From 7b407b4840c9e82d1ea859647ceee5fd87b5588c Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Sun, 10 Mar 2019 17:09:12 +0100 Subject: [PATCH] Updating algorithm interface definitions --- .../daYacsSchemaCreator/infos_daComposant.py | 57 ++++++++++++------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py index 4b9dc63..539c1bf 100644 --- a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py +++ b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py @@ -64,27 +64,29 @@ AssimAlgos = [ "3DVAR", "4DVAR", "Blue", - "DerivativeFreeOptimization", "ExtendedBlue", "EnsembleBlue", "KalmanFilter", "ExtendedKalmanFilter", "EnsembleKalmanFilter", "UnscentedKalmanFilter", - "LinearLeastSquares", - "NonLinearLeastSquares", "QuantileRegression", + "DerivativeFreeOptimization", "ParticleSwarmOptimization", "DifferentialEvolution", + "TabuSearch", + "LinearLeastSquares", + "NonLinearLeastSquares", ] CheckAlgos = [ "FunctionTest", "LinearityTest", "GradientTest", "AdjointTest", - "ObserverTest", "TangentTest", + "LocalSensitivityTest", "SamplingTest", + "ObserverTest", ] AlgoDataRequirements = {} @@ -103,11 +105,6 @@ AlgoDataRequirements["Blue"] = [ "Observation", "ObservationError", "ObservationOperator", ] -AlgoDataRequirements["DerivativeFreeOptimization"] = [ - "Background", "BackgroundError", - "Observation", "ObservationError", - "ObservationOperator", - ] AlgoDataRequirements["ExtendedBlue"] = [ "Background", "BackgroundError", "Observation", "ObservationError", @@ -138,12 +135,13 @@ AlgoDataRequirements["UnscentedKalmanFilter"] = [ "Observation", "ObservationError", "ObservationOperator", ] -AlgoDataRequirements["LinearLeastSquares"] = [ - "Observation", "ObservationError", +AlgoDataRequirements["QuantileRegression"] = [ + "Background", + "Observation", "ObservationOperator", ] -AlgoDataRequirements["NonLinearLeastSquares"] = [ - "Background", +AlgoDataRequirements["DerivativeFreeOptimization"] = [ + "Background", "BackgroundError", "Observation", "ObservationError", "ObservationOperator", ] @@ -157,9 +155,18 @@ AlgoDataRequirements["DifferentialEvolution"] = [ "Observation", "ObservationError", "ObservationOperator", ] -AlgoDataRequirements["QuantileRegression"] = [ +AlgoDataRequirements["TabuSearch"] = [ + "Background", "BackgroundError", + "Observation", "ObservationError", + "ObservationOperator", + ] +AlgoDataRequirements["LinearLeastSquares"] = [ + "Observation", "ObservationError", + "ObservationOperator", + ] +AlgoDataRequirements["NonLinearLeastSquares"] = [ "Background", - "Observation", + "Observation", "ObservationError", "ObservationOperator", ] @@ -179,35 +186,41 @@ AlgoDataRequirements["AdjointTest"] = [ "CheckingPoint", "ObservationOperator", ] -AlgoDataRequirements["ObserverTest"] = [ - "Observers", - ] AlgoDataRequirements["TangentTest"] = [ "CheckingPoint", "ObservationOperator", ] +AlgoDataRequirements["LocalSensitivityTest"] = [ + "CheckingPoint", + "Observation", + "ObservationOperator", + ] AlgoDataRequirements["SamplingTest"] = [ "CheckingPoint", "BackgroundError", "Observation", "ObservationError", "ObservationOperator", ] +AlgoDataRequirements["ObserverTest"] = [ + "Observers", + ] AlgoType = {} AlgoType["3DVAR"] = "Optim" AlgoType["4DVAR"] = "Optim" AlgoType["Blue"] = "Optim" -AlgoType["DerivativeFreeOptimization"] = "Optim" AlgoType["ExtendedBlue"] = "Optim" AlgoType["EnsembleBlue"] = "Optim" AlgoType["KalmanFilter"] = "Optim" AlgoType["ExtendedKalmanFilter"] = "Optim" AlgoType["EnsembleKalmanFilter"] = "Optim" AlgoType["UnscentedKalmanFilter"] = "Optim" -AlgoType["LinearLeastSquares"] = "Optim" -AlgoType["NonLinearLeastSquares"] = "Optim" +AlgoType["QuantileRegression"] = "Optim" +AlgoType["DerivativeFreeOptimization"] = "Optim" AlgoType["ParticleSwarmOptimization"] = "Optim" AlgoType["DifferentialEvolution"] = "Optim" -AlgoType["QuantileRegression"] = "Optim" +AlgoType["TabuSearch"] = "Optim" +AlgoType["LinearLeastSquares"] = "Optim" +AlgoType["NonLinearLeastSquares"] = "Optim" # Variables qui sont partages avec le generateur de # catalogue Eficas -- 2.39.2