Documentation update and method improvement

[modules/adao.git] / src / daComposant / daAlgorithms / Atoms / eosg.py

diff --git a/src/daComposant/daAlgorithms/Atoms/eosg.py b/src/daComposant/daAlgorithms/Atoms/eosg.py
index e29ac5d3f4e9fc6889014d56454ef2dd09a62bbb..2204cd149e004f298f63514ad2d469cc7834403d 100644 (file)
--- a/src/daComposant/daAlgorithms/Atoms/eosg.py
+++ b/src/daComposant/daAlgorithms/Atoms/eosg.py
@@ -38,9 +38,16 @@ def eosg(selfA, Xb, HO, outputEOX = False, assumeNoFailure = True):
         selfA._parameters["SampleAsnUplet"],
         selfA._parameters["SampleAsExplicitHyperCube"],
         selfA._parameters["SampleAsMinMaxStepHyperCube"],
+        selfA._parameters["SampleAsMinMaxLatinHyperCube"],
         selfA._parameters["SampleAsIndependantRandomVariables"],
         Xb,
+        selfA._parameters["SetSeed"],
         )
+    #
+    if hasattr(sampleList,"__len__") and len(sampleList) == 0:
+        if outputEOX: return numpy.array([[]]), numpy.array([[]])
+        else:         return numpy.array([[]])
+    #
     if outputEOX or selfA._toStore("EnsembleOfStates"):
         EOX = numpy.stack(tuple(copy.copy(sampleList)), axis=1)
     #
@@ -88,13 +95,15 @@ def eosg(selfA, Xb, HO, outputEOX = False, assumeNoFailure = True):
     # ----------
     #
     if selfA._toStore("EnsembleOfStates"):
-        assert EOX.shape[1] == EOS.shape[1], "  Error of number of states in Ensemble Of Simulations Generation"
+        if EOX.shape[1] != EOS.shape[1]:
+            raise ValueError("Numbers of states (=%i) and snapshots (=%i) has to be the same!"%(EOX.shape[1], EOS.shape[1]))
         selfA.StoredVariables["EnsembleOfStates"].store( EOX )
     if selfA._toStore("EnsembleOfSimulations"):
         selfA.StoredVariables["EnsembleOfSimulations"].store( EOS )
     #
     if outputEOX:
-        assert EOX.shape[1] == EOS.shape[1], "  Error of number of states in Ensemble Of Simulations Generation"
+        if EOX.shape[1] != EOS.shape[1]:
+            raise ValueError("Numbers of states (=%i) and snapshots (=%i) has to be the same!"%(EOX.shape[1], EOS.shape[1]))
         return EOX, EOS
     else:
         return EOS