Merge branch 'develop' into gpt-docs
						commit
						cdbff87e92
					
				|  | @ -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 | ||||
|  |  | |||
|  | @ -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; | ||||
| 
 | ||||
|  | @ -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; | ||||
| 
 | ||||
|  |  | |||
|  | @ -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], | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue