Skip to content

Commit 8cb95d5

Browse files
committed
remove redundancy from HybridConditional constructors
1 parent 4302ee3 commit 8cb95d5

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

gtsam/hybrid/HybridConditional.cpp

+4-11
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,9 @@ HybridConditional::HybridConditional(const KeyVector &continuousFrontals,
2828
const DiscreteKeys &discreteFrontals,
2929
const KeyVector &continuousParents,
3030
const DiscreteKeys &discreteParents)
31-
: HybridConditional(
32-
CollectKeys(
33-
{continuousFrontals.begin(), continuousFrontals.end()},
34-
KeyVector{continuousParents.begin(), continuousParents.end()}),
35-
CollectDiscreteKeys(
36-
{discreteFrontals.begin(), discreteFrontals.end()},
37-
{discreteParents.begin(), discreteParents.end()}),
38-
continuousFrontals.size() + discreteFrontals.size()) {}
31+
: HybridConditional(CollectKeys(continuousFrontals, continuousParents),
32+
CollectDiscreteKeys(discreteFrontals, discreteParents),
33+
continuousFrontals.size() + discreteFrontals.size()) {}
3934

4035
/* ************************************************************************ */
4136
HybridConditional::HybridConditional(
@@ -56,9 +51,7 @@ HybridConditional::HybridConditional(
5651
/* ************************************************************************ */
5752
HybridConditional::HybridConditional(
5853
const std::shared_ptr<HybridGaussianConditional> &gaussianMixture)
59-
: BaseFactor(KeyVector(gaussianMixture->keys().begin(),
60-
gaussianMixture->keys().begin() +
61-
gaussianMixture->nrContinuous()),
54+
: BaseFactor(gaussianMixture->continuousKeys(),
6255
gaussianMixture->discreteKeys()),
6356
BaseConditional(gaussianMixture->nrFrontals()) {
6457
inner_ = gaussianMixture;

0 commit comments

Comments
 (0)