Changeset 419 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

Timestamp:

Jun 21, 2013, 2:32:47 PM (11 years ago)

Author:

lemeur

Message:

ajout de l'include algorithm

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc (modified) (4 diffs)

Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

@@ -64 +64 @@
 }
 
-void dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, abstractSoftware* prog)
-{
-    jobList_.push_back(new sectionToExecute(debut, debutIndex, fin, finIndex, prog));
+sectionToExecute*  dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, nomDeLogiciel logiciel)
+{
+  abstractSoftware* prog;
+  string inputFileName;
+  if(logiciel == nomDeLogiciel::parmela) {
+    inputFileName = "parmin";
+    prog = new softwareParmela(inputFileName, &globParam_, this);
+  } else if (logiciel  == nomDeLogiciel::transport) {
+    inputFileName = "transport.input";
+    prog =  new softwareTransport(inputFileName, &globParam_, this);
+  } else if (logiciel == nomDeLogiciel::generator) {
+    inputFileName = "generator.in";
+    prog = new softwareGenerator(inputFileName, &globParam_, this);
+  } else if (logiciel  == nomDeLogiciel::test) {
+    prog = new softwareTest(inputFileName, &globParam_, this);
+  } else {
+    prog = NULL;
+  }
+
+  //  abstractSoftware* prog = createSoftwareConnexion(logiciel);
+  jobList_.push_back(new sectionToExecute(debut, debutIndex, fin, finIndex, prog));
+  //  return prog;
+  return jobList_.back();
 }
 
@@ -81 +101 @@
 
 void dataManager::clearSectionToExecute(int a) {
+  cout << " dataManager::clearSectionToExecute efaacement section d'index : " << a << endl;
   if (a<0) return;
   if (a>= jobList_.size()) return;
+
+  // lors de la creation de la section on a fait un 'new' d'un softwareXXXX
+  // on fait ici le 'delete'
+
+  const abstractSoftware* soft = jobList_.at(a)->getSoftware();
+    if ( soft != NULL ) delete soft;
   jobList_.erase (jobList_.begin()+a);
 }
@@ -160 +187 @@
       }
       
-      delete softw;
       if ( success ) {
         currentBeam_ = &diagnosticBeam_.at(indexElementToIndexDiag_.back());
@@ -328 +354 @@
     string inputFileName;
     if(logi == nomDeLogiciel::parmela) {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : parmela " << endl;
         inputFileName = "parmin";
         return new softwareParmela(inputFileName, &globParam_, this);
     } else if (logi == nomDeLogiciel::transport) {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : transport " << endl;
         inputFileName = "transport.input";
         return new softwareTransport(inputFileName, &globParam_, this);
     } else if (logi == nomDeLogiciel::generator) {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : generator " << endl;
         inputFileName = "generator.in";
         return new softwareGenerator(inputFileName, &globParam_, this);
     } else if (logi == nomDeLogiciel::test) {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : test " << endl;
         return new softwareTest(inputFileName, &globParam_, this);
     } else {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : null " << endl;
         return NULL;
     }