Changeset 493 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/abstractSoftware.cc

Timestamp:

Mar 11, 2014, 11:21:43 AM (10 years ago)

Author:

lemeur

Message:

refection generale des secteurs et applications de softwares (suite)

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/abstractSoftware.cc (modified) (1 diff)

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

@@ -10 +10 @@
 }
 
-abstractSoftware::abstractSoftware(string inputFileName, sectionToExecute* sect, dataManager* data)
+// abstractSoftware::abstractSoftware(string inputFileName, sectionToExecute* sect, dataManager* data)
+// {
+//   inputFileName_ = inputFileName;
+//   //  sectionToExecute_ = sect;
+//   compBlock_ = NULL;
+//   dataManager_ = data;
+//   nameOfSoftware_ = new nomDeLogiciel("unknownSoftware");
+// }
+
+abstractSoftware::abstractSoftware(string inputFileName, computingBlock* cmpb, dataManager* data)
 {
   inputFileName_ = inputFileName;
-  sectionToExecute_ = sect;
+  compBlock_ = cmpb;
   dataManager_ = data;
+  cout << " abstractSoftware::abstractSoftware adresse manager " << dataManager_  << endl;
   nameOfSoftware_ = new nomDeLogiciel("unknownSoftware");
 }
 
 
-// void abstractSoftware::registerElement(nomdElements::typedElement nomdel,trivaluedBool b) 
-// {
-//   //  std::cout << " abstractSoftware::registerElement soft : " << nameOfSoftware_.getString() << std::endl;
-//   if (b == TBoolIgnore) {
-//     //    std::cout << " abstractSoftware::registerElement j'enregistre element " <<  nomdel << "   ignore " << std::endl;
-//     ignoredElements_.push_back(nomdel);
-//   } else if (b == TBoolOk) {
-//     //    std::cout << " abstractSoftware::registerElement j'enregistre element " <<  nomdel << "  OK " << std::endl;
-//     acceptedElements_.push_back(nomdel);
-//   }
-// }
-
-// trivaluedBool abstractSoftware::doAcceptElement(nomdElements::typedElement typdel) 
-// {
-
-//   //xx
-//   if (acceptedElements_.size() == 0 && nameOfSoftware_ != nomDeLogiciel::unknownSoftware) {
-//     return TBoolError;
-//   }
-
-//   if (std::find(acceptedElements_.begin(),acceptedElements_.end(),typdel) != acceptedElements_.end()) {
-//     return TBoolOk;
-//   }
-
-//   if (ignoredElements_.size() == 0) {
-//     return TBoolError;
-//   }
-
-//   if (std::find(ignoredElements_.begin(),ignoredElements_.end(),typdel) != ignoredElements_.end()) {
-//     return TBoolIgnore;
-//   }
-
-//   return TBoolOk;
-// }
 
 bool abstractSoftware::launchJob(string commandLine, string& resul)