Version 7.3.0

Version 7.3.0

appveyor.yml

@@ -1,5 +1,5 @@
 environment:
-  app_version: '7.2.0'
+  app_version: '7.3.0'
 
 version: '%app_version%.{build}'
 

packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  	<package id="OSPSuite.FuncParser" version="2.0.0.1"/>
-  	<package id="OSPSuite.SimModelSolver_CVODES282" version="2.0.0.1" />
-	<package id="OSPSuite.SimModel" version="2.2.0.6"/>
-	<package id="OSPSuite.SimModelComp" version="2.2.0.6"/>
+  	<package id="OSPSuite.FuncParser" version="3.0.0.6"/>
+  	<package id="OSPSuite.SimModelSolver_CVODES282" version="3.0.0.7" />
+	<package id="OSPSuite.SimModel" version="3.0.0.16"/>
+	<package id="OSPSuite.SimModelComp" version="3.0.0.16"/>
 </packages>

rakefile

@@ -90,7 +90,7 @@ end
 
 def copy_to_lib_dir(target_lib_dir) 
   copy_depdencies lib_dir, target_lib_dir do
-    copy_dci_dll
+    copy_files File.join('DCI','x86'), 'dll'
     copy_schema_xsd
     copy_dcimatlab_dll
     copy_dimensions_xml

tests/checkHelptextForDirectory.m

@@ -4,8 +4,7 @@ function checkHelptextForDirectory(functionDir)
 %   CHECKHELPTEXTFORDIRECTORY(functionDir)
 %       functionDir name of the directory
 
-% Open Systems Pharmacology Suite;  [email protected]
-% Date: 16-Sep-2010
+% Open Systems Pharmacology Suite;  http://open-systems-pharmacology.org
 
 files=dir([functionDir filesep '*.m']);
 

tests/loop_BasisToolBox.m

@@ -3,8 +3,7 @@
 % 
 % LOOP_BASISTOOLBOX
 
-% Open Systems Pharmacology Suite;  [email protected]
-% Date: 16-Sep-2010
+% Open Systems Pharmacology Suite;  http://open-systems-pharmacology.org
 
 % prepare logDir
 if ~exist('log','dir')

tests/mergeErrorFlag.m

@@ -7,9 +7,7 @@
 %   ErrorFlag double: Maximum of ErrorFlag_tmp
 %   ErrorMessage (string): concatination of all
 
-% Open Systems Pharmacology Suite;  [email protected]
-% Date: 16-Sep-2010
-
+% Open Systems Pharmacology Suite;  http://open-systems-pharmacology.org
 
 if isempty(ErrorFlag_tmp)
     ErrorFlag=0;

tests/test_0_checkInputOptions.m

@@ -8,8 +8,7 @@
 %               2 = 'Serious Error'
 %       ErrorMessage (string): Description of the error
 
-% Open Systems Pharmacology Suite;  [email protected]
-% Date: 17-Sep-2010
+% Open Systems Pharmacology Suite;  http://open-systems-pharmacology.org
 
 ErrorFlag_tmp=0;
 ErrorMessage_tmp{1}='';
@@ -136,8 +135,6 @@
 diary( ['log/' logfile '_' datestr(now,'yyyy_mm_dd') '.log']);
 diary on;
 
-ErrorFlag_tmp(end+1)=1;
-ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
 
 % Check input option possible option values cell array wrong keyword
 TestDescription{end+1}='7) input option possible option values cell array wrong keyword;';
@@ -152,6 +149,13 @@
         });
 catch exception
     disp(exception.message);
+    if strcmp(exception.message,'For option "optionname" the keyword "Key4" is unknown!')
+        ErrorFlag_tmp(end+1)=0;
+        ErrorMessage_tmp{end+1}={};
+    else
+        ErrorFlag_tmp(end+1)=1;
+        ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
+    end
 end
 disp(' ');
 
@@ -169,6 +173,14 @@
         });
 catch exception
     disp(exception.message);
