| commit | c038f83bd16b2122b358586ba4e309018eb356c0 | [log] [tgz] |
|---|---|---|
| author | James Kaufman <jhkauf@us.ibm.com> | Tue Nov 24 20:17:13 2020 -0800 |
| committer | James Kaufman <jhkauf@us.ibm.com> | Tue Nov 24 20:17:13 2020 -0800 |
| tree | 8a4277954920d9b826d05d3db7078c18a13215be | |
| parent | 7cb33cb1178403975ef0407ffac585bb0206e520 [diff] |
Only flush the autoexperiment logger when the convergence is done (to improve performance)
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/NelderMeadAlgorithm.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/NelderMeadAlgorithm.java index 3ce018a..dfaf715 100644 --- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/NelderMeadAlgorithm.java +++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/NelderMeadAlgorithm.java
@@ -412,6 +412,8 @@ if(AutomaticExperimentManager.QUIT_NOW) break; */ } + fn.getValue(start).copy(); + fn.done(); } private void limit(double []vals) {
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexAlgorithmExecuter.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexAlgorithmExecuter.java index e0964b8..6ca1359 100644 --- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexAlgorithmExecuter.java +++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexAlgorithmExecuter.java
@@ -264,7 +264,9 @@ // Activator.logInformation(" Error in validation data set is: " + result.getValidationError()); resultWriter.write(error+""); resultWriter.write(LS); - resultWriter.flush(); + + // after exp is done + // resultWriter.flush(); // TODO: GUI output here @@ -334,6 +336,16 @@ simulation.simulationSleep = false; return simulation; } + + @Override + public void done() { + try { + resultWriter.flush(); + } catch(IOException ioe) { + ioe.printStackTrace(); + } + + } } }
diff --git a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexFunction.java b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexFunction.java index 6651274..55cf153 100644 --- a/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexFunction.java +++ b/org.eclipse.stem/analysis/org.eclipse.stem.analysis.automaticexperiment/src/org/eclipse/stem/analysis/automaticexperiment/SimplexFunction.java
@@ -18,4 +18,5 @@ public interface SimplexFunction { public ErrorResult getValue(double[] parameters); + public void done(); }