From 9e6d89eb998bf0233eded23152c0b91b17cfa8d6 Mon Sep 17 00:00:00 2001
From: David <mayerich@uh.edu>
Date: Mon, 21 Nov 2016 15:32:43 -0600
Subject: [PATCH] minor changes with Jack

---
 main.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/main.cpp b/main.cpp
index aac7aa1..f425682 100644
--- a/main.cpp
+++ b/main.cpp
@@ -210,39 +210,26 @@ void compare(float sigma){
 }
 
 // writes features of the networks i.e average segment length, tortuosity, branching index, contraction, fractal dimension, number of end and branch points to a csv file
-void features(){
+// Pranathi wrote this - saves network features to a CSV file
+void features(std::string filename){
 			double avgL_t, avgL_gt, avgT_t, avgT_gt, avgB_t, avgB_gt, avgC_t, avgC_gt, avgFD_t, avgFD_gt;
 		unsigned int e_t, e_gt, b_gt, b_t;
 		avgL_gt = GT.Lengths();
 		avgT_gt = GT.Tortuosities();
-		//std::cout<<avgL_gt<<"---average segment length in the ground truth network"<<std::endl;
-		//std::cout<<avgT_gt<<"---average segment tortuosity in the ground truth network"<<std::endl;
 		avgL_t = T.Lengths();
 		avgT_t = T.Tortuosities();
-		//std::cout<<avgL_t<<"---average segment length in the truth network"<<std::endl;
-		//std::cout<<avgT_t<<"---average segment tortuosity in the truth network"<<std::endl;
 		avgB_gt = GT.BranchingIndex();
-		//std::cout<<avgB_gt<<"---average branching index in the ground truth"<<std::endl;
 		avgB_t = T.BranchingIndex();
-		//std::cout<<avgB_t<<"---average branching index in the truth case"<<std::endl;
 		avgC_gt = GT.Contractions();
 		avgFD_gt = GT.FractalDimensions();
-		//std::cout<<avgC_gt<<"---average segment contraction in the ground truth network"<<std::endl;
-		//std::cout<<avgFD_gt<<"---average segment fractal dimension in the ground truth network"<<std::endl;
 		avgC_t = T.Contractions();
 		avgFD_t = T.FractalDimensions();
-		//std::cout<<avgC_t<<"---average segment contraction in the truth network"<<std::endl;
-		//std::cout<<avgFD_t<<"---average segment fractal dimension in the truth network"<<std::endl;
 		e_gt = GT.EndP();
-		//std::cout<<e_gt<<"---Number of tips in the ground truth"<<std::endl;
 		e_t = T.EndP();
-		//std::cout<<e_t<<"---Number of tips in the truth case"<<std::endl;
 		b_gt = GT.BranchP();
-		//std::cout<<b_gt<<"---Number of branch points in the ground truth"<<std::endl;
 		b_t = T.BranchP();
-		//std::cout<<b_t<<"---Number of branch points in the truth case"<<std::endl;
 		std::ofstream myfile;
-		myfile.open ("features.csv");
+		myfile.open (filename.c_str());
 		myfile << "Length, Tortuosity, Contraction, Fractal Dimension, Branch Points, End points, Branching Index, \n";
 		myfile << avgL_gt << "," << avgT_gt << "," << avgC_gt << "," << avgFD_gt << "," << b_gt << "," << e_gt << "," << avgB_gt <<std::endl;
 		myfile << avgL_t << "," << avgT_t << "," << avgC_t << "," << avgFD_t << "," << b_t << "," << e_t << "," << avgB_t <<std::endl;
@@ -273,6 +260,7 @@ int main(int argc, char* argv[])
 	args.add("help", "prints this help");
 	args.add("sigma", "force a sigma value to specify the tolerance of the network comparison", "10");
 	args.add("gui", "display the network or network comparison using OpenGL");
+	args.add("features", "save features to a CSV file, specify file name");
 
 	args.parse(argc, argv);					//parse the user arguments
 
@@ -292,7 +280,8 @@ int main(int argc, char* argv[])
 		num_nets = 2;										//set the number of networks to two
 		float sigma = args["sigma"].as_float();				//get the sigma value from the user
 		T.load_obj(args.arg(1));                           //load the second (test) network
-		features();
+		if(args["features"].is_set())						//if the user wants to save features
+			features(args["features"].as_string());
 		GT = GT.resample(resample_rate * sigma);			//resample both networks based on the sigma value
 		T = T.resample(resample_rate * sigma);
 		compare(sigma);										//run the comparison algorithm
--
libgit2 0.21.4