Changeset 8301

Timestamp:

Aug 11, 2006, 4:58:18 PM (20 years ago)

Author:

eugene

Message:

moved gaussj to libohana

Location:

trunk/Ohana/src

Files:

• libohana/src/gaussj.c (added)
• misc/src/fitdist.c (modified) (1 diff)
• misc/src/list_astro.c (modified) (2 diffs)
• misc/src/mosastro.c (modified) (1 diff)
• mosastro/Makefile (modified) (1 diff)
• mosastro/src/GetGradients.c (modified) (1 diff)
• mosastro/src/fitpoly.c (modified) (1 diff)
• mosastro/src/gaussj.c (deleted)

trunk/Ohana/src/misc/src/fitdist.c

@@ -626 +626 @@
   
 }
-
-
-/***************************************************************************/
-
-int
-gaussj (a, n, b, m)
-double **a, **b;
-int n,m;
-{
-  int *indxc,*indxr,*ipiv;
-  int i, icol, irow, j, k, l, ll, status;
-  double big,dum,pivinv;
-  
-  ALLOCATE (indxc, int, n);
-  ALLOCATE (indxr, int, n);
-  ALLOCATE (ipiv, int, n);
-  for (j = 0; j < n; j++) 
-    ipiv[j] = 0;
- 
-  for (i = 0; i < n; i++) {
-    big = 0.0;
-    for (j = 0; j < n; j++) {
-      if (ipiv[j] != 1) {
-        for (k = 0; k < n; k++) {
-          if (ipiv[k] == 0) {
-            if (fabs (a[j][k]) >= big) {
-              big  = fabs (a[j][k]);
-              irow = j;
-              icol = k;
-            }
-          } 
-          else 
-            if (ipiv[k] > 1) {
-              fprintf (stderr, "GAUSSJ: Singular Matrix! (1)\n");
-              return (0);
-            }
-        }
-      }
-    }
-    ipiv[icol]++;
-    if (irow != icol) {
-      for (l = 0; l < n; l++) 
-        SWAP (a[irow][l], a[icol][l]);
-      for (l = 0; l < m; l++) 
-        SWAP (b[irow][l], b[icol][l]);
-    }
-    indxr[i] = irow;
-    indxc[i] = icol;
-    if (a[icol][icol] == 0.0) {
-      fprintf (stderr, "GAUSSJ: Singular Matrix! (2)\n");
-      return (0);
-    }
-    pivinv = 1.0 / a[icol][icol];
-    a[icol][icol] = 1.0;
-    for (l = 0; l < n; l++) 
-      a[icol][l] *= pivinv;
-    for (l = 0; l < m; l++) 
-      b[icol][l] *= pivinv;
-    for (ll = 0; ll < n; ll++) {
-      if (ll != icol) {
-        dum = a[ll][icol];
-        a[ll][icol] = 0.0;
-        for (l = 0; l < n; l++) 
-          a[ll][l] -= a[icol][l]*dum;
-        for (l = 0; l < m; l++) 
-          b[ll][l] -= b[icol][l]*dum;
-      }
-    }
-  }
- 
-  for (l = n - 1; l >= 0; l--) {
-    if (indxr[l] != indxc[l])
-      for (k = 0; k < n; k++)
-        SWAP (a[k][indxr[l]], a[k][indxc[l]]);
-  }
-  free (ipiv);
-  free (indxr);
-  free (indxc);
-  return (1);
-}
- 

trunk/Ohana/src/misc/src/list_astro.c

@@ -97 +97 @@
   RA = R/N - RX*x/N - RY*y/N;
 
-/*
-  gaussj (a, 4, b, 1);
-
-  RA = b[0][0];
-  RX = b[1][0];
-  RY = b[2][0];
-  RX2 = b[3][0];
-*/
-  
   DX  = (Sdx*Sy2 - Sdy*Sxy) / (Sx2*Sy2 - Sxy*Sxy);
   DY  = (Sdy*Sx2 - Sdx*Sxy) / (Sx2*Sy2 - Sxy*Sxy);
