Browse Source

Fixed a critical bug in the GmmxxAdapter.h

Former-commit-id: 062f330dbf
tempestpy_adaptions
PBerger 12 years ago
parent
commit
eae169727a
  1. 12
      src/adapters/GmmxxAdapter.h

12
src/adapters/GmmxxAdapter.h

@ -60,11 +60,11 @@ public:
gmm::csr_matrix<T>* result = new gmm::csr_matrix<T>(matrix.rowCount, matrix.colCount); gmm::csr_matrix<T>* result = new gmm::csr_matrix<T>(matrix.rowCount, matrix.colCount);
// Move Row Indications // Move Row Indications
result->jc(std::move(matrix.rowIndications));
result->jc = std::vector<uint_fast64_t>(std::move(matrix.rowIndications));
// Move Columns Indications // Move Columns Indications
result->ir(std::move(matrix.columnIndications));
result->ir = std::vector<uint_fast64_t>(std::move(matrix.columnIndications));
// And do the same thing with the actual values. // And do the same thing with the actual values.
result->pr(std::move(matrix.valueStorage));
result->pr = std::vector<T>(std::move(matrix.valueStorage));
LOG4CPLUS_DEBUG(logger, "Done converting matrix to gmm++ format."); LOG4CPLUS_DEBUG(logger, "Done converting matrix to gmm++ format.");
@ -128,11 +128,11 @@ public:
result->setState(result->Initialized); result->setState(result->Initialized);
// Move Row Indications // Move Row Indications
result->rowIndications(std::move(matrix.jc));
result->rowIndications = std::vector<uint_fast64_t>(std::move(matrix.jc));
// Move Columns Indications // Move Columns Indications
result->columnIndications(std::move(matrix.ir));
result->columnIndications = std::vector<uint_fast64_t>(std::move(matrix.ir));
// And do the same thing with the actual values. // And do the same thing with the actual values.
result->valueStorage(std::move(matrix.pr));
result->valueStorage = std::vector<T>(std::move(matrix.pr));
result->currentSize = realNonZeros; result->currentSize = realNonZeros;
result->lastRow = matrix.nrows() - 1; result->lastRow = matrix.nrows() - 1;

Loading…
Cancel
Save