Skip to content

I
imagej-elphel
Commit 6e8225bb authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Fixing stopRequested

parent 71a02244
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/main/java/FocusingField.java
View file @ 6e8225bb
...@@ -4525,8 +4525,8 @@ public boolean LevenbergMarquardt( ...@@ -4525,8 +4525,8 @@ public boolean LevenbergMarquardt(
// this.seriesNumber++; // this.seriesNumber++;
break; // while (true), proceed to the next series break; // while (true), proceed to the next series
} }
this.stopRequested.set(saveStopRequested); // restore caller stop request
} // while true - same series } // while true - same series
this.stopRequested.set(saveStopRequested); // restore caller stop request
// if (wasLastSeries) break; // if (wasLastSeries) break;
// } // while (this.fittingStrategy.isSeriesValid(this.seriesNumber)){ // TODO: Add "stop" tag to series // } // while (this.fittingStrategy.isSeriesValid(this.seriesNumber)){ // TODO: Add "stop" tag to series
if (fieldFitting.fieldStrategies.isLast(this.currentStrategyStep)) break; if (fieldFitting.fieldStrategies.isLast(this.currentStrategyStep)) break;
...@@ -4536,6 +4536,7 @@ public boolean LevenbergMarquardt( ...@@ -4536,6 +4536,7 @@ public boolean LevenbergMarquardt(
if (debugLevel>0) System.out.println("stepLevenbergMarquardtAction() "+msg); if (debugLevel>0) System.out.println("stepLevenbergMarquardtAction() "+msg);
this.currentStrategyStep++; this.currentStrategyStep++;
this.iterationStepNumber=0; this.iterationStepNumber=0;
this.stopRequested.set(saveStopRequested); // restore caller stop request
} // for all series } // for all series
String msg="RMS="+this.currentRMS+" ("+this.firstRMS+") "+ String msg="RMS="+this.currentRMS+" ("+this.firstRMS+") "+
", pure RMS="+this.currentRMSPure+" ("+this.firstRMSPure+") "+ ", pure RMS="+this.currentRMSPure+" ("+this.firstRMSPure+") "+
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment