Commit d0f3ff06 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

changed parameters for automatic LMA run

parent 41015a35

src/main/java/FocusingField.java

+99 −93
Original line number Diff line number Diff line
@@ -3018,15 +3018,15 @@ d_s2/d_x0= 2*delta_x*delta_y^2/r2^2 
			String msg="initial Jacobian matrix calculation. Points:"+this.dataValues.length+" Parameters:"+this.currentVector.length;

			if (debugLevel>1) System.out.println(msg);

			if (this.updateStatus) IJ.showStatus(msg);

			System.out.println("*** 1 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

			if (debugLevel>1) System.out.println("*** 1 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

            this.currentfX=createFXandJacobian(this.currentVector, true); // is it always true here (this.jacobian==null)

			System.out.println("*** 2 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

            if (debugLevel>1) System.out.println("*** 2 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

            this.lMAArrays=calculateJacobianArrays(this.currentfX);

			System.out.println("*** 3 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

            if (debugLevel>1) System.out.println("*** 3 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

            this.currentRMS= calcErrorDiffY(this.currentfX,false);

			System.out.println("*** 4 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

            if (debugLevel>1) System.out.println("*** 4 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

            this.currentRMSPure=calcErrorDiffY(this.currentfX, true);

			System.out.println("*** 5 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

            if (debugLevel>1) System.out.println("*** 5 @ "+ IJ.d2s(0.000000001*(System.nanoTime()-this.startTime),5));

			msg=this.currentStrategyStep+": initial RMS="+IJ.d2s(this.currentRMS,8)+" (pure RMS="+IJ.d2s(this.currentRMSPure,8)+")"+

					". Calculating next Jacobian. Points:"+this.dataValues.length+" Parameters:"+this.currentVector.length;

			if (debugLevel>1) System.out.println(msg);
@@ -4282,6 +4282,12 @@ public boolean LevenbergMarquardt( 
	double savedLambda=this.lambda;

	this.debugLevel=debugLevel;

	if (openDialog && !selectLMAParameters(autoSel)) return false;

	

	if (!openDialog && autoSel) {

		this.stopEachStep= false;

		this.stopEachSeries= false;

		this.currentStrategyStep=0;		

	}

	this.startTime=System.nanoTime();

	// create savedVector (it depends on parameter masks), restore from it if aborted

//	fieldFitting.initSampleCorrVector(