Changeset 93 for trunk/test/src/RpUnitsC_test.c

Timestamp:

Oct 6, 2005 3:33:41 PM (18 years ago)

Author:

dkearney

Message:

1. corrected c interface language binding function names so they are

consistant with previous c interface function names

2. separated object dictionaries from fortran code, placed them in

the RpBindings.[h,cc] files so matlab bindings can use them too.

3. adjusted makefile to compile RpBindings code

File:

• trunk/test/src/RpUnitsC_test.c (modified) (8 diffs)

trunk/test/src/RpUnitsC_test.c

@@ -48 +48 @@
 }
 
-int main() 
+int main()
 {
 
-    RpUnits* meters = defineUnit("m",NULL);
+    RpUnits* meters = rpDefineUnit("m",NULL);
 
     RpUnits* centimeters = NULL;
@@ -57 +57 @@
     RpUnits* cm_basis = NULL;
 
-    RpUnits* angstrom = defineUnit("A",NULL);
-    RpUnits* fahrenheit = defineUnit("F",NULL);
-    RpUnits* celcius = defineUnit("C",NULL);
-    RpUnits* kelvin = defineUnit("K",NULL);
+    RpUnits* angstrom = rpDefineUnit("A",NULL);
+    RpUnits* fahrenheit = rpDefineUnit("F",NULL);
+    RpUnits* celcius = rpDefineUnit("C",NULL);
+    RpUnits* kelvin = rpDefineUnit("K",NULL);
 
-    defineConv(angstrom, meters, angstrom2meter, meter2angstrom);
-    defineConv(fahrenheit, celcius, fahrenheit2centigrade, centigrade2fahrenheit);
-    defineConv(celcius, kelvin, centigrade2kelvin, kelvin2centigrade);
-    
-    
+    rpDefineConv(angstrom, meters, angstrom2meter, meter2angstrom);
+    rpDefineConv(fahrenheit, celcius, fahrenheit2centigrade, centigrade2fahrenheit);
+    rpDefineConv(celcius, kelvin, centigrade2kelvin, kelvin2centigrade);
+
+
     double cm_exp = 0;
     double nm_conv = 0;
     double value = 0;
-    
+
     int result = 0;
     int showUnits = 0;
@@ -76 +76 @@
     const char* nm_conv_str = NULL;
     const char* retStr = NULL;
-    
-    makeMetric(meters);
-    centimeters = find("cm");
-    
+
+    rpMakeMetric(meters);
+    centimeters = rpFind("cm");
+
     if (meters) {
-        printf("meters sign is :%s:\n",getUnitsName(meters));
+        printf("meters sign is :%s:\n",rpGetUnitsName(meters));
     }
 
     if (centimeters) {
-        cm_exp = getExponent(centimeters);
-        cm_basis = getBasis(centimeters);
+        cm_exp = rpGetExponent(centimeters);
+        cm_basis = rpGetBasis(centimeters);
 
-        printf("centimeters sign is :%s:\n",getUnits(centimeters));
+        printf("centimeters sign is :%s:\n",rpGetUnits(centimeters));
         printf("cm_exp is :%f:\n",cm_exp);
 
         if (cm_basis) {
-            printf("cm_basis sign is :%s:\n",getUnitsName(cm_basis));
+            printf("cm_basis sign is :%s:\n",rpGetUnitsName(cm_basis));
         }
         else {
@@ -100 +100 @@
     }
 
-    nanometers = find("nm");
+    nanometers = rpFind("nm");
 
     if (nanometers) {
 
-        nm_conv = convert_obj_double_result(nanometers,meters,1.0e9,&result);
+        nm_conv = rpConvert_ObjDbl(nanometers,meters,1.0e9,&result);
         printf("1.0e9 nm = %f m\tresult = %d\n",nm_conv,result);
 
-        nm_conv = convert_obj_double(nanometers,meters,1.0e9);
+        nm_conv = rpConvert_ObjDbl(nanometers,meters,1.0e9, NULL);
         printf("1.0e9 nm = %f m\n",nm_conv);
 
         showUnits = 1;
-        nm_conv_str = convert_obj_str(nanometers,meters,1.588e9,showUnits);
+        nm_conv_str = rpConvert_ObjStr(nanometers,meters,1.588e9,showUnits,NULL);
         printf("1.588e9 nm = %s\n",nm_conv_str);
 
         showUnits = 0;
-        nm_conv_str = convert_obj_str(nanometers,meters,1.588e9,showUnits);
+        nm_conv_str = rpConvert_ObjStr(nanometers,meters,1.588e9,showUnits,NULL);
         printf("1.588e9 nm = %s\n",nm_conv_str);
     }
@@ -123 +123 @@
 
     if (meters && angstrom && centimeters) {
-        value = convert_obj_double_result(angstrom,meters,1.0,&result);
+        value = rpConvert_ObjDbl(angstrom,meters,1.0,&result);
         printf("1 angstrom = %e meters\n",value);
 
-        value = convert_obj_double_result(centimeters,angstrom,1e-8,&result);
+        value = rpConvert_ObjDbl(centimeters,angstrom,1e-8,&result);
         printf("1.0e-8 centimeter = %f angstroms\n",value);
     }
@@ -135 +135 @@
 
     if (fahrenheit && celcius) {
-        value = convert_obj_double_result(fahrenheit,celcius,72,&result);
+        value = rpConvert_ObjDbl(fahrenheit,celcius,72,&result);
         printf("72 degrees fahrenheit = %f degrees celcius\n",value);
-    
-        value = convert_obj_double_result(celcius,fahrenheit,value,&result);
+
+        value = rpConvert_ObjDbl(celcius,fahrenheit,value,&result);
         printf("22.222 degrees celcius = %f degrees fahrenheit\n",value);
     }
@@ -144 +144 @@
         printf("fahrenheit or celcius is NULL\n");
     }
-        
+
     if (celcius && kelvin) {
-        value = convert_obj_double_result(celcius,kelvin,20,&result);
+        value = rpConvert_ObjDbl(celcius,kelvin,20,&result);
         printf("20 degrees celcius = %f kelvin\n",value);
 
-        value = convert_obj_double_result(kelvin,celcius,300,&result);
+        value = rpConvert_ObjDbl(kelvin,celcius,300,&result);
         printf("300 kelvin = %f degrees celcius\n", value);
     }
@@ -157 +157 @@
 
     printf("====== adding all preset units ======\n");
-    add_presets("all");
+    rpAddPresets("all");
 
     printf("====== TESTING STATIC CONVERT FXNS ======\n");
 
-    retStr = convert("72F","C",1,&result);
+    retStr = rpConvert("72F","C",1,&result);
     printf("72F = %s\tresult = %d\n", retStr,result);
 
-    retStr = convert("300K","F",1,&result);
+    retStr = rpConvert("300K","F",1,&result);
     printf("300K = %s\tresult = %d\n", retStr,result);
 
-    retStr = convert("1eV","J",0,&result);
+    retStr = rpConvert("1eV","J",0,&result);
     printf("1eV = %s (no units)\tresult = %d\n", retStr,result);
 
-    retStr = convert_str("300K","R",1,&result);
+    retStr = rpConvertStr("300K","R",1,&result);
     printf("300K = %s\tresult = %d\n", retStr,result);
 
-    retStr = convert_str("5m","ft",1,&result);
+    retStr = rpConvertStr("5m","ft",1,&result);
     printf("5m = %s\tresult = %d\n", retStr,result);
 
-    value = convert_dbl("5000mV","V",&result);
+    value = rpConvertDbl("5000mV","V",&result);
     printf("5V = %f (double value)\n", value);
 
-    
+
     return 0;
 }