From 4c75ff9e4318973ec010d34fa0b374b87123c607 Mon Sep 17 00:00:00 2001 From: "Kai T. Ohlhus" Date: Thu, 5 Mar 2020 17:29:50 +0900 Subject: [PATCH] Overhaul remaining code for VSDP 2020 release. --- test/@vsdp_benchmark/add_benchmark.m | 2 +- test/@vsdp_benchmark/disp.m | 2 +- test/@vsdp_benchmark/filter.m | 4 ++-- test/@vsdp_benchmark/run.m | 2 +- test/@vsdp_benchmark/vsdp_benchmark.m | 6 +++--- test/@vsdp_benchmark_exporter/columns.m | 2 +- test/@vsdp_benchmark_exporter/disp.m | 2 +- test/@vsdp_benchmark_exporter/get_data.m | 2 +- test/@vsdp_benchmark_exporter/get_test_cases.m | 2 +- test/@vsdp_benchmark_exporter/rows.m | 2 +- test/@vsdp_benchmark_exporter/to_cell_strings.m | 2 +- test/@vsdp_benchmark_exporter/to_csv.m | 2 +- test/@vsdp_benchmark_exporter/to_html.m | 4 ++-- test/@vsdp_benchmark_exporter/to_latex.m | 2 +- test/@vsdp_benchmark_exporter/to_markdown.m | 2 +- test/@vsdp_benchmark_exporter/vsdp_benchmark_exporter.m | 4 ++-- test/testVSDP.m | 4 ++-- test/testVSDP2006.m | 2 +- test/testVSDP_SDP.m | 2 +- test/testVSDP_svec_smat.m | 2 +- vsdp_indexable.m | 4 ++-- vsdp_options.m | 2 +- vsdp_solution.m | 4 ++-- 23 files changed, 31 insertions(+), 31 deletions(-) diff --git a/test/@vsdp_benchmark/add_benchmark.m b/test/@vsdp_benchmark/add_benchmark.m index 038838a..e24a441 100644 --- a/test/@vsdp_benchmark/add_benchmark.m +++ b/test/@vsdp_benchmark/add_benchmark.m @@ -13,7 +13,7 @@ % See also vsdp_benchmark. % -% Copyright 2004-2019 Christian Jansson (jansson@tuhh.de) +% Copyright 2004-2020 Christian Jansson (jansson@tuhh.de) % Recursive call with well-known benchmarks. if (nargin == 2) diff --git a/test/@vsdp_benchmark/disp.m b/test/@vsdp_benchmark/disp.m index e835534..7efd2e2 100644 --- a/test/@vsdp_benchmark/disp.m +++ b/test/@vsdp_benchmark/disp.m @@ -9,7 +9,7 @@ function disp (obj, item) % See also vsdp_benchmark. % -% Copyright 2004-2019 Christian Jansson (jansson@tuhh.de) +% Copyright 2004-2020 Christian Jansson (jansson@tuhh.de) if (nargin > 1) item = validatestring (item, {'system', 'solver', 'benchmark'}); diff --git a/test/@vsdp_benchmark/filter.m b/test/@vsdp_benchmark/filter.m index e2d09a9..1ceb7ca 100644 --- a/test/@vsdp_benchmark/filter.m +++ b/test/@vsdp_benchmark/filter.m @@ -10,7 +10,7 @@ % % obj.filter (bm_library, name) Optionally, the benchmark can be reduced to % a subset of the data by applying filters, i.e. regular expressions -% machted with the "regexp()" function. To filter the benchmark library +% matched with the "regexp()" function. To filter the benchmark library % provide a string for 'bm_library' and for the test case name set 'name'. % % Example: @@ -20,7 +20,7 @@ % See also vsdp_benchmark. % -% Copyright 2004-2019 Christian Jansson (jansson@tuhh.de) +% Copyright 2004-2020 Christian Jansson (jansson@tuhh.de) idx = true (size (obj.BENCHMARK(:,1))); if (isempty (idx)) diff --git a/test/@vsdp_benchmark/run.m b/test/@vsdp_benchmark/run.m index 0fa8373..da5788b 100644 --- a/test/@vsdp_benchmark/run.m +++ b/test/@vsdp_benchmark/run.m @@ -35,7 +35,7 @@ % See also vsdp_benchmark, vsdp_benchmark.filter. % -% Copyright 2004-2019 Christian Jansson (jansson@tuhh.de) +% Copyright 2004-2020 Christian Jansson (jansson@tuhh.de) if (isempty (obj.RESULT_DIR)) error ('VSDP_BENCHMARK:run:resultDirUnknown', ... diff --git a/test/@vsdp_benchmark/vsdp_benchmark.m b/test/@vsdp_benchmark/vsdp_benchmark.m index f83ee86..c57d550 100644 --- a/test/@vsdp_benchmark/vsdp_benchmark.m +++ b/test/@vsdp_benchmark/vsdp_benchmark.m @@ -4,14 +4,14 @@ % See also vsdp. % - % Copyright 2004-2018 Christian Jansson (jansson@tuhh.de) + % Copyright 2004-2020 Christian Jansson (jansson@tuhh.de) properties % A cell array of strings with VSDP benchmarks to run. The columns are: % % obj.BENCHMARK(:,1) Benchmark library name. % obj.BENCHMARK(:,2) Short name for the test case. - % obj.BENCHMARK(:,3) System dependend full path of the original test + % obj.BENCHMARK(:,3) System dependent full path of the original test % case data. % % Default: cell (0, 3). @@ -87,8 +87,8 @@ function p = check_dir (~, p) % CHECK_DIR Check 'p' to be an existing directory. % - % Return the absolute path 'p' or an emtpy char array. + % Return the absolute path 'p' or an empty char array. if (exist (p, "dir") == 7) p = what (p); % Get absolute path. p = p.path; diff --git a/test/@vsdp_benchmark_exporter/columns.m b/test/@vsdp_benchmark_exporter/columns.m index 6913f56..15d46ae 100644 --- a/test/@vsdp_benchmark_exporter/columns.m +++ b/test/@vsdp_benchmark_exporter/columns.m @@ -1,7 +1,7 @@ function obj = columns (obj, names) % COLUMNS Use specified columns by header names or indices. -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) if (isnumeric (names) || islogical (names)) obj.cdata_view = obj.cdata_view(:,names); diff --git a/test/@vsdp_benchmark_exporter/disp.m b/test/@vsdp_benchmark_exporter/disp.m index 2fedd0a..605eb24 100644 --- a/test/@vsdp_benchmark_exporter/disp.m +++ b/test/@vsdp_benchmark_exporter/disp.m @@ -1,7 +1,7 @@ function disp (obj) % DISP Display short export overview. -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) fprintf ('\n VSDP Benchmark Export\n\n'); fprintf (' obj.RESULT_DIR =\n\n ''%s''\n\n', obj.RESULT_DIR); diff --git a/test/@vsdp_benchmark_exporter/get_data.m b/test/@vsdp_benchmark_exporter/get_data.m index 2909d61..ac3c047 100644 --- a/test/@vsdp_benchmark_exporter/get_data.m +++ b/test/@vsdp_benchmark_exporter/get_data.m @@ -1,7 +1,7 @@ function obj = get_data (obj) % GET_DATA Get the data for the listed test cases. -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) obj.cdata{1,16} = []; % Preallocate width len = size (obj.cdata, 1); diff --git a/test/@vsdp_benchmark_exporter/get_test_cases.m b/test/@vsdp_benchmark_exporter/get_test_cases.m index 23eadda..7a206f7 100644 --- a/test/@vsdp_benchmark_exporter/get_test_cases.m +++ b/test/@vsdp_benchmark_exporter/get_test_cases.m @@ -3,7 +3,7 @@ % with format {'lib', 'test case', 'solver'}. % -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) file_list = dir (fullfile (obj.RESULT_DIR, 'data', '*.mat')); idx = {file_list.name}'; diff --git a/test/@vsdp_benchmark_exporter/rows.m b/test/@vsdp_benchmark_exporter/rows.m index bcab27d..19f4fc9 100644 --- a/test/@vsdp_benchmark_exporter/rows.m +++ b/test/@vsdp_benchmark_exporter/rows.m @@ -5,7 +5,7 @@ % regular expression to be matched. % -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) if (isnumeric (op) || islogical (op)) obj.cdata_view = obj.cdata_view(op,:); diff --git a/test/@vsdp_benchmark_exporter/to_cell_strings.m b/test/@vsdp_benchmark_exporter/to_cell_strings.m index 9532c47..26044ab 100644 --- a/test/@vsdp_benchmark_exporter/to_cell_strings.m +++ b/test/@vsdp_benchmark_exporter/to_cell_strings.m @@ -4,7 +4,7 @@ % The second input 'use_columns' determines the string conversion. % -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) if (all (all (cellfun (@ischar, obj.cdata_view)))) return; % All done. diff --git a/test/@vsdp_benchmark_exporter/to_csv.m b/test/@vsdp_benchmark_exporter/to_csv.m index f70eb7a..f467317 100644 --- a/test/@vsdp_benchmark_exporter/to_csv.m +++ b/test/@vsdp_benchmark_exporter/to_csv.m @@ -1,7 +1,7 @@ function str = to_csv (obj) % TO_CSV Export 'obj.cdata_view' to comma separated values (CSV). -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) % Ensure string entries. cdata = obj.to_cell_strings ().cdata_view; diff --git a/test/@vsdp_benchmark_exporter/to_html.m b/test/@vsdp_benchmark_exporter/to_html.m index 05c7468..d2008b2 100644 --- a/test/@vsdp_benchmark_exporter/to_html.m +++ b/test/@vsdp_benchmark_exporter/to_html.m @@ -1,7 +1,7 @@ function str = to_html (obj, html_title) % TO_HTML Export 'cdata' to rich HTML markup (MathJax, jQuery, dataTables). -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) % Ensure string entries. cdata = obj.to_cell_strings ().cdata_view; @@ -24,7 +24,7 @@ end datatables_url = ... - 'https://cdn.datatables.net/v/dt/jq-3.3.1/dt-1.10.18/fh-3.1.4/sl-1.3.0/datatables.min'; + 'https://cdn.datatables.net/v/dt/jq-3.3.1/dt-1.10.20/fh-3.1.6/sl-1.3.1/datatables.min'; header = strjoin ({ ... '', ... diff --git a/test/@vsdp_benchmark_exporter/to_latex.m b/test/@vsdp_benchmark_exporter/to_latex.m index 30352a3..a10d020 100644 --- a/test/@vsdp_benchmark_exporter/to_latex.m +++ b/test/@vsdp_benchmark_exporter/to_latex.m @@ -1,7 +1,7 @@ function str = to_latex (obj, body_only) % TO_LATEX Export 'obj.cdata_view' to LaTeX markup (longtable environment). -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) % Ensure string entries. cdata = obj.to_cell_strings ().cdata_view; diff --git a/test/@vsdp_benchmark_exporter/to_markdown.m b/test/@vsdp_benchmark_exporter/to_markdown.m index 63c52f6..17c12d4 100644 --- a/test/@vsdp_benchmark_exporter/to_markdown.m +++ b/test/@vsdp_benchmark_exporter/to_markdown.m @@ -1,7 +1,7 @@ function str = to_markdown (obj) % TO_MARKDOWN Export 'obj.cdata_view' to Markdown format. -% Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) % Ensure string entries. cdata = obj.to_cell_strings ().cdata_view; diff --git a/test/@vsdp_benchmark_exporter/vsdp_benchmark_exporter.m b/test/@vsdp_benchmark_exporter/vsdp_benchmark_exporter.m index 6bc7067..4d7f832 100644 --- a/test/@vsdp_benchmark_exporter/vsdp_benchmark_exporter.m +++ b/test/@vsdp_benchmark_exporter/vsdp_benchmark_exporter.m @@ -4,8 +4,8 @@ % Helper class to export benchmarks. % - % Copyright 2018-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) + % Copyright 2018-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) properties % Current view of the data to be exported. % @@ -111,8 +111,8 @@ function save_cache (obj) function p = check_dir (~, p) % CHECK_DIR Check 'p' to be an existing directory. % - % Return the absolute path 'p' or an emtpy char array. + % Return the absolute path 'p' or an empty char array. if (exist (p, "dir") == 7) p = what (p); % Get absolute path. p = p.path; diff --git a/test/testVSDP.m b/test/testVSDP.m index d89d9dd..38e6af9 100644 --- a/test/testVSDP.m +++ b/test/testVSDP.m @@ -1,5 +1,5 @@ function tests = testVSDP() -% TESTVSDP Runs a testsuite for VSDP (version 2018). +% TESTVSDP Runs a testsuite for VSDP (version 2020). % % Example: % @@ -9,7 +9,7 @@ % See also vsdp. % -% Copyright 2016-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2016-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) tests = functiontests (localfunctions); end diff --git a/test/testVSDP2006.m b/test/testVSDP2006.m index bf100ac..4f1e2a0 100644 --- a/test/testVSDP2006.m +++ b/test/testVSDP2006.m @@ -10,7 +10,7 @@ % See also demovsdp. % -% Copyright 2016-2019 Kai T. Ohlhus (kai.ohlhus@tuhh.de) +% Copyright 2016-2020 Kai T. Ohlhus (kai.ohlhus@tuhh.de) tests = functiontests(localfunctions); end diff --git a/test/testVSDP_SDP.m b/test/testVSDP_SDP.m index 3a8b8dc..4d9b1a8 100644 --- a/test/testVSDP_SDP.m +++ b/test/testVSDP_SDP.m @@ -112,7 +112,7 @@ function SDP_Jansson2007a_P192 (testCase) yu = 1e5 * [1 1 1 1]'; % An evaluation of Jansson2007a (p. 193) yields for EPSILON = 2e-4 -% the values X_22 = 5000, X_33 = 0 and y, repectivly. +% the values X_22 = 5000, X_33 = 0 and y, respectively. x_sol = [ EPSILON; -1; 0; -1; 1/EPSILON; 0; 0; 0; 0 ]; diff --git a/test/testVSDP_svec_smat.m b/test/testVSDP_svec_smat.m index 2dc851e..b029e55 100644 --- a/test/testVSDP_svec_smat.m +++ b/test/testVSDP_svec_smat.m @@ -1,6 +1,6 @@ function testVSDP_svec_smat (testCase) -% Unsymmetric matrix. +% Not symmetric matrix. A = [... 11, 12, 13, 14; ... 21, 22, 23, 24; ... diff --git a/vsdp_indexable.m b/vsdp_indexable.m index bf97adc..06ca91c 100644 --- a/vsdp_indexable.m +++ b/vsdp_indexable.m @@ -1,5 +1,5 @@ classdef vsdp_indexable < handle - % VSDP_INDEXABLE A quantity that can be separated into differrent cones. + % VSDP_INDEXABLE A quantity that can be separated into different cones. % % Example: % @@ -11,8 +11,8 @@ % See also vsdp. % - % Copyright 2004-2019 Christian Jansson (jansson@tuhh.de) + % Copyright 2004-2020 Christian Jansson (jansson@tuhh.de) properties value vsdp_obj diff --git a/vsdp_options.m b/vsdp_options.m index 4639de0..6cc5f87 100644 --- a/vsdp_options.m +++ b/vsdp_options.m @@ -92,8 +92,8 @@ % % See also vsdp. - % Copyright 2004-2019 Christian Jansson (jansson@tuhh.de) + % Copyright 2004-2020 Christian Jansson (jansson@tuhh.de) narginchk (0, 1); % Check for default solver by explicitly setting it again. diff --git a/vsdp_solution.m b/vsdp_solution.m index 8f3128d..4844a5a 100644 --- a/vsdp_solution.m +++ b/vsdp_solution.m @@ -52,8 +52,8 @@ % % See also vsdp. - % Copyright 2004-2019 Christian Jansson (jansson@tuhh.de) + % Copyright 2004-2020 Christian Jansson (jansson@tuhh.de) narginchk (4, 6); obj.sol_type = validatestring (sol_type, {'Initial', ... @@ -235,7 +235,7 @@ function mem_info (obj) % TO_2006_FMT Export conic problem solution to VSDP 2006 format. % % [X0, y0, Z0] = sol.to_2006_fmt (obj); Export the solution 'sol' of - % a VSDP 2018 conic problem 'obj' to VSDP 2006 format. + % a VSDP 2020 conic problem 'obj' to VSDP 2006 format. % % See also vsdp, vsdp_solution. %