Skip to content

FIX Bugs and Errors #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrino-meli wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX Bugs and Errors #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
benchmarks/matFiles/*
3 changes: 2 additions & 1 deletion benchmarks/Benchmark.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;'] );

Expand Down
10 changes: 5 additions & 5 deletions benchmarks/Benchmark_toyExample.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function [ problem ] = Benchmark_toyExample1( variant )
%Benchmark_toyExample1 does something.
function [ problem ] = Benchmark_toyExample( variant )
%Benchmark_toyExample does something.
%
%Inputs:
% (tbd)
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions benchmarks/Benchmarks.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/auxFiles/getBenchmarkList.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
benchmarkFeatures = cell( nBenchmarks,1 );


curWarningState = adjustWarnLevel( WarnLevel.showNone );
%curWarningState = adjustWarnLevel( WarnLevel.showNone );

for ii=1:nBenchmarks

Expand Down Expand Up @@ -58,6 +58,6 @@
fprintf( '\n' );

% restore warning state
warning( curWarningState );
%warning( curWarningState );

end