Changeset 431 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/abstractSoftware.cc

Timestamp:

Nov 15, 2013, 3:30:50 PM (11 years ago)

Author:

touze

Message:

systeme periodique (mailles) + multipoles + madx

File:

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

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

@@ -2 +2 @@
 #include "dataManager.h"
 #include <algorithm>
+
 abstractSoftware::abstractSoftware()
 {
   globParamPtr_ = NULL;
+  sectParamPtr_ = NULL; //xx
   dataManager_ = NULL;
   nameOfSoftware_ = nomDeLogiciel("unknownSoftware");
 }
 
-abstractSoftware::abstractSoftware(string inputFileName, globalParameters* globals, dataManager* dt) {
+abstractSoftware::abstractSoftware(string inputFileName, globalParameters* globals, dataManager* dt) 
+{
   inputFileName_ = inputFileName;
   globParamPtr_ = globals;
+  sectParamPtr_ = NULL; //xx
   dataManager_ = dt;
   numeroDeb_ = 0;
@@ -18 +22 @@
 }
 
-bool abstractSoftware::initComputationLimits(unsigned int numeroDeb,unsigned int numeroFin) {
+abstractSoftware::abstractSoftware(string inputFileName,sectorParameters* lattice,dataManager* dt) 
+{
+  inputFileName_ = inputFileName;
+  globParamPtr_ = NULL;
+  sectParamPtr_ = lattice;
+  dataManager_ = dt;
+  numeroDeb_ = 0;
+  numeroFin_ = 0;
+  nameOfSoftware_ = nomDeLogiciel("unknownSoftware");
+}
+
+bool abstractSoftware::initComputationLimits(unsigned int numeroDeb,unsigned int numeroFin) 
+{
   numeroDeb_ = numeroDeb;
   numeroFin_ = numeroFin;
@@ -24 +40 @@
 }
 
-bool abstractSoftware::ComputationLimitsOk() const {
-  if (   numeroDeb_ < 1 ||  numeroFin_ < 1 || numeroDeb_ > dataManager_->getBeamLineSize() || numeroFin_ > dataManager_->getBeamLineSize() ) {
-  dataManager_->consoleMessage(" abstractSoftware::initComputationLimit : numero of element out of limits in software " + getName() );
+bool abstractSoftware::ComputationLimitsOk() const 
+{
+  if (numeroDeb_ < 1 || numeroFin_ < 1 || numeroDeb_ > dataManager_->getBeamLineSize() || numeroFin_ > dataManager_->getBeamLineSize() ) {
+    dataManager_->consoleMessage(" abstractSoftware::initComputationLimit : num of element out of limits in software " + getName() );
     return false;
   } else {
@@ -33 +50 @@
 }
 
-
-void abstractSoftware::registerElement(nomdElements::typedElement nomdel,trivaluedBool b) {
+void abstractSoftware::registerElement(nomdElements::typedElement nomdel,trivaluedBool b) 
+{
   if (b == TBoolIgnore) {
     ignoredElements_.push_back(nomdel);
@@ -42 +59 @@
 }
 
-trivaluedBool abstractSoftware::doAcceptElement(nomdElements::typedElement typdel) {
-  if (acceptedElements_.size() == 0) {
+trivaluedBool abstractSoftware::doAcceptElement(nomdElements::typedElement typdel) 
+{
+
+  //xx
+  if (acceptedElements_.size() == 0 && nameOfSoftware_ != nomDeLogiciel::unknownSoftware) {
     return TBoolError;
   }
-  if ( std::find(acceptedElements_.begin(), acceptedElements_.end(), typdel) != acceptedElements_.end()) {
+
+  if (std::find(acceptedElements_.begin(),acceptedElements_.end(),typdel) != acceptedElements_.end()) {
     return TBoolOk;
   }
+
   if (ignoredElements_.size() == 0) {
     return TBoolError;
   }
-  if ( std::find(ignoredElements_.begin(), ignoredElements_.end(), typdel) != ignoredElements_.end()) {
+
+  if (std::find(ignoredElements_.begin(),ignoredElements_.end(),typdel) != ignoredElements_.end()) {
     return TBoolIgnore;
   }
+
   return TBoolOk;
 }
-
 
 bool abstractSoftware::launchJob(string commandLine, string& resul)
@@ -66 +89 @@
   ostringstream sortie;
   if (pp == NULL) {
-    sortie << " launching  failed : " << commandLine << endl;
+    sortie << " launching failed : " << commandLine << endl;
     ExecuteStatus = false;
   } else {
-    cout << " executing command :  "  << commandLine << endl;
     // on copie la sortie dans le fichier assigne
     char buf[132];