X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fevalyfx%2FYACSEvalYFXPattern.hxx;h=8dd2d301096bbd9a8bdb66a16a3817707f45edad;hb=255150e4eec79294bbd06c7c464f309b4a264960;hp=a53bf4a05d3ef266839ddb008a75239aac524cc1;hpb=2967c6bab119215c635eb87184be1a69ed82d9f5;p=modules%2Fyacs.git

diff --git a/src/evalyfx/YACSEvalYFXPattern.hxx b/src/evalyfx/YACSEvalYFXPattern.hxx
index a53bf4a05..8dd2d3010 100644
--- a/src/evalyfx/YACSEvalYFXPattern.hxx
+++ b/src/evalyfx/YACSEvalYFXPattern.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2012-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -37,6 +37,7 @@ namespace YACS
     class TypeCode;
     class ForEachLoop;
     class ComposedNode;
+    class InlineNode;
     class InputPyPort;
     class SequenceAny;
   }
@@ -45,6 +46,7 @@ namespace YACS
 class YACSEvalYFX;
 class YACSEvalSession;
 class YACSEvalObserver;
+class YACSEvalExecParams;
 class YACSEvalListOfResources;
 class ResourcesManager_cpp;
 class YACSEvalYFXRunOnlyPatternInternalObserver;
@@ -67,6 +69,7 @@ public:
   void registerObserver(YACSEvalObserver *observer);
   YACSEvalObserver *getObserver() const { return _observer; }
   YACSEvalYFX *getBoss() const { return _boss; }
+  YACSEvalListOfResources *getResourcesInternal() const { return _res; }
   virtual void setOutPortsOfInterestForEvaluation(const std::vector<YACSEvalOutputPort *>& outputs) = 0;
   virtual void resetOutputsOfInterest() = 0;
   virtual void generateGraph() = 0;
@@ -80,17 +83,16 @@ public:
   virtual std::string getStatusOfRunStr() const = 0;
   virtual std::vector<YACSEvalSeqAny *> getResults() const = 0;
   virtual std::vector<YACSEvalSeqAny *> getResultsInCaseOfFailure(std::vector<unsigned int>& passedIds) const = 0;
-  virtual bool go(bool stopASAP, YACSEvalSession *session) const = 0;
-public:
-  static const char DFT_PROC_NAME[];
+  virtual bool go(const YACSEvalExecParams& params, YACSEvalSession *session) const = 0;
+public://for _gen
+  const std::vector< YACSEvalInputPort >& getInputs() const { return _inputs; }
+  static YACS::ENGINE::TypeCode *CreateSeqTypeCodeFrom(YACS::ENGINE::Proc *scheme, const std::string& zeType);
+  static YACSEvalSeqAny *BuildValueInPort(YACS::ENGINE::InputPyPort *port);
 protected:
   YACSEvalYFXPattern(YACSEvalYFX *boss, YACS::ENGINE::Proc *scheme, bool ownScheme);
-  YACS::ENGINE::TypeCode *createSeqTypeCodeFrom(YACS::ENGINE::Proc *scheme, const std::string& zeType);
   void setResources(YACSEvalListOfResources *res);
   void resetResources();
-  YACSEvalListOfResources *getResourcesInternal() const { return _res; }
   ResourcesManager_cpp *getCatalogInAppli() const { return _rm; }
-  static YACSEvalSeqAny *BuildValueInPort(YACS::ENGINE::InputPyPort *port);
   static YACSEvalSeqAny *BuildValueFromEngineFrmt(YACS::ENGINE::SequenceAny *data);
 private:
   void cleanScheme();
@@ -112,6 +114,8 @@ public:
   static const std::size_t MAX_LGTH_OF_INP_DUMP;
 };
 
