Changeset 2780 for trunk/psLib/src/dataManip

Timestamp:

Dec 21, 2004, 1:25:14 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src/dataManip

Files:

• psRandom.h (modified) (1 diff)
• psStats.c (modified) (7 diffs)

trunk/psLib/src/dataManip/psRandom.h

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-24 20:55:01 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-21 23:25:14 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
 */
 
-#if !defined(PS_FUNCTIONS_H)
-#define PS_FUNCTIONS_H
+#if !defined(PS_RANDOM_H)
+#define PS_RANDOM_H
 
 #include <stdio.h>

trunk/psLib/src/dataManip/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-21 20:42:07 $
+ *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-21 23:25:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -151 +151 @@
                          psStats* stats)
 {
+
     psS32 i = 0;                // Loop index variable
     float mean = 0.0;           // The mean
@@ -920 +921 @@
                     sumDiffs += diff;
                     countInt++;
-                    errorDivisor+= (1.0 / PS_SQR(errors->data.F32[i]));
+                    if (errors != NULL) {
+                        errorDivisor+= (1.0 / PS_SQR(errors->data.F32[i]));
+                    }
                 }
             }
@@ -931 +934 @@
                     sumDiffs += diff;
                     countInt++;
-                    errorDivisor+= (1.0 / PS_SQR(errors->data.F32[i]));
+                    if (errors != NULL) {
+                        errorDivisor+= (1.0 / PS_SQR(errors->data.F32[i]));
+                    }
                 }
             }
@@ -944 +949 @@
                     sumDiffs += diff;
                     countInt++;
-                    errorDivisor+= (1.0 / PS_SQR(errors->data.F32[i]));
+                    if (errors != NULL) {
+                        errorDivisor+= (1.0 / PS_SQR(errors->data.F32[i]));
+                    }
                 }
             }
@@ -955 +962 @@
             }
             countInt = myVector->n;
-            errorDivisor+= (1.0 / PS_SQR(errors->data.F32[i]));
+            if (errors != NULL) {
+                errorDivisor+= (1.0 / PS_SQR(errors->data.F32[i]));
+            }
         }
     }
@@ -1962 +1971 @@
 psVector* p_psConvertToF32(psVector* in)
 {
+    if (in == NULL) {
+        return(NULL);
+    }
     psS32 i = 0;
     psVector* tmp = NULL;