Changeset 7872 for trunk/projects/slimcurve
 Timestamp:
 01/27/12 19:41:10 (8 years ago)
 Location:
 trunk/projects/slimcurve/src/main/c
 Files:

 4 edited
Legend:
 Unmodified
 Added
 Removed

trunk/projects/slimcurve/src/main/c/EcfWrapper.c
r7781 r7872 30 30 double instr[], 31 31 int n_instr, 32 int noise, 32 33 double sig[], 33 34 double *z, … … 39 40 ) { 40 41 41 int noise = 0;42 42 int n_data = fit_end + 1; 43 43 float *y_float = (float *)malloc(n_data * sizeof(float)); … … 119 119 double instr[], 120 120 int n_instr, 121 int noise, 121 122 double sig[], 122 123 double param[], … … 125 126 double fitted[], 126 127 double *chi_square, 127 double chi_square_target 128 double chi_square_target, 129 double chi_square_delta 128 130 ) { 129 131 130 int noise = 0;131 132 int restrain = 0; 132 float chi_square_delta = 0;133 133 float chi_square_percent = 500; 134 134 135 int n_data = fit_end + 1; 135 136 float *y_float = (float *)malloc(n_data * sizeof(float)); 
trunk/projects/slimcurve/src/main/c/EcfWrapper.h
r7781 r7872 39 39 double instr[], 40 40 int n_instr, 41 int noise, 41 42 double sig[], 42 43 double *z, … … 55 56 double instr[], 56 57 int n_instr, 58 int noise, 57 59 double sig[], 58 60 double param[], … … 61 63 double fitted[], 62 64 double *chi_square, 63 double chi_square_target 65 double chi_square_target, 66 double chi_square_delta 64 67 ); 65 68 
trunk/projects/slimcurve/src/main/c/loci_curvefitter_SLIMCurveFitter.c
r7781 r7872 24 24 * Class: loci_curvefitter_SLIMCurveFitter 25 25 * Method: RLD_fit 26 * Signature: (D[DII[DI [D[D[D[D[D[DD)I26 * Signature: (D[DII[DII[D[D[D[D[D[DD)I 27 27 */ 28 28 JNIEXPORT jint JNICALL Java_loci_curvefitter_SLIMCurveFitter_RLD_1fit 29 29 (JNIEnv *env, jobject obj, jdouble x_inc, jdoubleArray y, 30 30 jint fit_start, jint fit_end, jdoubleArray instr, jint n_instr, 31 jdoubleArray sig, jdoubleArray z, jdoubleArray a, jdoubleArray tau, 31 jint noise, jdoubleArray sig, 32 jdoubleArray z, jdoubleArray a, jdoubleArray tau, 32 33 jdoubleArray fitted, jdoubleArray chi_square, jdouble chi_square_target) { 33 34 … … 61 62 62 63 return_value = RLD_fit(x_inc, y_array, fit_start, fit_end, 63 instr_array, n_instr, sig_array, z_ref, a_ref, tau_ref,64 instr_array, n_instr, noise, sig_array, z_ref, a_ref, tau_ref, 64 65 fitted_array, chi_square_ref, chi_square_target); 65 66 … … 86 87 * Class: loci_curvefitter_SLIMCurveFitter 87 88 * Method: LMA_fit 88 * Signature: (D[DII[DI [D[D[II[D[DD)I89 * Signature: (D[DII[DII[D[D[II[D[DDD)I 89 90 */ 90 91 JNIEXPORT jint JNICALL Java_loci_curvefitter_SLIMCurveFitter_LMA_1fit 91 92 (JNIEnv *env, jobject obj, jdouble x_inc, jdoubleArray y, 92 93 jint fit_start, jint fit_end, jdoubleArray instr, jint n_instr, 93 jdoubleArray sig, jdoubleArray param, jintArray param_free, jint n_param, 94 jdoubleArray fitted, jdoubleArray chi_square, jdouble chi_square_target) { 94 jint noise, jdoubleArray sig, 95 jdoubleArray param, jintArray param_free, jint n_param, 96 jdoubleArray fitted, jdoubleArray chi_square, 97 jdouble chi_square_target, jdouble chi_square_delta) { 95 98 96 99 jdouble *y_array; … … 121 124 122 125 return_value = LMA_fit(x_inc, y_array, fit_start, fit_end, 123 instr_array, n_instr, sig_array, param_array, param_free_array, n_param, 124 fitted_array, chi_square_ref, chi_square_target); 126 instr_array, n_instr, noise, sig_array, 127 param_array, param_free_array, n_param, 128 fitted_array, chi_square_ref, chi_square_target, chi_square_delta); 125 129 126 130 // pass back the arrays 
trunk/projects/slimcurve/src/main/c/loci_curvefitter_SLIMCurveFitter.h
r7724 r7872 12 12 * Class: loci_curvefitter_SLIMCurveFitter 13 13 * Method: RLD_fit 14 * Signature: (D[DII[DI [D[D[D[D[D[DD)I14 * Signature: (D[DII[DII[D[D[D[D[D[DD)I 15 15 */ 16 16 JNIEXPORT jint JNICALL Java_loci_curvefitter_SLIMCurveFitter_RLD_1fit 17 (JNIEnv *, jobject, jdouble, jdoubleArray, jint, jint, jdoubleArray, jint, j doubleArray, jdoubleArray, jdoubleArray, jdoubleArray, jdoubleArray, jdoubleArray, jdouble);17 (JNIEnv *, jobject, jdouble, jdoubleArray, jint, jint, jdoubleArray, jint, jint, jdoubleArray, jdoubleArray, jdoubleArray, jdoubleArray, jdoubleArray, jdoubleArray, jdouble); 18 18 19 19 /* 20 20 * Class: loci_curvefitter_SLIMCurveFitter 21 21 * Method: LMA_fit 22 * Signature: (D[DII[DI [D[D[II[D[DD)I22 * Signature: (D[DII[DII[D[D[II[D[DDD)I 23 23 */ 24 24 JNIEXPORT jint JNICALL Java_loci_curvefitter_SLIMCurveFitter_LMA_1fit 25 (JNIEnv *, jobject, jdouble, jdoubleArray, jint, jint, jdoubleArray, jint, j doubleArray, jdoubleArray, jintArray, jint, jdoubleArray, jdoubleArray, jdouble);25 (JNIEnv *, jobject, jdouble, jdoubleArray, jint, jint, jdoubleArray, jint, jint, jdoubleArray, jdoubleArray, jintArray, jint, jdoubleArray, jdoubleArray, jdouble, jdouble); 26 26 27 27 #ifdef __cplusplus
Note: See TracChangeset
for help on using the changeset viewer.