X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FdaComposant%2FdaCore%2FAidsm.py;h=a981db1b3330e1a1e0e4af1020af85a952e71c4e;hb=c3059023647feca54ad621b0af00ef55127b59fa;hp=5802c0cecbae1060736526e1d1e331f69409b915;hpb=b912ef4751aca1c5935c91d3db8ac157ed21b6f0;p=modules%2Fadao.git diff --git a/src/daComposant/daCore/Aidsm.py b/src/daComposant/daCore/Aidsm.py index 5802c0c..a981db1 100644 --- a/src/daComposant/daCore/Aidsm.py +++ b/src/daComposant/daCore/Aidsm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2008-2018 EDF R&D +# Copyright (C) 2008-2021 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 @@ -32,6 +32,7 @@ import sys from daCore.BasicObjects import State, Covariance, FullOperator, Operator from daCore.BasicObjects import AlgorithmAndParameters, DataObserver from daCore.BasicObjects import RegulationAndParameters, CaseLogger +from daCore.BasicObjects import UserScript, ExternalParameters from daCore import PlatformInfo # from daCore import ExtendedLogging ; ExtendedLogging.ExtendedLogging() # A importer en premier @@ -49,33 +50,37 @@ class Aidsm(object): self.__StoredInputs = {} self.__PostAnalysis = [] # - self.__Concepts = [ + self.__Concepts = [ # Liste exhaustive "AlgorithmParameters", "Background", + "BackgroundError", "CheckingPoint", "ControlInput", - "Observation", - "BackgroundError", - "ObservationError", + "ControlModel", + "Debug", + "Directory", "EvolutionError", - "ObservationOperator", "EvolutionModel", - "ControlModel", "Name", - "Directory", - "Debug", "NoDebug", - "RegulationParameters", + "Observation", + "ObservationError", + "ObservationOperator", "Observer", + "RegulationParameters", + "SupplementaryParameters", + "UserPostAnalysis", ] # for ename in self.__Concepts: self.__adaoObject[ename] = None for ename in ("ObservationOperator", "EvolutionModel", "ControlModel"): self.__adaoObject[ename] = {} - for ename in ("Observer",): + for ename in ("Observer", "UserPostAnalysis"): self.__adaoObject[ename] = [] - self.__StoredInputs[ename] = [] + self.__StoredInputs[ename] = [] # Vide par defaut + self.__StoredInputs["Name"] = self.__name + self.__StoredInputs["Directory"] = self.__directory # # Récupère le chemin du répertoire parent et l'ajoute au path # (Cela complète l'action de la classe PathManagement dans PlatformInfo, @@ -90,8 +95,13 @@ class Aidsm(object): AppliedInXb = None, AvoidRC = True, Checked = False, + ColMajor = False, + ColNames = None, + DataFile = None, DiagonalSparseMatrix = None, + ExtraArguments = None, Info = None, + InputFunctionAsMulti = False, Matrix = None, ObjectFunction = None, ObjectMatrix = None, @@ -113,7 +123,7 @@ class Aidsm(object): try: if Concept in ("Background", "CheckingPoint", "ControlInput", "Observation"): commande = getattr(self,"set"+Concept) - commande(Vector, VectorSerie, Script, Stored, Scheduler, Checked ) + commande(Vector, VectorSerie, Script, DataFile, ColNames, ColMajor, Stored, Scheduler, Checked ) elif Concept in ("BackgroundError", "ObservationError", "EvolutionError"): commande = getattr(self,"set"+Concept) commande(Matrix, ScalarSparseMatrix, DiagonalSparseMatrix, @@ -132,16 +142,21 @@ class Aidsm(object): self.setNoDebug() elif Concept == "Observer": self.setObserver( Variable, Template, String, Script, Info, ObjectFunction, Scheduler ) + elif Concept == "UserPostAnalysis": + self.setUserPostAnalysis( Template, String, Script ) + elif Concept == "SupplementaryParameters": + self.setSupplementaryParameters( Parameters, Script ) elif Concept == "ObservationOperator": self.setObservationOperator( Matrix, OneFunction, ThreeFunctions, AppliedInXb, - Parameters, Script, Stored, AvoidRC, Checked ) + Parameters, Script, ExtraArguments, + Stored, AvoidRC, InputFunctionAsMulti, Checked ) elif Concept in ("EvolutionModel", "ControlModel"): commande = getattr(self,"set"+Concept) commande( Matrix, OneFunction, ThreeFunctions, - Parameters, Script, Scheduler, Stored, AvoidRC, Checked ) - + Parameters, Script, Scheduler, ExtraArguments, + Stored, AvoidRC, InputFunctionAsMulti, Checked ) else: raise ValueError("the variable named '%s' is not allowed."%str(Concept)) except Exception as e: @@ -158,6 +173,9 @@ class Aidsm(object): Vector = None, VectorSerie = None, Script = None, + DataFile = None, + ColNames = None, + ColMajor = False, Stored = False, Scheduler = None, Checked = False): @@ -169,6 +187,9 @@ class Aidsm(object): asVector = Vector, asPersistentVector = VectorSerie, asScript = self.__with_directory(Script), + asDataFile = DataFile, + colNames = ColNames, + colMajor = ColMajor, scheduledBy = Scheduler, toBeChecked = Checked, ) @@ -180,6 +201,9 @@ class Aidsm(object): Vector = None, VectorSerie = None, Script = None, + DataFile = None, + ColNames = None, + ColMajor = False, Stored = False, Scheduler = None, Checked = False): @@ -191,6 +215,9 @@ class Aidsm(object): asVector = Vector, asPersistentVector = VectorSerie, asScript = self.__with_directory(Script), + asDataFile = DataFile, + colNames = ColNames, + colMajor = ColMajor, scheduledBy = Scheduler, toBeChecked = Checked, ) @@ -202,6 +229,9 @@ class Aidsm(object): Vector = None, VectorSerie = None, Script = None, + DataFile = None, + ColNames = None, + ColMajor = False, Stored = False, Scheduler = None, Checked = False): @@ -213,6 +243,9 @@ class Aidsm(object): asVector = Vector, asPersistentVector = VectorSerie, asScript = self.__with_directory(Script), + asDataFile = DataFile, + colNames = ColNames, + colMajor = ColMajor, scheduledBy = Scheduler, toBeChecked = Checked, ) @@ -224,6 +257,9 @@ class Aidsm(object): Vector = None, VectorSerie = None, Script = None, + DataFile = None, + ColNames = None, + ColMajor = False, Stored = False, Scheduler = None, Checked = False): @@ -235,6 +271,9 @@ class Aidsm(object): asVector = Vector, asPersistentVector = VectorSerie, asScript = self.__with_directory(Script), + asDataFile = DataFile, + colNames = ColNames, + colMajor = ColMajor, scheduledBy = Scheduler, toBeChecked = Checked, ) @@ -315,15 +354,17 @@ class Aidsm(object): return 0 def setObservationOperator(self, - Matrix = None, - OneFunction = None, - ThreeFunctions = None, - AppliedInXb = None, - Parameters = None, - Script = None, - Stored = False, - AvoidRC = True, - Checked = False): + Matrix = None, + OneFunction = None, + ThreeFunctions = None, + AppliedInXb = None, + Parameters = None, + Script = None, + ExtraArguments = None, + Stored = False, + AvoidRC = True, + InputFunctionAsMulti = False, + Checked = False): "Definition d'un concept de calcul" Concept = "ObservationOperator" self.__case.register("set"+Concept, dir(), locals()) @@ -335,7 +376,9 @@ class Aidsm(object): asScript = self.__with_directory(Script), asDict = Parameters, appliedInX = AppliedInXb, + extraArguments = ExtraArguments, avoidRC = AvoidRC, + inputAsMF = InputFunctionAsMulti, scheduledBy = None, toBeChecked = Checked, ) @@ -344,15 +387,17 @@ class Aidsm(object): return 0 def setEvolutionModel(self, - Matrix = None, - OneFunction = None, - ThreeFunctions = None, - Parameters = None, - Script = None, - Stored = False, - Scheduler = None, - AvoidRC = True, - Checked = False): + Matrix = None, + OneFunction = None, + ThreeFunctions = None, + Parameters = None, + Script = None, + Scheduler = None, + ExtraArguments = None, + Stored = False, + AvoidRC = True, + InputFunctionAsMulti = False, + Checked = False): "Definition d'un concept de calcul" Concept = "EvolutionModel" self.__case.register("set"+Concept, dir(), locals()) @@ -364,7 +409,9 @@ class Aidsm(object): asScript = self.__with_directory(Script), asDict = Parameters, appliedInX = None, + extraArguments = ExtraArguments, avoidRC = AvoidRC, + inputAsMF = InputFunctionAsMulti, scheduledBy = Scheduler, toBeChecked = Checked, ) @@ -373,15 +420,17 @@ class Aidsm(object): return 0 def setControlModel(self, - Matrix = None, - OneFunction = None, - ThreeFunctions = None, - Parameters = None, - Script = None, - Stored = False, - Scheduler = None, - AvoidRC = True, - Checked = False): + Matrix = None, + OneFunction = None, + ThreeFunctions = None, + Parameters = None, + Script = None, + Scheduler = None, + ExtraArguments = None, + Stored = False, + AvoidRC = True, + InputFunctionAsMulti = False, + Checked = False): "Definition d'un concept de calcul" Concept = "ControlModel" self.__case.register("set"+Concept, dir(), locals()) @@ -393,7 +442,9 @@ class Aidsm(object): asScript = self.__with_directory(Script), asDict = Parameters, appliedInX = None, + extraArguments = ExtraArguments, avoidRC = AvoidRC, + inputAsMF = InputFunctionAsMulti, scheduledBy = Scheduler, toBeChecked = Checked, ) @@ -456,12 +507,14 @@ class Aidsm(object): Parameters = None, Script = None): "Mise a jour d'un concept de calcul" - if "AlgorithmParameters" not in self.__adaoObject: - raise ValueError("No algorithm registred, ask for one before updating parameters") - self.__adaoObject["AlgorithmParameters"].updateParameters( + Concept = "AlgorithmParameters" + if Concept not in self.__adaoObject or self.__adaoObject[Concept] is None: + raise ValueError("\n\nNo algorithm registred, set one before updating parameters or executing\n") + self.__adaoObject[Concept].updateParameters( asDict = Parameters, asScript = self.__with_directory(Script), ) + # RaJ du register return 0 def setRegulationParameters(self, @@ -472,10 +525,36 @@ class Aidsm(object): Concept = "RegulationParameters" self.__case.register("set"+Concept, dir(), locals()) self.__adaoObject[Concept] = RegulationAndParameters( - name = Concept, - asAlgorithm = Algorithm, - asDict = Parameters, - asScript = self.__with_directory(Script), + name = Concept, + asAlgorithm = Algorithm, + asDict = Parameters, + asScript = self.__with_directory(Script), + ) + return 0 + + def setSupplementaryParameters(self, + Parameters = None, + Script = None): + "Definition d'un concept de calcul" + Concept = "SupplementaryParameters" + self.__case.register("set"+Concept, dir(), locals()) + self.__adaoObject[Concept] = ExternalParameters( + name = Concept, + asDict = Parameters, + asScript = self.__with_directory(Script), + ) + return 0 + + def updateSupplementaryParameters(self, + Parameters = None, + Script = None): + "Mise a jour d'un concept de calcul" + Concept = "SupplementaryParameters" + if Concept not in self.__adaoObject or self.__adaoObject[Concept] is None: + self.__adaoObject[Concept] = ExternalParameters(name = Concept) + self.__adaoObject[Concept].updateParameters( + asDict = Parameters, + asScript = self.__with_directory(Script), ) return 0 @@ -528,6 +607,20 @@ class Aidsm(object): else: return self.__adaoObject["AlgorithmParameters"].removeObserver( ename, ObjectFunction ) + def setUserPostAnalysis(self, + Template = None, + String = None, + Script = None): + "Definition d'un concept de calcul" + Concept = "UserPostAnalysis" + self.__case.register("set"+Concept, dir(), locals()) + self.__adaoObject[Concept].append( repr(UserScript( + name = Concept, + asTemplate = Template, + asString = String, + asScript = self.__with_directory(Script), + ))) + # ----------------------------------------------------------- def get(self, Concept=None, noDetails=True ): @@ -549,14 +642,29 @@ class Aidsm(object): elif Concept == "AlgorithmRequiredParameters" and self.__adaoObject["AlgorithmParameters"] is not None: return self.__adaoObject["AlgorithmParameters"].getAlgorithmRequiredParameters(noDetails) # + elif Concept == "AlgorithmRequiredInputs" and self.__adaoObject["AlgorithmParameters"] is not None: + return self.__adaoObject["AlgorithmParameters"].getAlgorithmInputArguments() + # + elif Concept == "AlgorithmAttributes" and self.__adaoObject["AlgorithmParameters"] is not None: + return self.__adaoObject["AlgorithmParameters"].getAlgorithmAttributes() + # + elif self.__adaoObject["SupplementaryParameters"] is not None and Concept == "SupplementaryParameters": + return self.__adaoObject["SupplementaryParameters"].get() + # + elif self.__adaoObject["SupplementaryParameters"] is not None and Concept in self.__adaoObject["SupplementaryParameters"]: + return self.__adaoObject["SupplementaryParameters"].get( Concept ) + # else: raise ValueError("The requested key \"%s\" does not exists as an input or a stored variable."%Concept) else: allvariables = {} allvariables.update( {"AlgorithmParameters":self.__adaoObject["AlgorithmParameters"].get()} ) + if self.__adaoObject["SupplementaryParameters"] is not None: + allvariables.update( {"SupplementaryParameters":self.__adaoObject["SupplementaryParameters"].get()} ) # allvariables.update( self.__adaoObject["AlgorithmParameters"].get() ) allvariables.update( self.__StoredInputs ) allvariables.pop('Observer', None) + allvariables.pop('UserPostAnalysis', None) return allvariables # ----------------------------------------------------------- @@ -575,9 +683,13 @@ class Aidsm(object): variables = [] if len(list(self.__adaoObject["AlgorithmParameters"].keys())) > 0: variables.extend(list(self.__adaoObject["AlgorithmParameters"].keys())) + if self.__adaoObject["SupplementaryParameters"] is not None and \ + len(list(self.__adaoObject["SupplementaryParameters"].keys())) > 0: + variables.extend(list(self.__adaoObject["SupplementaryParameters"].keys())) if len(list(self.__StoredInputs.keys())) > 0: variables.extend( list(self.__StoredInputs.keys()) ) variables.remove('Observer') + variables.remove('UserPostAnalysis') variables.sort() return variables @@ -592,11 +704,12 @@ class Aidsm(object): if os.path.isdir(trypath): for fname in os.listdir(trypath): if os.path.isfile(os.path.join(trypath,fname)): - fc = open(os.path.join(trypath,fname)).read() - iselal = bool("class ElementaryAlgorithm" in fc) root, ext = os.path.splitext(fname) - if iselal and ext == '.py' and root != '__init__': - files.append(root) + if ext != ".py": continue + with open(os.path.join(trypath,fname)) as fc: + iselal = bool("class ElementaryAlgorithm" in fc.read()) + if iselal and ext == '.py' and root != '__init__': + files.append(root) files.sort() return files @@ -623,10 +736,11 @@ class Aidsm(object): # ----------------------------------------------------------- - def execute(self, Executor=None, SaveCaseInFile=None): + def execute(self, Executor=None, SaveCaseInFile=None, nextStep=False): "Lancement du calcul" self.__case.register("execute",dir(),locals(),None,True) - Operator.CM.clearCache() + self.updateAlgorithmParameters(Parameters={"nextStep":bool(nextStep)}) + if not nextStep: Operator.CM.clearCache() try: if Executor == "YACS": self.__executeYACSScheme( SaveCaseInFile ) else: self.__executePythonScheme( SaveCaseInFile ) @@ -666,7 +780,7 @@ class Aidsm(object): __commands = self.__case.load(FileName, Content, Object, Formater) from numpy import array, matrix for __command in __commands: - if __command.find("set")>-1 and __command.find("set_")<0: + if (__command.find("set")>-1 and __command.find("set_")<0) or 'UserPostAnalysis' in __command: exec("self."+__command) else: self.__PostAnalysis.append(__command) @@ -700,7 +814,7 @@ class Aidsm(object): def __dir__(self): "Clarifie la visibilité des méthodes" - return ['set', 'get', 'execute', '__doc__', '__init__', '__module__'] + return ['set', 'get', 'execute', 'dump', 'load', '__doc__', '__init__', '__module__'] def prepare_to_pickle(self): "Retire les variables non pickelisables, avec recopie efficace" @@ -708,15 +822,18 @@ class Aidsm(object): for k in self.__adaoObject['AlgorithmParameters'].keys(): if k == "Algorithm": continue if k in self.__StoredInputs: - raise ValueError("the key \"%s\s to be transfered for pickling will overwrite an existing one.") + raise ValueError("The key \"%s\" to be transfered for pickling will overwrite an existing one."%(k,)) if self.__adaoObject['AlgorithmParameters'].hasObserver( k ): self.__adaoObject['AlgorithmParameters'].removeObserver( k, "", True ) self.__StoredInputs[k] = self.__adaoObject['AlgorithmParameters'].pop(k, None) if sys.version_info[0] == 2: del self.__adaoObject # Because it breaks pickle in Python 2. Not required for Python 3 del self.__case # Because it breaks pickle in Python 2. Not required for Python 3 - return 0 + if sys.version_info.major < 3: + return 0 + else: + return self.__StoredInputs # ============================================================================== if __name__ == "__main__": - print('\n AUTODIAGNOSTIC \n') + print('\n AUTODIAGNOSTIC\n')