Changeset 1761

Timestamp:

16/11/11 17:52:10 (6 months ago)

Author:

Freddie Akeroyd

Message:

Add in support for 64bit integers. Refs #304

Location:

trunk/applications/NXtranslate

Files:

• nexus_util.cpp (modified) (1 diff)
• node.cpp (modified) (4 diffs)
• node.h (modified) (1 diff)
• node_util.cpp (modified) (4 diffs)
• string_util.cpp (modified) (3 diffs)
• string_util.h (modified) (2 diffs)

trunk/applications/NXtranslate/nexus_util.cpp

@@ -394 +394 @@
   }else if(type==NX_INT32 || type==NX_UINT32 || type==NX_FLOAT32){
     size*=4;
-  }else if(type==NX_FLOAT64){
+  }else if(type==NX_FLOAT64 || type==NX_UINT64 || type==NX_INT64){
     size*=8;
   }else{

trunk/applications/NXtranslate/node.cpp

@@ -31 +31 @@
   else if(type==Node::INT32)
     return "NX_INT32";
+  else if(type==Node::INT64)
+    return "NX_INT64";
   else if(type==Node::UINT8)
     return "NX_UINT8";
@@ -37 +39 @@
   else if(type==Node::UINT32)
     return "NX_UINT32";
+  else if(type==Node::UINT64)
+    return "NX_UINT64";
   else
     throw runtime_error("Did not understand type in set_data");
@@ -154 +158 @@
   else if(__type=="NX_INT32")
     return INT32;
+  else if(__type=="NX_INT64")
+    return INT64;
   else if(__type=="NX_UINT8")
     return UINT8;
@@ -160 +166 @@
   else if(__type=="NX_UINT32")
     return UINT32;
+  else if(__type=="NX_UINT64")
+    return UINT64;
   else
     throw runtime_error("do not understand type");

trunk/applications/NXtranslate/node.h

@@ -13 +13 @@
   // enum for types
   enum NXtype{CHAR=NX_CHAR,   FLOAT32=NX_FLOAT32, FLOAT64=NX_FLOAT64,
-              INT8=NX_INT8,   INT16=NX_INT16,     INT32=NX_INT32,
-              UINT8=NX_UINT8, UINT16=NX_UINT16,   UINT32=NX_UINT32,
+              INT8=NX_INT8,   INT16=NX_INT16,     INT32=NX_INT32, INT64=NX_INT64,
+              UINT8=NX_UINT8, UINT16=NX_UINT16,   UINT32=NX_UINT32, UINT64=NX_UINT64,
               GROUP};
   enum NXcompress{COMP_NONE=NX_COMP_NONE, COMP_LZW=NX_COMP_LZW,

trunk/applications/NXtranslate/node_util.cpp

@@ -60 +60 @@
   }else if(type==NX_INT32){
     string_util::str_to_intArray(char_data,(int *)value,len);
+  }else if(type==NX_INT64){
+    string_util::str_to_int64Array(char_data,(long long*)value,len);
   }else if(type==NX_UINT8){
     string_util::str_to_ucharArray(char_data,(unsigned char *)value,len);
@@ -66 +68 @@
   }else if(type==NX_UINT32){
     string_util::str_to_uintArray(char_data,(unsigned int *)value,len);
+  }else if(type==NX_UINT64){
+    string_util::str_to_uint64Array(char_data,(unsigned long long*)value,len);
   }else{
     throw runtime_error("unknown type in end_add_char()");
@@ -116 +120 @@
   else if(str=="NX_INT32")
     return Node::INT32;
+  else if(str=="NX_INT64")
+    return Node::INT64;
   else if(str=="NX_UINT8")
     return Node::UINT8;
@@ -122 +128 @@
   else if(str=="NX_UINT32")
     return Node::UINT32;
+  else if(str=="NX_UINT64")
+    return Node::UINT64;
   else
     throw runtime_error("Could not understand type in node_type("+str+")");

trunk/applications/NXtranslate/string_util.cpp

@@ -104 +104 @@
 }
 
+extern long long string_util::str_to_int64(const string &str){
+  if(str.substr(0,1)=="-")
+    return -1*str_to_int64(str.substr(1,str.size()));
+
+  string::const_iterator it=str.begin();
+  it=find_if(it,str.end(),my_isnotdigit);
+
+  if(it!=str.end())
+    throw invalid_argument("str_to_int(string) argument is not an integer");
+
+  return atoll(str.c_str());
+}
+
 extern unsigned long string_util::str_to_uint(const string &str){
   long num=str_to_int(str);
+  if(num<0)
+    throw invalid_argument("str_to_uint(string) argument is not an integer");
+  return num;
+}
+
+extern unsigned long long string_util::str_to_uint64(const string &str){
+  long long num=str_to_int64(str);
   if(num<0)
     throw invalid_argument("str_to_uint(string) argument is not an integer");
@@ -306 +326 @@
 }
 
+extern void string_util::str_to_int64Array(std::string & str,long long *array, const unsigned int len){
+  // break it up into a string vector
+  StrVec splitted=shrink_and_split(str);
+
+  if(splitted.size()!=len)
+    throw runtime_error("array and string not same size");
+
+  // turn each string into a short
+  StrVecIter strIt=splitted.begin();
+  for( unsigned int i=0 ; i<len ; i++ )
+    *(array+i)=(long long)str_to_int64(*(strIt+i));
+}
+
 extern void string_util::str_to_intArray(std::string & str,int *array, const unsigned int len){
   // break it up into a string vector
@@ -356 +389 @@
   for( unsigned int i=0 ; i<len ; i++ )
     *(array+i)=(unsigned short)str_to_uint(*(strIt+i));
+}
+
+extern void string_util::str_to_uint64Array(std::string & str,unsigned long long *array, const unsigned int len){
+  // break it up into a string vector
+  StrVec splitted=shrink_and_split(str);
+
+  if(splitted.size()!=len)
+    throw runtime_error("array and string not same size");
+
+  // turn each string into a short
+  StrVecIter strIt=splitted.begin();
+  for( unsigned int i=0 ; i<len ; i++ )
+    *(array+i)=(unsigned long long)str_to_uint64(*(strIt+i));
 }
 

trunk/applications/NXtranslate/string_util.h

@@ -14 +14 @@
   extern std::string trim(const std::string &);
   extern long   str_to_int(const std::string &);
+  extern long long  str_to_int64(const std::string &);
   extern unsigned long  str_to_uint(const std::string &);
+  extern unsigned long long  str_to_uint64(const std::string &);
   extern double str_to_float(const std::string &);
   extern std::vector<std::string> string_to_path(const std::string &);
@@ -22 +24 @@
   extern void str_to_shortArray(std::string &,short *, const unsigned int);
   extern void str_to_intArray(std::string &,int *, const unsigned int);
+  extern void str_to_int64Array(std::string &,long long *, const unsigned int);
   extern void str_to_longArray(std::string &,long *, const unsigned int);
   extern void str_to_ushortArray(std::string &,unsigned short *, const unsigned int);
   extern void str_to_uintArray(std::string &,unsigned int *, const unsigned int);
+  extern void str_to_uint64Array(std::string &,unsigned long long *, const unsigned int);
   extern void str_to_ulongArray(std::string &,unsigned long *, const unsigned int);
   extern void str_to_floatArray(std::string &,float *, const unsigned int);