unstable-commit

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

diff --git a/trunk/noumerov/noumerov b/trunk/noumerov/noumerov
index 2bca60a..aaa5063 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 9d26a41..dbba66d 100644 (file)
--- a/trunk/noumerov/noumerov.c
+++ b/trunk/noumerov/noumerov.c
@@ -355,7 +355,7 @@ double u(p, t)
 param *p;
 double t;
 {
-       double delta = norm_theta(p->delta);
+       double delta = p->delta;
        int l = p->l;
        double kt = p->k * t;
        double A = p->A;
@@ -441,7 +441,7 @@ double dudA(p, t)
 param *p;
 double t;
 {
-       double delta = norm_theta(p->delta);
+       double delta = p->delta;
        int l = p->l;
        double kt = p->k * t;
        double result = 0.0;
@@ -457,7 +457,7 @@ double duddelta(p, t)
 param *p;
 double t;
 {
-       double delta = norm_theta(p->delta);
+       double delta = p->delta;
        int l = p->l;
        double kt = p->k * t;
        double A = p->A;
@@ -704,7 +704,7 @@ gsl_vector *f;
        double *r = p->r->data;
        size_t i = 0;
        p->A = gsl_vector_get(x, 0);
-       p->delta = gsl_vector_get(x, 1);
+       p->delta = norm_theta(gsl_vector_get(x, 1));
        for (i = 0; i < n; i++) {
                double Yi = u(p, r[i]);
                gsl_vector_set(f, i, Yi - y[i]);
@@ -724,7 +724,7 @@ gsl_matrix *J;
        double *r = p->r->data;
        size_t i = 0;
        p->A = gsl_vector_get(x, 0);
-       p->delta = gsl_vector_get(x, 1);
+       p->delta = norm_theta(gsl_vector_get(x, 1));
        for (i = 0; i < n; i++) {
                gsl_matrix_set(J, i, 0, dudA(p, r[i]));
                gsl_matrix_set(J, i, 1, duddelta(p, r[i]));
@@ -824,7 +824,7 @@ param *p;
                printf("\n");
        }
        p->A = gsl_vector_get(s->x, 0);
-       p->delta = gsl_vector_get(s->x, 1);
+       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 09f0c82..8785771 100644 (file)
Binary files a/trunk/noumerov/noumerov.o and b/trunk/noumerov/noumerov.o differ