xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1343: Fix Derived Parameter clean up of global map performance" into development

Browse source 
Former-commit-id: d276bf25df [formerly 1f4591a861 [formerly a8b691b11e] [formerly d276bf25df [formerly 7ca68476dd30a056223d4b1b8788640cae245ca9]]]
Former-commit-id: 1f4591a861 [formerly a8b691b11e]
Former-commit-id: 1f4591a861
Former-commit-id: 07bf1fbe9c
This commit is contained in:
Richard Peter 2012-11-20 16:58:13 -06:00 • committed by Gerrit Code Review
commit 24e897ef89
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cave/com.raytheon.uf.viz.derivparam.python/src/com/raytheon/uf/viz/derivparam/python/MasterDerivScript.java
View file

@ -61,7 +61,7 @@ public class MasterDerivScript extends PythonInterpreter {
private static final String DATA_NAME = "Data";
private Map<Object, String> prevArgs = new HashMap<Object, String>();
private final Map<Object, List<String>> prevArgs = new HashMap<Object, List<String>>();
/**
* Constructor
@ -86,7 +86,14 @@ public class MasterDerivScript extends PythonInterpreter {
throws JepException {
this.prevArgs.clear();
executeFunctionInternal(name, args);
cleanupGlobals();
jep.eval("globalsRef=globals()");
for (List<String> pArgs : prevArgs.values()) {
for (String arg : pArgs) {
jep.eval(arg + " = None");
jep.eval("del globalsRef['" + arg + "']");
}
}
this.prevArgs.clear();
return getExecutionResult();
}
@ -122,7 +129,7 @@ public class MasterDerivScript extends PythonInterpreter {
protected void evaluateArgument(String argName, Object argValue)
throws JepException {
if (prevArgs.containsKey(argValue)) {
jep.eval(argName + " = " + prevArgs.get(argValue));
jep.eval(argName + " = " + prevArgs.get(argValue).get(0));
} else if (argValue instanceof List) {
@SuppressWarnings({ "rawtypes" })
List valList = (List) argValue;
@ -222,7 +229,7 @@ public class MasterDerivScript extends PythonInterpreter {
// create a list of arrays
jep.eval(argName + " = []");
for (int argIdx = 0; argIdx < valList.length; argIdx++) {
IDataRecord val = (IDataRecord) valList[argIdx];
IDataRecord val = valList[argIdx];
jep.eval(argName + ".append(None)");
// setNumeric won't work with indexed objects
evaluateArgument("__tmp", val);
@ -248,7 +255,12 @@ public class MasterDerivScript extends PythonInterpreter {
} else {
super.evaluateArgument(argName, argValue);
}
prevArgs.put(argValue, argName);
List<String> pArgs = prevArgs.get(argValue);
if (pArgs == null) {
pArgs = new ArrayList<String>();
prevArgs.put(argValue, pArgs);
}
pArgs.add(argName);
}
/**