simplifying multiclass finish

6 files changed, 6 insertions, 10 deletions

diff --git a/vowpalwabbit/cbify.cc b/vowpalwabbit/cbify.cc
index f66f1856..d8176228 100644
--- a/vowpalwabbit/cbify.cc
+++ b/vowpalwabbit/cbify.cc
@@ -366,8 +366,7 @@ namespace CBIFY {
   
   void init_driver(cbify&) {}
 
-  void finish_example(vw& all, cbify&, example& ec)
-  { MULTICLASS::finish_multiclass_example(all, ec); }
+  void finish_example(vw& all, cbify&, example& ec) { MULTICLASS::finish_example(all, ec); }
 
   void finish(cbify& data)
   { CB::cb_label.delete_label(&data.cb_label); }
diff --git a/vowpalwabbit/ect.cc b/vowpalwabbit/ect.cc
index 59c67dac..dea87040 100644
--- a/vowpalwabbit/ect.cc
+++ b/vowpalwabbit/ect.cc
@@ -360,8 +360,7 @@ namespace ECT
     e.tournaments_won.delete_v();
   }
 
-  void finish_example(vw& all, ect&, example& ec)
-  { MULTICLASS::finish_multiclass_example(all, ec); }
+  void finish_example(vw& all, ect&, example& ec) { MULTICLASS::finish_example(all, ec); }
   
   base_learner* setup(vw& all, po::variables_map& vm)
   {
diff --git a/vowpalwabbit/log_multi.cc b/vowpalwabbit/log_multi.cc
index 5595da92..226376bd 100644
--- a/vowpalwabbit/log_multi.cc
+++ b/vowpalwabbit/log_multi.cc
@@ -496,8 +496,7 @@ namespace LOG_MULTI
       }

   }

   

-  void finish_example(vw& all, log_multi&, example& ec)

-  { MULTICLASS::finish_multiclass_example(all, ec); }

+  void finish_example(vw& all, log_multi&, example& ec) { MULTICLASS::finish_example(all, ec); }

   

   base_learner* setup(vw& all, po::variables_map& vm)	//learner setup

   {

diff --git a/vowpalwabbit/multiclass.cc b/vowpalwabbit/multiclass.cc
index 1e90aca6..4aad3a73 100644
--- a/vowpalwabbit/multiclass.cc
+++ b/vowpalwabbit/multiclass.cc
@@ -140,7 +140,7 @@ namespace MULTICLASS {
       }
   }
 
-  void finish_multiclass_example(vw& all, example& ec)
+  void finish_example(vw& all, example& ec)
   {
     multiclass ld = ec.l.multi;
     
diff --git a/vowpalwabbit/multiclass.h b/vowpalwabbit/multiclass.h
index 738de421..f48efbfc 100644
--- a/vowpalwabbit/multiclass.h
+++ b/vowpalwabbit/multiclass.h
@@ -18,7 +18,7 @@ namespace MULTICLASS
   
   extern label_parser mc_label;
   
-  void finish_multiclass_example(vw& all, example& ec);
+  void finish_example(vw& all, example& ec);
 
   inline int label_is_test(multiclass* ld)
   { return ld->label == (uint32_t)-1; }
diff --git a/vowpalwabbit/oaa.cc b/vowpalwabbit/oaa.cc
index 634ef365..2328b00d 100644
--- a/vowpalwabbit/oaa.cc
+++ b/vowpalwabbit/oaa.cc
@@ -60,8 +60,7 @@ namespace OAA {
       o.all->print_text(o.all->raw_prediction, outputStringStream.str(), ec.tag);
   }
   
-  void finish_example(vw& all, oaa&, example& ec)
-  { MULTICLASS::finish_multiclass_example(all, ec); }
+  void finish_example(vw& all, oaa&, example& ec) { MULTICLASS::finish_example(all, ec); }
 
   LEARNER::base_learner* setup(vw& all, po::variables_map& vm)
   {