+    if strcmp(exception.message,'For option "optionname" the value "4" is unknown!')
+        ErrorFlag_tmp(end+1)=0;
+        ErrorMessage_tmp{end+1}={};
+    else
+        ErrorFlag_tmp(end+1)=1;
+        ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
+    end
+
 end
 disp(' ');
 
@@ -186,6 +198,13 @@
         });
 catch exception
     disp(exception.message);
+    if strcmp(exception.message,'For option "optionname" the value "1" must be numeric!')
+        ErrorFlag_tmp(end+1)=0;
+        ErrorMessage_tmp{end+1}={};
+    else
+        ErrorFlag_tmp(end+1)=1;
+        ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
+    end
 end
 disp(' ');
 
@@ -201,6 +220,14 @@
         });
 catch exception
     disp(exception.message);
+    if strcmp(exception.message,'For option "optionname" value "8" is not valid. The following condition has to be fulfilled: optionname>0 & optionname <= 7 !')
+        ErrorFlag_tmp(end+1)=0;
+        ErrorMessage_tmp{end+1}={};
+    else
+        ErrorFlag_tmp(end+1)=1;
+        ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
+    end
+
 end
 disp(' ');
 
@@ -216,10 +243,19 @@
         });
 catch exception
     disp(exception.message);
+    if strcmp(exception.message,'For option "optionname" the value "none" must be a cell!')
+        ErrorFlag_tmp(end+1)=0;
+        ErrorMessage_tmp{end+1}={};
+    else
+        ErrorFlag_tmp(end+1)=1;
+        ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
+    end
+
+
 end
 disp(' ');
 diary off;
 
 [ErrorFlag,ErrorMessage,TestDescription]=mergeErrorFlag(ErrorFlag_tmp,ErrorMessage_tmp,TestDescription);
 
-return
+return

tests/test_0_checkInputSimulationIndex.m

@@ -8,15 +8,13 @@
 %               2 = 'Serious Error'
 %       ErrorMessage (string): Description of the error
 
-% Open Systems Pharmacology Suite;  [email protected]
-% Date: 20-Sep-2010
-
+% Open Systems Pharmacology Suite;  http://open-systems-pharmacology.org
 
 ErrorFlag_tmp=0;
 ErrorMessage_tmp{1}='';
 TestDescription={};
 
-
+% preparation  for test initialize model
 xml=['models' filesep 'PopSim.xml'];
 initSimulation(xml,'none','report','none');
 initSimulation(xml,'none','report','none','addFile',true);
@@ -30,8 +28,6 @@
 
 
 
-ErrorFlag_tmp(end+1)=1;
-ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
 
 % Check simulationIndex non numeric
 TestDescription{end+1}='1) non numeric simulationIndex:;';
@@ -42,10 +38,19 @@
     checkInputSimulationIndex('simulationIndex');
 catch exception
     disp(exception.message);
+    if strcmp(exception.message,'SimulationIndex simulationIndex is not valid. Please add a simulationIndex between 1 and 2')
+        ErrorFlag_tmp(end+1) = 0;
+        ErrorMessage_tmp{end+1} = {};
+    else
+        ErrorFlag_tmp(end+1)=1;
+        ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
+
+    end
 end
 
 disp(' ');
 
+% Check simulationIndex not existin
 TestDescription{end+1}='2) simulationIndex not existing (=0);';
 disp(sprintf('Test: %s',TestDescription{end})); %#ok<*DSPS>
 disp('expected is an errormessage');
@@ -54,10 +59,18 @@
     checkInputSimulationIndex(0);
 catch exception
     disp(exception.message);
+    if strcmp(exception.message,'Please add a simulationIndex, if more than one simulation is initialized')
+            ErrorFlag_tmp(end+1) = 0;
+        ErrorMessage_tmp{end+1} = {};
+    else
+        ErrorFlag_tmp(end+1)=1;
+        ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
+
+    end
 end
 
 disp(' ');
-
+% check simulationIndex to larg
 TestDescription{end+1}='3)  simulationIndex to large (=5, 2 allowed);';
 disp(sprintf('Test: %s',TestDescription{end})); %#ok<*DSPS>
 disp('expected is an errormessage');
@@ -66,6 +79,16 @@
     checkInputSimulationIndex(5);
 catch exception
     disp(exception.message);