@@ -125 +116 @@
   exit (0);
 }
-
-
-int gaussj (double **a, int n, double **b, int m) {
-
-  int *indxc,*indxr,*ipiv;
-  int i, icol, irow, j, k, l, ll;
-  double big,dum,pivinv;
-  
-  ALLOCATE (indxc, int, n);
-  ALLOCATE (indxr, int, n);
-  ALLOCATE (ipiv, int, n);
-  for (j = 0; j < n; j++) 
-    ipiv[j] = 0;
-
-  for (i = 0; i < n; i++) {
-    big = 0.0;
-    for (j = 0; j < n; j++) {
-      if (ipiv[j] != 1) {
-        for (k = 0; k < n; k++) {
-          if (ipiv[k] == 0) {
-            if (fabs (a[j][k]) >= big) {
-              big  = fabs (a[j][k]);
-              irow = j;
-              icol = k;
-            }
-          } 
-          else 
-            if (ipiv[k] > 1) {
-              fprintf (stderr, "GAUSSJ: Singular Matrix! (1)\n");
-              return (0);
-            }
-        }
-      }
-    }
-    ipiv[icol]++;
-    if (irow != icol) {
-      for (l = 0; l < n; l++) 
-        SWAP (a[irow][l], a[icol][l]);
-      for (l = 0; l < m; l++) 
-        SWAP (b[irow][l], b[icol][l]);
-    }
-    indxr[i] = irow;
-    indxc[i] = icol;
-    if (a[icol][icol] == 0.0) {
-      fprintf (stderr, "GAUSSJ: Singular Matrix! (2)\n");
-      return (0);
-    }
-    pivinv = 1.0 / a[icol][icol];
-    a[icol][icol] = 1.0;
-    for (l = 0; l < n; l++) 
-      a[icol][l] *= pivinv;
-    for (l = 0; l < m; l++) 
-      b[icol][l] *= pivinv;
-    for (ll = 0; ll < n; ll++) {
-      if (ll != icol) {
-        dum = a[ll][icol];
-        a[ll][icol] = 0.0;
-        for (l = 0; l < n; l++) 
-          a[ll][l] -= a[icol][l]*dum;
-        for (l = 0; l < m; l++) 
-          b[ll][l] -= b[icol][l]*dum;
-      }
-    }
-  }
-
-  for (l = n - 1; l >= 0; l--) {
-    if (indxr[l] != indxc[l])
-      for (k = 0; k < n; k++)
-        SWAP (a[k][indxr[l]], a[k][indxc[l]]);
-  }
-  free (ipiv);
-  free (indxr);
-  free (indxc);
-  return (1);
-}
-

trunk/Ohana/src/misc/src/mosastro.c

@@ -18 +18 @@
 int mrqinit (int *index, int Npts, double *par, int Npar,                             double (funcs)(int, double *, int, double *));
 int mrqfree (int Npar);
-int gaussj (double **a, int n, double **b, int m);
 int fit (double *X, double *Y, int N, double *A, double *B);
 

trunk/Ohana/src/mosastro/Makefile

@@ -52 +52 @@
 $(SRC)/output.$(ARCH).o \
 $(SRC)/wstars.$(ARCH).o \
-$(SRC)/gaussj.$(ARCH).o \
 $(SRC)/mkpolyterm.$(ARCH).o \
 $(SRC)/mkmosaic.$(ARCH).o \

trunk/Ohana/src/mosastro/src/GetGradients.c

@@ -90 +90 @@
 
         if (Npts < 5) continue;
-        if (!gaussj (a, 3, b, 2)) continue;
+        if (!dgaussj (a, 3, b, 2)) continue;
 
         /* we only care about the slopes, not the offsets */

trunk/Ohana/src/mosastro/src/fitpoly.c

@@ -109 +109 @@
 # endif
 
-  gaussj (matrix, NPARS, vector, 2); 
+  dgaussj (matrix, NPARS, vector, 2); 
 
 # if (0)