Turned optimal heuristics back on in assign.

f25d0aa9 · Christopher Alfeld · f064c9e4 · f25d0aa9 · f25d0aa9
Commit f25d0aa9 authored Mar 21, 2001 by Christopher Alfeld
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

assign/GNUmakefile.in assign/GNUmakefile.in +2 -2

assign/assign.cc assign/assign.cc +3 -2

No files found.
--- a/assign/GNUmakefile.in
+++ b/assign/GNUmakefile.in
@@ -19,8 +19,8 @@ LIBS+=-L${LEDA} -lD3 -lW -lP -lG -lL -L/usr/X11R6/lib -lX11 -lm -L.
 LDFLAGS+= -O3 -fomit-frame-pointer -m486
 CXXFLAGS = -I${LEDA}/incl
 # Pick one of the two below.
-CXXFLAGS += -Wall -O3 -fomit-frame-pointer -m486
-#CXXFLAGS += -O0 -g -Wall -DSCORE_DEBUG -DVERBOSE -DSCORE_DEBUG_MORE
+CXXFLAGS += -Wall -O3 -fomit-frame-pointer -m486 -DUSE_OPTIMAL
+#CXXFLAGS += -O0 -g -Wall -DSCORE_DEBUG -DVERBOSE -DSCORE_DEBUG_MORE -DUSE_OPTIMAL
 DEPLIBS=$(OBJS)

 assign: ${DEPLIBS} ${OBJS} assign.o

--- a/assign/assign.cc
+++ b/assign/assign.cc
@@ -20,14 +20,15 @@
 #include "score.h"

 // Purely heuristic
-/*
+#ifdef USE_OPTIMAL
 #define OPTIMAL_SCORE(edges,nodes) (nodes*SCORE_PNODE + \
                                    nodes/5.0*SCORE_SWITCH + \
                                    edges*((SCORE_INTRASWITCH_LINK+ \
                                    SCORE_DIRECT_LINK*2)*4+\
                                           SCORE_INTERSWITCH_LINK)/5.0)
-*/
+#else
 #define OPTIMAL_SCORE(edges,nodes) 0
+#endif

 tb_pgraph PG(1,1);
 tb_vgraph G(1,1);