Changeset 230 in PSPA for Interface_Web/trunk

Timestamp:

Jan 3, 2013, 6:35:36 PM (11 years ago)

Author:

lemeur

Message:

fin implementation fit

Location:

Interface_Web/trunk/pspaWT

Files:

• include/dataManager.h (modified) (2 diffs)
• include/elementsCollection.h (modified) (1 diff)
• include/trivaluedBool.h (added)
• src/GWt_LigneFaisceau.cc (modified) (1 diff)
• src/GWt_pspaApplication.cc (modified) (3 diffs)
• src/dataManager.cc (modified) (14 diffs)
• src/elementFit.cc (modified) (2 diffs)
• src/elementsCollection.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -9 +9 @@
 #include "sectionToExecute.h"
 #include "nomDeLogiciel.h"
-
+#include "trivaluedBool.h"
 class dataManager
 {
@@ -49 +49 @@
   string getLabelFromElementNumero(int numero);
   void initializeExecution(string workingDir);
-  string checkExecute();
-  bool executeTransport( unsigned int indexDeb, unsigned int indexFin, string workingDir,  string& resul);
-  bool executeParmela( unsigned int indexDeb, unsigned int indexFin, string workingDir, string& resul);
+  trivaluedBool checkExecute(string& diagnostic);
+  bool executeTransport( unsigned int numeroDeb, unsigned int numeroFin, string workingDir,  string& resul);
+  bool executeParmela( unsigned int numeroDeb, unsigned int numeroFin, string workingDir, string& resul);
   bool executeAll(string workingDir, string& resul);
   void saveConfiguration(string workingDir, string nameOfFile);

Interface_Web/trunk/pspaWT/include/elementsCollection.h

@@ -24 +24 @@
   abstractElement* addElement(typedElement elemType);
   abstractElement* getElementPointer(string label) const;
-  abstractElement* getElementPointer(unsigned int index) const;
+  abstractElement* getElementPointerFromIndex(unsigned int index) const;
   abstractElement* getElementPointerFromNumero(int num) const;
 

Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc

@@ -63 +63 @@
   for(k = 0; k < (unsigned)nbElem; k++) 
     {     
-      abstractElement* ptr = pspa_->getDataManager()->getCollection()->getElementPointer(k);
+      abstractElement* ptr = pspa_->getDataManager()->getCollection()->getElementPointerFromIndex(k);
       GWt_abstractElement* gw = GWt_abstractElement::ajoute(ptr);
       if(gw == NULL) {

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -15 +15 @@
 #include "environmentVariables.h"
 #include "GWt_tools.h"
+#include "trivaluedBool.h"
 
 #include <Wt/WLineEdit>
@@ -420 +421 @@
     }
 
-  string diagnostic = dtmanage_->checkExecute();
-  if ( !diagnostic.empty() )
-    {   
-      caMarche = false; 
-      //     GWt_tools::addConsoleMessage(diagnostic.c_str());
-      GWt_dialog calculDialog("PSPA : Erreur lors de check execute", diagnostic , GWt_dialog::Error,true,true);
-      calculDialog.exec();
-    }
+  string diagnostic;
+  trivaluedBool essai = dtmanage_->checkExecute(diagnostic);
+  cout << " retour verif , essai = " << essai << endl;
+  if ( essai == error ) {
+    cout << " appli : erreur " << endl;
+    caMarche = false;   
+    GWt_dialog calculDialog("PSPA check execute : ERROR", diagnostic , GWt_dialog::Error,true,true);
+    calculDialog.exec();
+  } else if ( essai == warning )  {
+    cout << " appli : warnig " << endl;
+    caMarche = true;    
+    GWt_dialog calculDialog("PSPA check execute : warning ", diagnostic , GWt_dialog::Warning, false,true);
+    calculDialog.exec();
+  }
 
   return caMarche;
@@ -904 +911 @@
 //   chart->setPlotAreaPadding(40, Top | Bottom);
   // Add the curves
-  WDataSeries s(1, CurveSeries, Y1Axis);
+  WDataSeries s(1, LineSeries, Y1Axis);
   chart->addSeries(s);
 

Interface_Web/trunk/pspaWT/src/dataManager.cc

@@ -37 +37 @@
 }
 
-string dataManager::checkExecute()
+trivaluedBool dataManager::checkExecute(string& diagnostic)
 {
   cout << "dataManager::checkExecute()" << endl;
-  
+  trivaluedBool resul = ok;
   unsigned k,j;
-  string diagnostic;
+  diagnostic.clear();
   unsigned indexDeb, indexFin;
   cout << "controle execution : " << endl;
@@ -50 +50 @@
     if ( indexFin  <= indexDeb )
       {
-        diagnostic += " first ans last elements are the same \n";
-        break;
+        diagnostic += " first and last elements are the same \n";
+        resul = error;
+        break;
       }
     cout << " indexDeb= " << indexDeb << " indexFin= " << indexFin << endl;
@@ -57 +58 @@
     indexFin--;
     abstractElement* elPtr;
-    if(jobList_[k]->software == nomDeLogiciel::parmela ) 
-      {
-        for(j = indexDeb; j <= indexFin; j++) {
-          elPtr = elementsGallery_.getElementPointer(j);
-
-          cout << "elPtr parmela: " << elPtr->getLabel() << endl;
-
-          if(!elPtr->is_parmela_element()) {
+    if(jobList_[k]->software == nomDeLogiciel::parmela ) {
+      for(j = indexDeb; j <= indexFin; j++) {
+        elPtr = elementsGallery_.getElementPointerFromIndex(j);
+
+        cout << "elPtr parmela: " << elPtr->getLabel() << endl;
+
+        if(!elPtr->is_parmela_element()) {
+          cout << " el non parmela : " << elPtr->getLabel()  << " ignored ? " << elPtr->is_parmela_ignored() << endl;
+          if ( elPtr->is_parmela_ignored() ) {
+            cout << " element ignore " << elPtr->getLabel() << endl;
+            diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is ignored by PARMELA \n";
+            resul = warning;
+          } else {
             diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for PARMELA \n";
+            resul =error;
           }
         }           
       }
-    else if (jobList_[k]->software == nomDeLogiciel::transport) 
-      {
-        for(j = indexDeb; j <= indexFin; j++) {
-          elPtr = elementsGallery_.getElementPointer(j);
-
-          cout << "elPtr transp: " << elPtr->getLabel() << endl;
-
-          if (!elPtr->is_transport_element()) {
-            diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for TRANSPORT \n";
-          }
-        }           
-      }
+    }
+    else if (jobList_[k]->software == nomDeLogiciel::transport) {
+      for(j = indexDeb; j <= indexFin; j++) {
+        elPtr = elementsGallery_.getElementPointerFromIndex(j);
+
+        cout << "elPtr transp: " << elPtr->getLabel() << endl;
+
+        if (!elPtr->is_transport_element()) {
+          diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for TRANSPORT \n";
+          resul = error;
+        }
+      }     
+    }
     else 
       {
-        diagnostic += (jobList_[k]->software).getString() + " : unknown software \n ";  
-      }
-  }
-  
-  return diagnostic;
-}
-
-bool dataManager::executeTransport( unsigned int indexDeb, unsigned int indexFin, string workingDir, string& resul)
+        diagnostic += (jobList_[k]->software).getString() + " : unknown software \n ";
+        resul = error;
+      }
+  }
+  cout << " data manager renvoie resul = " << resul << endl;
+  return resul;
+}
+
+bool dataManager::executeTransport( unsigned int numeroDeb, unsigned int numeroFin, string workingDir, string& resul)
 {
   ostringstream sortie;
   resul.clear();
-  sortie << " EXECUTION DE TRANSPORT DE " << indexDeb << " a " << indexFin << endl;
-  if ( !createInputFileTransport( indexDeb, indexFin, workingDir) )
+  sortie << " EXECUTION DE TRANSPORT DE " << numeroDeb << " a " << numeroFin << endl;
+  if ( !createInputFileTransport( numeroDeb, numeroFin, workingDir) )
     {
       sortie << " error creating transport input file "  << endl;
@@ -143 +152 @@
 
         unsigned k;
-        for ( k= indexDeb; k <= indexFin; k++)
+        for ( k= numeroDeb; k <= numeroFin; k++)
           {
             diagnosticBeam_.push_back(particleBeam());
@@ -164 +173 @@
 }
 
-bool  dataManager::executeParmela(unsigned int indexDeb,unsigned int indexFin,string workingDir,string& resul)
+bool  dataManager::executeParmela(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul)
 {
   ostringstream sortie;
   bool ExecuteStatus = true;
   resul.clear();
-  if ( !createInputFileParmela(indexDeb,indexFin, workingDir) )
+  if ( !createInputFileParmela(numeroDeb,numeroFin, workingDir) )
     {
       sortie << " error creating parmela input file "  << endl;
@@ -176 +185 @@
     }
 
-  sortie << " EXECUTION DE PARMELA DE l'ELEMENT " << indexDeb << " A L'ELEMENT " << indexFin << endl;
+  sortie << " EXECUTION DE PARMELA DE l'ELEMENT " << numeroDeb << " A L'ELEMENT " << numeroFin << endl;
 
   char buf[132];
@@ -204 +213 @@
       {
         unsigned k;
-        for ( k= indexDeb; k <= indexFin; k++)
+        for ( k= numeroDeb; k <= numeroFin; k++)
           {
             diagnosticBeam_.push_back(particleBeam());
             if (! diagnosticBeam_.back().setFromParmela(workingDir, k, globParam_.getFrequency()) )
               {
-                sortie << " reading parmdesz  failed " << endl;
-                ExecuteStatus = false;
-                break;
+                abstractElement* elem = elementsGallery_.getElementPointerFromNumero(k);
+                if ( elem->is_parmela_ignored() ) {
+                  int avantDernier = diagnosticBeam_.size() -2;
+                  diagnosticBeam_.back() = diagnosticBeam_.at(avantDernier);
+                } else {
+                  sortie << " reading parmdesz  failed " << endl;
+                  ExecuteStatus = false;
+                  break;
+                }
               }
           }
+
         if ( ExecuteStatus ) currentBeam_ = &diagnosticBeam_.back();
         else currentBeam_ = NULL;
@@ -236 +252 @@
 
   abstractElement* premierEl = NULL;
-  premierEl = elementsGallery_.getElementPointer(indexDeb);
+  premierEl = elementsGallery_.getElementPointerFromIndex(indexDeb);
 
   // ceinture et bretelles
@@ -298 +314 @@
   for ( k=indexDeb; k <= indexFin; k++)
     {
-      elPtr = elementsGallery_.getElementPointer(k);
+      elPtr = elementsGallery_.getElementPointerFromIndex(k);
       outfile << elPtr->transportOutputFlow() << endl;
     }
@@ -332 +348 @@
   abstractElement* elPtr;
   double initalKineticEnergy = 0.0;
-  elPtr = elementsGallery_.getElementPointer(indexDeb);
+  elPtr = elementsGallery_.getElementPointerFromIndex(indexDeb);
   if ( elPtr->getNomdElement().getElementType() != RFgun ) {
     cerr << " dataManager::createInputFileParmela : the first element should be rfgun" << endl;
@@ -350 +366 @@
   for ( k = indexDeb; k <= indexFin; k++)
     {
-      elPtr = elementsGallery_.getElementPointer(k);
+      elPtr = elementsGallery_.getElementPointerFromIndex(k);
       outfile << elPtr->parmelaOutputFlow() << endl;
     }
@@ -424 +440 @@
   for ( k=0 ; k < elementsGallery_.size() ; k++)
     {
-      elPtr = elementsGallery_.getElementPointer(k);
+      elPtr = elementsGallery_.getElementPointerFromIndex(k);
       outfile << elPtr->FileOutputFlow();
     }
@@ -477 +493 @@
   unsigned k;
   for(k = 0; k <  elementsGallery_.size(); k++) {
-    abstractElement* ptr= elementsGallery_.getElementPointer(k);
+    abstractElement* ptr= elementsGallery_.getElementPointerFromIndex(k);
     cout << "reupere " << ptr->getLabel() << endl;
   }
@@ -516 +532 @@
         {
           if ( !diagnosticBeam_.at(k).momentRepresentationOk() ) diagnosticBeam_.at(k).buildMomentRepresentation();
-          longueur += elementsGallery_.getElementPointer(k)->getLenghtOfElement();
+          longueur += elementsGallery_.getElementPointerFromIndex(k)->getLenghtOfElement();
           valeur = diagnosticBeam_.at(k).getXmaxRms();
           xcor.push_back(longueur);

Interface_Web/trunk/pspaWT/src/elementFit.cc

@@ -10 +10 @@
   parametersString_ = new string[nbParam_+1];
   transportOk_ = true;
+  parmelaIgnored_ = true;
 }
 
@@ -73 +74 @@
     ostringstream sortie;
     sortie << label_ << ":" << "  FIT," << variableName_ << " = " << variableValue_ << ", TOLER = " << tolerance_ << " ;" << endl;
+    if ( variableName_ == "R11" || variableName_ == "R22" || variableName_ == "R12" || variableName_ == "R21" ) {
+      sortie << " PRINT, TRANS;" << endl;
+    }
     return sortie.str();
   }

Interface_Web/trunk/pspaWT/src/elementsCollection.cc

@@ -94 +94 @@
 }
 
-abstractElement* elementsCollection::getElementPointer(unsigned int index) const
+abstractElement* elementsCollection::getElementPointerFromIndex(unsigned int index) const
 {
   if ( index >= elements_.size() ) return NULL;