Documentation and code update for PSO

[modules/adao.git] / src / daComposant / daAlgorithms / MeasurementsOptimalPositioningTask.py

diff --git a/src/daComposant/daAlgorithms/MeasurementsOptimalPositioningTask.py b/src/daComposant/daAlgorithms/MeasurementsOptimalPositioningTask.py
index 0a974c44c92f36e9af34026561d4f343f3a82da3..df6756760d489dafef44ce09f10f6a2bb48e47ce 100644 (file)
--- a/src/daComposant/daAlgorithms/MeasurementsOptimalPositioningTask.py
+++ b/src/daComposant/daAlgorithms/MeasurementsOptimalPositioningTask.py
@@ -22,8 +22,7 @@
 
 import numpy
 from daCore import BasicObjects
-from daAlgorithms.Atoms import ecweim
-from daAlgorithms.Atoms import eosg
+from daAlgorithms.Atoms import ecweim, eosg
 
 # ==============================================================================
 class ElementaryAlgorithm(BasicObjects.Algorithm):
@@ -56,8 +55,13 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             name     = "ExcludeLocations",
             default  = [],
             typecast = tuple,
-            message  = "Liste des positions exclues selon la numérotation interne d'un snapshot",
-            minval   = -1,
+            message  = "Liste des indices ou noms de positions exclues selon l'ordre interne d'un snapshot",
+            )
+        self.defineRequiredParameter(
+            name     = "NameOfLocations",
+            default  = [],
+            typecast = tuple,
+            message  = "Liste des noms de positions selon l'ordre interne d'un snapshot",
             )
         self.defineRequiredParameter(
             name     = "ErrorNorm",
@@ -111,6 +115,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             listval  = [
                 "EnsembleOfSimulations",
                 "EnsembleOfStates",
+                "ExcludedPoints",
                 "OptimalPoints",
                 "ReducedBasis",
                 "Residus",
@@ -127,6 +132,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             )
         self.setAttributes(tags=(
             "Reduction",
+            "Checking",
             ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):