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

Timestamp:

Feb 5, 2013, 2:23:23 PM (12 years ago)

Author:

lemeur

Message:

suppression designation elements par index + fin generator

File:

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

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

@@ -55 +55 @@
 
 
-abstractElement* dataManager::getElementPointerFromIndex(int k){
-    return pspa_->getBeamLine()->getAbstractElement(k);
+abstractElement* dataManager::getElementPointerFromNumero(int k){
+    return pspa_->getBeamLine()->getAbstractElement(k-1);
 }
 
@@ -85 +85 @@
   unsigned k,j;
   diagnostic.clear();
-  unsigned indexDeb, indexFin;
+  unsigned numeroDeb, numeroFin;
   cout << "controle execution : " << endl;
   for(k = 0; k < jobList_.size(); k++) {
-    indexDeb = jobList_[k]->firstElement;
-    indexFin = jobList_[k]->lastElement;
-    if ( indexFin  < indexDeb )
+    numeroDeb = jobList_[k]->firstElement;
+    numeroFin = jobList_[k]->lastElement;
+    if ( numeroFin  < numeroDeb )
       {
         diagnostic += " last element before first  for job " + (jobList_[k]->software).getString() + " \n";
@@ -96 +96 @@
         break;
       }
-    cout << " indexDeb= " << indexDeb << " indexFin= " << indexFin << endl;
-    indexDeb--;
-    indexFin--;
+    cout << " numeroDeb= " << numeroDeb << " numeroFin= " << numeroFin << endl;
+    // indexDeb--;
+    // indexFin--;
     
     abstractElement* elPtr;
     string checkCompatibility;
-    resul = checkElementsForExec(jobList_[k]->software, indexDeb, indexFin, checkCompatibility);
+    resul = checkElementsForExec(jobList_[k]->software, numeroDeb, numeroFin, checkCompatibility);
     diagnostic += checkCompatibility;
   }
@@ -110 +110 @@
 
 
-trivaluedBool dataManager::checkElementsForExec(nomDeLogiciel logiciel, unsigned indexDeb, unsigned indexFin, string& diagnostic)
+trivaluedBool dataManager::checkElementsForExec(nomDeLogiciel logiciel, unsigned numeroDeb, unsigned numeroFin, string& diagnostic)
 {
     trivaluedBool resul = ok;
@@ -116 +116 @@
     trivaluedBool accepted;
     abstractElement* elPtr;
-    for(unsigned j = indexDeb; j <= indexFin; j++) {
-        elPtr = pspa_->getBeamLine()->getAbstractElement(j);
+    for(unsigned j = numeroDeb; j <= numeroFin; j++) {
+        elPtr = pspa_->getBeamLine()->getAbstractElement(j-1);
         accepted = elPtr->is_accepted_by_software(logiciel);
         if(accepted  == error  ) {
@@ -192 +192 @@
         resultatPartiel += " error creating input file \n";
       } else {
-        success = softw->execute(debut,fin,workingDir_,resultatPartiel);
+        success = softw->execute(inputFileName, debut,fin,workingDir_,resultatPartiel);
         if ( success ) {
           success = softw->buildBeamAfterElements(debut, fin, diagnosticBeam_, workingDir_);
           if ( !success ) {
-            resultatPartiel += " readingt results  failed \n";
+            resultatPartiel += " reading results failed \n";
           }
         }
       }
       delete softw;
-      if ( success ) currentBeam_ = &diagnosticBeam_.back();
-      else currentBeam_ = NULL;
+      if ( success ) {
+        currentBeam_ = &diagnosticBeam_.back();
+        cout << " execute termine avec succes " << endl;
+      } else {
+        currentBeam_ = NULL;
+        cout << " execute termine en ECHEC " << endl;
+      }
       resul += resultatPartiel;
       if ( !success ) break;
@@ -303 +308 @@
     if ( numeroDeb < 1 ) numeroDeb = 1;
     if ( numeroFin > diagnosticBeam_.size() ) numeroFin = diagnosticBeam_.size();
-    
-    unsigned indexDeb = numeroDeb -1;
-    unsigned indexFin = numeroFin -1;
-    
+        
     double longueur = 0.0;
     double valeur = 0.0;
@@ -313 +315 @@
     if ( type == "x" )
     {
-        for (k= indexDeb; k <= indexFin; k++)
+        for (k= numeroDeb; k <= numeroFin; k++)
         {
-            if ( !diagnosticBeam_.at(k).momentRepresentationOk() ) diagnosticBeam_.at(k).buildMomentRepresentation();
-            longueur += pspa_->getBeamLine()->getAbstractElement(k)->getLenghtOfElement();
-            valeur = diagnosticBeam_.at(k).getXmaxRms();
+            if ( !diagnosticBeam_.at(k-1).momentRepresentationOk() ) diagnosticBeam_.at(k-1).buildMomentRepresentation();
+            longueur += pspa_->getBeamLine()->getAbstractElement(k-1)->getLenghtOfElement();
+            valeur = diagnosticBeam_.at(k-1).getXmaxRms();
             xcor.push_back(longueur);
             ycor.push_back(valeur);