Commit 02778c2b authored by Ogier Maitre's avatar Ogier Maitre

Debuged installer version

parent aee03dc8
......@@ -52,11 +52,13 @@ $(EXEC):EaseaSym.o EaseaParse.o EaseaLex.o alexyacc/libalex.a EaseaYTools.o boos
install:
mkdir -p /usr/local/easea/ /usr/local/easea/bin /usr/local/easea/tpl /usr/local/easea/libeasea/include
mkdir -p /usr/local/easea/ /usr/local/easea/bin /usr/local/easea/tpl /usr/local/easea/libeasea/include /usr/local/easea/boost
cp easea /usr/local/easea/bin/
cp tpl/* /usr/local/easea/tpl/
cp libeasea/include/* /usr/local/easea/libeasea/include/
cp libeasea/libeasea.a /usr/local/easea/libeasea/
cp boost/program_options.a /usr/local/easea/boost
cp -r boost/boost/ /usr/local/easea/boost/boost/
vars:
ifeq ($(UNAME), Darwin)
@sed '/EZ_PATH/d' $(HOME)/.profile>$(HOME)/.profile_save
......
......@@ -71,6 +71,7 @@ GenomeClass {
t1 = ba_postgres_load_ilot(1);
t2 = ba_postgres_load_batiment(1);
ba_sort_instances(t1,0,0);
ba_set_links(t1,t2);
//ba_print_links(t1);
//printf("+ %d - %d\n",t1->class_repartition[1],t1->class_repartition[0]);
......@@ -130,6 +131,8 @@ GenomeClass {
struct base* tmp_table = table_from_genome(best->x,t1,t2,GENOME_SIZE,GENE_SIZE);
show_tree(tmp_table,root);
ba_to_arff(tmp_table,"best_table.arff");
printf("depth of resulting tree %d\n",root->tree_depth());
#if 1
......
UNAME := $(shell uname)
ifeq ($(UNAME),Darwin)
CXXFLAGS = -g -Wall -fmessage-length=0 -I../boost/
else ifeq ($(UNAME),Linux)
CXXFLAGS = -g -Wall -fmessage-length=0
endif #OS
OBJS = CRandomGenerator.o CSelectionOperator.o CEvolutionaryAlgorithm.o\
CStoppingCriterion.o COptionParser.o CPopulation.o CIndividual.o\
......@@ -22,16 +18,10 @@ LIBS =
#endif #OS
TARGET = libeasea.a
CPPFLAGS=-I/usr/local/cuda/include/ -I../boost/
CPPFLAGS=-I/usr/local/cuda/include/ -I../boost/ -pg
$(TARGET): $(OBJS)
#ifeq ($(UNAME),Darwin)
ar rcs $@ $^ #../boost/program_options.a
#else ifeq ($(UNAME),Linux)
# ar rcs $@ $^
#endif #OS
#$(TARGET): $(OBJS)
# ar rcs $@ $^
%.o:%.cpp
$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $^
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment