diff --git a/fastlib2/contrib/nvasil/l_bfgs/l_bfgs_impl.h b/fastlib2/contrib/nvasil/l_bfgs/l_bfgs_impl.h index e4017d2c20..5e03cc04dd 100644 --- a/fastlib2/contrib/nvasil/l_bfgs/l_bfgs_impl.h +++ b/fastlib2/contrib/nvasil/l_bfgs/l_bfgs_impl.h @@ -61,7 +61,6 @@ void LBfgs::Init(OptimizedFunction *optimized_function, template void LBfgs::Destruct() { fclose(fp_log_); - } template @@ -177,6 +176,7 @@ void LBfgs::InitOptimization_() { s_bfgs_[i].Init(new_dimension_, num_of_points_); y_bfgs_[i].Init(new_dimension_, num_of_points_); } + num_of_iterations_=0; } template diff --git a/fastlib2/contrib/nvasil/l_bfgs/optimization_utils.h b/fastlib2/contrib/nvasil/l_bfgs/optimization_utils.h index f731f370dd..8394f11495 100644 --- a/fastlib2/contrib/nvasil/l_bfgs/optimization_utils.h +++ b/fastlib2/contrib/nvasil/l_bfgs/optimization_utils.h @@ -34,8 +34,8 @@ class OptUtils { } } static void NonNegativeProjection(Matrix *data) { - double ptr=data->ptr(); - for(index_t i=0; in_elements(); i++) { + double *ptr=data->ptr(); + for(index_t i=0; i<(index_t)data->n_elements(); i++) { if (ptr[i]<0) { ptr[i]=0; } @@ -45,12 +45,12 @@ class OptUtils { DEBUG_ASSERT(sparse_factor<=1); DEBUG_ASSERT(sparse_factor>=0); index_t dimension=data->n_rows(); - ArrayList zero_coeff; + ArrayList zero_coeff; zero_coeff.Init(); Vector w_vector; - w.Init(dimension); + w_vector.Init(dimension); Vector v_vector; - v.Init(dimension); + v_vector.Init(dimension); Vector a_vector; Vector ones; ones.Init(dimension); @@ -74,15 +74,15 @@ class OptUtils { for(index_t j=0; j