diff options
Diffstat (limited to 'src/de/lmu/ifi/dbs/elki/gui/multistep/panels/EvaluationTabPanel.java')
-rw-r--r-- | src/de/lmu/ifi/dbs/elki/gui/multistep/panels/EvaluationTabPanel.java | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/gui/multistep/panels/EvaluationTabPanel.java b/src/de/lmu/ifi/dbs/elki/gui/multistep/panels/EvaluationTabPanel.java index c6d73133..9a74e250 100644 --- a/src/de/lmu/ifi/dbs/elki/gui/multistep/panels/EvaluationTabPanel.java +++ b/src/de/lmu/ifi/dbs/elki/gui/multistep/panels/EvaluationTabPanel.java @@ -79,7 +79,7 @@ public class EvaluationTabPanel extends ParameterTabPanel implements Observer<Ob @Override protected synchronized void configureStep(Parameterization config) { evals = config.tryInstantiate(EvaluationStep.class); - if(config.getErrors().size() > 0) { + if (config.getErrors().size() > 0) { evals = null; } basedOnResult = null; @@ -87,13 +87,13 @@ public class EvaluationTabPanel extends ParameterTabPanel implements Observer<Ob @Override protected void executeStep() { - if(input.canRun() && !input.isComplete()) { + if (input.canRun() && !input.isComplete()) { input.execute(); } - if(algs.canRun() && !algs.isComplete()) { + if (algs.canRun() && !algs.isComplete()) { algs.execute(); } - if(!input.isComplete() || !algs.isComplete()) { + if (!input.isComplete() || !algs.isComplete()) { throw new AbortException("Input data not available."); } // Get the database and run the algorithms @@ -109,35 +109,35 @@ public class EvaluationTabPanel extends ParameterTabPanel implements Observer<Ob * @return Evaluation step */ public EvaluationStep getEvaluationStep() { - if(evals == null) { + if (evals == null) { throw new AbortException("Evaluators not configured."); } return evals; } @Override - protected String getStatus() { - if(evals == null) { - return STATUS_UNCONFIGURED; + protected Status getStatus() { + if (evals == null) { + return Status.STATUS_UNCONFIGURED; } - if(!input.canRun() || !algs.canRun()) { - return STATUS_CONFIGURED; + if (!input.canRun() || !algs.canRun()) { + return Status.STATUS_CONFIGURED; } checkDependencies(); - if(input.isComplete() && algs.isComplete() && basedOnResult != null) { - //if(evals.getResult() == null) { - //return STATUS_FAILED; - //} - //else { - return STATUS_COMPLETE; - //} + if (input.isComplete() && algs.isComplete() && basedOnResult != null) { + // if(evals.getResult() == null) { + // return STATUS_FAILED; + // } + // else { + return Status.STATUS_COMPLETE; + // } } - return STATUS_READY; + return Status.STATUS_READY; } @Override public void update(Object o) { - if(o == input || o == algs) { + if (o == input || o == algs) { checkDependencies(); updateStatus(); } @@ -147,12 +147,12 @@ public class EvaluationTabPanel extends ParameterTabPanel implements Observer<Ob * Test if the dependencies are still valid. */ private void checkDependencies() { - if(basedOnResult != null) { - if(!input.isComplete() || !algs.isComplete() || basedOnResult.get() != algs.getAlgorithmStep().getResult()) { + if (basedOnResult != null) { + if (!input.isComplete() || !algs.isComplete() || basedOnResult.get() != algs.getAlgorithmStep().getResult()) { // We've become invalidated, notify. basedOnResult = null; observers.notifyObservers(this); } } } -}
\ No newline at end of file +} |