From 8e861fbb940e9ab9b6ee602d1b3974bcf7c1c3ce Mon Sep 17 00:00:00 2001
From: Andrino Meli <55392123+andrino-meli@users.noreply.github.com>
Date: Mon, 23 Oct 2023 19:00:14 +0200
Subject: [PATCH] FIX Bugs and Errors - make scripts generate .mat files with
 problem data

---
 .gitignore                             |  1 +
 benchmarks/Benchmark.m                 |  3 ++-
 benchmarks/Benchmark_toyExample.m      | 10 +++++-----
 benchmarks/Benchmarks.m                | 10 +++++-----
 benchmarks/auxFiles/getBenchmarkList.m |  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f920cc4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+benchmarks/matFiles/*
diff --git a/benchmarks/Benchmark.m b/benchmarks/Benchmark.m
index 02886bc..8b0d553 100644
--- a/benchmarks/Benchmark.m
+++ b/benchmarks/Benchmark.m
@@ -988,7 +988,8 @@
                 error( ['Unable to export variant no. ',num2str(variant),'!'] );
             end
             
-            caesarPath = getCaesarPath( );
+            caesarPath = '';
+            sep = '/';
             eval( ['problem = Benchmark_',char(obj.getName()),'( variant );'] );
             eval( ['save ',caesarPath,'benchmarks',sep,'matFiles',sep,obj.getLabel(variant),'.mat problem;'] );
 
diff --git a/benchmarks/Benchmark_toyExample.m b/benchmarks/Benchmark_toyExample.m
index fd15d94..4bcb98a 100644
--- a/benchmarks/Benchmark_toyExample.m
+++ b/benchmarks/Benchmark_toyExample.m
@@ -1,5 +1,5 @@
-function [ problem ] = Benchmark_toyExample1( variant )
-%Benchmark_toyExample1 does something.
+function [ problem ] = Benchmark_toyExample( variant )
+%Benchmark_toyExample does something.
 %
 %Inputs:
 %  (tbd)
@@ -27,11 +27,11 @@
 problem = Benchmark(variant);
 
 % try to load benchmark from mat file
-problem = problem.loadFromMatFile( 'toyExample1',variant );
+problem = problem.loadFromMatFile( 'toyExample',variant );
 
 problem.info              = setupBenchmarkInfoStruct( );
-problem.info.ID           = uint32(Benchmarks.toyExample1);
-problem.info.name         = 'toyExample1';
+problem.info.ID           = uint32(Benchmarks.toyExample);
+problem.info.name         = 'toyExample';
 problem.info.description  = 'A simple toy example.';
 problem.info.reference    = 'Problem Set 6 - Numerical Optimization Methods, Model Predictive Control course at ETH Zurich in 2013';
 problem.info.origin       = Origin.academicExample;
diff --git a/benchmarks/Benchmarks.m b/benchmarks/Benchmarks.m
index bc302df..c69b40a 100644
--- a/benchmarks/Benchmarks.m
+++ b/benchmarks/Benchmarks.m
@@ -31,13 +31,13 @@
         robotArm                 (16)
         nonlinearChain           (17)
         fiordosExample           (18)
-        overheadCrane            (19)
-        polytopicTerminal        (20)
+        %overheadCrane            (22) % gives an error
+        polytopicTerminal        (19)
         ... % industrial, not part of public benchmark collection
-        compressor               (21)
+        compressor               (20)
         ... % under development
-        nonlinearAcDrive         (22)
-        %powerNetworkSystem      (xx)
+        nonlinearAcDrive         (21)
+        %powerNetworkSystem      (xk)
         %underwaterVehicle       (xx)
         %dieselEngine            (xx)
         %linearizedCstr          (xx)
diff --git a/benchmarks/auxFiles/getBenchmarkList.m b/benchmarks/auxFiles/getBenchmarkList.m
index a856372..506a208 100644
--- a/benchmarks/auxFiles/getBenchmarkList.m
+++ b/benchmarks/auxFiles/getBenchmarkList.m
@@ -24,7 +24,7 @@
     benchmarkFeatures = cell( nBenchmarks,1 );
 
     
-    curWarningState = adjustWarnLevel( WarnLevel.showNone );
+    %curWarningState = adjustWarnLevel( WarnLevel.showNone );
     
     for ii=1:nBenchmarks
 
@@ -58,6 +58,6 @@
     fprintf( '\n' );
     
     % restore warning state
-    warning( curWarningState );
+    %warning( curWarningState );
 
 end