GP cpu

Makefile

@@ -121,9 +121,9 @@ clean:
 #	rm -f EaseaParse.cpp EaseaParse.h EaseaLex.cpp EaseaLex.h
 
 
-EaseaParse.cpp: EaseaParse.y
-	wine ~/.wine/drive_c/Program\ Files/Parser\ Generator/BIN/ayacc.exe $< -Tcpp -d
+#EaseaParse.cpp: EaseaParse.y
+#	wine ~/.wine/drive_c/Program\ Files/Parser\ Generator/BIN/ayacc.exe $< -Tcpp -d
 
-EaseaLex.cpp: EaseaLex.l
-	wine ~/.wine/drive_c/Program\ Files/Parser\ Generator/BIN/ALex.exe $< -Tcpp -i
+#EaseaLex.cpp: EaseaLex.l
+#	wine ~/.wine/drive_c/Program\ Files/Parser\ Generator/BIN/ALex.exe $< -Tcpp -i
 #endif

examples/regression/regression.ez

@@ -60,6 +60,7 @@ void free_data(){
 \After everything else function:
 {
   toDotFile( ((IndividualImpl*)EA->population->Best)->root, "best", 0);
+  toString(((IndividualImpl*)EA->population->Best)->root);
   free_data();
 }
 \end
@@ -88,7 +89,9 @@ GenomeClass {
 }
 \end
 
-\GenomeClass::display:
+\GenomeClass::display:{
+  cout << *this << endl;
+}	
 \end
 
 \GenomeClass::initialiser :
@@ -138,8 +141,7 @@ return sqrtf(ERROR/gNO_FITNESS_CASES);
 \end
 
 \User Makefile options: 
-
-CXXFLAGS+=-I/usr/local/cuda/common/inc/ -I/usr/local/cuda/include/
+CXXFLAGS+=#-I/usr/local/cuda/common/inc/ -I/usr/local/cuda/include/
 LDFLAGS+=
 \end
 

tpl/GP.tpl

 \TEMPLATE_START
 #ifdef WIN32
 #define _CRT_SECURE_NO_WARNINGS
-#pragma comment(lib, "libEasea.lib")
+#pragma comment(lib, "libEasea.lib")
 #endif
 /**
  This is program entry for TreeGP template for EASEA
@@ -743,26 +743,20 @@ public:
 
 \START_CUDA_MAKEFILE_TPL
 
-NVCC=g++
-EASEALIB_PATH=\EZ_PATHlibeasea/#/home/kruger/Bureau/Easea/libeasea/
-
+CXX=g++
+EASEALIB_PATH=\EZ_PATHlibeasea/
 CXXFLAGS =  -g  -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
-
-
-
 OBJS = EASEA.o EASEAIndividual.o 
-
 LIBS = 
-
-TARGET =	EASEA
+TARGET = EASEA
 
 \INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
 
 $(TARGET):	$(OBJS)
-	$(NVCC) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a $(EZ_PATH)boost/program_options.a -lpthread
+	$(CXX) -o $(TARGET) $(OBJS) $(LIBS) -g $(EASEALIB_PATH)libeasea.a $(EZ_PATH)boost/program_options.a -lpthread
 
 %.o:%.cpp
-	$(NVCC) -c $(CXXFLAGS) $^ $(NVCC_OPT)
+	$(CXX) -c $(CXXFLAGS) $^ $(CXX_OPT)
 
 all:	$(TARGET)
 clean: