made loss viewable by sender

stephenLee · Sep 30, 2009 · 8fce3bc · 8fce3bc
1 parent 84d09d6
commit 8fce3bc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/global_data.cc b/global_data.cc
@@ -1,6 +1,7 @@
 #include <pthread.h>
 #include "global_data.h"
 #include "multisource.h"
+#include "message_relay.h"
 
 global_data global;
 pthread_mutex_t io = PTHREAD_MUTEX_INITIALIZER;

diff --git a/global_data.h b/global_data.h
@@ -32,6 +32,7 @@ struct global_data {
   size_t unique_id; //unique id for each node in the network, id == 0 means extra io.
 
   void (*print)(int,float,v_array<char>);
+  loss_function* loss;
 
   char* program_name;
 

diff --git a/message_relay.cc b/message_relay.cc
@@ -10,8 +10,8 @@ void* mesg_relay(void* in)
     {
       example *ec = blocking_get_delay_example(global.num_threads());
       ec->final_prediction = ps.p;
-      //      label_data* ld = (label_data*)ec->ld;
+      label_data* ld = (label_data*)ec->ld;
-      ec->loss = 0;//global.reg.loss->getLoss(ec->final_prediction, ld->label) * ld->weight;
+      ec->loss = global.loss->getLoss(ec->final_prediction, ld->label) * ld->weight;
       finish_example(ec);
     }
   return NULL;

diff --git a/parse_args.cc b/parse_args.cc
@@ -131,6 +131,7 @@ po::variables_map parse_args(int argc, char *argv[], boost::program_options::opt
   if(vm.count("quantiles_tau"))
 	  loss_parameter = vm["quantiles_tau"].as<double>();
   r.loss = getLossFunction(loss_function, loss_parameter);
+  global.loss = r.loss;
 
   vars.eta *= pow(vars.t, vars.power_t);
   if (!global.quiet)