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

Timestamp:

Jan 8, 2014, 6:05:38 PM (10 years ago)

Author:

garnier

Message:

Suppression de methodes deprecated et de quelques warning de compilation

File:

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

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

@@ -24 +24 @@
 }
 
-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();
-
-  bool there_is_rfgun = ( elPtr->getNomdElement().getElementType() == nomdElements::RFgun );
-  unsigned offsetNumElem;
-  // 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;
-    // les elements de parmela sont indexes de 0 Ã  max, s'il y a un rfgun
-  } else {
-//    offsetNumElem = numeroDeb_deprecated_;
-  }
-
-  // index du premier element de parmela
-//  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;
-    // if ( elem->is_accepted_by_software(nameOfSoftware_) == TBoolOk ) {
-    if ( doAcceptElement(elem->getNomdElement().getElementType() )  == TBoolOk ) {
-//      relativeParmelaElementIndices_.at(curseur) = id;
-//      cout << " mis a " << id << endl;
-//      id++;
-    }
-    curseur++;
-  }
-}
 
 
@@ -94 +61 @@
   outfile << "OUTPUT 0" << endl;
   if ( there_is_rfgun ) {
-    //    outfile << dataManager_->getElementPointerFromNumero(numeroDeb_deprecated_)->parmelaOutputFlow();
     outfile << elementsData(elPtr->parametersToSoftware());
   } else {
@@ -152 +118 @@
   bool result = true;
 
-  if ( !ComputationLimitsOk_deprecated() ) return false;
   unsigned curseur;
   for ( unsigned int k=0; k < getSectionToExecute()->getElements().size() ; k++ ) {
@@ -161 +126 @@
       }
 
-    curseur = k;// - numeroDeb_deprecated_;
+    curseur = k;
 
     if (!(doAcceptElement(getSectionToExecute()->getElements()[curseur]->getNomdElement().getElementType()) == TBoolOk)) {