unstable-commit

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

diff --git a/trunk/noumerov/noumerov b/trunk/noumerov/noumerov
index 0e962e6..177b2c0 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 94e7c9a..9ece327 100644 (file)
--- a/trunk/noumerov/noumerov.c
+++ b/trunk/noumerov/noumerov.c
@@ -184,8 +184,8 @@ size_t array_num;
        return;
 }
 
-double norm_theta(double theta);
-double norm_theta(theta)
+double norm_rad(double theta);
+double norm_rad(theta)
 double theta;
 {
        double T = 2 * M_PI;
@@ -306,7 +306,7 @@ param *p;
        p->x_0 = exp(C / (gsl_pow_5(p->t_0)));
        p->v_0 = p->x_0 * (C * (-5) / gsl_pow_6(p->t_0));
        i = 0;
-       p->delta = norm_theta(6.0);
+       p->delta = norm_rad(6.0);
        p->k = sqrt(2 * p->m * p->E) / hbar;
        p->A = 1E+16;
        p->r_num = 100;
@@ -712,7 +712,7 @@ gsl_vector *f;
        double *r = p->r->data;
        size_t i = 0;
        p->A = gsl_vector_get(x, 0);
-       p->delta = norm_theta(gsl_vector_get(x, 1));
+       p->delta = norm_rad(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]);
@@ -732,7 +732,7 @@ gsl_matrix *J;
        double *r = p->r->data;
        size_t i = 0;
        p->A = gsl_vector_get(x, 0);
-       p->delta = norm_theta(gsl_vector_get(x, 1));
+       p->delta = norm_rad(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]));
@@ -783,7 +783,7 @@ param *p;
        gsl_multifit_function_fdf f;
        double x_init[2];
        x_init[0] = p->A;
-       x_init[1] = norm_theta(p->delta);
+       x_init[1] = norm_rad(p->delta);
        x = gsl_vector_view_array(x_init, 2);
        f.f = &calc_f;
        f.df = &calc_df;
@@ -814,7 +814,7 @@ param *p;
         */
        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));
+       p->delta = norm_rad(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))
        {
@@ -851,7 +851,7 @@ param *p;
        double *u_data = p->u->data;
        double *dudr_data = p->dudr->data;
        double A_init = p->A;
-       double delta_init = norm_theta(p->delta);
+       double delta_init = norm_rad(p->delta);
        printf("\n");
        printf("#");
        printf("chisq/dof\t");

diff --git a/trunk/noumerov/noumerov.o b/trunk/noumerov/noumerov.o
index 11b5469..50a988e 100644 (file)
Binary files a/trunk/noumerov/noumerov.o and b/trunk/noumerov/noumerov.o differ