remove o2.cpp files

AMICI-dev · May 12, 2017 · 5bc7f8c · 5bc7f8c
1 parent 7cfa77e
commit 5bc7f8c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 33 deletions.
diff --git a/@amimodel/compileC.m b/@amimodel/compileC.m
@@ -405,16 +405,7 @@ function compileC(this)
 
 
     fprintf('amici | ');
-    if(this.nxtrue ~= this.nx)
-        cstr = 'amicio2.cpp';
-    else
-        cstr = 'amici.cpp';
-    end
-    eval(['mex ' DEBUG COPT ...
-        ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ...
-        fullfile(this.wrap_path,'src',cstr) ' ' ...
-        includesstr]);
-
+
     if(isunix)
         if(~ismac)
             CLIBS = 'CLIBS="-lrt"';
@@ -429,35 +420,37 @@ function compileC(this)
         end
     end
 
-
-    if(this.nxtrue ~= this.nx)
-        o2ext = 'o2';
-    else
-        o2ext = '';
+    if(this.nxtrue == this.nx)
+        eval(['mex ' DEBUG COPT ...
+            ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ...
+            fullfile(this.wrap_path,'src','amici.cpp') ' ' ...
+            includesstr]);
     end
-
-    prefix = 'ami';
-
 
-    eval(['mex ' DEBUG ' ' COPT ...
-        ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ...
-        fullfile(this.wrap_path,'src',['amiwrap' o2ext '.cpp']) ' ' ...
-        includesstr]);
+    if(this.nxtrue == this.nx)
+        eval(['mex ' DEBUG ' ' COPT ...
+            ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ...
+            fullfile(this.wrap_path,'src','amiwrap.cpp') ' ' ...
+            includesstr]);
+    end
 
-    eval(['mex ' DEBUG ' ' COPT ...
-        ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ...
-        fullfile(this.wrap_path,'src',['amici_interface_matlab' o2ext '.cpp']) ' ' ...
-        includesstr]);
+    if(this.nxtrue == this.nx)
+        eval(['mex ' DEBUG ' ' COPT ...
+            ' -c -outdir ' fullfile(this.wrap_path,'src') ' ' ...
+            fullfile(this.wrap_path,'src','amici_interface_matlab.cpp') ' ' ...
+            includesstr]);
+    end
 
     eval(['mex ' DEBUG ' ' COPT ' ' CLIBS ...
-        ' -output ' fullfile(this.wrap_path,'models',this.modelname,[prefix '_' this.modelname]) ...
-        ' "' fullfile(this.wrap_path,'src',['amiwrap' o2ext o_suffix]) '"' ...
-        ' "' fullfile(this.wrap_path,'src',['amici' o2ext o_suffix]) '"' ...
-        ' "' fullfile(this.wrap_path,'src',['amici_interface_matlab' o2ext o_suffix]) '"' ...
+        ' -output ' fullfile(this.wrap_path,'models',this.modelname,['ami_' this.modelname]) ...
+        ' "' fullfile(this.wrap_path,'src',['amiwrap' o_suffix]) '"' ...
+        ' "' fullfile(this.wrap_path,'src',['amici' o_suffix]) '"' ...
+        ' "' fullfile(this.wrap_path,'src',['amici_interface_matlab' o_suffix]) '"' ...
         ' "' fullfile(this.wrap_path,'models',this.modelname,['wrapfunctions' o_suffix]) '"' ...
         objectsstr ...
         includesstr ...
         ])
+
 
 
 

diff --git a/src/amici_interface_matlabo2.cpp b/src/amici_interface_matlabo2.cpp
diff --git a/src/amicio2.cpp b/src/amicio2.cpp
diff --git a/src/amiwrapo2.cpp b/src/amiwrapo2.cpp