unstable-commit

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

diff --git a/trunk/noumerov/noumerov b/trunk/noumerov/noumerov
index b0fe21f..6b1ea38 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 b48039d..558bc6a 100644 (file)
--- a/trunk/noumerov/noumerov.c
+++ b/trunk/noumerov/noumerov.c
@@ -657,12 +657,13 @@ param *p;
        return;
 }
 
-void fit2(const double*x, const double*y, const size_t size, int (*f));
-void fit2(x, y, size, f)
+void fit2(const double*x, const double*y, const size_t xy_size, const double *parame, const size_t parame_size);
+void fit2(x, y, xy_size, parame, parame_size)
 const double *x;
 const double *y;
-const size_t size;
-int (*f);
+const size_t xy_size;
+const double *parame;
+const size_t parame_size;
 {
        return;
 }
@@ -686,12 +687,6 @@ param *p;
        */
        for (i = 0; i < 2000; i++) {
                fit(p);
-               fit2(
-                       p->r->data,
-                       p->u->data,
-                       p->r->size,
-                       &calc_f
-               );
                p->r->data = &p->r->data[1];
                p->u->data = &p->u->data[1];
                p->dudr->data = &p->dudr->data[1];

diff --git a/trunk/noumerov/noumerov.o b/trunk/noumerov/noumerov.o
index fa41d44..2558a92 100644 (file)
Binary files a/trunk/noumerov/noumerov.o and b/trunk/noumerov/noumerov.o differ