From e9a7821b05145a1b6c019b4c9faa288044eba3e5 Mon Sep 17 00:00:00 2001
From: David Mayerich <mayerich@uh.edu>
Date: Mon, 16 Dec 2019 20:12:26 +0000
Subject: [PATCH] Code should now compile, but still needs the determinant lines replaced

---
 src/main.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 71ac674..68dc9e6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -154,11 +154,14 @@ void gpuComputeEignS( size_t g, size_t fea){
 	}
 	
 	///DETERMINANT CURRENTLY REQUIRES OPENCV
-	cv::Mat newSw = cv::Mat((int)r, (int)r, CV_32FC1, nSw);		//within scatter of gnome g in the population 
-	cv::Mat newSb = cv::Mat((int)r, (int)r, CV_32FC1, nSb);		//within scatter of gnome g in the population 
+	std::cout<<"ERROR: This code requires a fix to remove an OpenCV dependence."<<std::endl;
+	exit(1);
+	//FIX BY REPLACING THE FOLLOWING THREE LINES OF CODE USING LAPACK
+	//cv::Mat newSw = cv::Mat((int)r, (int)r, CV_32FC1, nSw);		//within scatter of gnome g in the population 
+	//cv::Mat newSb = cv::Mat((int)r, (int)r, CV_32FC1, nSb);		//within scatter of gnome g in the population 
 			
 	//fisher's ratio from ratio of projected sb and sw
-	float fisherRatio = cv::determinant(newSb) /cv::determinant(newSw);
+	float fisherRatio = 0;// = cv::determinant(newSb) /cv::determinant(newSw);
 	gnom.S[g] = 1/fisherRatio;
 	if (debug) {
 		std::cout<<"Score["<<g<<"]: "<< gnom.S[g]<<std::endl;
@@ -190,17 +193,8 @@ void fitnessFunction( float* sb, float* sw, float* lda, float* M, float* cM, siz
  		size_t nC = nP.size();													//total number of classes
 		
 		//--------------Compute between class scatter 		
-	//	ga.cpu_computeSbSw(sb, sw,  M,  cM, nC,  tP, nP, gen);		
-		//
-		//if(debug){
-		//	std::cout<<"cpu results of Sb sn Sw"<<std::endl;
-		//	displayS(sb, ga.f);									//display Sb				
-		//	displayS(sw, ga.f);									//display Sw
-		// }
-		
-		//ga.callingGpuComputeSbSw(sb, sw,  nC, tP, nP, props, gen);			
+	
 		ga.gpu_computeSbSw(sb, sw, nC, tP, props, gen, debug, profilefile);
-		//ga.cpu_computeSbSw(sb, sw, M, cM, nC, tP, nP);
 
 		if(debug){
 			std::cout<<"From fitness function: gpu results of Sb sn Sw"<<std::endl;
--
libgit2 0.21.4