Revert "made label type explicit for examples"

This reverts commit b46ca4d0ebe3e5d81b507a8477129f1a998e86bb.

5 files changed, 10 insertions, 10 deletions

diff --git a/library/gd_mf_weights.cc b/library/gd_mf_weights.cc
index 82348a1c..4b394775 100644
--- a/library/gd_mf_weights.cc
+++ b/library/gd_mf_weights.cc
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
     right_linear((outdir + string("/") + string(1, right_ns) + string(".linear")).c_str()),

     right_quadratic((outdir + string("/") + string(1, right_ns) + string(".quadratic")).c_str());

 

-  example<void> *ec = NULL;

+  example *ec = NULL;

   while ((read = getline(&line, &len, file)) != -1)

     {

       line[strlen(line)-1] = 0; // chop

diff --git a/library/library_example.cc b/library/library_example.cc
index 540999ac..ad0bd2f2 100644
--- a/library/library_example.cc
+++ b/library/library_example.cc
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
 {

   vw* model = VW::initialize("--hash all -q st --noconstant -i train.w -f train2.vw");

 

-  example<void> *vec2 = VW::read_example(*model, (char*)"|s p^the_man w^the w^man |t p^un_homme w^un w^homme");

+  example *vec2 = VW::read_example(*model, (char*)"|s p^the_man w^the w^man |t p^un_homme w^un w^homme");

   model->learn(vec2);

   cerr << "p2 = " << (((label_data*)vec2->ld)->prediction) << endl;

   VW::finish_example(*model, vec2);

@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
   t_features.push_back( vw_feature_from_string(*model, "w^homme", t_hash, 1.0) );

   ec_info.push_back( VW::feature_space('s', s_features) );

   ec_info.push_back( VW::feature_space('t', t_features) );

-  example<void>* vec3 = VW::import_example(*model, ec_info);

+  example* vec3 = VW::import_example(*model, ec_info);

     

   model->learn(vec3);

   cerr << "p3 = " << (((label_data*)vec3->ld)->prediction) << endl;

diff --git a/library/libsearch.h b/library/libsearch.h
index 40155206..d4e0e985 100644
--- a/library/libsearch.h
+++ b/library/libsearch.h
@@ -52,7 +52,7 @@ template<class INPUT, class OUTPUT> class SearchTask {
   Search::search& sch;
   
   private:
-  example<void>* bogus_example, *blank_line;
+  example* bogus_example, *blank_line;
 
   void call_vw(INPUT& input_example, OUTPUT& output) {
     HookTask::task_data* d = sch.template get_task_data<HookTask::task_data> (); // ugly calling convention :(
@@ -92,10 +92,10 @@ template<class INPUT, class OUTPUT> class SearchTask {
 };
 
 
-class BuiltInTask : public SearchTask< vector<example<void>*>, vector<uint32_t> > {
+class BuiltInTask : public SearchTask< vector<example*>, vector<uint32_t> > {
   public:
   BuiltInTask(vw& vw_obj, Search::search_task* task)
-      : SearchTask< vector<example<void>*>, vector<uint32_t> >(vw_obj) {
+      : SearchTask< vector<example*>, vector<uint32_t> >(vw_obj) {
     HookTask::task_data* d = sch.get_task_data<HookTask::task_data>();
     size_t num_actions = d->num_actions;
     my_task = task;
@@ -105,7 +105,7 @@ class BuiltInTask : public SearchTask< vector<example<void>*>, vector<uint32_t>
 
   ~BuiltInTask() { if (my_task->finish) my_task->finish(sch); }
 
-  void _run(Search::search& sch, vector<example<void>*> & input_example, vector<uint32_t> & output) {
+  void _run(Search::search& sch, vector<example*> & input_example, vector<uint32_t> & output) {
     my_task->run(sch, input_example);
     sch.get_test_action_sequence(output);
   }
diff --git a/library/recommend.cc b/library/recommend.cc
index 35420780..42c35d4d 100644
--- a/library/recommend.cc
+++ b/library/recommend.cc
@@ -206,7 +206,7 @@ int main(int argc, char *argv[])
 
                         if (!bf_hit(bf,estr))
                         {
-                                example<void> *ex = VW::read_example(*model, estr);
+                                example *ex = VW::read_example(*model, estr);
                                 model->learn(ex);
 
                                 const string str(estr);
diff --git a/library/test_search.cc b/library/test_search.cc
index 98c4527b..c941ab24 100644
--- a/library/test_search.cc
+++ b/library/test_search.cc
@@ -24,7 +24,7 @@ class SequenceLabelerTask : public SearchTask< vector<wt>, vector<uint32_t> > {
   void _run(Search::search& sch, vector<wt> & input_example, vector<uint32_t> & output) {
     output.clear();
     for (size_t i=0; i<input_example.size(); i++) {
-      example<void>* ex = VW::read_example(vw_obj, "1 |w " + input_example[i].word);
+      example* ex = VW::read_example(vw_obj, "1 |w " + input_example[i].word);
       action p  = Search::predictor(sch, i+1).set_input(*ex).set_oracle(input_example[i].tag).set_condition(i, 'p').predict();
       VW::finish_example(vw_obj, ex);
       output.push_back(p);
@@ -91,7 +91,7 @@ void test_buildin_task() {
   vw& vw_obj = *VW::initialize("-t -i sequence.model --search_task hook");
   {  // create a new scope for the task object
     BuiltInTask task(vw_obj, &SequenceTask::task);
-    vector<example<void>*> V;
+    vector<example*> V;
     V.push_back( VW::read_example(vw_obj, (char*)"1 | a") );
     V.push_back( VW::read_example(vw_obj, (char*)"1 | a") );
     V.push_back( VW::read_example(vw_obj, (char*)"1 | a") );