Changeset 418 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/abstractElement.cc

Timestamp:

Jun 21, 2013, 10:16:56 AM (11 years ago)

Author:

lemeur

Message:

definition des compatibilites des elements dans les software

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/abstractElement.cc (modified) (7 diffs)

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

@@ -6 +6 @@
 
 abstractElement::abstractElement() 
-: abstractSoftware_(NULL)
+//: nameOfSoftware_(NULL)
+  : abstractSoftware_(NULL)
 {
   setDefaultValues();
@@ -14 +15 @@
 
 abstractElement::abstractElement(string lab)
+  //: nameOfSoftware_(NULL)
+  : abstractSoftware_(NULL)
 {
-  label_ = lab;
+  specificName_ = lab;
   setDefaultValues();
   setDefaults();
@@ -24 +27 @@
 {
   if (parametersString_ != NULL) delete [] parametersString_ ;
+  //  if ( nameOfSoftware_ != NULL ) delete nameOfSoftware_;
 }
 
 void abstractElement::setDefaultValues() 
 {
-  defaultLabel_ = string("XXXXXX");
+  defaultSpecificName_ = string("XXXXXX");
   defaultLength_ = 0.0;
   defaultAperture_ = 1.e+6;
@@ -36 +40 @@
 void abstractElement::setDefaults() 
 {
-  label_ = defaultLabel_;
+  specificName_ = defaultSpecificName_;
   nbParam_ = 2;
   lenghtElem_ = defaultLength_;
@@ -55 +59 @@
 void abstractElement::setLabel(string lab)
 {
-  label_= lab;
+  specificName_= lab;
 }
 
 string abstractElement::getLabel() const
 {
-  return label_;
+  return specificName_;
 }
 
@@ -80 +84 @@
 
 
-trivaluedBool abstractElement::is_accepted_by_software(nomDeLogiciel prog) {
-    if (acceptableSoftware_.size() == 0) {
-        return TBoolError;
-    }
-
-    if ( std::find(acceptableSoftware_.begin(), acceptableSoftware_.end(), prog) != acceptableSoftware_.end()) {
-        return TBoolOk;
-    } else if ( std::find(ignoreSoftware_.begin(), ignoreSoftware_.end(), prog) != ignoreSoftware_.end()) {
-        return TBoolIgnore;
-    } else {
-        return TBoolError;
-    }
-
-    return TBoolOk;
-}
-
-
 double abstractElement::getInitialKineticEnergy() const {
   return 0.0;
@@ -102 +89 @@
 
 
-string abstractElement::generatorOutputFlow() const {
-  return "";
-}
 
-trivaluedBool abstractElement::setSoftware(nomDeLogiciel prog) 
-{
-  trivaluedBool tb = TBoolError;
-  if (std::find(acceptableSoftware_.begin(),acceptableSoftware_.end(),prog) != acceptableSoftware_.end()) {
-    tb = TBoolOk;
-  } else if (std::find(ignoreSoftware_.begin(),ignoreSoftware_.end(),prog) != ignoreSoftware_.end()) {
-    tb = TBoolIgnore;
-  } else {
-    tb = TBoolError;
-  }
-  
-  if (prog == nomDeLogiciel::unknownSoftware){
-    tb = TBoolOk;
-  }
-  
-  if ((tb == TBoolOk)/* || (tb == TBoolIgnore)*/) {
-    if (prog == nomDeLogiciel::parmela) {
-      abstractSoftware_ = new softwareParmela();
-    } else if (prog == nomDeLogiciel::transport) {
-      abstractSoftware_ = new softwareTransport();
-    } else if (prog == nomDeLogiciel::generator) {
-      abstractSoftware_ = new softwareGenerator();
-    } else if (prog == nomDeLogiciel::test) {
-      abstractSoftware_ = new softwareTest();
-    } else if (prog == nomDeLogiciel::unknownSoftware) {
-      abstractSoftware_ = NULL;
-    }
-  }
-  return tb;
-}
-
-void abstractElement::registerAcceptableSoftware(nomDeLogiciel abs,trivaluedBool b) {
-  if (b == TBoolIgnore) {
-    ignoreSoftware_.push_back(abs);
-  } else if (b == TBoolOk) {
-    acceptableSoftware_.push_back(abs);
-  }
-}