X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FdaComposant%2FdaCore%2FAidsm.py;h=a981db1b3330e1a1e0e4af1020af85a952e71c4e;hb=c3059023647feca54ad621b0af00ef55127b59fa;hp=e753bc418a920d2e74544d18b72c74778e024512;hpb=97fd3d5fc6e59330aad2475129065b29897515b6;p=modules%2Fadao.git diff --git a/src/daComposant/daCore/Aidsm.py b/src/daComposant/daCore/Aidsm.py index e753bc4..a981db1 100644 --- a/src/daComposant/daCore/Aidsm.py +++ b/src/daComposant/daCore/Aidsm.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2008-2019 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, @@ -137,6 +142,10 @@ 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, @@ -498,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, @@ -514,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 @@ -570,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 ): @@ -591,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 # ----------------------------------------------------------- @@ -617,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 @@ -636,10 +706,10 @@ class Aidsm(object): if os.path.isfile(os.path.join(trypath,fname)): root, ext = os.path.splitext(fname) if ext != ".py": continue - fc = open(os.path.join(trypath,fname)).read() - iselal = bool("class ElementaryAlgorithm" in fc) - if iselal and ext == '.py' and root != '__init__': - files.append(root) + 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 @@ -710,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)