trainModelImpl becomes protected

"*Impl" are not part of a public API, pretty much by definition.
h2oai · Sep 21, 2015 · ba9e6f4 · ba9e6f4
1 parent 6d6495f
commit ba9e6f4
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 17 deletions.
diff --git a/h2o-algos/src/main/java/hex/coxph/CoxPH.java b/h2o-algos/src/main/java/hex/coxph/CoxPH.java
@@ -37,7 +37,7 @@ public ModelBuilderSchema schema() {
   /** Start the Cox PH training Job on an F/J thread.
    * @param work
    * @param restartTimer*/
-  @Override public Job<CoxPHModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<CoxPHModel> trainModelImpl(long work, boolean restartTimer) {
     CoxPHDriver cd = new CoxPHDriver();
     cd.setModelBuilderTrain(_train);
     CoxPH cph = (CoxPH) start(cd, work, restartTimer);

diff --git a/h2o-algos/src/main/java/hex/deeplearning/DeepLearning.java b/h2o-algos/src/main/java/hex/deeplearning/DeepLearning.java
@@ -53,7 +53,7 @@ public DeepLearning( DeepLearningParameters parms ) {
   /** Start the DeepLearning training Job on an F/J thread.
    * @param work
    * @param restartTimer*/
-  @Override public Job<DeepLearningModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<DeepLearningModel> trainModelImpl(long work, boolean restartTimer) {
     // We look at _train before init(true) is called, so step around that here:
     return start(new DeepLearningDriver(), work, restartTimer);
   }

diff --git a/h2o-algos/src/main/java/hex/example/Example.java b/h2o-algos/src/main/java/hex/example/Example.java
@@ -32,7 +32,7 @@ public ModelCategory[] can_build() {
 
   public ModelBuilderSchema schema() { return new ExampleV3(); }
 
-  @Override public Example trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Example trainModelImpl(long work, boolean restartTimer) {
     return (Example)start(new ExampleDriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/glm/GLM.java b/h2o-algos/src/main/java/hex/glm/GLM.java
@@ -560,8 +560,7 @@ public ModelBuilderSchema schema() {
 
 
   private static final long WORK_TOTAL = 1000000;
-  @Override
-  public Job<GLMModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<GLMModel> trainModelImpl(long work, boolean restartTimer) {
     start(new GLMDriver(null), work, restartTimer);
     return this;
   }

diff --git a/h2o-algos/src/main/java/hex/glrm/GLRM.java b/h2o-algos/src/main/java/hex/glrm/GLRM.java
@@ -60,7 +60,7 @@ public class GLRM extends ModelBuilder<GLRMModel,GLRMModel.GLRMParameters,GLRMMo
     return new GLRMV99();
   }
 
-  @Override public Job<GLRMModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<GLRMModel> trainModelImpl(long work, boolean restartTimer) {
     return start(new GLRMDriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/grep/Grep.java b/h2o-algos/src/main/java/hex/grep/Grep.java
@@ -26,7 +26,7 @@ public class Grep extends ModelBuilder<GrepModel,GrepModel.GrepParameters,GrepMo
 
   public ModelBuilderSchema schema() { return new GrepV3(); }
 
-  @Override public Grep trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Grep trainModelImpl(long work, boolean restartTimer) {
     return (Grep)start(new GrepDriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/kmeans/KMeans.java b/h2o-algos/src/main/java/hex/kmeans/KMeans.java
@@ -61,7 +61,7 @@ protected void checkMemoryFootPrint() {
   /** Start the KMeans training Job on an F/J thread.
    * @param work
    * @param restartTimer*/
-  @Override public Job<KMeansModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<KMeansModel> trainModelImpl(long work, boolean restartTimer) {
     return start(new KMeansDriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/naivebayes/NaiveBayes.java b/h2o-algos/src/main/java/hex/naivebayes/NaiveBayes.java
@@ -36,8 +36,7 @@ public ModelBuilderSchema schema() {
 
   public boolean isSupervised(){return true;}
 
-  @Override
-  public Job<NaiveBayesModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<NaiveBayesModel> trainModelImpl(long work, boolean restartTimer) {
     return start(new NaiveBayesDriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/pca/PCA.java b/h2o-algos/src/main/java/hex/pca/PCA.java
@@ -43,8 +43,7 @@ public ModelBuilderSchema schema() {
     return new PCAV3();
   }
 
-  @Override
-  public Job<PCAModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<PCAModel> trainModelImpl(long work, boolean restartTimer) {
     return start(new PCADriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/svd/SVD.java b/h2o-algos/src/main/java/hex/svd/SVD.java
@@ -44,7 +44,7 @@ public class SVD extends ModelBuilder<SVDModel,SVDModel.SVDParameters,SVDModel.S
     return new SVDV99();
   }
 
-  @Override public Job<SVDModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<SVDModel> trainModelImpl(long work, boolean restartTimer) {
     return start(new SVDDriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/tree/drf/DRF.java b/h2o-algos/src/main/java/hex/tree/drf/DRF.java
@@ -48,7 +48,7 @@ public class DRF extends SharedTree<hex.tree.drf.DRFModel, hex.tree.drf.DRFModel
   /** Start the DRF training Job on an F/J thread.
    * @param work
    * @param restartTimer*/
-  @Override public Job<hex.tree.drf.DRFModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<hex.tree.drf.DRFModel> trainModelImpl(long work, boolean restartTimer) {
     return start(new DRFDriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/tree/gbm/GBM.java b/h2o-algos/src/main/java/hex/tree/gbm/GBM.java
@@ -39,7 +39,7 @@ public class GBM extends SharedTree<GBMModel,GBMModel.GBMParameters,GBMModel.GBM
   /** Start the GBM training Job on an F/J thread.
    * @param work
    * @param restartTimer*/
-  @Override public Job<GBMModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<GBMModel> trainModelImpl(long work, boolean restartTimer) {
     return start(new GBMDriver(), work, restartTimer);
   }
 

diff --git a/h2o-algos/src/main/java/hex/word2vec/Word2Vec.java b/h2o-algos/src/main/java/hex/word2vec/Word2Vec.java
@@ -32,7 +32,7 @@ public enum NormModel { HSM, NegSampling }
   /** Start the KMeans training Job on an F/J thread.
    * @param work
    * @param restartTimer*/
-  @Override public Job<Word2VecModel> trainModelImpl(long work, boolean restartTimer) {
+  @Override protected Job<Word2VecModel> trainModelImpl(long work, boolean restartTimer) {
     return start(new Word2VecDriver(), work, restartTimer);
   }
 

diff --git a/h2o-r/H2O_Load.R b/h2o-r/H2O_Load.R
@@ -3,7 +3,7 @@ CLIFF.ROOT.PATH <- "C:/Users/cliffc/Desktop/"
 ANQIS.ROOT.PATH <- "/Users/anqi_fu/Documents/workspace/"
 ANQIS.WIN.PATH <- "C:/Users/Anqi/Documents/Work/"
 SPENCER.ROOT.PATH <- "/Users/spencer/0xdata/"
-ROOT.PATH <- SPENCER.ROOT.PATH
+ROOT.PATH <- CLIFF.ROOT.PATH
 DEV.PATH  <- "h2o-3/h2o-r/h2o-package/R/"
 FULL.PATH <- paste(ROOT.PATH, DEV.PATH, sep="")