From 81e7efa1d1fddd9b669b33b72f35a3a8b6567afd Mon Sep 17 00:00:00 2001 From: p-zach Date: Thu, 27 Mar 2025 16:43:49 -0400 Subject: [PATCH 1/4] Squashed 'wrap/' changes from 4cefad122..3f1a4c5d5 3f1a4c5d5 Merge pull request #173 from p-zach/docs-fix 08af82f33 Fix missing parameter git-subtree-dir: wrap git-subtree-split: 3f1a4c5d53481be9e2e94cf0318751de5d7269d5 --- gtwrap/xml_parser/xml_parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtwrap/xml_parser/xml_parser.py b/gtwrap/xml_parser/xml_parser.py index 9b3d4d804..9920027ac 100644 --- a/gtwrap/xml_parser/xml_parser.py +++ b/gtwrap/xml_parser/xml_parser.py @@ -54,7 +54,7 @@ class XMLDocParser: # Find which member to get docs from, if there are multiple that match in name and args documenting_index = self.determine_documenting_index( - cpp_class, cpp_method, method_args_names) + cpp_class, cpp_method, method_args_names, member_defs) # Extract the docs for the function that matches cpp_class.cpp_method(*method_args_names). return self.get_formatted_docstring(member_defs[documenting_index], From 3ef95a482a6dc3e385facffef84460ea6792c472 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Thu, 3 Apr 2025 16:07:48 -0400 Subject: [PATCH 2/4] update Metis' cmake_minimum_required to 3.5 --- gtsam/3rdparty/metis/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtsam/3rdparty/metis/CMakeLists.txt b/gtsam/3rdparty/metis/CMakeLists.txt index dc26aecb2..f8da7ce6f 100644 --- a/gtsam/3rdparty/metis/CMakeLists.txt +++ b/gtsam/3rdparty/metis/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(METIS) # Add flags for currect directory and below From 74fba4bc633fbb2641607fcc70f18e98527ab6ec Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Thu, 3 Apr 2025 19:22:49 -0400 Subject: [PATCH 3/4] fix DiscreteBayesTree::marginalFactor return type --- gtsam/discrete/discrete.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtsam/discrete/discrete.i b/gtsam/discrete/discrete.i index 74de7a922..d483782f3 100644 --- a/gtsam/discrete/discrete.i +++ b/gtsam/discrete/discrete.i @@ -288,7 +288,7 @@ class DiscreteBayesTree { const DiscreteBayesTreeClique* clique(size_t j) const; size_t numCachedSeparatorMarginals() const; - gtsam::DiscreteConditional marginalFactor(size_t key) const; + gtsam::DiscreteConditional* marginalFactor(size_t key) const; gtsam::DiscreteFactorGraph* joint(size_t j1, size_t j2) const; gtsam::DiscreteBayesNet* jointBayesNet(size_t j1, size_t j2) const; From 5ab2e3f03b67e5120490bc2a1e53d8f468c28bb5 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Thu, 3 Apr 2025 19:26:20 -0400 Subject: [PATCH 4/4] fix return type of DiscreteFactorGraoh::product --- gtsam/discrete/discrete.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtsam/discrete/discrete.i b/gtsam/discrete/discrete.i index d483782f3..91176601c 100644 --- a/gtsam/discrete/discrete.i +++ b/gtsam/discrete/discrete.i @@ -369,7 +369,7 @@ class DiscreteFactorGraph { void print(string s = "") const; bool equals(const gtsam::DiscreteFactorGraph& fg, double tol = 1e-9) const; - gtsam::DecisionTreeFactor product() const; + gtsam::DiscreteFactor* product() const; double operator()(const gtsam::DiscreteValues& values) const; gtsam::DiscreteValues optimize() const;