Skip to content

Commit

Permalink
Merge branch 'devlp'
Browse files Browse the repository at this point in the history
Merge branch "devlp". This version can interpret more complex formulas for
constraints within .lgo files.
  • Loading branch information
alanrogers committed Dec 30, 2017
2 parents ab5dd76 + 9d113f2 commit b39bb69
Show file tree
Hide file tree
Showing 41 changed files with 3,527 additions and 676 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
*~
core
depend
raf
version.h
xboot
xdtnorm
xexopar
xhashtab
xerror
xgene
xgptree
xparse
Expand All @@ -24,12 +27,14 @@ xparkeyval
xdiffev
xjobqueue
xdafreader
xrafreader
xmisc
xstrint
legosim
numcores
legofit
tabpat
sitepat
tabpat.log
daf
try
20 changes: 16 additions & 4 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ opt := -DNDEBUG -O3 -finline-functions # For full optimization
prof :=
incl := -I/usr/local/include -I/opt/local/include

targets := legosim legofit tabpat daf numcores
targets := legosim legofit tabpat sitepat daf raf numcores
pytargets := diverg.py bootci.py flatfile.py
tests := xzeroin xbinary

Expand Down Expand Up @@ -43,28 +43,40 @@ test : $(tests)
-./xzeroin
@echo "ALL UNIT TESTS WERE COMPLETED."

version.h:
./mkversion.py > version.h

LEGOSIM := legosim.o patprob.o gptree.o binary.o jobqueue.o misc.o parse.o \
branchtab.o popnodetab.o lblndx.o tokenizer.o parstore.o parkeyval.o \
popnode.o gene.o dprintf.o rngseed.o dtnorm.o
popnode.o gene.o dprintf.o rngseed.o dtnorm.o tinyexpr.o
legosim : $(LEGOSIM)
$(CC) $(CFLAGS) -o $@ $(LEGOSIM) $(lib)

LEGOFIT := legofit.o patprob.o gptree.o binary.o jobqueue.o misc.o \
parse.o branchtab.o popnodetab.o lblndx.o tokenizer.o parstore.o \
parkeyval.o popnode.o gene.o cost.o diffev.o dprintf.o rngseed.o \
simsched.o dtnorm.o
simsched.o dtnorm.o tinyexpr.o
legofit : $(LEGOFIT)
$(CC) $(CFLAGS) -o $@ $(LEGOFIT) $(lib)

TABPAT := tabpat.o misc.o binary.o lblndx.o parkeyval.o dafreader.o \
tokenizer.o strint.o boot.o
tokenizer.o strint.o boot.o error.o
tabpat : $(TABPAT)
$(CC) $(CFLAGS) -o $@ $(TABPAT) $(lib)

SITEPAT := sitepat.o misc.o binary.o lblndx.o parkeyval.o rafreader.o \
tokenizer.o strint.o boot.o error.o
sitepat : $(SITEPAT)
$(CC) $(CFLAGS) -o $@ $(SITEPAT) $(lib)

DAF := daf.o misc.o
daf : $(DAF)
$(CC) $(CFLAGS) -o $@ $(DAF) $(lib)

RAF := raf.o misc.o
raf : $(RAF)
$(CC) $(CFLAGS) -o $@ $(RAF) $(lib)

NUMCORES := numcores.o misc.o
numcores : $(NUMCORES)
$(CC) $(CFLAGS) -o $@ $(NUMCORES) $(lib)
Expand Down
Loading

0 comments on commit b39bb69

Please sign in to comment.