# -*- coding: utf-8 -*-
#
-# Copyright (C) 2008-2017 EDF R&D
+# Copyright (C) 2008-2019 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import logging
-from daCore import BasicObjects
+from daCore import BasicObjects, NumericObjects
import numpy
# ==============================================================================
default = [],
typecast = tuple,
message = "Liste de calculs supplémentaires à stocker et/ou effectuer",
- listval = ["BMA", "OMA", "OMB", "CurrentState", "CostFunctionJ", "CostFunctionJb", "CostFunctionJo", "Innovation", "SimulatedObservationAtBackground", "SimulatedObservationAtCurrentState", "SimulatedObservationAtOptimum"]
+ listval = [
+ "Analysis",
+ "BMA",
+ "CostFunctionJ",
+ "CostFunctionJb",
+ "CostFunctionJo",
+ "CurrentState",
+ "Innovation",
+ "OMA",
+ "OMB",
+ "SimulatedObservationAtBackground",
+ "SimulatedObservationAtCurrentState",
+ "SimulatedObservationAtOptimum",
+ ]
)
self.defineRequiredParameter( # Pas de type
name = "Bounds",
)
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, R, B, Q)
+ self._pre_run(Parameters, Xb, Y, R, B, Q)
#
Hm = HO["Direct"].appliedTo
#
# ------------------------------
def CostFunction(x):
_X = numpy.asmatrix(numpy.ravel( x )).T
- if self._parameters["StoreInternalVariables"] or "CurrentState" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._parameters["StoreInternalVariables"] or self._toStore("CurrentState"):
self.StoredVariables["CurrentState"].store( _X )
_HX = Hm( _X )
_HX = numpy.asmatrix(numpy.ravel( _HX )).T
- if "SimulatedObservationAtCurrentState" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._toStore("SimulatedObservationAtCurrentState"):
self.StoredVariables["SimulatedObservationAtCurrentState"].store( _HX )
Jb = 0.
Jo = 0.
# Minimisation de la fonctionnelle
# --------------------------------
if self._parameters["Minimizer"] == "MMQR":
- import mmqr
- Minimum, J_optimal, Informations = mmqr.mmqr(
+ Minimum, J_optimal, Informations = NumericObjects.mmqr(
func = CostFunction,
x0 = Xini,
fprime = GradientOfCostFunction,
#
self.StoredVariables["Analysis"].store( Xa.A1 )
#
- if "OMA" in self._parameters["StoreSupplementaryCalculations"] or \
- "SimulatedObservationAtOptimum" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._toStore("OMA") or \
+ self._toStore("SimulatedObservationAtOptimum"):
HXa = Hm(Xa)
#
# Calculs et/ou stockages supplémentaires
# ---------------------------------------
- if "Innovation" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._toStore("Innovation"):
self.StoredVariables["Innovation"].store( numpy.ravel(d) )
- if "BMA" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._toStore("BMA"):
self.StoredVariables["BMA"].store( numpy.ravel(Xb - Xa) )
- if "OMA" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._toStore("OMA"):
self.StoredVariables["OMA"].store( numpy.ravel(Y - HXa) )
- if "OMB" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._toStore("OMB"):
self.StoredVariables["OMB"].store( numpy.ravel(d) )
- if "SimulatedObservationAtBackground" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._toStore("SimulatedObservationAtBackground"):
self.StoredVariables["SimulatedObservationAtBackground"].store( numpy.ravel(HXb) )
- if "SimulatedObservationAtOptimum" in self._parameters["StoreSupplementaryCalculations"]:
+ if self._toStore("SimulatedObservationAtOptimum"):
self.StoredVariables["SimulatedObservationAtOptimum"].store( numpy.ravel(HXa) )
#
self._post_run(HO)
# ==============================================================================
if __name__ == "__main__":
- print('\n AUTODIAGNOSTIC \n')
+ print('\n AUTODIAGNOSTIC\n')