diff --git a/src/agrum/BN/inference/tools/jointTargetedInference_tpl.h b/src/agrum/BN/inference/tools/jointTargetedInference_tpl.h index fb6acdb00618890a9c6822f4b0e5ae75e4084d0f..069e3bd67f411cd0d852ce7dd69d849c5b877b48 100644 --- a/src/agrum/BN/inference/tools/jointTargetedInference_tpl.h +++ b/src/agrum/BN/inference/tools/jointTargetedInference_tpl.h @@ -333,11 +333,11 @@ namespace gum { JointTargetedInference< GUM_SCALAR >::evidenceJointImpact( const std::vector< NodeId >& targets, const std::vector< NodeId >& evs) { - NodeSet sotargets(targets.size()); + NodeSet sotargets(Size(targets.size())); for (const auto& e : targets) sotargets << e; - NodeSet soevs(evs.size()); + NodeSet soevs(Size(evs.size())); for (const auto& e : evs) soevs << e; diff --git a/src/agrum/BN/inference/tools/marginalTargetedInference_tpl.h b/src/agrum/BN/inference/tools/marginalTargetedInference_tpl.h index 3ecd7131ba3202bd22147f32e0e1e32d31ac6836..e7de4fe0bf8d85f355b0cc92f6847be10e679380 100644 --- a/src/agrum/BN/inference/tools/marginalTargetedInference_tpl.h +++ b/src/agrum/BN/inference/tools/marginalTargetedInference_tpl.h @@ -283,7 +283,7 @@ namespace gum { NodeId target, const std::vector< NodeId >& evs) { const auto& vtarget = this->BN().variable(target); - NodeSet soids(evs.size()); + NodeSet soids(Size(evs.size())); for (const auto& e : evs) soids << e; if (soids.contains(target)) { diff --git a/src/agrum/learning/BNLearnUtils/genericBNLearner_inl.h b/src/agrum/learning/BNLearnUtils/genericBNLearner_inl.h index 4527f89ae05bf65ec49bc0397393b1063dbe9ee6..f34f80a1932519f03aacf016ea96392b6273693e 100644 --- a/src/agrum/learning/BNLearnUtils/genericBNLearner_inl.h +++ b/src/agrum/learning/BNLearnUtils/genericBNLearner_inl.h @@ -57,7 +57,7 @@ namespace gum { genericBNLearner::Database::idFromName(const std::string& var_name) const { try { return __name2nodeId.second(const_cast< std::string& >(var_name)); - } catch (gum::NotFound) { + } catch (gum::NotFound& ) { GUM_ERROR(MissingVariableInDatabase, "for variable " << var_name); } } diff --git a/src/agrum/learning/Miic.cpp b/src/agrum/learning/Miic.cpp index 2b25c3e6389622eff99580f8ebd6abce8fb2996c..c3fbc9869117d3050839fea5d9ca2d953c21fb06 100644 --- a/src/agrum/learning/Miic.cpp +++ b/src/agrum/learning/Miic.cpp @@ -472,7 +472,7 @@ namespace gum { std::vector< NodeId > path = graph.directedPath(z, x); // if we find a cycle, we force the competing edge __latent_couples.push_back(Arc(z, x)); - } catch (gum::NotFound) { + } catch (gum::NotFound&) { graph.addArc(x, z); } graph.addArc(z, x); @@ -482,7 +482,7 @@ namespace gum { // if we find a cycle, we force the competing edge graph.addArc(z, x); __latent_couples.push_back(Arc(z, x)); - } catch (gum::NotFound) { + } catch (gum::NotFound&) { graph.addArc(x, z); } } @@ -492,7 +492,7 @@ namespace gum { std::vector< NodeId > path = graph.directedPath(z, y); // if we find a cycle, we force the competing edge __latent_couples.push_back(Arc(z, y)); - } catch (gum::NotFound) { + } catch (gum::NotFound&) { graph.addArc(y, z); } graph.addArc(z, y); @@ -503,7 +503,7 @@ namespace gum { graph.addArc(z, y); __latent_couples.push_back(Arc(z, y)); - } catch (gum::NotFound) { + } catch (gum::NotFound&) { graph.addArc(y, z); } } @@ -540,7 +540,7 @@ namespace gum { // if we find a cycle, we force the competing edge graph.addArc(y, z); __latent_couples.push_back(Arc(y, z)); - } catch (gum::NotFound) { + } catch (gum::NotFound&) { graph.addArc(z, y); } } @@ -553,7 +553,7 @@ namespace gum { // if we find a cycle, we force the competing edge graph.addArc(x, z); __latent_couples.push_back(Arc(x, z)); - } catch (gum::NotFound) { + } catch (gum::NotFound&) { graph.addArc(z, x); } } diff --git a/src/testunits/module_BASE/PotentialTestSuite.h b/src/testunits/module_BASE/PotentialTestSuite.h index 5b769000c909345e4dd8d842d3738fa8afe76979..b3e2bbda036df6f52455ea2b4a646dedbd29e7a3 100644 --- a/src/testunits/module_BASE/PotentialTestSuite.h +++ b/src/testunits/module_BASE/PotentialTestSuite.h @@ -75,7 +75,7 @@ namespace gum_tests { i.setFirst(); TS_ASSERT_EQUALS(p[i], 2.0 / (taille * (taille + 1))); - } catch (gum::Exception e) { + } catch (gum::Exception& e) { GUM_SHOWERROR(e); } } diff --git a/src/testunits/module_BN/ShaferShenoyInferenceTestSuite.h b/src/testunits/module_BN/ShaferShenoyInferenceTestSuite.h index b1eaad1cba7ae24153de85582895ffcfac543cd2..d6527ce8404a0826d8efd2673a46596604b066fd 100644 --- a/src/testunits/module_BN/ShaferShenoyInferenceTestSuite.h +++ b/src/testunits/module_BN/ShaferShenoyInferenceTestSuite.h @@ -108,7 +108,7 @@ namespace gum_tests { if (inf != 0) { TS_GUM_ASSERT_THROWS_NOTHING(delete inf); } - } catch (gum::Exception e) { + } catch (gum::Exception& e) { TS_ASSERT(false); std::cerr << std::endl << e.errorContent() << std::endl; throw; diff --git a/src/testunits/module_PRM/O3prmTestSuite.h b/src/testunits/module_PRM/O3prmTestSuite.h index a73239bd6ca4834d31c96257d8a2e39123dc1328..f2a888449fcfa4fd2a4a3857e4065a2717dd82af 100644 --- a/src/testunits/module_PRM/O3prmTestSuite.h +++ b/src/testunits/module_PRM/O3prmTestSuite.h @@ -58,7 +58,7 @@ namespace gum_tests { TS_ASSERT_EQUALS(prm->type("t_color_p").variable().domainSize(), (gum::Size)5); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -90,7 +90,7 @@ namespace gum_tests { TS_ASSERT(prm->type("t_color_p").isSubTypeOf(prm->type("t_degraded"))); TS_ASSERT_EQUALS(prm->types().size(), (gum::Size)7); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -111,7 +111,7 @@ namespace gum_tests { TS_GUM_ASSERT_THROWS_NOTHING(prm->getClass("Printer")); TS_GUM_ASSERT_THROWS_NOTHING(prm->getClass("Computer")); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -129,7 +129,7 @@ namespace gum_tests { TS_ASSERT_EQUALS(c.aggregates().size(), (gum::Size)0); TS_ASSERT_EQUALS(c.slotChains().size(), (gum::Size)0); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -147,7 +147,7 @@ namespace gum_tests { TS_ASSERT_EQUALS(c.aggregates().size(), (gum::Size)0); TS_ASSERT_EQUALS(c.slotChains().size(), (gum::Size)0); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -165,7 +165,7 @@ namespace gum_tests { TS_ASSERT_EQUALS(c.aggregates().size(), (gum::Size)0); TS_ASSERT_EQUALS(c.slotChains().size(), (gum::Size)1); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -183,7 +183,7 @@ namespace gum_tests { TS_ASSERT_EQUALS(c.aggregates().size(), (gum::Size)0); TS_ASSERT_EQUALS(c.slotChains().size(), (gum::Size)1); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -201,7 +201,7 @@ namespace gum_tests { TS_ASSERT_EQUALS(c.aggregates().size(), (gum::Size)1); TS_ASSERT_EQUALS(c.slotChains().size(), (gum::Size)2); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -235,7 +235,7 @@ namespace gum_tests { prm->getInterface("fr.lip6.printers.Printer")); delete prm; } - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -321,7 +321,7 @@ namespace gum_tests { TS_ASSERT(!Computer.isSubTypeOf(ColorPrinter)); TS_ASSERT(Computer.isSubTypeOf(Computer)); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -407,7 +407,7 @@ namespace gum_tests { TS_ASSERT(!Computer.isSuperTypeOf(ColorPrinter)); TS_ASSERT(Computer.isSuperTypeOf(Computer)); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -455,7 +455,7 @@ namespace gum_tests { TS_ASSERT(!PowerSupply.isInnerNode( PowerSupply["(fr.lip6.printers.t_state)state"])); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -475,7 +475,7 @@ namespace gum_tests { TS_ASSERT_EQUALS(Room.aggregates().size(), (gum::Size)0); TS_ASSERT_EQUALS(Room.slotChains().size(), (gum::Size)0); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -529,7 +529,7 @@ namespace gum_tests { TS_ASSERT(!Equipment.isInputNode(Equipment["(boolean)equipState"])); TS_ASSERT(Equipment.isInnerNode(Equipment["(boolean)equipState"])); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -599,7 +599,7 @@ namespace gum_tests { TS_ASSERT(!Printer.isInputNode(Printer["hasInk"])); TS_ASSERT(Printer.isInnerNode(Printer["hasInk"])); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1008,7 +1008,7 @@ namespace gum_tests { TS_GUM_ASSERT_THROWS_NOTHING(Computer["printers.equipState"]); TS_GUM_ASSERT_THROWS_NOTHING(Computer["room.power.state"]); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1048,7 +1048,7 @@ namespace gum_tests { TS_GUM_ASSERT_THROWS_NOTHING( SafeComputer["room.power.(fr.lip6.printers.t_state)state"]); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1077,7 +1077,7 @@ namespace gum_tests { } TS_ASSERT_EQUALS(set.size(), gum::Size(0)); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1105,7 +1105,7 @@ namespace gum_tests { } TS_ASSERT_EQUALS(set.size(), gum::Size(0)); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1135,7 +1135,7 @@ namespace gum_tests { } TS_ASSERT_EQUALS(set.size(), gum::Size(0)); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1154,7 +1154,7 @@ namespace gum_tests { if (prm) { delete prm; } - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1203,7 +1203,7 @@ namespace gum_tests { if (prm) { delete prm; } - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1246,7 +1246,7 @@ namespace gum_tests { if (prm) { delete prm; } - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1336,7 +1336,7 @@ namespace gum_tests { if (prm) { delete prm; } - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1361,7 +1361,7 @@ namespace gum_tests { TS_GUM_ASSERT_THROWS_NOTHING(ParamClass["equipState"]); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1382,7 +1382,7 @@ namespace gum_tests { prm->getClass("fr.lip6.printers.ParamClass")); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1411,7 +1411,7 @@ namespace gum_tests { TS_ASSERT_DELTA(values[1], 0.6, 1e-6); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } } @@ -1441,7 +1441,7 @@ namespace gum_tests { TS_ASSERT_DELTA(values[2], 0.0, 1e-6); delete prm; - } catch (gum::Exception) { + } catch (gum::Exception&) { TS_ASSERT(false); } }