From f4940d2bc782fe8c6637f4c9b2c874810f1aa688 Mon Sep 17 00:00:00 2001
From: Jiaming Guo <jackguo523@gmail.com>
Date: Tue, 15 Aug 2017 10:27:40 -0500
Subject: [PATCH] fixed syntax errors

---
 main.cu | 57 +--------------------------------------------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

diff --git a/main.cu b/main.cu
index 7df8799..493ab06 100644
--- a/main.cu
+++ b/main.cu
@@ -23,15 +23,9 @@
 // BOOST includes
 #include <boost/tuple/tuple.hpp>
 
-<<<<<<< HEAD
 // visualization objects
 stim::gl_aaboundingbox<float> bb;	// axis-aligned bounding box object
 stim::camera cam;					// camera object
-=======
-//visualization objects
-stim::gl_aaboundingbox<float> bb;			//axis-aligned bounding box object
-stim::camera cam;							//camera object
->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
 
 // overall parameters
 unsigned num_nets = 0;				// number of networks that've been loaded
@@ -40,7 +34,6 @@ float radius = 0.7;					// equals to radius
 float delta;						// camera moving parameter
 
 // networks
-<<<<<<< HEAD
 stim::gl_network<float> GT;			// ground truth network
 stim::gl_network<float> T;			// test network
 stim::gl_network<float> _GT;		// splitted GT
@@ -66,29 +59,6 @@ float radius_factor = 0.5f;			// radius changing factor
 
 // mouse click
 bool LButtonDown = false;			// true when left button down
-=======
-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
-
-// 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
-
-//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 zoom_factor = 10.0f;
-float radius_factor = 0.5f;
-
-//mouse click
-bool LButtonDown = false;					// true when left button down
->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
 bool RButtonDown = false;
 
 // mouse position tracking
@@ -96,7 +66,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;
 bool volumeMode = false;
 
@@ -106,24 +76,12 @@ std::vector<float> colormap;
 // special key indicator
 int mods;
 
-<<<<<<< HEAD
 // OpenGL objects
 GLuint cmap_tex = 0;				// texture name for the color map
 
 // Stack view parameter
 stim::gl_texture<unsigned char> S;					// texture storing the image stack
 float planes[3] = { 0.0f, 0.0f, 0.0f };				// plane position in world space
-=======
-//OpenGL objects
-GLuint cmap_tex = 0;						//texture name for the color map
-
-float delta;
-float sigma = 3;							//default sigma
-float radius = 0.7;							//equals to radius
-int adjoint_fac = 0;
-int light_fac = 0;
-int difference_fac = 0;
->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
 
 // sets an OpenGL viewport taking up the entire window
 void glut_render_single_projection(){
@@ -960,14 +918,9 @@ void advertise(){
 	std::cout<<"            mapping two files in random colors with a threshold of value"<<std::endl<<std::endl;
 }
 
-<<<<<<< HEAD
 int main(int argc, char* argv[])
 {
 	stim::arglist args;						// create an instance of arglist
-=======
-int main(int argc, char* argv[]) {
-	stim::arglist args;						//create an instance of arglist
->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
 
 	// add arguments
 	args.add("help", "prints this help");
@@ -1022,7 +975,6 @@ int main(int argc, char* argv[]) {
 			float threshold = args["mapping"].as_float();
 			mapping(sigma, device, threshold);
 		}
-<<<<<<< HEAD
 		else
 			compare(sigma, device);							// run the comparison algorithm
 		}
@@ -1046,12 +998,6 @@ int main(int argc, char* argv[]) {
 	planes[0] = S.size(0) / 4.0f;							// initialize the start positions for the orthogonal display planes
 	planes[1] = S.size(1) / 4.0f;
 	planes[2] = S.size(2) / 4.0f;
-=======
-		else {
-			compare(sigma, device);							//run the comparison algorithm
-		}
-	}
->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
 
 	//if a GUI is requested, display the network using OpenGL
 	if(args["gui"].is_set()){
@@ -1067,5 +1013,4 @@ int main(int argc, char* argv[]) {
 			glutMainLoop();									// enter GLUT event processing cycle
 		}
 	}
-	return 1;
 }
--
libgit2 0.21.4