[mlpack-svn] r10317 - in mlpack/trunk/src/mlpack/methods: emst naive_bayes nnsvm svm

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: mamidon
Date: 2011-11-17 14:04:07 -0500 (Thu, 17 Nov 2011)
New Revision: 10317

Modified:
   mlpack/trunk/src/mlpack/methods/emst/dtb.hpp
   mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_main.cc
   mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_impl.hpp
   mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_main.cpp
   mlpack/trunk/src/mlpack/methods/svm/svm_impl.h
Log:
Diffed a clean working copy, this should end my svn issues.




Modified: mlpack/trunk/src/mlpack/methods/emst/dtb.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/emst/dtb.hpp	2011-11-17 18:50:07 UTC (rev 10316)
+++ mlpack/trunk/src/mlpack/methods/emst/dtb.hpp	2011-11-17 19:04:07 UTC (rev 10317)
@@ -575,11 +575,11 @@
       CLI::GetParam<int>("tree/leaf_size") =
           CLI::GetParam<int>("emst/leaf_size");
 
-      Timers::StartTimer("emst/tree_building");
+      Timers::Start("emst/tree_building");
 
       tree_ = new DTBTree(data_points_, old_from_new_permutation_);
 
-      Timers::StopTimer("emst/tree_building");
+      Timers::Stop("emst/tree_building");
       
     }
     else {
@@ -615,7 +615,7 @@
    */
   void ComputeMST(arma::mat& results) {
 
-    Timers::StartTimer("emst/MST_computation");
+    Timers::Start("emst/MST_computation");
 
     while (number_of_edges_ < (number_of_points_ - 1)) {
       
@@ -639,7 +639,7 @@
       
     }
 
-    Timers::StopTimer("emst/MST_computation");
+    Timers::Stop("emst/MST_computation");
 
     EmitResults_(results);
 

Modified: mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_main.cc	2011-11-17 18:50:07 UTC (rev 10316)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_main.cc	2011-11-17 19:04:07 UTC (rev 10317)
@@ -87,25 +87,25 @@
   ////// SIMPLE NAIVE BAYES CLASSIFICATCLIN ASSUMING THE DATA TO BE UNIFORMLY DISTRIBUTED //////
 
   ////// Timing the training of the Naive Bayes Classifier //////
-  Timers::StartTimer("nbc/training");
+  Timers::Start("nbc/training");
 
   ////// Create and train the classifier
   SimpleNaiveBayesClassifier nbc = SimpleNaiveBayesClassifier(training_data);
 
   ////// Stop training timer //////
-  Timers::StopTimer("nbc/training");
+  Timers::Stop("nbc/training");
 
   ////// Timing the testing of the Naive Bayes Classifier //////
   ////// The variable that contains the result of the classification
   arma::vec results;
 
-  Timers::StartTimer("nbc/testing");
+  Timers::Start("nbc/testing");
 
   ////// Calling the function that classifies the test data
   nbc.Classify(testing_data, results);
 
   ////// Stop testing timer //////
-  Timers::StopTimer("nbc/testing");
+  Timers::Stop("nbc/testing");
 
   ////// OUTPUT RESULTS //////
   std::string output_filename = CLI::GetParam<std::string>("nbc/output");

Modified: mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_impl.hpp	2011-11-17 18:50:07 UTC (rev 10316)
+++ mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_impl.hpp	2011-11-17 19:04:07 UTC (rev 10317)
@@ -62,9 +62,9 @@
   nnsmo.Init(dataset, param_.c_, param_.b_, param_.eps_, param_.max_iter_);
 
   /* 2-classes NNSVM training using NNSMO */
-  Timers::StartTimer("nnsvm/nnsvm_train");
+  Timers::Start("nnsvm/nnsvm_train");
   nnsmo.Train();
-  Timers::StopTimer("nnsvm/nnsvm_train");
+  Timers::Stop("nnsvm/nnsvm_train");
 
   /* Get the trained bi-class model */
   nnsmo.GetNNSVM(support_vectors_, model_.sv_coef_, model_.w_);

Modified: mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_main.cpp	2011-11-17 18:50:07 UTC (rev 10316)
+++ mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_main.cpp	2011-11-17 19:04:07 UTC (rev 10317)
@@ -61,7 +61,7 @@
           CLI::GetParam<double>("nnsvm/eps"),
           CLI::GetParam<int>("nnsvm/max_iter"));
 
-      Timers::StartTimer("nnsvm/nnsvm_train");
+      Timers::Start("nnsvm/nnsvm_train");
       Log::Debug << "nnsvm_train_time" << CLI::GetParam<timeval>("nnsvm/nnsvm_train").tv_usec / 1e6 << std::endl;
       /* training and testing, thus no need to load model from file */
       if (mode=="train_test")

Modified: mlpack/trunk/src/mlpack/methods/svm/svm_impl.h
===================================================================
--- mlpack/trunk/src/mlpack/methods/svm/svm_impl.h	2011-11-17 18:50:07 UTC (rev 10316)
+++ mlpack/trunk/src/mlpack/methods/svm/svm_impl.h	2011-11-17 19:04:07 UTC (rev 10317)
@@ -162,9 +162,9 @@
 
         /* Initialize kernel */
         /* 2-classes SVM training using SMO */
-        Timers::StartTimer("svm/train_smo");
+        Timers::Start("svm/train_smo");
         smo.Train(learner_typeid, &dataset_bi);
-        Timers::StopTimer("svm/train_smo");
+        Timers::Stop("svm/train_smo");
 
         /* Get the trained bi-class model */
         models_[ct].bias_ = smo.Bias(); /* bias */