Improvements for classification of algorithms extended to all

diff --git a/src/daComposant/daAlgorithms/3DVAR.py b/src/daComposant/daAlgorithms/3DVAR.py
index 01ead91714a9ee91c61e8a875fdb027bf76c80f1..9517df6e441fbdbdaad35153780d51e5262ed0d2 100644 (file)
--- a/src/daComposant/daAlgorithms/3DVAR.py
+++ b/src/daComposant/daAlgorithms/3DVAR.py
@@ -140,6 +140,11 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO", "R", "B" ),
             )
+        self.setAttributes(tags=(
+            "DataAssimilation",
+            "NonLinear",
+            "Variational",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/4DVAR.py b/src/daComposant/daAlgorithms/4DVAR.py
index 8dadd5f7904f523324ce3c386854ca79a8060bc0..d39a5f1b74a0517d3e841b50c62314fb718f86fe 100644 (file)
--- a/src/daComposant/daAlgorithms/4DVAR.py
+++ b/src/daComposant/daAlgorithms/4DVAR.py
@@ -110,6 +110,12 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             mandatory= ("Xb", "Y", "HO", "EM", "R", "B" ),
             optional = ("U", "CM"),
             )
+        self.setAttributes(tags=(
+            "DataAssimilation",
+            "NonLinear",
+            "Variational",
+            "Dynamic",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
index e3012aca477fbb2fc1a67464d256d541751a308b..d6b4cb22b2366c3b5d09173d8378c14ac1e74ce2 100644 (file)
--- a/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
+++ b/src/daComposant/daAlgorithms/DerivativeFreeOptimization.py
@@ -112,6 +112,11 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO", "R", "B" ),
             )
+        self.setAttributes(tags=(
+            "Optimization",
+            "NonLinear",
+            "MetaHeuristic",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/DifferentialEvolution.py b/src/daComposant/daAlgorithms/DifferentialEvolution.py
index 8c2b09aeb08232c2e418eb98a5e8e7677f504f8c..b36407abad6cf52e227a9c4e8c5dfb28d4748fd0 100644 (file)
--- a/src/daComposant/daAlgorithms/DifferentialEvolution.py
+++ b/src/daComposant/daAlgorithms/DifferentialEvolution.py
@@ -141,6 +141,12 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO", "R", "B" ),
             )
+        self.setAttributes(tags=(
+            "Optimization",
+            "NonLinear",
+            "MetaHeuristic",
+            "Population",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/EnsembleBlue.py b/src/daComposant/daAlgorithms/EnsembleBlue.py
index fe2bd3b6e03adadef9f22d06b7156874fa31c3b3..75be71ef2dcfa86fafe231c3b67f3f2090abc63c 100644 (file)
--- a/src/daComposant/daAlgorithms/EnsembleBlue.py
+++ b/src/daComposant/daAlgorithms/EnsembleBlue.py
@@ -56,6 +56,12 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO", "R", "B"),
             )
+        self.setAttributes(tags=(
+            "DataAssimilation",
+            "NonLinear",
+            "Filter",
+            "Ensemble",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py b/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
index 201cf4b9ab97e00ac7caeaed6fb1ca0ab92b8660..5e683966d81595acad573b05bb5a7892fecfae81 100644 (file)
--- a/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
+++ b/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
@@ -87,6 +87,13 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             mandatory= ("Xb", "Y", "HO", "R", "B"),
             optional = ("U", "EM", "CM", "Q"),
             )
+        self.setAttributes(tags=(
+            "DataAssimilation",
+            "NonLinear",
+            "Filter",
+            "Ensemble",
+            "Dynamic",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/ExtendedBlue.py b/src/daComposant/daAlgorithms/ExtendedBlue.py
index f98df9558174563a67c6fe4905663470f644ff13..6a9ebd5280a97301520c33e02cbca9589e3fb3c0 100644 (file)
--- a/src/daComposant/daAlgorithms/ExtendedBlue.py
+++ b/src/daComposant/daAlgorithms/ExtendedBlue.py
@@ -97,6 +97,11 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO", "R", "B"),
             )
+        self.setAttributes(tags=(
+            "DataAssimilation",
+            "NonLinear",
+            "Filter",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/ExtendedKalmanFilter.py b/src/daComposant/daAlgorithms/ExtendedKalmanFilter.py
index a400b2e16b42b0ddbc8f4b084ec77b2f84100697..1cd932a3fbea3c87fd8f4a6e5fecdc2832ce96e1 100644 (file)
--- a/src/daComposant/daAlgorithms/ExtendedKalmanFilter.py
+++ b/src/daComposant/daAlgorithms/ExtendedKalmanFilter.py
@@ -85,6 +85,12 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             mandatory= ("Xb", "Y", "HO", "R", "B"),
             optional = ("U", "EM", "CM", "Q"),
             )
+        self.setAttributes(tags=(
+            "DataAssimilation",
+            "NonLinear",
+            "Filter",
+            "Dynamic",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/FunctionTest.py b/src/daComposant/daAlgorithms/FunctionTest.py
index 4457d8396792eabe3a29b218bc22744fe905d67e..2914c4338958f9495ad17ef4c3e5d8693565592a 100644 (file)
--- a/src/daComposant/daAlgorithms/FunctionTest.py
+++ b/src/daComposant/daAlgorithms/FunctionTest.py
@@ -71,6 +71,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "HO"),
             )
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/GradientTest.py b/src/daComposant/daAlgorithms/GradientTest.py
index ac6ace8eeb8319e218e089d8f116e051e3bd4f2a..acde0007e76d5bc6daea806d604fc3254e47e9d0 100644 (file)
--- a/src/daComposant/daAlgorithms/GradientTest.py
+++ b/src/daComposant/daAlgorithms/GradientTest.py
@@ -109,6 +109,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "HO"),
             )
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/InputValuesTest.py b/src/daComposant/daAlgorithms/InputValuesTest.py
index 6f2c60f826b52052489779168ad0702f74226a60..a49957a2ecb7a3956733b2a0e2a334264ae923a7 100644 (file)
--- a/src/daComposant/daAlgorithms/InputValuesTest.py
+++ b/src/daComposant/daAlgorithms/InputValuesTest.py
@@ -66,6 +66,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= (),
             )
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/KalmanFilter.py b/src/daComposant/daAlgorithms/KalmanFilter.py
index 9cbea1adc8e821b32caa53a94f90929f5e386683..4bc9686a4947747c82e89dd48626b778a0a4cbaa 100644 (file)
--- a/src/daComposant/daAlgorithms/KalmanFilter.py
+++ b/src/daComposant/daAlgorithms/KalmanFilter.py
@@ -74,6 +74,12 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             mandatory= ("Xb", "Y", "HO", "R", "B"),
             optional = ("U", "EM", "CM", "Q"),
             )
+        self.setAttributes(tags=(
+            "DataAssimilation",
+            "Linear",
+            "Filter",
+            "Dynamic",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/LinearityTest.py b/src/daComposant/daAlgorithms/LinearityTest.py
index fee4d854966b34de144cd0ed766ff89ff1bb66bb..02a0963919fdfd01de093615158400c351e55cd3 100644 (file)
--- a/src/daComposant/daAlgorithms/LinearityTest.py
+++ b/src/daComposant/daAlgorithms/LinearityTest.py
@@ -91,6 +91,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "HO"),
             )
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/LocalSensitivityTest.py b/src/daComposant/daAlgorithms/LocalSensitivityTest.py
index d29f6b4126f4dd8c3e32db31dd013a3e27b3ef27..f8ed9340ad431390e9449f8721d57f4f968e6869 100644 (file)
--- a/src/daComposant/daAlgorithms/LocalSensitivityTest.py
+++ b/src/daComposant/daAlgorithms/LocalSensitivityTest.py
@@ -48,6 +48,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO"),
             )
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/ObserverTest.py b/src/daComposant/daAlgorithms/ObserverTest.py
index 1b2e14491c5d31b1d994859345c471c90afcc85e..c13f0aa2f831f46fd9db83ea3ad1435937e27f99 100644 (file)
--- a/src/daComposant/daAlgorithms/ObserverTest.py
+++ b/src/daComposant/daAlgorithms/ObserverTest.py
@@ -28,6 +28,9 @@ import numpy
 class ElementaryAlgorithm(BasicObjects.Algorithm):
     def __init__(self):
         BasicObjects.Algorithm.__init__(self, "OBSERVERTEST")
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/ParallelFunctionTest.py b/src/daComposant/daAlgorithms/ParallelFunctionTest.py
index 6ec96c0db5d1e9892337bb81cab49cb643990609..8fc24657b812b3d50205d3fd0383a9960bf88049 100644 (file)
--- a/src/daComposant/daAlgorithms/ParallelFunctionTest.py
+++ b/src/daComposant/daAlgorithms/ParallelFunctionTest.py
@@ -71,6 +71,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "HO"),
             )
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
index 122968ae605a0957628e7403a6875ca0d3492108..0b62667a78c1e131a0234bb587326d3078503df9 100644 (file)
--- a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
+++ b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
@@ -113,6 +113,11 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO", "R", "B"),
             )
