Merge with version on tag OCC-V2_1_0d

[modules/smesh.git] / src / SMESH / SMESH_Algo.hxx

diff --git a/src/SMESH/SMESH_Algo.hxx b/src/SMESH/SMESH_Algo.hxx
index 53a0fbdde814bbf241e65fd8cd22e7d767a7d65e..029dc67117bb1df9746dd9e31b079f9ab10db8ae 100644 (file)
--- a/src/SMESH/SMESH_Algo.hxx
+++ b/src/SMESH/SMESH_Algo.hxx
@@ -37,9 +37,8 @@
 #include <string>
 #include <vector>
 #include <list>
-using namespace std;
 
-class SMESH_gen;
+class SMESH_Gen;
 class SMESH_Mesh;
 
 class SMESH_Algo:public SMESH_Hypothesis
@@ -48,13 +47,14 @@ class SMESH_Algo:public SMESH_Hypothesis
        SMESH_Algo(int hypId, int studyId, SMESH_Gen * gen);
          virtual ~ SMESH_Algo();
 
-       const vector < string > &GetCompatibleHypothesis();
-       virtual bool CheckHypothesis(SMESH_Mesh & aMesh,
-               const TopoDS_Shape & aShape);
+       const std::vector < std::string > &GetCompatibleHypothesis();
+       virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
+                                     const TopoDS_Shape& aShape,
+                                     SMESH_Hypothesis::Hypothesis_Status& aStatus) = 0;
 
-       virtual bool Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
+       virtual bool Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape) = 0;
 
-       virtual const list <const SMESHDS_Hypothesis *> &
+       virtual const std::list <const SMESHDS_Hypothesis *> &
                GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
 
        const list <const SMESHDS_Hypothesis *> &
@@ -62,15 +62,29 @@ class SMESH_Algo:public SMESH_Hypothesis
 
        static double EdgeLength(const TopoDS_Edge & E);
 
-       virtual ostream & SaveTo(ostream & save);
-       virtual istream & LoadFrom(istream & load);
-       friend ostream & operator <<(ostream & save, SMESH_Algo & hyp);
-       friend istream & operator >>(istream & load, SMESH_Algo & hyp);
+ public:
+        // algo features
 
-  protected:
-         vector<string> _compatibleHypothesis;
-         list<const SMESHDS_Hypothesis *> _appliedHypList;
-         list<const SMESHDS_Hypothesis *> _usedHypList;
+        // SMESH_Hypothesis::GetDim();
+        // 1 - dimention of target mesh
+
+        bool OnlyUnaryInput() const { return _onlyUnaryInput; }
+        // 2 - is collection of tesselatable shapes inacceptable as input;
+        // "collection" means a shape containing shapes of dim equal
+        // to GetDim().
+        // Algo which can process a collection shape should expect
+        // an input temporary shape that is neither MainShape nor
+        // its child.
+        
+        bool NeedDescretBoundary() const { return _requireDescretBoundary; }
+        // 3 - is a Dim-1 mesh prerequisite
+
+ protected:
+        bool _onlyUnaryInput;
+        bool _requireDescretBoundary;
+        std::vector<std::string> _compatibleHypothesis;
+        std::list<const SMESHDS_Hypothesis *> _appliedHypList;
+        std::list<const SMESHDS_Hypothesis *> _usedHypList;
 };
 
 #endif