Commit 631c4f87 authored by george's avatar george
Browse files

Added multInvRight function and temporary matrix space for reducing...

Added multInvRight function and temporary matrix space for reducing constructor calls to GeneralMatrix

git-svn-id: https://www.dynare.org/svn/dynare/trunk@2830 ac1d8469-bf42-47a9-8791-bf33cf982152
parent e8700bc0
......@@ -76,7 +76,7 @@ class GeneralMatrix {
int rows;
int cols;
int ld;
GeneralMatrix * tmpGMp;
public:
GeneralMatrix(int m, int n)
: data(m*n), rows(m), cols(n), ld(m) {}
......@@ -193,7 +193,10 @@ public:
/* this = m' * this */
void multLeftTrans(const ConstGeneralMatrix& m);
void multLeftTrans(const GeneralMatrix& m)
{multLeftTrans(ConstGeneralMatrix(m));}
{multLeftTrans(ConstGeneralMatrix(m));}
/* this = this * m^(-1) */
void multInvRight(GeneralMatrix&m);
/* x = scalar(a)*x + scalar(b)*this*d */
void multVec(double a, Vector& x, double b, const ConstVector& d) const;
......
......@@ -2,8 +2,8 @@
# Tag $Name: $
CC_FLAGS := -Wall -I../testing -I../cc -DMATLAB \
$(CC_INCLUDE_PATH) -Ic:/"Program Files"/MATLAB_SV71/extern/include
CC_FLAGS := -Wall -Winline -I../testing -I../cc -DMATLAB \
$(CC_INCLUDE_PATH) -Ic:/"Program Files"/MATLAB_SV71/extern/include #-pg
LDFLAGS = -Wl,-L"c:/Program Files"/MATLAB_SV71/extern/lib/win32/microsoft/ \
-Wl,-llibmex -Wl,-llibmx -Wl,-llibmwlapack -Wl,-llibdflapack \
......@@ -15,7 +15,7 @@ ifeq ($(DEBUG),yes)
# CC_FLAGS := $(CC_FLAGS) -g -DTL_DEBUG=2
CC_FLAGS := $(CC_FLAGS) -g -DPOSIX_THREADS
else
CC_FLAGS := $(CC_FLAGS) -O2
CC_FLAGS := $(CC_FLAGS) -O3
endif
ifeq ($(OS),Windows_NT)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment