New GeometricSeqPhenotype class

Antigen.java

@@ -1,7 +1,9 @@
 /* Implements an individual-based model in which the infection's genealogical history is tracked through time */
 
+import java.io.FileNotFoundException;
+
 class Antigen {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws FileNotFoundException {
 
 		// initialize random number generator
 		cern.jet.random.AbstractDistribution.makeDefaultGenerator();

HostPopulation.java

@@ -17,7 +17,7 @@ public class HostPopulation {
 	private double tmrca;
 	private double netau;	
 	private double serialInterval;
-	private double antigenicDiversity;		
+	private double antigenicDiversity;
 
 	private int newContacts;
 	private int newRecoveries;

PhenotypeFactory.java

@@ -7,6 +7,7 @@ public class PhenotypeFactory {
 	public static String GEOMETRIC3D = "geometric3d";
 	public static String GEOMETRIC10D = "geometric10d";
 	public static String SEQUENCE = "sequence";
+	public static String GEOMETRIC_SEQ = "geometricSeq";
 
 	// returns newly instantiated Phenotype objects of type according to Parameters.phenotypeSpace
 	public static Phenotype makeVirusPhenotype() {
@@ -15,7 +16,7 @@ public static Phenotype makeVirusPhenotype() {
 		if (GEOMETRIC.equals(Parameters.phenotypeSpace)) { p = new GeometricPhenotype(); }
 		if (GEOMETRIC3D.equals(Parameters.phenotypeSpace)) { p = new GeometricPhenotype3D(); }
 		if (GEOMETRIC10D.equals(Parameters.phenotypeSpace)) { p = new GeometricPhenotype10D(); }
-		if (SEQUENCE.equals(Parameters.phenotypeSpace)) { p = new SequencePhenotype(); }
+		if (GEOMETRIC_SEQ.equals(Parameters.phenotypeSpace)) { p = new GeometricSeqPhenotype(); }
 		return p;
 
 	}
@@ -34,8 +35,13 @@ public static Phenotype makeHostPhenotype() {
 			double[] traits = {Parameters.initialTraitA, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 			p = new GeometricPhenotype10D(traits);
 		}
-		if (SEQUENCE.equals(Parameters.phenotypeSpace)) {
-			p = new SequencePhenotype(Parameters.startingSequence);
+		if (GEOMETRIC_SEQ.equals(Parameters.phenotypeSpace)) {
+			String startingSequence = Parameters.startingSequence;
+			if (startingSequence == null) {
+				p = new GeometricSeqPhenotype(Parameters.initialTraitA, 0);
+			} else {
+				p = new GeometricSeqPhenotype(Parameters.initialTraitA, 0, Parameters.startingSequence.toCharArray());
+			}
 		}
 		return p;
 
@@ -46,6 +52,7 @@ public static Phenotype makeArbitaryPhenotype(double x, double y) {
 
 		Phenotype p = null;
 		if (GEOMETRIC.equals(Parameters.phenotypeSpace)) { p = new GeometricPhenotype(x, y); }
+		if (GEOMETRIC_SEQ.equals(Parameters.phenotypeSpace)) { p = new GeometricSeqPhenotype(x, y); }
 		return p;
 
 	}

README.md

@@ -18,10 +18,25 @@ rate of within deme contact.
 
 ## Running
 
+### Setting up Java on Fred Hutch cluster
+
+
+To load Java 11, run these commands:
+
+	source /app/lmod/lmod/init/profile
+	ml Java/11;
+
+
+
 The program can be compiled with:
 
 	javac *.java
 
+
+I (@zorian15) have found that I sometimes need to specify all of the `.jar` files in the compilation command to get things to compile completely, this can be done with::
+
+	javac -classpath ".:lib/classmexer.jar:lib/colt-1.2.0.jar:lib/hamcrest-core-1.3.jar:lib/junit-4.13.1.jar:" *.java
+
 Then to run:
 
 	java -XX:+UseSerialGC -Xmx1G Antigen

Random.java

@@ -1,54 +1,53 @@
 /* Holds random number genator necessities */
-/* Trying to encapsulate this, so the RNG particulars can be changed if necessary */ 
+/* Trying to encapsulate this, so the RNG particulars can be changed if necessary */
 /* Completely static class, allows no instances to be instantiated */
 
-//import cern.jet.random.*;
+import cern.jet.random.*;
 
 public class Random {
-								
+
 	// methods
 
 	public static int nextInt(int from, int to) {
 		return cern.jet.random.Uniform.staticNextIntFromTo(from, to);
-	}	
-	
+	}
+
 	public static double nextDouble() {
-		return cern.jet.random.Uniform.staticNextDouble();		
+		return cern.jet.random.Uniform.staticNextDouble();
 	}
-	
+
 	public static double nextDouble(double from, double to) {
-		return cern.jet.random.Uniform.staticNextDoubleFromTo(from, to);		
-	}	
+		return cern.jet.random.Uniform.staticNextDoubleFromTo(from, to);
+	}
 
 	public static double nextNormal() {
-		return cern.jet.random.Normal.staticNextDouble(0.0,1.0);
+		return cern.jet.random.Normal.staticNextDouble(0.0, 1.0);
 	}
-	
+
 	public static double nextNormal(double mean, double sd) {
-		return cern.jet.random.Normal.staticNextDouble(mean,sd);
-	}	
+		return cern.jet.random.Normal.staticNextDouble(mean, sd);
+	}
 
 	// tuned with mean
 	public static double nextExponential(double lambda) {
-		return cern.jet.random.Exponential.staticNextDouble(1.0/lambda);
+		return cern.jet.random.Exponential.staticNextDouble(1.0 / lambda);
 	}
-	
+
 	// tuned with alpha and beta, matching Mathematica's notation
 	public static double nextGamma(double alpha, double beta) {
-		return cern.jet.random.Gamma.staticNextDouble(alpha, 1/beta);
-	}	
-	
+		return cern.jet.random.Gamma.staticNextDouble(alpha, 1 / beta);
+	}
+
 	public static int nextPoisson(double lambda) {
 		return cern.jet.random.Poisson.staticNextInt(lambda);
 	}
-	
+
 	public static boolean nextBoolean(double p) {
 		boolean x = false;
 		if (nextDouble() < p) {
 			x = true;
 		}
 		return x;
-	}	
-
+	}
 
 }