From b94e89ba0395c37b553d928b61a5375ed418bca9 Mon Sep 17 00:00:00 2001
From: Tuomas Karna <tuomas.karna@uclouvain.be>
Date: Mon, 13 Dec 2010 13:23:55 +0000
Subject: [PATCH] fix fullMatrix lua bindings
---
Numeric/fullMatrix.cpp | 2 +-
Numeric/fullMatrix.h | 4 ++--
Solver/linearSystemFull.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Numeric/fullMatrix.cpp b/Numeric/fullMatrix.cpp
index 6261e39e41..205417ca97 100644
--- a/Numeric/fullMatrix.cpp
+++ b/Numeric/fullMatrix.cpp
@@ -352,7 +352,7 @@ void fullMatrix<double>::registerBindings(binding *b)
cm->setArgNames("A","B","alpha","beta",NULL);
cm->setDescription("this = beta*this + alpha * (A.B)");
cm = cb->addMethod("print", &fullMatrix<double>::print);
- cm->setArgNames("name",NULL);
+ cm->setArgNames("name","format",NULL);
cm->setDescription("print the matrix");
cm = cb->addMethod("invertInPlace", &fullMatrix<double>::invertInPlace);
cm->setDescription("invert the matrix and return the determinant");
diff --git a/Numeric/fullMatrix.h b/Numeric/fullMatrix.h
index 6a29640b46..6bad73638e 100644
--- a/Numeric/fullMatrix.h
+++ b/Numeric/fullMatrix.h
@@ -490,7 +490,7 @@ class fullMatrix
#endif
;
- void print(const std::string name = "", const char *format = "%12.5E ") const
+ void print(const std::string name = "", const std::string format = "%12.5E ") const
{
printf("Printing matrix %s:\n", name.c_str());
int ni = size1();
@@ -498,7 +498,7 @@ class fullMatrix
for(int I = 0; I < ni; I++){
printf(" ");
for(int J = 0; J < nj; J++){
- printf(format, (*this)(I, J));
+ printf(format.c_str(), (*this)(I, J));
}
printf("\n");
}
diff --git a/Solver/linearSystemFull.h b/Solver/linearSystemFull.h
index 641f0b02a7..01deac224f 100644
--- a/Solver/linearSystemFull.h
+++ b/Solver/linearSystemFull.h
@@ -68,7 +68,7 @@ class linearSystemFull : public linearSystem<scalar> {
}
virtual void zeroRightHandSide()
{
- for(int i = 0; i < _b->size(); i++) (*_b)(i) = 0.;
+ _b->setAll(0.);
}
virtual double normInfRightHandSide() const{
double nor = 0.;
--
GitLab