Changeset 479 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc

Timestamp:

Jan 7, 2014, 1:51:17 PM (10 years ago)

Author:

garnier

Message:

Modification en vue du passage de Parmela. Restauration du fichier Phyl ok

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc (modified) (6 diffs)

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

@@ -24 +24 @@
 }
 
-void softwareParmela::setRelativeParmelaElementIndices() {
-  relativeParmelaElementIndices_.clear();
-  relativeParmelaElementIndices_.resize(numeroFin_deprecated_ - numeroDeb_deprecated_ + 1, -1);
-  cout << " setRelativeParmelaElementIndices() taille a priori : " << relativeParmelaElementIndices_.size() << endl;
+void softwareParmela::setRelativeParmelaElementIndices_deprecated() {
+  return;
+  //  relativeParmelaElementIndices_.clear();
+//  relativeParmelaElementIndices_.resize(numeroFin_deprecated_ - numeroDeb_deprecated_ + 1, -1);
+//  cout << " setRelativeParmelaElementIndices() taille a priori : " << relativeParmelaElementIndices_.size() << endl;
   abstractElement* elPtr = getSectionToExecute()->getElements().front();
 
@@ -34 +35 @@
   // les elements de parmela sont indexes de 1 Ã  max, s'il n'y a pas de rfgun
   if ( !there_is_rfgun ) {
-    offsetNumElem = numeroDeb_deprecated_ -1;
+//    offsetNumElem = numeroDeb_deprecated_ -1;
     // les elements de parmela sont indexes de 0 Ã  max, s'il y a un rfgun
   } else {
-    offsetNumElem = numeroDeb_deprecated_;
+//    offsetNumElem = numeroDeb_deprecated_;
   }
 
   // index du premier element de parmela
-  int id= numeroDeb_deprecated_ - offsetNumElem;
+//  int id= numeroDeb_deprecated_ - offsetNumElem;
   unsigned k;
   unsigned curseur = 0;
   for ( k=0; k < getSectionToExecute()->getElements().size() ; k++ ) {
     abstractElement* elem = getSectionToExecute()->getElements()[k];
-    cout << " liste PARMELA no absolu " << k << " relatif provisoire " << relativeParmelaElementIndices_.at(curseur) << endl;
+//    cout << " liste PARMELA no absolu " << k << " relatif provisoire " << relativeParmelaElementIndices_.at(curseur) << endl;
     // if ( elem->is_accepted_by_software(nameOfSoftware_) == TBoolOk ) {
     if ( doAcceptElement(elem->getNomdElement().getElementType() )  == TBoolOk ) {
-      relativeParmelaElementIndices_.at(curseur) = id;
-      cout << " mis a " << id << endl;
-      id++;
+//      relativeParmelaElementIndices_.at(curseur) = id;
+//      cout << " mis a " << id << endl;
+//      id++;
     }
     curseur++;
@@ -62 +63 @@
   unsigned int k;
 
-  setRelativeParmelaElementIndices();
+//  setRelativeParmelaElementIndices();
   string name = workingDir + inputFileName_;
   ofstream outfile;
@@ -100 +101 @@
   
  // retrouver le sector !!
-  for ( k =1; k <= getSectionToExecute()->getElements().size(); k++)
+  for ( k =1; k < getSectionToExecute()->getElements().size(); k++)
     {
       outfile << elementsData(getSectionToExecute()->getElements()[k]->parametersToSoftware());
@@ -160 +161 @@
       }
 
-      curseur = k - numeroDeb_deprecated_;
-
-      if ( relativeParmelaElementIndices_.at(curseur) < 0 ) {
+    curseur = k;// - numeroDeb_deprecated_;
+
+    if (!(doAcceptElement(getSectionToExecute()->getElements()[curseur]->getNomdElement().getElementType()) == TBoolOk)) {
+//      if ( relativeParmelaElementIndices_.at(curseur) < 0 ) {
 
         // si l'element doit etre ignore de parmela, on renvoie sur le diag precedent
@@ -186 +188 @@
           double freq= dataManager_->getGlobalParameters()->getFrequency();
           unsigned numeroParmel;
-          numeroParmel = (unsigned)relativeParmelaElementIndices_.at(curseur);
+//        numeroParmel = (unsigned)relativeParmelaElementIndices_.at(curseur);
+    numeroParmel = curseur;
           cout << " lecture PARMELA el no absolu " << k << " numero relatif " << numeroParmel << " nom " << elem->getNomdElement().getExpandedName() << endl;
         // lecture sortie parmela