fixed some comments, there is still a bug in the gl_network.h

David Mayerich
1 parent 3a4a7f69
Showing 1 changed file with 20 additions and 19 deletions Show diff stats
main.cu
@@ -24,33 +24,33 @@
 //visualization objects
 stim::gl_aaboundingbox<float> bb;			//axis-aligned bounding box object
-stim::camera cam;					//camera object
+stim::camera cam;							//camera object
 // number of networks
 unsigned num_nets = 0;
 // networks
-stim::gl_network<float> GT;			//ground truth network
-stim::gl_network<float> T;			//test network
-stim::gl_network<float> _GT;		//splitted GT
-stim::gl_network<float> _T;			//splitted T
+stim::gl_network<float> GT;					//ground truth network
+stim::gl_network<float> T;					//test network
+stim::gl_network<float> _GT;				//splitted GT
+stim::gl_network<float> _T;					//splitted T
 // indicator
-unsigned ind = 0;						//indicator of mapping
+unsigned ind = 0;							//indicator of mapping
 // relationships
-std::vector<unsigned> _gt_t;								// store indices of nearest edge points in _T for _GT
-std::vector<unsigned> _t_gt;								// store indices of nearest edge points in _GT for _T
+std::vector<unsigned> _gt_t;				// store indices of nearest edge points in _T for _GT
+std::vector<unsigned> _t_gt;				// store indices of nearest edge points in _GT for _T
 //hard-coded parameters
-float resample_rate = 0.5f;			//sample rate for the network (fraction of sigma used as the maximum sample rate)
-float camera_factor = 1.2f;			//start point of the camera as a function of X and Y size
-float orbit_factor = 0.01f;			//degrees per pixel used to orbit the camera
+float resample_rate = 0.5f;					//sample rate for the network (fraction of sigma used as the maximum sample rate)
+float camera_factor = 1.2f;					//start point of the camera as a function of X and Y size
+float orbit_factor = 0.01f;					//degrees per pixel used to orbit the camera
 float zoom_factor = 10.0f;
 float radius_factor = 0.5f;
 //mouse click
-bool LButtonDown = false;			// true when left button down
+bool LButtonDown = false;					// true when left button down
 bool RButtonDown = false;
 //mouse position tracking
@@ -58,7 +58,7 @@ int mouse_x;
 int mouse_y;
 // render modes
-bool compareMode = true;			// default mode is compare mode
+bool compareMode = true;					// default mode is compare mode
 bool mappingMode = false;
 // random color set
@@ -68,11 +68,11 @@ std::vector&lt;float&gt; colormap;
 int mods;
 //OpenGL objects
-GLuint cmap_tex = 0;				//texture name for the color map
+GLuint cmap_tex = 0;						//texture name for the color map
 float delta;
-float sigma = 3;					//default sigma
-float radius = 0.7;					//equals to radius
+float sigma = 3;							//default sigma
+float radius = 0.7;							//equals to radius
 int adjoint_fac = 0;
 int light_fac = 0;
 int difference_fac = 0;
@@ -682,8 +682,7 @@ void advertise(){
 	std::cout<<"            mapping two files in random colors with a threshold of value"<<std::endl<<std::endl;
 }
-int main(int argc, char* argv[])
-{
+int main(int argc, char* argv[]) {
 	stim::arglist args;						//create an instance of arglist
 	//add arguments
@@ -737,9 +736,10 @@ int main(int argc, char* argv[])
 			float threshold = args["mapping"].as_float();
 			map(sigma, device, threshold);
 		}
-		else
+		else {
 			compare(sigma, device);							//run the comparison algorithm
 		}
+	}
 	//if a GUI is requested, display the network using OpenGL
 	if(args["gui"].is_set()){
@@ -755,4 +755,5 @@ int main(int argc, char* argv[])
 			glutMainLoop();							//enter GLUT event processing cycle
 		}
 	}
+	return 1;
 }