12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compilation errors in unstable discrete examples

release/4.3a0
Duy-Nguyen Ta 2013-10-11 19:01:12 +00:00
parent 1531abd285
commit 8add3de3c2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam_unstable/discrete/examples/schedulingExample.cpp
View File

@ -156,7 +156,7 @@ void solveStaged(size_t addMutex = 2) {
gttoc_(eliminate); gttoc_(eliminate);
// find root node // find root node
DiscreteConditional::shared_ptr root = *(chordal->rbegin()); DiscreteConditional::shared_ptr root = *(chordal->end()-1);
if (debug) if (debug)
root->print(""/*scheduler.studentName(s)*/); root->print(""/*scheduler.studentName(s)*/);
@ -223,7 +223,7 @@ void sampleSolutions() {
vector<size_t> stats(19, 0); vector<size_t> stats(19, 0);
vector<Scheduler::sharedValues> samples; vector<Scheduler::sharedValues> samples;
for (size_t i = 0; i < 7; i++) { for (size_t i = 0; i < 7; i++) {
samples.push_back(sample(*samplers[i])); samples.push_back(samplers[i]->sample());
schedulers[i].accumulateStats(samples[i], stats); schedulers[i].accumulateStats(samples[i], stats);
} }
size_t max = *max_element(stats.begin(), stats.end()); size_t max = *max_element(stats.begin(), stats.end());
@ -309,7 +309,7 @@ void accomodateStudent() {
DiscreteBayesNet::shared_ptr chordal = scheduler.eliminate(); DiscreteBayesNet::shared_ptr chordal = scheduler.eliminate();
// find root node // find root node
DiscreteConditional::shared_ptr root = *(chordal->rbegin()); DiscreteConditional::shared_ptr root = *(chordal->end()-1);
if (debug) if (debug)
root->print(""/*scheduler.studentName(s)*/); root->print(""/*scheduler.studentName(s)*/);
// GTSAM_PRINT(*chordal); // GTSAM_PRINT(*chordal);
@ -327,7 +327,7 @@ void accomodateStudent() {
// sample schedules // sample schedules
for (size_t n = 0; n < 10; n++) { for (size_t n = 0; n < 10; n++) {
Scheduler::sharedValues sample0 = sample(*chordal); Scheduler::sharedValues sample0 = chordal->sample();
scheduler.printAssignment(sample0); scheduler.printAssignment(sample0);
} }
} }

6
gtsam_unstable/discrete/examples/schedulingQuals12.cpp
View File

@ -130,7 +130,7 @@ void runLargeExample() {
tictoc_finishedIteration(); tictoc_finishedIteration();
tictoc_print(); tictoc_print();
for (size_t i=0;i<100;i++) { for (size_t i=0;i<100;i++) {
DiscreteFactor::sharedValues assignment = sample(*chordal); DiscreteFactor::sharedValues assignment = chordal->sample();
vector<size_t> stats(scheduler.nrFaculty()); vector<size_t> stats(scheduler.nrFaculty());
scheduler.accumulateStats(assignment, stats); scheduler.accumulateStats(assignment, stats);
size_t max = *max_element(stats.begin(), stats.end()); size_t max = *max_element(stats.begin(), stats.end());
@ -183,7 +183,7 @@ void solveStaged(size_t addMutex = 2) {
gttoc_(eliminate); gttoc_(eliminate);
// find root node // find root node
DiscreteConditional::shared_ptr root = *(chordal->rbegin()); DiscreteConditional::shared_ptr root = *(chordal->end()-1);
if (debug) if (debug)
root->print(""/*scheduler.studentName(s)*/); root->print(""/*scheduler.studentName(s)*/);
@ -234,7 +234,7 @@ void sampleSolutions() {
vector<size_t> stats(19, 0); vector<size_t> stats(19, 0);
vector<Scheduler::sharedValues> samples; vector<Scheduler::sharedValues> samples;
for (size_t i = 0; i < NRSTUDENTS; i++) { for (size_t i = 0; i < NRSTUDENTS; i++) {
samples.push_back(sample(*samplers[i])); samples.push_back(samplers[i]->sample());
schedulers[i].accumulateStats(samples[i], stats); schedulers[i].accumulateStats(samples[i], stats);
} }
size_t max = *max_element(stats.begin(), stats.end()); size_t max = *max_element(stats.begin(), stats.end());

4
gtsam_unstable/discrete/examples/schedulingQuals13.cpp
View File

@ -208,7 +208,7 @@ void solveStaged(size_t addMutex = 2) {
gttoc_(eliminate); gttoc_(eliminate);
// find root node // find root node
DiscreteConditional::shared_ptr root = *(chordal->rbegin()); DiscreteConditional::shared_ptr root = *(chordal->end()-1);
if (debug) if (debug)
root->print(""/*scheduler.studentName(s)*/); root->print(""/*scheduler.studentName(s)*/);
@ -262,7 +262,7 @@ void sampleSolutions() {
vector<size_t> stats(nrFaculty, 0); vector<size_t> stats(nrFaculty, 0);
vector<Scheduler::sharedValues> samples; vector<Scheduler::sharedValues> samples;
for (size_t i = 0; i < NRSTUDENTS; i++) { for (size_t i = 0; i < NRSTUDENTS; i++) {
samples.push_back(sample(*samplers[i])); samples.push_back(samplers[i]->sample());
schedulers[i].accumulateStats(samples[i], stats); schedulers[i].accumulateStats(samples[i], stats);
} }
size_t max = *max_element(stats.begin(), stats.end()); size_t max = *max_element(stats.begin(), stats.end());