signal handled

Author: kmorita0111

cerealize.cpp

@@ -1,17 +1,18 @@
 #include "spatialsim/spatialsimulator.h"
 #include "spatialsim/mystruct.h"
-#include "cerealize.h"
+#include "spatialsim/cerealize.h"
 #include "sbml/SBMLTypes.h"
 #include "sbml/packages/spatial/common/SpatialExtensionTypes.h"
 #include "sbml/packages/spatial/extension/SpatialModelPlugin.h"
 #include <float.h>
-#include <vector.h>
+#include <vector>
 
 using namespace std;
 LIBSBML_CPP_NAMESPACE_USE
 
-void cerealize(){
+void cerealize(int signal){
 
+  cout << endl;
   cout << "simulation is canceled" << endl;
 
   exit(1);

spatialsim/cerealize.h

@@ -3,6 +3,6 @@
 
 #include "mystruct.h"
 
-void cerealize();
+void cerealize(int signal);
 
 #endif

spatialsimulator.cpp

@@ -1123,6 +1123,9 @@ void simulate(optionList options)
   }
   outputGeo3dImage(geoInfoList, Xdiv, Ydiv, Zdiv, fname, outpath);
 	cout << "finished" << endl << endl;
+        
+        //### DUMP ###//
+        std::signal(SIGINT, cerealize);
 
 	//simulation
 	cout << "simulation starts" << endl;
@@ -1521,9 +1524,6 @@ void simulate(optionList options)
   cout << "assign_time: "<< (assign_time / static_cast<double>(CLOCKS_PER_SEC)) << endl;
   cout << "output_time: "<< (output_time / static_cast<double>(CLOCKS_PER_SEC)) << endl;
 
-  //### DUMP ###//
-  std::signal(SIGINT, cerealize);
-  
   //free
   delete[] geo_edge;//mashimo
 //for (i = 0; i < freeConstList.size(); i++) {