Discrete Elimination Refactor #1919
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 306a3ba.
varunagrawal
commented
Dec 8, 2024
gtsam/discrete/DiscreteFactor.h
Outdated
| virtual DecisionTreeFactor operator*(const DecisionTreeFactor&) const = 0; | ||
| /// Multiply in a DiscreteFactor and return the result as | ||
| /// DiscreteFactor | ||
| virtual DiscreteFactor::shared_ptr operator*( |
There was a problem hiding this comment.
Should this be a DiscreteFactor::shared_ptr or a DiscreteFactor& (aka a reference?)
|
Maybe only push when you want a review? |
|
The second push was because of your comments on the multiply PR. Making your life easier. |
|
@dellaert this is ready for review |
dellaert
approved these changes
Jan 6, 2025
| @@ -45,7 +45,8 @@ template class GTSAM_EXPORT | |||
| /* ************************************************************************** */ | |||
| DiscreteConditional::DiscreteConditional(const size_t nrFrontals, | |||
There was a problem hiding this comment.
Can this now be a DiscreetFactor& ?
| @@ -45,7 +45,8 @@ template class GTSAM_EXPORT | |||
| /* ************************************************************************** */ | |||
| DiscreteConditional::DiscreteConditional(const size_t nrFrontals, | |||
| const DecisionTreeFactor& f) | |||
| : BaseFactor(f / (*f.sum(nrFrontals))), BaseConditional(nrFrontals) {} | |||
| : BaseFactor(f / f.sum(nrFrontals)->toDecisionTreeFactor()), | |||
There was a problem hiding this comment.
Is that a no-op if already a DecisionTreeFactor?
There was a problem hiding this comment.
It's not actually. In the simple case where there are no parents, we'll get a DecisionTreeFactor with a single value as a DiscreteFactor::shared_ptr. We can cast it explicitly, but I used toDecisionTreeFactor to do it instead as a shortcut.
| /* ************************************************************************ */ | ||
| DiscreteFactor::shared_ptr DecisionTreeFactor::operator/( | ||
| const DiscreteFactor::shared_ptr& f) const { | ||
| if (auto tf = std::dynamic_pointer_cast<TableFactor>(f)) { |
| @@ -111,15 +111,15 @@ TEST(DecisionTreeFactor, sum_max) { | |||
| DecisionTreeFactor f1(v0 & v1, "1 2 3 4 5 6"); | |||
|
|
|||
| DecisionTreeFactor expected(v1, "9 12"); | |||
| DecisionTreeFactor::shared_ptr actual = f1.sum(1); | |||
| auto actual = std::dynamic_pointer_cast<DecisionTreeFactor>(f1.sum(1)); | |||
| CHECK(assert_equal(expected, *actual, 1e-5)); | |||
| CHECK(assert_equal(expected, *actual, 1e-5)); | ||
|
|
||
| DecisionTreeFactor expected2(v1, "5 6"); | ||
| DecisionTreeFactor::shared_ptr actual2 = f1.max(1); | ||
| auto actual2 = std::dynamic_pointer_cast<DecisionTreeFactor>(f1.max(1)); |
| CHECK(assert_equal(expected2, *actual2)); | ||
|
|
||
| DecisionTreeFactor f2(v1 & v0, "1 2 3 4 5 6"); | ||
| DecisionTreeFactor::shared_ptr actual22 = f2.sum(1); | ||
| auto actual22 = std::dynamic_pointer_cast<DecisionTreeFactor>(f2.sum(1)); |
| @@ -303,15 +305,15 @@ TEST(TableFactor, sum_max) { | |||
| TableFactor f1(v0 & v1, "1 2 3 4 5 6"); | |||
|
|
|||
| TableFactor expected(v1, "9 12"); | |||
| TableFactor::shared_ptr actual = f1.sum(1); | |||
| auto actual = std::dynamic_pointer_cast<TableFactor>(f1.sum(1)); | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactor discrete elimination so it is agnostic to the underlying derived type of the
DiscreteFactor.