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

fixed bug in expression traceExecution

release/4.3a0
Mike Bosse 2015-07-09 09:39:13 +02:00
parent 2bc0d580e7
commit e9ddee4322
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam/nonlinear/internal/ExpressionNode.h
View File

@ -416,8 +416,9 @@ public:
Record* record = new (ptr) Record(); Record* record = new (ptr) Record();
ptr += upAligned(sizeof(Record)); ptr += upAligned(sizeof(Record));
record->value1 = expression1_->traceExecution(values, record->trace1, ptr); record->value1 = expression1_->traceExecution(values, record->trace1, ptr);
ptr += expression1_->traceSize();
record->value2 = expression2_->traceExecution(values, record->trace2, ptr); record->value2 = expression2_->traceExecution(values, record->trace2, ptr);
ptr += expression1_->traceSize() + expression2_->traceSize(); ptr += expression2_->traceSize();
trace.setFunction(record); trace.setFunction(record);
return function_(record->value1, record->value2, record->dTdA1, return function_(record->value1, record->value2, record->dTdA1,
record->dTdA2); record->dTdA2);
@ -534,10 +535,11 @@ public:
Record* record = new (ptr) Record(); Record* record = new (ptr) Record();
ptr += upAligned(sizeof(Record)); ptr += upAligned(sizeof(Record));
record->value1 = expression1_->traceExecution(values, record->trace1, ptr); record->value1 = expression1_->traceExecution(values, record->trace1, ptr);
ptr += expression1_->traceSize();
record->value2 = expression2_->traceExecution(values, record->trace2, ptr); record->value2 = expression2_->traceExecution(values, record->trace2, ptr);
ptr += expression2_->traceSize();
record->value3 = expression3_->traceExecution(values, record->trace3, ptr); record->value3 = expression3_->traceExecution(values, record->trace3, ptr);
ptr += expression1_->traceSize() + expression2_->traceSize() ptr += expression3_->traceSize();
+ expression3_->traceSize();
trace.setFunction(record); trace.setFunction(record);
return function_(record->value1, record->value2, record->value3, return function_(record->value1, record->value2, record->value3,
record->dTdA1, record->dTdA2, record->dTdA3); record->dTdA1, record->dTdA2, record->dTdA3);