+class YACSEvalYFXGraphGen;
+
 class YACSEvalYFXRunOnlyPattern : public YACSEvalYFXPattern
 {
 public:
@@ -130,24 +134,88 @@ public:
   std::string getStatusOfRunStr() const;
   std::vector<YACSEvalSeqAny *> getResults() const;
   std::vector<YACSEvalSeqAny *> getResultsInCaseOfFailure(std::vector<unsigned int>& passedIds) const;
-  bool go(bool stopASAP, YACSEvalSession *session) const;
+  bool go(const YACSEvalExecParams& params, YACSEvalSession *session) const;
   //
-  YACS::ENGINE::ForEachLoop *getUndergroundForEach() const { return _FEInGeneratedGraph; }
+  YACS::ENGINE::ForEachLoop *getUndergroundForEach() const;
   static bool IsMatching(YACS::ENGINE::Proc *scheme, YACS::ENGINE::ComposedNode *& runNode);
-public:
-  static const char FIRST_FE_SUBNODE_NAME[];
-  static const char GATHER_NODE_NAME[];
 private:
   void emitStart() const;
   void buildInputPorts();
   void buildOutputPorts();
-  YACS::ENGINE::ForEachLoop *findTopForEach() const;
+  YACSEvalYFXGraphGen *getGenerator() const;
+public://for _gen
+  const std::vector<YACSEvalOutputPort *>& getOutputsOfInterest() const { return _outputsOfInterest; }
+  YACS::ENGINE::ComposedNode *getRunNode() const { return _runNode; }
 private:
+  bool _lockedStatus;
   YACS::ENGINE::ComposedNode *_runNode;
   std::vector<YACSEvalOutputPort *> _outputsOfInterest;
+  YACSEvalYFXGraphGen *_gen;
+  YACSEvalYFXRunOnlyPatternInternalObserver *_obs;
+};
+
+class YACSEvalYFXGraphGen
+{
+public:
+  class CustomPatcher
+  {
+  public:
+    virtual ~CustomPatcher() { }
+    virtual void addOutputVar(const std::string& name) = 0;
+    virtual void assignOutput(YACS::ENGINE::InlineNode *node) = 0;
+  };
+protected:
+  YACSEvalYFXGraphGen(YACSEvalYFXRunOnlyPattern *boss);
+  YACSEvalYFXRunOnlyPattern *getBoss() const { return _boss; }
+public:
+  virtual ~YACSEvalYFXGraphGen();
+  virtual void generateGraph() = 0;
+  virtual bool go(const YACSEvalExecParams& params, YACSEvalSession *session) const = 0;
+  virtual std::vector<YACSEvalSeqAny *> getResults() const = 0;
+  virtual std::string getErrors()const = 0;
+  bool isLocked() const;
+  int assignNbOfBranches();
+  void resetGeneratedGraph();
+  YACS::ENGINE::Proc *getUndergroundGeneratedGraph() const { return _generatedGraph; }
+  YACS::ENGINE::ForEachLoop *getUndergroundForEach() const { return _FEInGeneratedGraph; }
+protected:
+  void generateGraphCommon(CustomPatcher& patcher);
+private:
+  YACSEvalYFXRunOnlyPattern *_boss;
+protected:
   YACS::ENGINE::Proc *_generatedGraph;
   YACS::ENGINE::ForEachLoop *_FEInGeneratedGraph;
-  YACSEvalYFXRunOnlyPatternInternalObserver *_obs;
+public:
+  static const char DFT_PROC_NAME[];
+  static const char FIRST_FE_SUBNODE_NAME[];
+  static const char GATHER_NODE_NAME[];
+  static const char HIDDEN_INDEX_VAR[];
+};
+
+class YACSEvalYFXGraphGenInteractive : public YACSEvalYFXGraphGen
+{
+public:
+  YACSEvalYFXGraphGenInteractive(YACSEvalYFXRunOnlyPattern *boss):YACSEvalYFXGraphGen(boss) { }
+  void generateGraph();
+  bool go(const YACSEvalExecParams& params, YACSEvalSession *session) const;
+  std::vector<YACSEvalSeqAny *> getResults() const;
+  virtual std::string getErrors()const;
+};
+
+class YACSEvalYFXGraphGenCluster : public YACSEvalYFXGraphGen
+{
+public:
+  YACSEvalYFXGraphGenCluster(YACSEvalYFXRunOnlyPattern *boss):YACSEvalYFXGraphGen(boss),_jobid(0) { }
+  void generateGraph();
+  bool go(const YACSEvalExecParams& params, YACSEvalSession *session) const;
+  std::vector<YACSEvalSeqAny *> getResults() const;
+  virtual std::string getErrors()const;
+private:
+  std::string _locSchemaFile;
+  std::string _jobName;
+  mutable int _jobid;
+  mutable std::string _errors;
+  mutable std::vector< std::vector<double> > _res;
 };
 
 #endif