+
+    if strcmp(exception.message,['SimulationIndex 5 is not valid. Only 2 simulations are initialized.'...
+            char(10) 'Please add a simulationIndex between 1 and 2'])
+        ErrorFlag_tmp(end+1) = 0;
+        ErrorMessage_tmp{end+1} = {};
+    else
+        ErrorFlag_tmp(end+1)=1;
+        ErrorMessage_tmp{end+1}=['check logfile:' logfile '!'];
+    end
+
 end
 
 diary off;

tests/test_0_findTableIndex.m

@@ -8,53 +8,52 @@
 %               2 = 'Serious Error'
 %       ErrorMessage (string): Description of the error
 
-% Open Systems Pharmacology Suite;  [email protected]
-% Date: 19-Sep-2010
+% Open Systems Pharmacology Suite;  http://open-systems-pharmacology.org
 
 ErrorFlag_tmp=0;
 ErrorMessage_tmp{1}='';
 TestDescription={};
 
-
-xml=['models' filesep 'Simulation 22_11_2011 12_38_50.xml'];
+% model initialisation
+xml=['models' filesep 'TableParameters.xml'];
 initSimulation(xml,'all','report','none');
 
 % find numeric
 TestDescription{end+1}='1) find indx per ID;';
-[indx] = findTableIndex(111, 2, 1);
-if indx~=1
+[indx] = findTableIndex(5738, 2, 1);
+if indx~= 1923
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end
 
 % find in refernce table
-TestDescription{end+1}='2) find in refernce table;';
-[indx] = findTableIndex(111, 2, 1,true);
-if indx~=1
+TestDescription{end+1}='2) find in reference table;';
+[indx] = findTableIndex(5738, 2, 1,true);
+if indx~=1923
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end
 
 % find numeric for nonexistent number
 TestDescription{end+1}='3) find numeric for nonexistent number;';
-[indx] = findTableIndex(1, 2, 1,true);
+[indx] = findTableIndex(9999, 2, 1,true);
 if ~isempty(indx)
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end
 
 % find path without wildcards
 TestDescription{end+1}='4) find path without wildcards;';
-[indx] = findTableIndex('No/H0', 2, 1,true);
-if indx~=7
+[indx] = findTableIndex('S1|Applications|T1|Fraction (dose)', 2, 1,true);
+if indx~=1923
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end
 
 % find path all
 TestDescription{end+1}='5) find path all;';
 [indx] = findTableIndex('*', 2, 1,true);
-if ~all(indx==1:8)
+if length(indx) ~= 1947
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end
@@ -69,32 +68,32 @@
 
 % find path end wildcard 
 TestDescription{end+1}='7) find path end wildcard ;';
-[indx] = findTableIndex('*Tol', 2, 1,true);
-if ~all(indx==[2:3]) %#ok<NBRAK>
+[indx] = findTableIndex('S1|Organism|FcRn receptor conc.*', 2, 1,true);
+if ~all(indx==9) 
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end
 
 % find path wildcard in bewtween 
 TestDescription{end+1}='8)find path wildcard in bewtween ;';
-[indx] = findTableIndex('|*n', 2, 1,true);
-if ~all(indx==[5 8])
+[indx] = findTableIndex('S1|O*sm|Weight', 2, 1,true);
+if ~all(indx==5)
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end
 
 % find path start wildcard 
 TestDescription{end+1}='9) find path start wildcard ;';
 [indx] = findTableIndex('*Tol', 2, 1,true);
-if ~all(indx==[2 3])
+if ~all(indx==[1941,1942])
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end
 
 % find path more than one wild card
 TestDescription{end+1}='10) find path more than one wild card;';
-[indx] = findTableIndex('Model*rganism|Re*ion*k1', 2, 1,true);
-if ~all(indx==[1])
+[indx] = findTableIndex('S1|*|Rate constant for *dosomal uptake (*)', 2, 1,true);
+if ~all(indx==[20])
     ErrorFlag_tmp(end+1)=2;
     ErrorMessage_tmp{end+1}=sprintf('failed: %s',TestDescription{end});
 end