Merge pull request #1097 from mikesheffler/develop
commit
916dc74955
|
|
@ -72,5 +72,5 @@ namespace gtsam {
|
||||||
}; // DiscreteKeys
|
}; // DiscreteKeys
|
||||||
|
|
||||||
/// Create a list from two keys
|
/// Create a list from two keys
|
||||||
DiscreteKeys operator&(const DiscreteKey& key1, const DiscreteKey& key2);
|
GTSAM_EXPORT DiscreteKeys operator&(const DiscreteKey& key1, const DiscreteKey& key2);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ using Domains = std::map<Key, Domain>;
|
||||||
* Base class for constraint factors
|
* Base class for constraint factors
|
||||||
* Derived classes include SingleValue, BinaryAllDiff, and AllDiff.
|
* Derived classes include SingleValue, BinaryAllDiff, and AllDiff.
|
||||||
*/
|
*/
|
||||||
class GTSAM_EXPORT Constraint : public DiscreteFactor {
|
class GTSAM_UNSTABLE_EXPORT Constraint : public DiscreteFactor {
|
||||||
public:
|
public:
|
||||||
typedef boost::shared_ptr<Constraint> shared_ptr;
|
typedef boost::shared_ptr<Constraint> shared_ptr;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue