diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

size_t invasion

Browse Source
This commit is contained in:
Tiago Gomes
2012-05-24 22:55:20 +01:00
parent 5124098b6c
commit af6601837c
36 changed files with 513 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
packages/CLPBN/horus/Factor.h
View File

@@ -25,9 +25,9 @@ class TFactor
Params& params (void) { return params_; }
unsigned nrArguments (void) const { return args_.size(); }
size_t nrArguments (void) const { return args_.size(); }
unsigned size (void) const { return params_.size(); }
size_t size (void) const { return params_.size(); }
unsigned distId (void) const { return distId_; }
@@ -41,31 +41,24 @@ class TFactor
assert (params_.size() == Util::sizeExpected (ranges_));
}
int indexOf (const T& t) const
size_t indexOf (const T& t) const
{
int idx = -1;
for (unsigned i = 0; i < args_.size(); i++) {
if (args_[i] == t) {
idx = i;
break;
}
}
return idx;
return Util::indexOf (args_, t);
}
const T& argument (unsigned idx) const
const T& argument (size_t idx) const
{
assert (idx < args_.size());
return args_[idx];
}
T& argument (unsigned idx)
T& argument (size_t idx)
{
assert (idx < args_.size());
return args_[idx];
}
unsigned range (unsigned idx) const
unsigned range (size_t idx) const
{
assert (idx < ranges_.size());
return ranges_[idx];
@@ -83,10 +76,10 @@ class TFactor
: params_ *= g_params;
} else {
bool sharedArgs = false;
vector<unsigned> gvarpos;
for (unsigned i = 0; i < g_args.size(); i++) {
int idx = indexOf (g_args[i]);
if (idx == -1) {
vector<size_t> gvarpos;
for (size_t i = 0; i < g_args.size(); i++) {
size_t idx = indexOf (g_args[i]);
if (idx == g_args.size()) {
ullong newSize = params_.size() * g_ranges[i];
if (newSize > params_.max_size()) {
cerr << "error: an overflow occurred on factor multiplication" ;
@@ -103,8 +96,8 @@ class TFactor
if (sharedArgs == false) {
// optimization: if the original factors doesn't have common args,
// we don't need to marry the states of the common args
unsigned count = 0;
for (unsigned i = 0; i < params_.size(); i++) {
size_t count = 0;
for (size_t i = 0; i < params_.size(); i++) {
if (Globals::logDomain) {
params_[i] += g_params[count];
} else {
@@ -118,9 +111,9 @@ class TFactor
} else {
StatesIndexer indexer (ranges_, false);
while (indexer.valid()) {
unsigned g_li = 0;
unsigned prod = 1;
for (int j = gvarpos.size() - 1; j >= 0; j--) {
size_t g_li = 0;
size_t prod = 1;
for (size_t j = gvarpos.size(); j-- > 0; ) {
g_li += indexer[gvarpos[j]] * prod;
prod *= g_ranges[j];
}
@@ -137,14 +130,14 @@ class TFactor
void absorveEvidence (const T& arg, unsigned evidence)
{
int idx = indexOf (arg);
assert (idx != -1);
size_t idx = indexOf (arg);
assert (idx != args_.size());
assert (evidence < ranges_[idx]);
Params copy = params_;
params_.clear();
params_.reserve (copy.size() / ranges_[idx]);
StatesIndexer indexer (ranges_);
for (unsigned i = 0; i < evidence; i++) {
for (size_t i = 0; i < evidence; i++) {
indexer.increment (idx);
}
while (indexer.valid()) {
@@ -162,16 +155,16 @@ class TFactor
return; // already in the wanted order
}
Ranges newRanges;
vector<unsigned> positions;
for (unsigned i = 0; i < newArgs.size(); i++) {
unsigned idx = indexOf (newArgs[i]);
vector<size_t> positions;
for (size_t i = 0; i < newArgs.size(); i++) {
size_t idx = indexOf (newArgs[i]);
newRanges.push_back (ranges_[idx]);
positions.push_back (idx);
}
unsigned N = ranges_.size();
size_t N = ranges_.size();
Params newParams (params_.size());
for (unsigned i = 0; i < params_.size(); i++) {
unsigned li = i;
for (size_t i = 0; i < params_.size(); i++) {
size_t li = i;
// calculate vector index corresponding to linear index
vector<unsigned> vi (N);
for (int k = N-1; k >= 0; k--) {
@@ -179,17 +172,17 @@ class TFactor
li /= ranges_[k];
}
// convert permuted vector index to corresponding linear index
unsigned prod = 1;
unsigned new_li = 0;
size_t prod = 1;
size_t new_li = 0;
for (int k = N - 1; k >= 0; k--) {
new_li += vi[positions[k]] * prod;
prod *= ranges_[positions[k]];
}
newParams[new_li] = params_[i];
}
args_ = newArgs;
ranges_ = newRanges;
params_ = newParams;
args_ = newArgs;
ranges_ = newRanges;
params_ = newParams;
}
bool contains (const T& arg) const
@@ -199,7 +192,7 @@ class TFactor
bool contains (const vector<T>& args) const
{
for (unsigned i = 0; i < args_.size(); i++) {
for (size_t i = 0; i < args_.size(); i++) {
if (contains (args[i]) == false) {
return false;
}
@@ -207,7 +200,7 @@ class TFactor
return true;
}
double& operator[] (psize_t idx)
double& operator[] (size_t idx)
{
assert (idx < params_.size());
return params_[idx];
@@ -223,11 +216,11 @@ class TFactor
private:
void insertArgument (const T& arg, unsigned range)
{
assert (indexOf (arg) == -1);
assert (indexOf (arg) == args_.size());
Params copy = params_;
params_.clear();
params_.reserve (copy.size() * range);
for (unsigned i = 0; i < copy.size(); i++) {
for (size_t i = 0; i < copy.size(); i++) {
for (unsigned reps = 0; reps < range; reps++) {
params_.push_back (copy[i]);
}
@@ -240,15 +233,15 @@ class TFactor
{
Params copy = params_;
unsigned nrStates = 1;
for (unsigned i = 0; i < args.size(); i++) {
assert (indexOf (args[i]) == -1);
for (size_t i = 0; i < args.size(); i++) {
assert (indexOf (args[i]) == args_.size());
args_.push_back (args[i]);
ranges_.push_back (ranges[i]);
nrStates *= ranges[i];
}
params_.clear();
params_.reserve (copy.size() * nrStates);
for (unsigned i = 0; i < copy.size(); i++) {
for (size_t i = 0; i < copy.size(); i++) {
for (unsigned reps = 0; reps < nrStates; reps++) {
params_.push_back (copy[i]);
}
@@ -277,9 +270,9 @@ class Factor : public TFactor<VarId>
void sumOutAllExcept (const VarIds&);
void sumOutIndex (unsigned idx);
void sumOutIndex (size_t idx);
void sumOutAllExceptIndex (unsigned idx);
void sumOutAllExceptIndex (size_t idx);
void sumOutFirstVariable (void);