Merge pull request #355 from lasp/feature/allow-function-as-dispersion-variable

Allow functions as dispersion variables

Author: patkenneally

src/utilities/MonteCarlo/Controller.py

@@ -826,10 +826,16 @@ def __call__(cls, params):
 
             # apply the dispersions and the random seeds
             for variable, value in list(modifications.items()):
-                disperseStatement = "simInstance." + variable + "=" + value
+                expresion = "simInstance." + variable
+                dispersionExpresion = None
+                if eval("callable(" + expresion + ")"):
+                    dispersionExpresion = expresion + "(" + value + ")"
+                else:
+                    dispersionExpresion = expresion + "=" + value
+
                 if simParams.verbose:
-                    print("Executing parameter modification -> ", disperseStatement)
-                exec(disperseStatement)
+                    print("Executing parameter modification -> ", dispersionExpresion)
+                exec(dispersionExpresion)
 
             # setup data logging
             if len(simParams.retentionPolicies) > 0:
@@ -921,4 +927,3 @@ def populateSeeds(simInstance, modifications):
             if ".RNGSeed" in variable:
                 rngStatement = "simInstance." + variable + "=" + value
                 exec(rngStatement)
-