Changeset 6191

Timestamp:

Jan 25, 2006, 12:33:41 PM (20 years ago)

Author:

drobbin

Message:

changed float output to show only 7 sig digits.

Location:

trunk/psLib

Files:

• src/types/psMetadataConfig.c (modified) (4 diffs)
• test/types/mdcfgwrt.verified (modified) (1 diff)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-25 22:18:00 $
+*  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-25 22:33:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1482 +1482 @@
         if (item == NULL) {
             // XXX : this is probably not the right error value
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, PS_DATA_UNKNOWN);
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    PS_ERRORTEXT_psMetadata_METATYPE_INVALID, PS_DATA_UNKNOWN);
             psFree(iter);
             return NULL;
@@ -1511 +1512 @@
         case PS_DATA_F32:
             psStringAppend(&content, "%s F32  ", item->name);
-            psStringAppend(&content, "%.15g ", item->data.F32);
+            psStringAppend(&content, "%.7g ", item->data.F32);
             if ( strncmp(item->comment,"",2) ) {
                 psStringAppend(&content, " #%s", item->comment);
@@ -1595 +1596 @@
                 psStringAppend(&content, "F32 ", MAXSTR);
                 for (int i = 0; i < vector->n; i++) {
-                    psStringAppend(&content, "%.15g ", vector->data.F32[i]);
+                    psStringAppend(&content, "%.7g ", vector->data.F32[i]);
                 }
                 break;

trunk/psLib/test/types/mdcfgwrt.verified

@@ -1 @@
-item1 BOOL  TRUE #I am a boolean
-item2 S32  55
-item3 F32  3.14000010490417
-item4 F64  6.28
-item5 STR  GNIRTS  #I am a string
-@vector6 S32 1 2 3 4 5  #I am a vector
-time01 PS_TIME_TAI  1000, 25, T  #I am time
+item1 BOOL  TRUE #I am a boolean 
+item2 S32  55  
+item3 F32  3.14  
+item4 F64  6.28  
+item5 STR  GNIRTS  #I am a string 
+@vector6 S32 1 2 3 4 5  #I am a vector 
+time01 PS_TIME_TAI  1000, 25, T  #I am time 
 
-metadata7  METADATA
-   ITEM01 S32  666
-   META NEW  METADATA
-      @VECTORNEW S32 1 2 3 4 5  #Newest VECTOR
-      cell STR  pStArRs  #I am a p-Star
+metadata7  METADATA  
+   ITEM01 S32  666  
+   META NEW  METADATA  
+      @VECTORNEW S32 1 2 3 4 5  #Newest VECTOR 
+      cell STR  pStArRs  #I am a p-Star 
    END   #I AM Newest METADATA
-   ITEM02 F32  666.599975585938  #I AM FLOAT
-   ITEM03 F64  666.666  #I AM DOUBLE
+   ITEM02 F32  666.6  #I AM FLOAT 
+   ITEM03 F64  666.666  #I AM DOUBLE 
 END   #I am a metadata