diff --git a/main.cu b/main.cu index 2a0e405..83a5000 100644 --- a/main.cu +++ b/main.cu @@ -26,8 +26,8 @@ const float PRIOR_MULTIPLIER = 1.0; const float CONST_LENGTH_PRIOR = 1.0; // how mcuh do constants cost in terms of length? const float X_LENGTH_PRIOR = 1.0; // how mcuh does X cost in terms of length? -const int PROGRAM_LENGTH = 3;//15; -const int NCONSTANTS = 3;//15; // these must be equal in this version -- one constant for each program slot; although note the low ones are never used, right? +const int PROGRAM_LENGTH = 15; +const int NCONSTANTS = 15; // these must be equal in this version -- one constant for each program slot; although note the low ones are never used, right? const float CONSTANT_SCALE = 10.0; // Maybe set to be the SD of the y values, fucntions as a scale over the constants in teh prior, proprosals diff --git a/postprocess.R b/postprocess.R index 9ef9216..24ee889 100644 --- a/postprocess.R +++ b/postprocess.R @@ -4,7 +4,7 @@ library(scales) # for adding alpha # DIRECTORY="out/data-sources/NIST/Bennett5/" -DIRECTORY="out/data-sources/Science/KeplerThird/" +DIRECTORY="out/data-sources/Science/AllometricScaling/" # DIRECTORY="run/data-sources/Science/Galileo-/" # DIRECTORY="run/data-sources/Science/Fibonacci-/" # DIRECTORY="out/" @@ -15,7 +15,7 @@ d <- read.table(paste(DIRECTORY, "tops.txt", sep="/"), sep="\t") names(d) <- c("thread", "outer", "posterior", "prior", "likelihood", "h.struct", "h") -CUTOFF=50 +CUTOFF=10 data <- read.table(paste(DIRECTORY, "data.txt", sep="/")) diff --git a/run-all.sh b/run-all.sh index cd288e2..7346ee0 100755 --- a/run-all.sh +++ b/run-all.sh @@ -1,5 +1,5 @@ -ITERATIONS=25000 +ITERATIONS=2500 OUTER_BLOCKS=100 N=8096 OUTROOT=run/