Skip to content

Commit

Permalink
Small corrections:
Browse files Browse the repository at this point in the history
- cosmetic changes in main window
- small changes in Check_installed (displays - OK! for each toolbox installed)
- setup example, disabled the opening of the simulink, improves greatly the speed of the install procedure #12
  • Loading branch information
MaximeBaudette committed Mar 1, 2016
1 parent 3c482b0 commit 2888d87
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
Binary file modified Sources/gui/rapidMainWindow.fig
Binary file not shown.
3 changes: 2 additions & 1 deletion Sources/install/check_installed.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@
%List the dependencies (with -- not installed! if not installed)
disp('RaPId Toolbox dependancies are: ');
for (i=1:length(dep_list))
disp(dep_list{i});
if ~sum(ismember(dep_inst(1,1,:),dep_list(i)))
warning(strcat(dep_list{i},' -- not installed!'));
check = check || true;
else
disp(strcat(dep_list{i}, ' -- OK !'));
end
end

Expand Down
8 changes: 4 additions & 4 deletions Sources/install/run_example.m
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
RaPIdObject.experimentSettings.modelName = 'variable_rafael'; %Simulink model name
RaPIdObject.experimentSettings.blockName = 'variable_rafael/Rafael_original_estimated'; %FMU name
RaPIdObject.experimentSettings.scopeName = 'simout'; %Result sink name
RaPIdObject.experimentSettings.displayMode = 'Show';
RaPIdObject.experimentSettings.displayMode = 'hide';

%Estimation parameter settings
RaPIdObject.experimentSettings.p_0 = [0.3, 4.1, 1.7, 1.1]; %Initial parameter guess
Expand Down Expand Up @@ -71,9 +71,9 @@
%% ==========Running the computation==========

%Opening simulink model
open_system(RaPIdObject.experimentSettings.pathToSimulinkModel); %Opening the simulink model
open_system(strcat(RaPIdObject.experimentSettings.modelName,'/Scope')); %Opening the scope in the model to observe estimation process
pause(1); %Waiting one second for scope to initialize
% open_system(RaPIdObject.experimentSettings.pathToSimulinkModel); %Opening the simulink model
% open_system(strcat(RaPIdObject.experimentSettings.modelName,'/Scope')); %Opening the scope in the model to observe estimation process
% pause(1); %Waiting one second for scope to initialize
%%

%Starting the estimation process
Expand Down

0 comments on commit 2888d87

Please sign in to comment.