+        self.setAttributes(tags=(
+            "Optimization",
+            "NonLinear",
+            "Population",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/QuantileRegression.py b/src/daComposant/daAlgorithms/QuantileRegression.py
index 3893d5c22de275004b8248c1a54d6b8e5069d0c1..d50c3a455a9a65ad561bb35495abd992f45f757e 100644 (file)
--- a/src/daComposant/daAlgorithms/QuantileRegression.py
+++ b/src/daComposant/daAlgorithms/QuantileRegression.py
@@ -89,6 +89,11 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO" ),
             )
+        self.setAttributes(tags=(
+            "Optimization",
+            "Risk",
+            "Variational",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/SamplingTest.py b/src/daComposant/daAlgorithms/SamplingTest.py
index 4e104808bf5f143f78999b4921bba5da2ea098c1..d6fc1633cedb7d54be3975e9d86a52106f8aed0f 100644 (file)
--- a/src/daComposant/daAlgorithms/SamplingTest.py
+++ b/src/daComposant/daAlgorithms/SamplingTest.py
@@ -91,6 +91,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "HO"),
             )
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/TabuSearch.py b/src/daComposant/daAlgorithms/TabuSearch.py
index 11fb806b91230ebeac58949b27c5c72070e00d65..0b7da4eed9c4225b8718cdc5003ea27d09effdba 100644 (file)
--- a/src/daComposant/daAlgorithms/TabuSearch.py
+++ b/src/daComposant/daAlgorithms/TabuSearch.py
@@ -125,6 +125,11 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "Y", "HO", "R", "B"),
             )
