Merge pull request #12 from rad-lanl/master

Update GeoTess to v2.7, expose new methods

geotess/src/CPPUtils.cc

@@ -123,7 +123,7 @@ string CPPUtils::itos(int i, const string& frmt)
 {
   char s[300];
 
-  sprintf(s, frmt.c_str(), i);
+  snprintf(s, 300, frmt.c_str(), i);
   return s;
 }
 
@@ -163,7 +163,7 @@ string CPPUtils::ltos(LONG_INT l, const string& frmt)
 {
   char s[300];
 
-  sprintf(s, frmt.c_str(), l);
+  snprintf(s, 300, frmt.c_str(), l);
   return s;
 }
 
@@ -192,7 +192,7 @@ string CPPUtils::ftos(float f, const string& frmt)
 {
   char s[300];
 
-  sprintf(s, frmt.c_str(), f);
+  snprintf(s, 300, frmt.c_str(), f);
   return s;
 }
 
@@ -221,7 +221,7 @@ string CPPUtils::dtos(double d, const string& frmt)
 {
   char s[300];
 
-  sprintf(s, frmt.c_str(), d);
+  snprintf(s, 300, frmt.c_str(), d);
   return s;
 }
 
@@ -505,4 +505,41 @@ void CPPUtils::tokenizeString(const string& str, const string& delim,
   }
 }
 
+void CPPUtils::split(const string& s, const string& delim, vector<string>& tokens)
+{
+	tokens.clear();
+	if (s.size() > 0)
+	{
+		if (delim.size() == 0)
+		{
+			tokens.push_back(s);
+			return;
+		}
+		string newString = s;
+		size_t pos = newString.find(delim);
+		while (pos != string::npos)
+		{
+			tokens.push_back(newString.substr(0, pos));
+			newString = newString.substr(pos+delim.size());
+			pos = newString.find(delim);
+		}
+		tokens.push_back(newString);
+	}
+}
+
+string CPPUtils::replace(const string& s, const string& r, const string& n)
+{
+	string newString = s;
+	if (s.size() > 0 && r.size() > 0)
+	{
+		size_t pos = newString.find(r);
+		if (pos != string::npos)
+		{
+			newString = newString.replace(pos, r.size(), n);
+			pos = newString.find(r);
+		}
+	}
+	return newString;
+}
+
 } // end namespace geotess

geotess/src/CPPUtils.h

@@ -116,6 +116,25 @@ class GEOTESS_EXP_IMP CPPUtils
 	static string			stringReplaceAll(const string& sf, const string& sr,
 			const string& s);
 
+	/**
+	 * Modify a copy of string s by replacing the first occurrence of string r with string n
+	 * and return the copy. This method functions much like the similarly named method in Java.
+	 * @param s the string to be modified
+	 * @param r the substring in s that is to be replaced
+	 * @param n the new substring that is to replace substring r in s.
+	 * @return a new string that is a copy of s with substring r replaced with substring n
+	 */
+	static string replace(const string& s, const string& r, const string& n);
+
+	/**
+	 * Split string s into substrings using string delim as the delimiter.
+	 * This method functions much like the similarly named method in Java.
+	 * @param s the string to be split
+	 * @param delim the delimiter
+	 * @param tokens the vector of substrings.
+	 */
+	static void split(const string& s, const string& delim, vector<string>& tokens);
+
 	/**
 	 * Removes '/r', '/n', or '/r/n' from the end of the input string if it exists.
 	 */

geotess/src/EarthShape.cc

@@ -1,15 +1,15 @@
 //- ****************************************************************************
-//-
+//- 
 //- Copyright 2009 Sandia Corporation. Under the terms of Contract
 //- DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
 //- retains certain rights in this software.
-//-
+//- 
 //- BSD Open Source License.
 //- All rights reserved.
-//-
+//- 
 //- Redistribution and use in source and binary forms, with or without
 //- modification, are permitted provided that the following conditions are met:
