unstable-commit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/applied-gslp@106 0e905424-1750-4201-adbd-bf076348bc1c

diff --git a/trunk/noumerov/noumerov b/trunk/noumerov/noumerov
index 63e73ad..9a16933 100755 (executable)
Binary files a/trunk/noumerov/noumerov and b/trunk/noumerov/noumerov differ

diff --git a/trunk/noumerov/noumerov.c b/trunk/noumerov/noumerov.c
index 8727781..bb7cc47 100644 (file)
--- a/trunk/noumerov/noumerov.c
+++ b/trunk/noumerov/noumerov.c
@@ -803,6 +803,8 @@ param *p;
                status = gsl_multifit_test_delta(s->dx, s->x, 1e-4, 1e-4);
        } while (status == GSL_CONTINUE && iter < 500);
        gsl_multifit_covar(s->J, 0.0, covar);
+       p->A = gsl_vector_get(s->x, 0);
+       p->delta = norm_theta(gsl_vector_get(s->x, 1));
 #define FIT(i) gsl_vector_get(s->x, i)
 #define ERR(i) sqrt(gsl_matrix_get(covar,i,i))
        {
@@ -816,16 +818,14 @@ param *p;
                   printf("# status = %s\n", gsl_strerror(status));
                 */
                printf("% .16e\t", pow(chi, 2.0) / dof);
-               printf("% .16e\t", FIT(0));
+               printf("% .16e\t", p->A);
                printf("% .16e\t", c * ERR(0));
-               printf("% .16e\t", FIT(1));
+               printf("% .16e\t", p->delta);
                printf("% .16e\t", c * ERR(1));
                printf("% d\t", p->r->size);
                printf("%s\t", gsl_strerror(status));
                printf("\n");
        }
-       p->A = gsl_vector_get(s->x, 0);
-       p->delta = norm_theta(gsl_vector_get(s->x, 1));
        gsl_multifit_fdfsolver_free(s);
        return;
 }

diff --git a/trunk/noumerov/noumerov.o b/trunk/noumerov/noumerov.o
index d09b540..6ad42bb 100644 (file)
Binary files a/trunk/noumerov/noumerov.o and b/trunk/noumerov/noumerov.o differ