X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile;h=ecccd72524fcd94b895bfd509ddc5e4ccd7da876;hb=a0f36c8849d41b4be54f00e3f9e19ce79a67abae;hp=9c82be7b10a0e3dc4eff139e1a01b0ade6d3fe8f;hpb=3c0d58c901fd6f8265dad93f096d2ae03866fc6e;p=moebius2.git

diff --git a/Makefile b/Makefile
index 9c82be7..ecccd72 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 
 
-VIEWDIMS=33 44 55
+VIEWDIMS=33 64 125
 TARGETS= minimise primer lumpy.cfm sgtatham.cfm ring.cfm \
-	$(addprefix view+, $(VIEWDIMS))
+	interpolate-64 \
+	$(addprefix view-, $(VIEWDIMS))
 SGTATHAM=sgtatham
 
 CWARNS=	-Wall -Wwrite-strings -Wpointer-arith -Werror -Wshadow
@@ -18,6 +19,8 @@ o= >$@.new && mv -f $@.new $@
 
 all:		$(TARGETS)
 
+compute:	best.CFM
+
 minimise:	energy.o graph.o common.o mgraph.o minimise.o half.o
 		$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBGSL)
 
@@ -37,27 +40,44 @@ lumpy.cfm: oldmoebius-converter prime.data ../moebius/ins-new ../moebius/a.out
 ring.cfm: oldmoebius-converter prime.data /dev/null ../moebius/a.out
 		./$^ -o$@
 
+best.CFM:
+		./minimise sgtatham.cfm -iwip.cfm -o$@
 
-# this ridiculous repetition is due to make being too lame
-
-view+%:		view+%.o mgraph+%.o common.o
+view-%:		view+%.o mgraph+%.o common.o
 		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL) -L/usr/X11R6/lib -lX11
 
-view+%.o:	view.c
-		$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+interpolate-%:	interpolate+%.o mgraph+%.o common.o
+		$(CC) $(CFLAGS) -o $@ $^ $(LIBGSL)
+
+define interpolate
+dense-$1.cfm:	interpolate-$1 $2
+		./$$< <$2 $$o
+endef
 
-mgraph+%.o:	mgraph.c
-		$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFBITS=$* $< -o $@
+$(eval $(call interpolate,64, best.CFM))
+$(eval $(call interpolate,125, dense-64.cfm, dense-64.cfm))
 
-.PRECIOUS: view+%.o mgraph+%.o
+# this ridiculous repetition is due to make being too lame
+
+view+%.o: view.c
+		$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+mgraph+%.o: mgraph.c
+		$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
 
+interpolate+%.o: interpolate.c
+		$(CC) -c $(CPPFLAGS) $(CFLAGS) -DDEFSZ=$* $< -o $@
+
+.PRECIOUS: view+%.o mgraph+%.o interpolate+%.o
 
 clean:
 		rm -f prime.data $(TARGETS)
 		rm -f *.o *.new *.tmp *.rej *.orig core vgcore.* *~
-		rm -f *.d
+		rm -f *.d *.cfm
 
 realclean:	clean
-		rm -f best
+		rm -f *.CFM
+
+%.d:
 
 -include *.d