joel/largeRCRF-Java
1
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

Very minor improvement to how tree filenames are saved.

Browse source
This commit is contained in:
Joel Therrien 2019-03-13 11:21:51 -07:00
parent 02b7a5cb9a
commit d65e010c48
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/ca/joeltherrien/randomforest/tree/ForestTrainer.java
View file

@ -28,6 +28,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@ -111,7 +112,7 @@ public class ForestTrainer<Y, TO, FO> {
System.out.print("\rFinished " + treeCount.get() + "/" + ntree + " trees");
}
final Runnable worker = new TreeSavedWorker(data, "tree-" + (j+1) + ".tree", treeCount);
final Runnable worker = new TreeSavedWorker(data, "tree-" + formatNumber(j+1) + ".tree", treeCount);
worker.run();
}
@ -183,7 +184,7 @@ public class ForestTrainer<Y, TO, FO> {
final AtomicInteger treeCount = new AtomicInteger(treeFiles.length); // tracks how many trees are finished
for(int j=treeCount.get(); j<ntree; j++){
final Runnable worker = new TreeSavedWorker(data, "tree-" + (j+1) + ".tree", treeCount);
final Runnable worker = new TreeSavedWorker(data, "tree-" + formatNumber(j+1) + ".tree", treeCount);
executorService.execute(worker);
}
@ -249,6 +250,28 @@ public class ForestTrainer<Y, TO, FO> {
}
}
/**
* When saving trees we typically save them as tree-1.tree, tree-2.tree. This is fine until we get tree-10.tree, which
* when sorted alphabetically goes before tree-2.tree. We should instead save tree-01.tree, ... tree-10.tree.
*
* We need to set the number of 0s though based on ntree.
*
* @return
*/
private String formatNumber(int currentTreeNumber){
final int numDigits = (int) Math.log10(ntree) + 1;
String currentTreeNumberString = Integer.toString(currentTreeNumber);
final StringBuilder builder = new StringBuilder();
for(int i=0; i<numDigits-currentTreeNumberString.length(); i++){
builder.append('0');
}
builder.append(currentTreeNumberString);
return builder.toString();
}
private class TreeSavedWorker implements Runnable {
private final Bootstrapper<Row<Y>> bootstrapper;