about a dozen changes to make Matlab toolbox work again, but one error remains having to do with the forward declaration of class GaussianBayesNet.

release/4.3a0
Chris Beall 2009-11-05 03:26:04 +00:00
parent 0ef7fe4a01
commit 3b258be8c4
1 changed files with 18 additions and 13 deletions

View File

@ -17,19 +17,22 @@ class LinearFactorSet {
class LinearFactor {
LinearFactor(string key1,
Matrix A1,
Vector b_in);
Vector b_in,
double sigma);
LinearFactor(string key1,
Matrix A1,
string key2,
Matrix A2,
Vector b_in);
Vector b_in,
double sigma);
LinearFactor(string key1,
Matrix A1,
string key2,
Matrix A2,
string key3,
Matrix A3,
Vector b_in);
Vector b_in,
double sigma);
bool empty() const;
Vector get_b() const;
Matrix get_A(string key) const;
@ -42,18 +45,24 @@ class LinearFactor {
class ConditionalGaussian {
ConditionalGaussian();
ConditionalGaussian(Vector d,
Matrix R);
ConditionalGaussian(Vector d,
ConditionalGaussian(string key,
Vector d,
Matrix R,
Vector precisions);
ConditionalGaussian(string key,
Vector d,
Matrix R,
string name1,
Matrix S);
ConditionalGaussian(Vector d,
Matrix S,
Vector precisions);
ConditionalGaussian(string key,
Vector d,
Matrix R,
string name1,
Matrix S,
string name2,
Matrix T);
Matrix T,
Vector precisions);
void print() const;
Vector solve(const VectorConfig& x);
void add(string key, Matrix S);
@ -68,8 +77,6 @@ class Ordering {
class GaussianBayesNet {
GaussianBayesNet();
void insert(string name, ConditionalGaussian* node);
ConditionalGaussian* get(string name);
VectorConfig* optimize();
void print() const;
bool equals(const GaussianBayesNet& cbn) const;
@ -87,8 +94,6 @@ class LinearFactorGraph {
bool equals(const LinearFactorGraph& lfgraph) const;
VectorConfig optimize(const Ordering& ordering);
LinearFactor* combine_factors(string key);
ConditionalGaussian* eliminate_one(string key);
GaussianBayesNet* eliminate(const Ordering& ordering);
pair<Matrix,Vector> matrix(const Ordering& ordering) const;
};