From 33b4571cff31610dd4220d4a0b09c44a207e8357 Mon Sep 17 00:00:00 2001
From: John Langford <jl@hunch.net>
Date: Sun, 28 Dec 2014 21:36:03 -0500
Subject: simpler multiclass finish

---
 vowpalwabbit/cbify.cc      | 9 ++-------
 vowpalwabbit/ect.cc        | 5 +----
 vowpalwabbit/log_multi.cc  | 5 +----
 vowpalwabbit/multiclass.cc | 3 ++-
 vowpalwabbit/multiclass.h  | 2 +-
 vowpalwabbit/oaa.cc        | 5 +----
 6 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/vowpalwabbit/cbify.cc b/vowpalwabbit/cbify.cc
index 9d8d830f..f66f1856 100644
--- a/vowpalwabbit/cbify.cc
+++ b/vowpalwabbit/cbify.cc
@@ -367,15 +367,10 @@ namespace CBIFY {
   void init_driver(cbify&) {}
 
   void finish_example(vw& all, cbify&, example& ec)
-  {
-    MULTICLASS::output_example(all, ec);
-    VW::finish_example(all, &ec);
-  }
+  { MULTICLASS::finish_multiclass_example(all, ec); }
 
   void finish(cbify& data)
-  {
-    CB::cb_label.delete_label(&data.cb_label);
-  }
+  { CB::cb_label.delete_label(&data.cb_label); }
 
   base_learner* setup(vw& all, po::variables_map& vm)
   {//parse and set arguments
diff --git a/vowpalwabbit/ect.cc b/vowpalwabbit/ect.cc
index bcf15c02..59c67dac 100644
--- a/vowpalwabbit/ect.cc
+++ b/vowpalwabbit/ect.cc
@@ -361,10 +361,7 @@ namespace ECT
   }
 
   void finish_example(vw& all, ect&, example& ec)
-  {
-    MULTICLASS::output_example(all, ec);
-    VW::finish_example(all, &ec);
-  }
+  { MULTICLASS::finish_multiclass_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 26f6b454..5595da92 100644
--- a/vowpalwabbit/log_multi.cc
+++ b/vowpalwabbit/log_multi.cc
@@ -497,10 +497,7 @@ namespace LOG_MULTI
   }
   
   void finish_example(vw& all, log_multi&, example& ec)
-  {
-    MULTICLASS::output_example(all, ec);
-    VW::finish_example(all, &ec);
-  }
+  { MULTICLASS::finish_multiclass_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 7e1f7a8e..1e90aca6 100644
--- a/vowpalwabbit/multiclass.cc
+++ b/vowpalwabbit/multiclass.cc
@@ -140,7 +140,7 @@ namespace MULTICLASS {
       }
   }
 
-  void output_example(vw& all, example& ec)
+  void finish_multiclass_example(vw& all, example& ec)
   {
     multiclass ld = ec.l.multi;
     
@@ -170,5 +170,6 @@ namespace MULTICLASS {
       all.print(*sink, (float)ec.pred.multiclass, 0, ec.tag);
     
     MULTICLASS::print_update(all, ec);
+    VW::finish_example(all, &ec);
   }
 }
diff --git a/vowpalwabbit/multiclass.h b/vowpalwabbit/multiclass.h
index aca34075..738de421 100644
--- a/vowpalwabbit/multiclass.h
+++ b/vowpalwabbit/multiclass.h
@@ -18,7 +18,7 @@ namespace MULTICLASS
   
   extern label_parser mc_label;
   
-  void output_example(vw& all, example& ec);
+  void finish_multiclass_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 02a9eaf2..634ef365 100644
--- a/vowpalwabbit/oaa.cc
+++ b/vowpalwabbit/oaa.cc
@@ -61,10 +61,7 @@ namespace OAA {
   }
   
   void finish_example(vw& all, oaa&, example& ec)
-  {
-    MULTICLASS::output_example(all, ec);
-    VW::finish_example(all, &ec);
-  }
+  { MULTICLASS::finish_multiclass_example(all, ec); }
 
   LEARNER::base_learner* setup(vw& all, po::variables_map& vm)
   {
-- 
cgit v1.2.3