From 077aabfbdd4f4dce71b172e0ea68d0e2615a2204 Mon Sep 17 00:00:00 2001 From: mandd Date: Fri, 24 Feb 2023 12:04:05 -0700 Subject: [PATCH 1/8] first edits and test file --- .../MooseBasedApp/MooseInputParser.py | 4 + ravenframework/Optimizers/Optimizer.py | 8 +- ravenframework/Samplers/CustomSampler.py | 2 +- .../testGAMaxwRep_custom_sampler.xml | 168 ++++++++++++++++++ 4 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml diff --git a/ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py b/ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py index 883354c47a..0a79890793 100644 --- a/ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py +++ b/ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py @@ -91,6 +91,7 @@ def getpotToInputTree(getpot): parentNodes.append(currentNode) currentNode = TreeStructure.InputNode(tag=line.strip('[]./')) closeEntry = False + #------------------ # closing node elif line.startswith(('[../]', '[]')): @@ -106,7 +107,9 @@ def getpotToInputTree(getpot): #------------------ # attributes and values elif '=' in line: + print('HERE') attribute, value = (x.strip() for x in line.split('=', maxsplit=1)) + print(attribute, value) # TODO multilline, if "'" or '"' in line # ASSUME: both " and ' aren't used in the same line if any(x in line for x in multiIndicators): @@ -124,6 +127,7 @@ def getpotToInputTree(getpot): # DO NOT continue, keep going until multiline is closed continue else: + print('HERE1') # single line entry with no vector representation value = value.strip() closeEntry = True diff --git a/ravenframework/Optimizers/Optimizer.py b/ravenframework/Optimizers/Optimizer.py index 517414d1dc..23d96ef341 100644 --- a/ravenframework/Optimizers/Optimizer.py +++ b/ravenframework/Optimizers/Optimizer.py @@ -208,7 +208,8 @@ def _localGenerateAssembler(self, initDict): self.assemblerDict['DataObjects'] = [] self.assemblerDict['Distributions'] = [] self.assemblerDict['Functions'] = [] - for mainClass in ['DataObjects', 'Distributions', 'Functions']: + self.assemblerDict['Files'] = [] + for mainClass in ['DataObjects', 'Distributions', 'Functions', 'Files']: for funct in initDict[mainClass]: self.assemblerDict[mainClass].append([mainClass, initDict[mainClass][funct].type, @@ -217,7 +218,7 @@ def _localGenerateAssembler(self, initDict): def localInputAndChecks(self, xmlNode, paramInput): """ - unfortunately-named method that serves as a pass-through for input reading. + Method that serves as a pass-through for input reading. comes from inheriting from Sampler and _readMoreXML chain. @ In, xmlNode, xml.etree.ElementTree.Element, xml element node (don't use!) @ In, paramInput, InputData.ParameterInput, parameter specs interpreted @@ -237,6 +238,7 @@ def _localWhatDoINeed(self): needDict['Distributions'] = [(None,'all')] needDict['Functions' ] = [(None,'all')] needDict['DataObjects' ] = [(None,'all')] + needDict['Files' ] = [(None,'all')] return needDict @@ -401,7 +403,7 @@ def _initializeInitSampler(self, externalSeeding): self._initSampler = sampler # initialize sampler samplerInit = {} - for entity in ['Distributions', 'Functions', 'DataObjects']: + for entity in ['Distributions', 'Functions', 'DataObjects','Files']: samplerInit[entity] = dict((entry[2], entry[3]) for entry in self.assemblerDict.get(entity, [])) self._initSampler._localGenerateAssembler(samplerInit) # assure sampler provides useful info diff --git a/ravenframework/Samplers/CustomSampler.py b/ravenframework/Samplers/CustomSampler.py index 5bf2bbc1a6..bb638edefa 100644 --- a/ravenframework/Samplers/CustomSampler.py +++ b/ravenframework/Samplers/CustomSampler.py @@ -128,7 +128,7 @@ def _localWhatDoINeed(self): This method is a local mirror of the general whatDoINeed method. It is implemented by the samplers that need to request special objects @ In, None - @ Out, needDict, dict, list of objects needed (in this case it is empty, since no distrubtions are needed and the Source is loaded automatically) + @ Out, needDict, dict, list of objects needed (in this case it is empty, since no distribtions are needed and the Source is loaded automatically) """ needDict = {} needDict['Functions'] = [] # In case functions have been inputted diff --git a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml new file mode 100644 index 0000000000..6d7e082379 --- /dev/null +++ b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml @@ -0,0 +1,168 @@ + + + + framework/Optimizers/GA.MaxwReplacement + MohammadAbdo + 2020-05-16 + GeneticAlgorithm + + This test assesses the Genetic algorithm using the weighted sum found in myLocalSum.py function. + The nominal dimensionality of the test problem is 3. + The objective variable is ans. The problem in unconstrained, it is a maximization problem, and the sampling is from discrete variables with replacement. + + + This test uses myLocalSum's analytic objective function. + + + + + MaxwReplacement + optimize, print + 1 + + + + restart.csv + + + + + placeholder + restart.csv + myLocalSum + GAopt + opt_export + optOut + opt_export + + + opt_export + optOut + opt_export + optOut + opt_path + + + + + + 1 + 6 + withReplacement + + + 1 + 6 + withoutReplacement + + + + + + + 10 + 42 + every + max + + + + 10 + rouletteWheel + + + 0.8 + + + 0.9 + + + + 2.0 + 1.0 + + fitnessBased + + + + 0.1 + + + + uniform_dist_Repl_1 + + + + uniform_dist_Repl_1 + + + + uniform_dist_Repl_1 + + + ans + optOut + restartSampler + + + + + + + + 10 + 20021986 + + + uniform_dist_Repl_1 + + + uniform_dist_Repl_1 + + + uniform_dist_Repl_1 + + + + + restart.csv + + + + + + + + + x1,x2,x3,ans + + + + + + + x1,x2,x3 + ans + + + trajID + x1,x2,x3,ans,age,batchId,fitness,iteration,accepted,AHDp,conv_AHDp + + + + + + csv + optOut + + + csv + opt_export + trajID + + + opt_export + x1,x2,x3,ans + + + From dd4a043de7d25ed1c5b4016b6e6e0993ce8b7d36 Mon Sep 17 00:00:00 2001 From: mandd Date: Fri, 24 Feb 2023 12:05:58 -0700 Subject: [PATCH 2/8] removed redundant line --- .../discrete/unconstrained/testGAMaxwRep_custom_sampler.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml index 6d7e082379..e2bb2a283d 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml +++ b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml @@ -28,7 +28,6 @@ placeholder - restart.csv myLocalSum GAopt opt_export From cf5620bc8b475255e0be851a9768dcd391d1667e Mon Sep 17 00:00:00 2001 From: mandd Date: Fri, 24 Feb 2023 12:52:32 -0700 Subject: [PATCH 3/8] added gold file --- .../testGAMaxwRep_custom_sampler.xml | 13 +++-- .../opt_export_0.csv | 52 +++++++++++++++++++ .../Optimizers/GeneticAlgorithms/tests | 11 ++++ 3 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 tests/framework/Optimizers/GeneticAlgorithms/gold/discrete/unconstrained/MaxwReplacement_customsampler/opt_export_0.csv diff --git a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml index e2bb2a283d..a8874350f2 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml +++ b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml @@ -1,14 +1,13 @@ - framework/Optimizers/GA.MaxwReplacement - MohammadAbdo - 2020-05-16 + framework/Optimizers/GA.MaxwReplacementCustomSampler + mandd + 2022-02-24 GeneticAlgorithm - This test assesses the Genetic algorithm using the weighted sum found in myLocalSum.py function. - The nominal dimensionality of the test problem is 3. - The objective variable is ans. The problem in unconstrained, it is a maximization problem, and the sampling is from discrete variables with replacement. + This test assesses the Genetic algorithm when a custom sampler (initialized by file) is used to + initialize the initial population This test uses myLocalSum's analytic objective function. @@ -16,7 +15,7 @@ - MaxwReplacement + MaxwReplacement_customsampler optimize, print 1 diff --git a/tests/framework/Optimizers/GeneticAlgorithms/gold/discrete/unconstrained/MaxwReplacement_customsampler/opt_export_0.csv b/tests/framework/Optimizers/GeneticAlgorithms/gold/discrete/unconstrained/MaxwReplacement_customsampler/opt_export_0.csv new file mode 100644 index 0000000000..0ecc21ade3 --- /dev/null +++ b/tests/framework/Optimizers/GeneticAlgorithms/gold/discrete/unconstrained/MaxwReplacement_customsampler/opt_export_0.csv @@ -0,0 +1,52 @@ +x1,x2,x3,ans,age,batchId,fitness,iteration,accepted,AHDp,conv_AHDp +6.0,6.0,6.0,36.0,0.0,1.0,72.0,0.0,first,,0.0 +2.0,2.0,6.0,24.0,0.0,1.0,48.0,0.0,first,,0.0 +4.0,5.0,3.0,23.0,0.0,1.0,46.0,0.0,first,,0.0 +3.0,4.0,2.0,17.0,0.0,1.0,34.0,0.0,first,,0.0 +2.0,6.0,1.0,17.0,0.0,1.0,34.0,0.0,first,,0.0 +1.0,2.0,4.0,17.0,0.0,1.0,34.0,0.0,first,,0.0 +2.0,2.0,2.0,12.0,0.0,1.0,24.0,0.0,first,,0.0 +4.0,4.0,3.0,21.0,0.0,1.0,42.0,0.0,first,,0.0 +2.0,6.0,6.0,32.0,0.0,1.0,64.0,0.0,first,,0.0 +2.0,1.0,3.0,13.0,0.0,1.0,26.0,0.0,first,,0.0 +3.0,4.0,4.0,23.0,0.0,2.0,46.0,1.0,accepted,2.44051339313,0.0 +4.0,2.0,1.0,11.0,0.0,2.0,22.0,1.0,accepted,2.44051339313,0.0 +6.0,4.0,4.0,26.0,0.0,2.0,52.0,1.0,accepted,2.44051339313,0.0 +3.0,6.0,6.0,33.0,0.0,2.0,66.0,1.0,accepted,2.44051339313,0.0 +3.0,4.0,4.0,23.0,0.0,2.0,46.0,1.0,accepted,2.44051339313,0.0 +6.0,2.0,2.0,16.0,0.0,2.0,32.0,1.0,accepted,2.44051339313,0.0 +6.0,6.0,1.0,21.0,0.0,2.0,42.0,1.0,accepted,2.44051339313,0.0 +4.0,2.0,6.0,26.0,0.0,2.0,52.0,1.0,accepted,2.44051339313,0.0 +6.0,2.0,1.0,13.0,0.0,2.0,26.0,1.0,accepted,2.44051339313,0.0 +4.0,2.0,2.0,14.0,0.0,2.0,28.0,1.0,accepted,2.44051339313,0.0 +6.0,6.0,6.0,36.0,0.0,3.0,72.0,2.0,accepted,2.15036705544,0.0 +6.0,6.0,3.0,27.0,0.0,3.0,54.0,2.0,accepted,2.15036705544,0.0 +1.0,6.0,6.0,31.0,0.0,3.0,62.0,2.0,accepted,2.15036705544,0.0 +6.0,6.0,6.0,36.0,0.0,3.0,72.0,2.0,accepted,2.15036705544,0.0 +3.0,5.0,6.0,31.0,0.0,3.0,62.0,2.0,accepted,2.15036705544,0.0 +4.0,6.0,6.0,34.0,0.0,3.0,68.0,2.0,accepted,2.15036705544,0.0 +1.0,6.0,3.0,22.0,0.0,3.0,44.0,2.0,accepted,2.15036705544,0.0 +6.0,6.0,6.0,36.0,0.0,3.0,72.0,2.0,accepted,2.15036705544,0.0 +3.0,6.0,3.0,24.0,0.0,3.0,48.0,2.0,accepted,2.15036705544,0.0 +6.0,5.0,4.0,28.0,0.0,3.0,56.0,2.0,accepted,2.15036705544,0.0 +6.0,6.0,6.0,36.0,0.0,4.0,72.0,3.0,accepted,2.98811264988,0.0 +6.0,6.0,6.0,36.0,0.0,4.0,72.0,3.0,accepted,2.98811264988,0.0 +6.0,6.0,6.0,36.0,0.0,4.0,72.0,3.0,accepted,2.98811264988,0.0 +6.0,2.0,6.0,28.0,0.0,4.0,56.0,3.0,accepted,2.98811264988,0.0 +6.0,6.0,6.0,36.0,0.0,4.0,72.0,3.0,accepted,2.98811264988,0.0 +6.0,6.0,6.0,36.0,0.0,4.0,72.0,3.0,accepted,2.98811264988,0.0 +6.0,6.0,6.0,36.0,0.0,4.0,72.0,3.0,accepted,2.98811264988,0.0 +6.0,2.0,6.0,28.0,0.0,4.0,56.0,3.0,accepted,2.98811264988,0.0 +6.0,6.0,6.0,36.0,0.0,4.0,72.0,3.0,accepted,2.98811264988,0.0 +6.0,6.0,6.0,36.0,0.0,4.0,72.0,3.0,accepted,2.98811264988,0.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,accepted,0.0,1.0 +6.0,6.0,6.0,36.0,1.0,5.0,72.0,4.0,final,0.0,1.0 diff --git a/tests/framework/Optimizers/GeneticAlgorithms/tests b/tests/framework/Optimizers/GeneticAlgorithms/tests index 50dfdf499d..84ec37dbd1 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/tests +++ b/tests/framework/Optimizers/GeneticAlgorithms/tests @@ -70,6 +70,17 @@ [../] [../] + [./MaxwReplacementCustomSampler] + type = 'RavenFramework' + input = 'discrete/unconstrained/testGAMaxwRep_custom_sampler.xml' + [./data] + type = OrderedCSV + output = 'discrete/unconstrained/MaxwReplacement_customsampler/opt_export_0.csv' + rel_err = 1e-3 + zero_threshold = 1e-5 + [../] + [../] + [./MaxwReplacementDiffDist] type = 'RavenFramework' input = 'discrete/unconstrained/testGAMaxwRepDifferentDist.xml' From 36d81f6e6251a4706d678d44600de0a0ea63b105 Mon Sep 17 00:00:00 2001 From: mandd Date: Fri, 24 Feb 2023 14:28:33 -0700 Subject: [PATCH 4/8] added missing file --- .../MaxwReplacement_customsampler/restart.csv | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/MaxwReplacement_customsampler/restart.csv diff --git a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/MaxwReplacement_customsampler/restart.csv b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/MaxwReplacement_customsampler/restart.csv new file mode 100644 index 0000000000..d852daf796 --- /dev/null +++ b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/MaxwReplacement_customsampler/restart.csv @@ -0,0 +1,11 @@ +x1,x2,x3 +6,6,6 +2,2,6 +4,5,3 +3,4,2 +2,6,1 +1,2,4 +2,2,2 +4,4,3 +2,6,6 +2,1,3 \ No newline at end of file From 0473401c4faf2ce41439820e3a6893d70e792fb1 Mon Sep 17 00:00:00 2001 From: mandd Date: Mon, 27 Feb 2023 08:37:18 -0700 Subject: [PATCH 5/8] addressing comments --- .../MooseBasedApp/MooseInputParser.py | 3 --- ravenframework/Optimizers/Optimizer.py | 4 +++- .../testGAMaxwRep_custom_sampler.xml | 17 ----------------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py b/ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py index 0a79890793..e2edf54b1b 100644 --- a/ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py +++ b/ravenframework/CodeInterfaceClasses/MooseBasedApp/MooseInputParser.py @@ -107,9 +107,7 @@ def getpotToInputTree(getpot): #------------------ # attributes and values elif '=' in line: - print('HERE') attribute, value = (x.strip() for x in line.split('=', maxsplit=1)) - print(attribute, value) # TODO multilline, if "'" or '"' in line # ASSUME: both " and ' aren't used in the same line if any(x in line for x in multiIndicators): @@ -127,7 +125,6 @@ def getpotToInputTree(getpot): # DO NOT continue, keep going until multiline is closed continue else: - print('HERE1') # single line entry with no vector representation value = value.strip() closeEntry = True diff --git a/ravenframework/Optimizers/Optimizer.py b/ravenframework/Optimizers/Optimizer.py index 23d96ef341..01d0b5d4fa 100644 --- a/ravenframework/Optimizers/Optimizer.py +++ b/ravenframework/Optimizers/Optimizer.py @@ -175,12 +175,14 @@ def __init__(self): self._constraintFunctions = [] # list of constraint functions self._impConstraintFunctions = [] # list of implicit constraint functions self._requireSolnExport = True # optimizers only produce result in solution export + self.optAssemblerList = ['DataObjects', 'Distributions', 'Functions', 'Files'] # List of assembler entities required to initialize an optmizer # __private # additional methods self.addAssemblerObject('Constraint', InputData.Quantity.zero_to_infinity) # Explicit (input-based) constraints self.addAssemblerObject('ImplicitConstraint', InputData.Quantity.zero_to_infinity) # Implicit constraints self.addAssemblerObject('Sampler', InputData.Quantity.zero_to_one) # This Sampler can be used to initialize the optimization initial points (e.g. partially replace the blocks for some variables) + # register adaptive sample identification criteria self.registerIdentifier('traj') # the trajectory of interest @@ -209,7 +211,7 @@ def _localGenerateAssembler(self, initDict): self.assemblerDict['Distributions'] = [] self.assemblerDict['Functions'] = [] self.assemblerDict['Files'] = [] - for mainClass in ['DataObjects', 'Distributions', 'Functions', 'Files']: + for mainClass in self.optAssemblerList: for funct in initDict[mainClass]: self.assemblerDict[mainClass].append([mainClass, initDict[mainClass][funct].type, diff --git a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml index a8874350f2..80d358ba3c 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml +++ b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwRep_custom_sampler.xml @@ -101,27 +101,10 @@ ans optOut restartSampler - - - - 10 - 20021986 - - - uniform_dist_Repl_1 - - - uniform_dist_Repl_1 - - - uniform_dist_Repl_1 - - - restart.csv From 0040e2a238d6c96f6831838463b09b46716400d7 Mon Sep 17 00:00:00 2001 From: mandd Date: Mon, 27 Feb 2023 12:30:40 -0700 Subject: [PATCH 6/8] edit file --- ravenframework/Optimizers/Optimizer.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ravenframework/Optimizers/Optimizer.py b/ravenframework/Optimizers/Optimizer.py index 01d0b5d4fa..61915d1a57 100644 --- a/ravenframework/Optimizers/Optimizer.py +++ b/ravenframework/Optimizers/Optimizer.py @@ -237,10 +237,12 @@ def _localWhatDoINeed(self): @ Out, needDict, dict, list of objects needed """ needDict = {} - needDict['Distributions'] = [(None,'all')] - needDict['Functions' ] = [(None,'all')] - needDict['DataObjects' ] = [(None,'all')] - needDict['Files' ] = [(None,'all')] + for elem in self.optAssemblerList: + needDict[elem] = [(None,'all')] + #needDict['Distributions'] = [(None,'all')] + #needDict['Functions' ] = [(None,'all')] + #needDict['DataObjects' ] = [(None,'all')] + #needDict['Files' ] = [(None,'all')] return needDict @@ -405,7 +407,7 @@ def _initializeInitSampler(self, externalSeeding): self._initSampler = sampler # initialize sampler samplerInit = {} - for entity in ['Distributions', 'Functions', 'DataObjects','Files']: + for entity in self.optAssemblerList: samplerInit[entity] = dict((entry[2], entry[3]) for entry in self.assemblerDict.get(entity, [])) self._initSampler._localGenerateAssembler(samplerInit) # assure sampler provides useful info From 7a31828dd20d16dd825a8bf63781626f4278e42b Mon Sep 17 00:00:00 2001 From: mandd Date: Mon, 27 Feb 2023 13:11:19 -0700 Subject: [PATCH 7/8] edit file --- ravenframework/Optimizers/Optimizer.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ravenframework/Optimizers/Optimizer.py b/ravenframework/Optimizers/Optimizer.py index 61915d1a57..bf5face36e 100644 --- a/ravenframework/Optimizers/Optimizer.py +++ b/ravenframework/Optimizers/Optimizer.py @@ -239,10 +239,6 @@ def _localWhatDoINeed(self): needDict = {} for elem in self.optAssemblerList: needDict[elem] = [(None,'all')] - #needDict['Distributions'] = [(None,'all')] - #needDict['Functions' ] = [(None,'all')] - #needDict['DataObjects' ] = [(None,'all')] - #needDict['Files' ] = [(None,'all')] return needDict From adf714a11a46dae2d38b43c9c8d9a97a2c5a6884 Mon Sep 17 00:00:00 2001 From: mandd Date: Tue, 28 Feb 2023 13:06:31 -0700 Subject: [PATCH 8/8] edit ARMA test --- tests/framework/ROM/TimeSeries/ARMA/tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/framework/ROM/TimeSeries/ARMA/tests b/tests/framework/ROM/TimeSeries/ARMA/tests index dd09b8774c..daf623359a 100644 --- a/tests/framework/ROM/TimeSeries/ARMA/tests +++ b/tests/framework/ROM/TimeSeries/ARMA/tests @@ -295,9 +295,9 @@ [./InterpolatedMaxCycles] type = 'RavenFramework' input = 'interpolated_maxcycles.xml' - csv = 'InterpolatedMaxCycles/synthetic.csv InterpolatedMaxCycles/resynthetic.csv' + output = 'InterpolatedMaxCycles/synthetic.csv InterpolatedMaxCycles/resynthetic.csv' #not consistent, see 1351 - rel_err = 10000.0 + #rel_err = 10000.0 [../] [./CloudPlot]