Changeset 316 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/nomDeLogiciel.cc

Timestamp:

Feb 9, 2013, 12:03:49 PM (11 years ago)

Author:

lemeur

Message:

introduction softwareTest

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/nomDeLogiciel.cc (modified) (5 diffs)

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

@@ -7 +7 @@
     else if ( s == "transport" ) return transport;
     else if ( s == "generator" ) return generator;
+    else if ( s == "test" ) return test;
     return unknownSoftware;
   }
@@ -17 +18 @@
       case transport : { return "transport"; }
       case generator : { return "generator"; }
+      case test : { return "test"; }
       case unknownSoftware : { return "unknownSoftware"; }
       }
     return "unknownSoftware";
-  }
-
-  nomDeLogiciel::Logiciel nomDeLogiciel::fromValue( int v)
-  {
-    switch (v)
-      {
-      case 0 : { return parmela; }
-      case 1 : { return transport; }
-      case 2 : { return generator; }
-      }
-    return unknownSoftware;
-  }
-
- int nomDeLogiciel::toValue( nomDeLogiciel::Logiciel lg)
-  {
-    switch (lg)
-      {
-      case parmela : { return 0; }
-      case transport : { return 1; }
-      case generator : { return 2; }
-      case unknownSoftware :  { return 3; }
-      }
-    return -1;
   }
 
@@ -49 +28 @@
     program_ = transport;
     progString_ = toString(program_);
-    value_ = toValue(program_);
+    //    value_ = toValue(program_);
   }
 
@@ -56 +35 @@
       program_ = fromString(s);
       progString_ = toString(program_);
-      value_ = toValue(program_);
+      //      value_ = toValue(program_);
     }
 
   nomDeLogiciel::nomDeLogiciel(int val)
     {  
-      program_ = fromValue(val);
+      program_ = (Logiciel)val;
       progString_ = toString(program_);
-      value_ = toValue(program_);
+      //      program_ = fromValue(val);
+      //      value_ = toValue(program_);
     }
+
+
 
 int nomDeLogiciel::getNumberOfSoftwares() 
 { 
-  return toValue(unknownSoftware);
+  //  return toValue(unknownSoftware);
+  return unknownSoftware;
 }
 
@@ -77 +60 @@
       program_ = nl.program_;
       progString_ = nl.progString_;
-      value_ = nl.value_;
+      //      value_ = nl.value_;
       return *this;
     }