[Kst] kdeextragear-2/kst/plugins/fits_nonlinear

[Andrew Walker]

CVS commit by arwalker: 

Added weighted Gaussian and Lorentzian fits


  M +1 -1      Makefile.am   1.3
  M +4 -3      non_linear.h   1.3


--- kdeextragear-2/kst/plugins/fits_nonlinear/Makefile.am  #1.2:1.3
@@ -1,2 +1,2 @@
-SUBDIRS=gaussian lorentzian
+SUBDIRS=gaussian gaussian_weighted lorentzian lorentzian_weighted
 

--- kdeextragear-2/kst/plugins/fits_nonlinear/non_linear.h  #1.2:1.3
@@ -59,4 +59,5 @@ int function_df( const gsl_vector* pVect
   data*  pData  = (data*)pParams;
   size_t i;
+  size_t j;
   
   for( i=0; i<NUM_PARAMS; i++ ) {
@@ -67,7 +68,7 @@ int function_df( const gsl_vector* pVect
     function_derivative( pData->pdX[i], dParameters, dDerivatives );
                                                                                    
-    gsl_matrix_set( pMatrixJ, i, 0, dDerivatives[0] );
-    gsl_matrix_set( pMatrixJ, i, 1, dDerivatives[1] );
-    gsl_matrix_set( pMatrixJ, i, 2, dDerivatives[2] );
+    for( j=0; j<NUM_PARAMS; j++ ) {
+      gsl_matrix_set( pMatrixJ, i, j, dDerivatives[j] );
+    }
   }