diff --git a/examples/testMCMCMC.xml b/examples/testMCMCMC.xml index 31f7b7c..364e6b3 100644 --- a/examples/testMCMCMC.xml +++ b/examples/testMCMCMC.xml @@ -24,13 +24,13 @@ name="rawdata"> - @@ -74,11 +74,6 @@ name="rawdata"> - 1.0 diff --git a/src/snap/SNAPPHeatedMCMC.java b/src/snap/SNAPPHeatedMCMC.java index 675d6ec..aaca1f0 100644 --- a/src/snap/SNAPPHeatedMCMC.java +++ b/src/snap/SNAPPHeatedMCMC.java @@ -34,7 +34,7 @@ public void setChainNr(int i, int resampleEvery) throws Exception { SubSampledData subSample = new SubSampledData(); try { subSample.initByName("data", data, - "proportion", 1.0 / (i + 1.0), + "proportion", 4.0 / (i + 4.0), "taxonset", data.m_taxonsets.get()); } catch (Exception e) { e.printStackTrace(); @@ -55,7 +55,7 @@ public void setChainNr(int i, int resampleEvery) throws Exception { public void optimiseRunTime(long startTime, long endTime, long endTimeMainChain) { double factor = ((double) endTimeMainChain - startTime) / ((double)endTime - startTime); this.resampleEvery = 1 + (int)(this.resampleEvery * factor); - System.err.println(this.resampleEvery); + //System.err.println(this.resampleEvery); } } // SNAPPHeatedMCMC