Changeset 7598 for trunk/projects

Timestamp:

01/27/11 23:39:21 (9 years ago)

Author:

aivar

Message:

Parameter ordering problems. GrayNRCurveFitter was out of date.

Location:

trunk/projects/curve-fitter/src/main/java/loci/curvefitter

Files:

• GrayNRCurveFitter.java (modified) (4 diffs)
• SLIMCurveFitter.java (modified) (1 diff)

trunk/projects/curve-fitter/src/main/java/loci/curvefitter/GrayNRCurveFitter.java

@@ -140 +140 @@
                 // load once, on-demand
                 s_library = (CLibrary) Native.loadLibrary("GrayNRCode", CLibrary.class);
+
+                System.out.println("s_library is " + s_library);
             }
             catch (UnsatisfiedLinkError e) {
@@ -170 +172 @@
             for (ICurveFitData data: dataArray) {
                 // grab incoming parameters
-                a.setValue(data.getParams()[0]);
-                tau.setValue(data.getParams()[1]);
-                z.setValue(data.getParams()[2]);
+                a.setValue(data.getParams()[2]);
+                tau.setValue(data.getParams()[3]);
+                z.setValue(data.getParams()[1]);
 
                 returnValue = s_library.RLD_fit(
@@ -191 +193 @@
 
                 // set outgoing parameters
-                data.getParams()[0] = a.getValue();
-                data.getParams()[1] = tau.getValue();
-                data.getParams()[2] = z.getValue();
+                data.getParams()[0] = chiSquare.getValue();
+                data.getParams()[1] = z.getValue();
+                data.getParams()[2] = a.getValue();
+                data.getParams()[3] = tau.getValue();
+
             }
         }
@@ -209 +213 @@
                         data.getParams(),
                         toIntArray(m_free),
-                        data.getParams().length,
+                        data.getParams().length - 1,
                         data.getYFitted(),
                         chiSquare,

trunk/projects/curve-fitter/src/main/java/loci/curvefitter/SLIMCurveFitter.java

@@ -148 +148 @@
                 //TODO sort out the name s_library = (CLibrary) Native.loadLibrary("SLIMCurve", CLibrary.class);
                //TODO test with old code instead: s_library = (CLibrary) Native.loadLibrary("slim-curve-1.0-SNAPSHOT", CLibrary.class);
-                s_library = (CLibrary) Native.loadLibrary("SLIMCurve_trimmed_down", CLibrary.class);
+                //TODO this was yet another version s_library = (CLibrary) Native.loadLibrary("SLIMCurve_trimmed_down", CLibrary.class);
+                s_library = (CLibrary) Native.loadLibrary("slim-curve-1.0-SNAPSHOT", CLibrary.class);
 
                 System.out.println("s_library is " + s_library);