Changeset 659

Timestamp:

May 12, 2004, 8:43:42 PM (22 years ago)

Author:

gusciora

Message:

I removed the docs target from the install target, because it was driving me
crazy. I fixed some things with psStats.c. I produced the first working
test case for psStats.c

This version of the code only builds with the following:

make
make install
make
make install

Location:

trunk/psLib

Files:

• src/Makefile (modified) (2 diffs)
• src/dataManip/psStats.c (modified) (1 diff)
• src/math/psStats.c (modified) (1 diff)
• test/dataManip/tst_psStats00.c (modified) (2 diffs)

trunk/psLib/src/Makefile

@@ -3 +3 @@
 ##  Makefile:  psLib
 ##
-##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-05-13 06:06:33 $
+##  $Revision: 1.11 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-05-13 06:43:42 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -140 +140 @@
 # the installation
 
-install: installdirs $(INSTALLTARGETS) docs
+install: installdirs $(INSTALLTARGETS)
         install *.h $(includedir)
         install $(TARGET_STATIC) $(libexecdir)

trunk/psLib/src/dataManip/psStats.c

@@ -183 +183 @@
     } else {
         for (i=0;i<myVector->n;i++) {
-            mean+= maskVector->vec.i[i];
-        }
-    }
+            mean+= myVector->vec.f[i];
+        }
+    }
+    mean/= myVector->n;
     return(mean);
 }

trunk/psLib/src/math/psStats.c

@@ -183 +183 @@
     } else {
         for (i=0;i<myVector->n;i++) {
-            mean+= maskVector->vec.i[i];
-        }
-    }
+            mean+= myVector->vec.f[i];
+        }
+    }
+    mean/= myVector->n;
     return(mean);
 }

trunk/psLib/test/dataManip/tst_psStats00.c

@@ -26 +26 @@
     dummyFloatType.dimen = PS_DIMEN_VECTOR;
     myVector = psVectorAlloc(dummyFloatType, N);
+    myVector->n = N;
 
     mean = 0.0;
@@ -37 +38 @@
     myStats2 = psArrayStats(myVector, NULL, 0, myStats);
     mean = myStats2->sampleMean;
-    printf("HMMMM mean is %f\n", mean);
 
     if (mean == realMean) {