automatic commit

diff --git a/Makefile b/Makefile
index c26cbd9..f0a1bed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # Contact <francois.fleuret@idiap.ch> for comments & bug reports        #
 #########################################################################
 
-CXX=g++-4.1
+# CXX=g++-4.1
 
 ifeq ($(STATIC),yes)
   LDFLAGS=-static -lm -ljpeg -lpng -lz

diff --git a/loss_machine.h b/loss_machine.h
index a293e8b..50a611e 100644 (file)
--- a/loss_machine.h
+++ b/loss_machine.h
@@ -38,14 +38,14 @@ public:
                           scalar_t *weak_learner_responses,
                           scalar_t *current_responses);
 
-  // This method returns in sample_nb_occurences[k] the number of time
-  // the example k was sampled, and in sample_responses[k] the
-  // consistent response so that the overall loss remains the same. If
-  // allow_duplicates is set to 1, all samples will have an identical
-  // response (i.e. weight), but some may have more than one
-  // occurence. On the contrary, if allow_duplicates is 0, samples
-  // will all have only one occurence (or zero) but the responses may
-  // vary to account for the multiple sampling.
+  /* This method returns in sample_nb_occurences[k] the number of time
+     the example k was sampled, and in sample_responses[k] the
+     consistent response so that the overall loss remains the same. If
+     allow_duplicates is set to 1, all samples will have an identical
+     response (i.e. weight), but some may have more than one
+     occurence. On the contrary, if allow_duplicates is 0, samples
+     will all have only one occurence (or zero) but the responses may
+     vary to account for the multiple sampling. */
 
   void subsample(int nb, scalar_t *labels, scalar_t *responses,
                  int nb_to_sample, int *sample_nb_occurences, scalar_t *sample_responses,

diff --git a/pi_referential.cc b/pi_referential.cc
index b6a6b1d..3d81b93 100644 (file)
--- a/pi_referential.cc
+++ b/pi_referential.cc
@@ -168,17 +168,16 @@ PiReferential::PiReferential(PoseCell *cell) {
 
   // Body location
 
+  // **********************************************************************
   // Useless code, but necessary to keep the exact same results with
   // g++ 4.1 and -O3 options on reference experiments.
-
   _body_xc = cell->_belly_xc.middle() * discrete_scale_ratio;
   _body_yc = cell->_belly_yc.middle() * discrete_scale_ratio;
-
   _body_tilt = 0;
-
   if((_head_xc - _body_xc) * cos(_body_tilt) + (_head_yc - _body_yc) * sin(_body_tilt) > 0) {
     _body_tilt += M_PI;
   }
+  // **********************************************************************
 
   // Belly location
 
@@ -197,7 +196,7 @@ PiReferential::PiReferential(PoseCell *cell) {
   // Frames
 
   if(_body_xc >= _head_xc) {
-  //   if(_belly_xc >= _head_xc) {
+    //   if(_belly_xc >= _head_xc) {
     _horizontal_polarity = 1;
   } else {
     _horizontal_polarity = -1;