From 1b9c4e96e7beacd87cbe738f8dd816eaa4634111 Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Tue, 8 Jan 2013 17:06:40 +0000 Subject: [PATCH] Prefix with bp_ some bp flags --- packages/CLPBN/horus/BeliefProp.cpp | 6 +++--- packages/CLPBN/horus/CountingBp.cpp | 6 +++--- packages/CLPBN/horus/LiftedBp.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/CLPBN/horus/BeliefProp.cpp b/packages/CLPBN/horus/BeliefProp.cpp index d009cd7a9..5ec3aafd5 100644 --- a/packages/CLPBN/horus/BeliefProp.cpp +++ b/packages/CLPBN/horus/BeliefProp.cpp @@ -52,15 +52,15 @@ BeliefProp::printSolverFlags (void) const { stringstream ss; ss << "belief propagation [" ; - ss << "msg_schedule=" ; + ss << "bp_msg_schedule=" ; switch (schedule_) { case MsgSchedule::SEQ_FIXED: ss << "seq_fixed"; break; case MsgSchedule::SEQ_RANDOM: ss << "seq_random"; break; case MsgSchedule::PARALLEL: ss << "parallel"; break; case MsgSchedule::MAX_RESIDUAL: ss << "max_residual"; break; } - ss << ",max_iter=" << Util::toString (maxIter_); - ss << ",accuracy=" << Util::toString (accuracy_); + ss << ",bp_max_iter=" << Util::toString (maxIter_); + ss << ",bp_accuracy=" << Util::toString (accuracy_); ss << ",log_domain=" << Util::toString (Globals::logDomain); ss << "]" ; cout << ss.str() << endl; diff --git a/packages/CLPBN/horus/CountingBp.cpp b/packages/CLPBN/horus/CountingBp.cpp index 39b47eab3..4dc1b249e 100644 --- a/packages/CLPBN/horus/CountingBp.cpp +++ b/packages/CLPBN/horus/CountingBp.cpp @@ -36,15 +36,15 @@ CountingBp::printSolverFlags (void) const { stringstream ss; ss << "counting bp [" ; - ss << "msg_schedule=" ; + ss << "bp_msg_schedule=" ; switch (WeightedBp::msgSchedule()) { case MsgSchedule::SEQ_FIXED: ss << "seq_fixed"; break; case MsgSchedule::SEQ_RANDOM: ss << "seq_random"; break; case MsgSchedule::PARALLEL: ss << "parallel"; break; case MsgSchedule::MAX_RESIDUAL: ss << "max_residual"; break; } - ss << ",max_iter=" << WeightedBp::maxIterations(); - ss << ",accuracy=" << WeightedBp::accuracy(); + ss << ",bp_max_iter=" << WeightedBp::maxIterations(); + ss << ",bp_accuracy=" << WeightedBp::accuracy(); ss << ",log_domain=" << Util::toString (Globals::logDomain); ss << ",fif=" << Util::toString (CountingBp::fif_); ss << "]" ; diff --git a/packages/CLPBN/horus/LiftedBp.cpp b/packages/CLPBN/horus/LiftedBp.cpp index b748cc9e1..b85e87cd5 100644 --- a/packages/CLPBN/horus/LiftedBp.cpp +++ b/packages/CLPBN/horus/LiftedBp.cpp @@ -62,15 +62,15 @@ LiftedBp::printSolverFlags (void) const { stringstream ss; ss << "lifted bp [" ; - ss << "msg_schedule=" ; + ss << "bp_msg_schedule=" ; switch (WeightedBp::msgSchedule()) { case MsgSchedule::SEQ_FIXED: ss << "seq_fixed"; break; case MsgSchedule::SEQ_RANDOM: ss << "seq_random"; break; case MsgSchedule::PARALLEL: ss << "parallel"; break; case MsgSchedule::MAX_RESIDUAL: ss << "max_residual"; break; } - ss << ",max_iter=" << WeightedBp::maxIterations(); - ss << ",accuracy=" << WeightedBp::accuracy(); + ss << ",bp_max_iter=" << WeightedBp::maxIterations(); + ss << ",bp_accuracy=" << WeightedBp::accuracy(); ss << ",log_domain=" << Util::toString (Globals::logDomain); ss << "]" ; cout << ss.str() << endl;