new
del some log files
Merge branch 'master' of https://github.com/hellomatt/Evo2

Conflicts:
	3adv-exchange/a280_n1395_uncorr-similar-weights_05.LS-P.log
	3adv-exchange/a280_n279_bounded-strongly-corr_01.LS-P.log
	exercise3/.svn/all-wcprops
	exercise3/.svn/prop-base/run.sh.svn-base
	exercise3/.svn/text-base/build.xml.svn-base
	exercise3/.svn/text-base/run.sh.svn-base
	exercise3/build.xml
	exercise3/instances/.svn/entries
	exercise3/instances/.svn/text-base/a280_n1395_uncorr-similar-weights_05.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/a280_n1395_uncorr-similar-weights_05.ttp.svn-base
	exercise3/instances/.svn/text-base/a280_n2790_uncorr_10.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/a280_n2790_uncorr_10.ttp.svn-base
	exercise3/instances/.svn/text-base/a280_n279_bounded-strongly-corr_01.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/a280_n279_bounded-strongly-corr_01.ttp.svn-base
	exercise3/instances/.svn/text-base/fnl4461_n22300_uncorr-similar-weights_05.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/fnl4461_n22300_uncorr-similar-weights_05.ttp.svn-base
	exercise3/instances/.svn/text-base/fnl4461_n44600_uncorr_10.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/fnl4461_n44600_uncorr_10.ttp.svn-base
	exercise3/instances/.svn/text-base/fnl4461_n4460_bounded-strongly-corr_01.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/fnl4461_n4460_bounded-strongly-corr_01.ttp.svn-base
	exercise3/instances/.svn/text-base/pla33810_n169045_uncorr-similar-weights_05.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/pla33810_n169045_uncorr-similar-weights_05.ttp.svn-base
	exercise3/instances/.svn/text-base/pla33810_n338090_uncorr_10.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/pla33810_n338090_uncorr_10.ttp.svn-base
	exercise3/instances/.svn/text-base/pla33810_n33809_bounded-strongly-corr_01.linkern.tour.svn-base
	exercise3/instances/.svn/text-base/pla33810_n33809_bounded-strongly-corr_01.ttp.svn-base
	exercise3/instances/a280_n1395_uncorr-similar-weights_05.linkern.tour
	exercise3/instances/a280_n1395_uncorr-similar-weights_05.ttp
	exercise3/instances/a280_n2790_uncorr_10.linkern.tour
	exercise3/instances/a280_n2790_uncorr_10.ttp
	exercise3/instances/a280_n279_bounded-strongly-corr_01.linkern.tour
	exercise3/instances/a280_n279_bounded-strongly-corr_01.ttp
	exercise3/instances/fnl4461_n22300_uncorr-similar-weights_05.linkern.tour
	exercise3/instances/fnl4461_n22300_uncorr-similar-weights_05.ttp
	exercise3/instances/fnl4461_n44600_uncorr_10.linkern.tour
	exercise3/instances/fnl4461_n44600_uncorr_10.ttp
	exercise3/instances/fnl4461_n4460_bounded-strongly-corr_01.linkern.tour
	exercise3/instances/fnl4461_n4460_bounded-strongly-corr_01.ttp
	exercise3/instances/pla33810_n169045_uncorr-similar-weights_05.linkern.tour
	exercise3/instances/pla33810_n169045_uncorr-similar-weights_05.ttp
	exercise3/instances/pla33810_n338090_uncorr_10.linkern.tour
	exercise3/instances/pla33810_n338090_uncorr_10.ttp
	exercise3/instances/pla33810_n33809_bounded-strongly-corr_01.linkern.tour
	exercise3/instances/pla33810_n33809_bounded-strongly-corr_01.ttp
	exercise3/run.sh
	exercise3/src/.svn/text-base/Driver.java.svn-base
	exercise3/src/.svn/text-base/README.txt.svn-base
	exercise3/src/Driver.java
	exercise3/src/README.txt
	exercise3/src/ttp/.svn/text-base/TTPInstance.java.svn-base
	exercise3/src/ttp/.svn/text-base/TTPSolution.java.svn-base
	exercise3/src/ttp/Optimisation/.svn/text-base/Optimisation.java.svn-base
	exercise3/src/ttp/Optimisation/Optimisation.java
	exercise3/src/ttp/TTPInstance.java
	exercise3/src/ttp/TTPSolution.java
	exercise3/src/ttp/Utils/.svn/entries
	exercise3/src/ttp/Utils/.svn/text-base/DeepCopy.java.svn-base
	exercise3/src/ttp/Utils/.svn/text-base/DriverOld.java.svn-base
	exercise3/src/ttp/Utils/.svn/text-base/FastByteArrayInputStream.java.svn-base
	exercise3/src/ttp/Utils/.svn/text-base/FastByteArrayOutputStream.java.svn-base
	exercise3/src/ttp/Utils/.svn/text-base/Utils.java.svn-base
	exercise3/src/ttp/Utils/DeepCopy.java
	exercise3/src/ttp/Utils/DriverOld.java
	exercise3/src/ttp/Utils/FastByteArrayInputStream.java
	exercise3/src/ttp/Utils/FastByteArrayOutputStream.java
	exercise3/src/ttp/Utils/Utils.java
clear results