-//-
+//- 
 //-    * Redistributions of source code must retain the above copyright notice,
 //-      this list of conditions and the following disclaimer.
 //-    * Redistributions in binary form must reproduce the above copyright
@@ -18,7 +18,7 @@
 //-    * Neither the name of Sandia National Laboratories nor the names of its
 //-      contributors may be used to endorse or promote products derived from
 //-      this software without specific prior written permission.
-//-
+//- 
 //- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 //- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 //- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

geotess/src/EarthShape.h

@@ -1,15 +1,15 @@
 //- ****************************************************************************
-//-
+//- 
 //- Copyright 2009 Sandia Corporation. Under the terms of Contract
 //- DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
 //- retains certain rights in this software.
-//-
+//- 
 //- BSD Open Source License.
 //- All rights reserved.
-//-
+//- 
 //- Redistribution and use in source and binary forms, with or without
 //- modification, are permitted provided that the following conditions are met:
-//-
+//- 
 //-    * Redistributions of source code must retain the above copyright notice,
 //-      this list of conditions and the following disclaimer.
 //-    * Redistributions in binary form must reproduce the above copyright
@@ -18,7 +18,7 @@
 //-    * Neither the name of Sandia National Laboratories nor the names of its
 //-      contributors may be used to endorse or promote products derived from
 //-      this software without specific prior written permission.
-//-
+//- 
 //- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 //- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 //- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,6 +40,7 @@
 
 #include <iostream>
 #include <string>
+#include <stdio.h>
 
 // use standard library objects
 using namespace std;
@@ -429,7 +430,7 @@ class GEOTESS_EXP_IMP EarthShape
 	{
 	  char s[300];
 	  string frmt("%9.5f %10.5f");
-	  sprintf(s, frmt.c_str(), getLatDegrees(v), getLonDegrees(v));
+	  snprintf(s, 300, frmt.c_str(), getLatDegrees(v), getLonDegrees(v));
 	  return s;
 	}
 

geotess/src/GeoTessDataArray.h

@@ -1,15 +1,15 @@
 //- ****************************************************************************
-//-
+//- 
 //- Copyright 2009 Sandia Corporation. Under the terms of Contract
 //- DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government
 //- retains certain rights in this software.
-//-
+//- 
 //- BSD Open Source License.
 //- All rights reserved.
-//-
+//- 
 //- Redistribution and use in source and binary forms, with or without
 //- modification, are permitted provided that the following conditions are met:
-//-
+//- 
 //-    * Redistributions of source code must retain the above copyright notice,
 //-      this list of conditions and the following disclaimer.
 //-    * Redistributions in binary form must reproduce the above copyright
@@ -18,7 +18,7 @@
 //-    * Neither the name of Sandia National Laboratories nor the names of its
 //-      contributors may be used to endorse or promote products derived from
 //-      this software without specific prior written permission.
-//-
+//- 
 //- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 //- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 //- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -432,7 +432,7 @@ class GEOTESS_EXP_IMP GeoTessDataArray : public GeoTessData
 template<>
 inline bool	GeoTessDataArray<double>::isNaN(int attributeIndex) const
 {
-	return (values[attributeIndex] == values [attributeIndex]);
+	return std::isnan(values[attributeIndex]);
 }
 
 /**
@@ -441,8 +441,7 @@ inline bool	GeoTessDataArray<double>::isNaN(int attributeIndex) const
 template<>
 inline bool	GeoTessDataArray<float>::isNaN(int attributeIndex) const
 {
-	double v = (double) values[attributeIndex];
-	return (v == v);
+	return std::isnan(values[attributeIndex]);
 }
 
 /**

geotess/src/GeoTessDataValue.h

@@ -326,8 +326,7 @@ inline bool	GeoTessDataValue<double>::isNaN(int attributeIndex) const
 template<>
 inline bool	GeoTessDataValue<float>::isNaN(int attributeIndex) const
 {
-	double v = (double) value;
-	return (std::isnan(v));
+	return (std::isnan(value));
 }
 
 /**