+        self.setAttributes(tags=(
+            "Optimization",
+            "NonLinear",
+            "MetaHeuristic",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/TangentTest.py b/src/daComposant/daAlgorithms/TangentTest.py
index 7c04be62c5a8e6d06eb1b09976c6b3444ec7e2ef..6b507b4c77a49dbf1850162a4c63b7111185c031 100644 (file)
--- a/src/daComposant/daAlgorithms/TangentTest.py
+++ b/src/daComposant/daAlgorithms/TangentTest.py
@@ -91,6 +91,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
         self.requireInputArguments(
             mandatory= ("Xb", "HO"),
             )
+        self.setAttributes(tags=(
+            "Checking",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)

diff --git a/src/daComposant/daAlgorithms/UnscentedKalmanFilter.py b/src/daComposant/daAlgorithms/UnscentedKalmanFilter.py
index ba61f9680d8127ad68f8b91bfc7df4c86910e2e8..23d160ef7ffec39c8e2bfb19d2bb3c7782418f96 100644 (file)
--- a/src/daComposant/daAlgorithms/UnscentedKalmanFilter.py
+++ b/src/daComposant/daAlgorithms/UnscentedKalmanFilter.py
@@ -104,6 +104,13 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             mandatory= ("Xb", "Y", "HO", "R", "B" ),
             optional = ("U", "EM", "CM", "Q"),
             )
+        self.setAttributes(tags=(
+            "DataAssimilation",
+            "NonLinear",
+            "Filter",
+            "Ensemble",
+            "Dynamic",
+            ))
 
     def run(self, Xb=None, Y=None, U=None, HO=None, EM=None, CM=None, R=None, B=None, Q=None, Parameters=None):
         self._pre_run(Parameters, Xb, Y, R, B, Q)