Changeset 7872 for trunk/projects/slim-curve/src/main/c/loci_curvefitter_SLIMCurveFitter.c

Timestamp:

01/27/12 19:41:10 (8 years ago)

Author:

aivar

Message:

Added 'noise' and 'chi_square_delta' parameters to EcfWrapper and JNI interface.

File:

• trunk/projects/slim-curve/src/main/c/loci_curvefitter_SLIMCurveFitter.c (modified) (4 diffs)

trunk/projects/slim-curve/src/main/c/loci_curvefitter_SLIMCurveFitter.c

@@ -24 +24 @@
  * Class:     loci_curvefitter_SLIMCurveFitter
  * Method:    RLD_fit
- * Signature: (D[DII[DI[D[D[D[D[D[DD)I
+ * Signature: (D[DII[DII[D[D[D[D[D[DD)I
  */
 JNIEXPORT jint JNICALL Java_loci_curvefitter_SLIMCurveFitter_RLD_1fit
   (JNIEnv *env, jobject obj, jdouble x_inc, jdoubleArray y,
         jint fit_start, jint fit_end, jdoubleArray instr, jint n_instr,
-        jdoubleArray sig, jdoubleArray z, jdoubleArray a, jdoubleArray tau,
+        jint noise, jdoubleArray sig,
+        jdoubleArray z, jdoubleArray a, jdoubleArray tau,
         jdoubleArray fitted, jdoubleArray chi_square, jdouble chi_square_target) {
 
@@ -61 +62 @@
 
     return_value = RLD_fit(x_inc, y_array, fit_start, fit_end,
-            instr_array, n_instr, sig_array, z_ref, a_ref, tau_ref,
+            instr_array, n_instr, noise, sig_array, z_ref, a_ref, tau_ref,
             fitted_array, chi_square_ref, chi_square_target);
 
@@ -86 +87 @@
  * Class:     loci_curvefitter_SLIMCurveFitter
  * Method:    LMA_fit
- * Signature: (D[DII[DI[D[D[II[D[DD)I
+ * Signature: (D[DII[DII[D[D[II[D[DDD)I
  */
 JNIEXPORT jint JNICALL Java_loci_curvefitter_SLIMCurveFitter_LMA_1fit
   (JNIEnv *env, jobject obj, jdouble x_inc, jdoubleArray y,
         jint fit_start, jint fit_end, jdoubleArray instr, jint n_instr,
-        jdoubleArray sig, jdoubleArray param, jintArray param_free, jint n_param,
-        jdoubleArray fitted, jdoubleArray chi_square, jdouble chi_square_target) {
+        jint noise, jdoubleArray sig,
+        jdoubleArray param, jintArray param_free, jint n_param,
+        jdoubleArray fitted, jdoubleArray chi_square,
+        jdouble chi_square_target, jdouble chi_square_delta) {
 
     jdouble *y_array;
@@ -121 +124 @@
 
     return_value = LMA_fit(x_inc, y_array, fit_start, fit_end,
-            instr_array, n_instr, sig_array, param_array, param_free_array, n_param,
-            fitted_array, chi_square_ref, chi_square_target);
+            instr_array, n_instr, noise, sig_array,
+            param_array, param_free_array, n_param,
+            fitted_array, chi_square_ref, chi_square_target, chi_square_delta);
 
     // pass back the arrays