Merge branch 'master' of github.com:mlin/PhyloCSF

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "twt"]
 	path = twt
 	url = git://github.com/mlin/twt.git
+[submodule "CDE"]
+	path = CDE
+	url = git://github.com/pgbovine/CDE.git

Makefile

@@ -1,9 +1,10 @@
 all: PhyloCSF
 
-.PHONY: PhyloCSF CamlPaml clean
+.PHONY: PhyloCSF CamlPaml cde-package CDE clean
 
-ARCH := `uname`.`uname -m`
-export ARCH
+ARCH := $(shell uname).$(shell uname -m)
+PHYLOCSF_BASE := $(shell pwd)
+export PHYLOCSF_BASE
 
 PhyloCSF: CamlPaml
 	cd src; $(MAKE) clean; $(MAKE) $(MFLAGS)
@@ -12,7 +13,19 @@ PhyloCSF: CamlPaml
 CamlPaml: 
 	cd lib/CamlPaml; $(MAKE) $(MFLAGS) reinstall
 
+cde-package: PhyloCSF CDE
+	CDE/cde ./PhyloCSF.$(ARCH) 12flies PhyloCSF_Examples/tal-AA.fa 
+	CDE/cde ./PhyloCSF.$(ARCH) 29mammals PhyloCSF_Examples/ALDH2.exon5.fa --frames=3
+	#CDE/cde ./PhyloCSF.$(ARCH) 29mammals PhyloCSF_Examples/Aldh2.mRNA.fa --frames=3 --removeRefGaps --aa
+	mv cde-package cde-package.$(ARCH)
+	tar -cf cde-package.$(ARCH).tar cde-package.$(ARCH)
+
+CDE:
+	cd CDE && make
+
 clean:
 	cd lib/CamlPaml; $(MAKE) clean
 	cd src; $(MAKE) clean
 	rm -f PhyloCSF.*
+	rm -rf cde-package*
+	cd CDE && make clean || true

PhyloCSF_Parameters/20flies.nh

@@ -0,0 +1 @@
+((dgri:0.183954, dvir:0.093575):0.000000, (dmoj:0.110563, ((((dbip:0.034265, dana:0.042476):0.121927, (dkik:0.097564, ((dfic:0.109823, (((dmel:0.023047, (dsim:0.015485, dsec:0.015184):0.013850):0.016088, (dyak:0.026909, dere:0.029818):0.008929):0.047596, (deug:0.102473, (dbia:0.069103, dtak:0.060723):0.015855):0.005098):0.010453):0.008044, (dele:0.062413, drho:0.051516):0.015405):0.046129):0.018695):0.078585, (dper:0.007065, dpse:0.005900):0.185269):0.068212, dwil:0.259408):0.097093):0.035250);

cde.options

@@ -0,0 +1,54 @@
+# cde.options v1 (do not alter this first line!)
+
+# These directories often contain pseudo-files that shouldn't be tracked
+ignore_prefix=/dev/
+ignore_exact=/dev
+ignore_prefix=/proc/
+ignore_exact=/proc
+ignore_prefix=/sys/
+ignore_exact=/sys
+ignore_prefix=/var/cache/
+ignore_prefix=/var/lock/
+ignore_prefix=/var/log/
+ignore_prefix=/var/run/
+ignore_prefix=/var/tmp/
+ignore_prefix=/tmp/
+ignore_exact=/tmp
+
+# un-comment the entries below if you think they might help your app:
+#ignore_exact=/etc/ld.so.cache
+#ignore_exact=/etc/ld.so.preload
+#ignore_exact=/etc/ld.so.nohwcap
+
+# Ignore .Xauthority to allow X Windows programs to work
+ignore_substr=.Xauthority
+
+# Ignore so that networking can work properly
+ignore_exact=/etc/resolv.conf
+# These files might be useful to ignore along with /etc/resolv.conf
+# (un-comment if you want to try them)
+#ignore_exact=/etc/host.conf
+#ignore_exact=/etc/hosts
+#ignore_exact=/etc/nsswitch.conf
+#ignore_exact=/etc/gai.conf
+
+# Access the target machine's password files:
+# (some programs like texmacs need these lines to be commented-out,
+#  since they try to use home directory paths within the passwd file,
+#  and those paths might not exist within the package.)
+ignore_prefix=/etc/passwd
+ignore_prefix=/etc/shadow
+
+# These environment vars might lead to 'overfitting' and hinder portability
+ignore_environment_var=DBUS_SESSION_BUS_ADDRESS
+ignore_environment_var=ORBIT_SOCKETDIR
+ignore_environment_var=SESSION_MANAGER
+ignore_environment_var=XAUTHORITY
+ignore_environment_var=DISPLAY
+
+# For PhyloCSF: allow the dispatch script in our package to set PHYLOCSF_BASE
+# so that the parameters and examples can reside at the top level rather than
+# buried deep in cde-package/
+ignore_environment_var=PHYLOCSF_BASE
+ignore_prefix=/home/mlin/src/PhyloCSF/PhyloCSF_Examples
+ignore_prefix=/home/mlin/src/PhyloCSF/PhyloCSF_Parameters