From feb0c9dde9bbda9a2ecfa3bc30893610801fb001 Mon Sep 17 00:00:00 2001
From: David Mayerich <mayerich@uh.edu>
Date: Thu, 8 Dec 2016 12:34:49 -0600
Subject: [PATCH] network processing for distance fields - debugging

---
 stim/image/image.h         |  11 -----------
 stim/parser/arguments.h    | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
 stim/structures/kdtree.cuh |   2 +-
 3 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/stim/image/image.h b/stim/image/image.h
index abea2e8..543d102 100644
--- a/stim/image/image.h
+++ b/stim/image/image.h
@@ -76,17 +76,6 @@ class image{
 	/// Returns the value for "white" based on the dynamic range (assumes white is 1.0 for floating point images)
 	T white(){
 		return std::numeric_limits<T>::max();
-		//if(typeid(T) == typeid(unsigned char))		return UCHAR_MAX;
-		//if(typeid(T) == typeid(unsigned short))		return SHRT_MAX;
-		//if(typeid(T) == typeid(unsigned))			return UINT_MAX;
-		//if(typeid(T) == typeid(unsigned long))		return ULONG_MAX;
-		//if(typeid(T) == typeid(unsigned long long))	return ULLONG_MAX;
-		//if(typeid(T) == typeid(float))				return 1.0f;
-		//if(typeid(T) == typeid(double))				return 1.0;
-
-		std::cout<<"ERROR in stim::image::white - no white value known for this data type"<<std::endl;
-		exit(1);
-
 	}
 
 
diff --git a/stim/parser/arguments.h b/stim/parser/arguments.h
index 3a67bee..23ee732 100644
--- a/stim/parser/arguments.h
+++ b/stim/parser/arguments.h
@@ -13,6 +13,44 @@
 #include <Windows.h>
 #endif
 
+/**The arglist class implements command line arguments.
+    Example:
+
+    1) Create an arglist instance:
+
+        stim::arglist args;
+
+    2) Add arguments:
+
+        args.add("help", "prints this help");
+        args.add("foo", "foo takes a single integer value", "", "[intval]");
+        args.add("bar", "bar takes two floating point values", "", "[value1], [value2]");
+
+    3) Parse the command line:
+
+        args.parse(argc, argv);
+
+    4) You generally want to immediately test for help and output available arguments:
+
+        if(args["help"].is_set())
+            std::cout<<args.str();
+
+
+
+    5)  Retrieve values:
+
+        int foo;
+        float bar1, bar2;
+        if(args["foo"])
+            foo = args["foo"].as_int();
+        if(args["bar"]){
+            bar1 = args["bar"].as_float(0);
+            bar2 = args["bar"].as_float(1);
+        }
+
+
+**/
+
 namespace stim{
 
 	class cmd_option
@@ -258,10 +296,12 @@ namespace stim{
             flag = true;
 		}
 
-		bool is_set()
-		{
+		bool is_set() const{
             return flag;
         }
+        operator bool() const{
+            return is_set();
+        }
 
 	};
 
@@ -271,43 +311,7 @@ namespace stim{
 		size_t index;
 	};
 
-    /**The arglist class implements command line arguments.
-        Example:
-
-        1) Create an arglist instance:
-
-            stim::arglist args;
-
-        2) Add arguments:
 
-            args.add("help", "prints this help");
-            args.add("foo", "foo takes a single integer value", "", "[intval]");
-            args.add("bar", "bar takes two floating point values", "", "[value1], [value2]");
-
-        3) Parse the command line:
-
-            args.parse(argc, argv);
-
-        4) You generally want to immediately test for help and output available arguments:
-
-            if(args["help"].is_set())
-                std::cout<<args.str();
-
-
-
-        5)  Retrieve values:
-
-            int foo;
-            float bar1, bar2;
-            if(args["foo"])
-                foo = args["foo"].as_int();
-            if(args["bar"]){
-                bar1 = args["bar"].as_float(0);
-                bar2 = args["bar"].as_float(1);
-            }
-
-
-    **/
 
 	class arglist
 	{
@@ -528,21 +532,21 @@ namespace stim{
 	std::vector<std::string> arg_vector(){
 		return args;
 	}
-        ///Returns an object describing the argument
-
-        /// @param _name is the name of the requested argument
-        cmd_option operator[](std::string _name){
-			std::vector<cmd_option>::iterator it;
-            it = find(opts.begin(), opts.end(), _name);// - opts.begin();
+    ///Returns an object describing the argument
 
-            if(it == opts.end()){
-                std::cout<<"ERROR - Unspecified parameter name: "<<_name<<std::endl;
-                exit(1);
-            }
+    /// @param _name is the name of the requested argument
+    cmd_option operator[](std::string _name){
+		std::vector<cmd_option>::iterator it;
+        it = find(opts.begin(), opts.end(), _name);// - opts.begin();
 
-            return *it;
+        if(it == opts.end()){
+            std::cout<<"ERROR - Unspecified parameter name: "<<_name<<std::endl;
+            exit(1);
         }
 
+        return *it;
+    }
+
 
 	};
 
diff --git a/stim/structures/kdtree.cuh b/stim/structures/kdtree.cuh
index b1481ed..9d401ce 100644
--- a/stim/structures/kdtree.cuh
+++ b/stim/structures/kdtree.cuh
@@ -457,7 +457,7 @@ namespace stim {
 			//bb.init(&h_reference_points[0]);
 			//aaboundingboxing<T, D>(bb, h_reference_points, reference_count);
 
-			std::vector <kdtree::point<T, D>> reference_points(reference_count);																				// restore the reference points in particular way
+			std::vector < typename kdtree::point<T, D> > reference_points(reference_count);																				// restore the reference points in particular way
 			for (size_t j = 0; j < reference_count; j++)
 				for (size_t i = 0; i < D; i++)
 					reference_points[j].dim[i] = h_reference_points[j * D + i];	
--
libgit2 0.21.4