[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Toon-members] TooN helpers.h
From: |
Christopher Mei |
Subject: |
[Toon-members] TooN helpers.h |
Date: |
Fri, 31 Jul 2009 16:43:04 +0000 |
CVSROOT: /sources/toon
Module name: TooN
Changes by: Christopher Mei <cmei> 09/07/31 16:43:04
Modified files:
. : helpers.h
Log message:
min/max fixed pointer bug.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/TooN/helpers.h?cvsroot=toon&r1=1.80&r2=1.81
Patches:
Index: helpers.h
===================================================================
RCS file: /sources/toon/TooN/helpers.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- helpers.h 31 Jul 2009 10:04:36 -0000 1.80
+++ helpers.h 31 Jul 2009 16:43:03 -0000 1.81
@@ -483,11 +483,11 @@
return Vector<Dynamic,Precision>( 0 );
}
void initialise( Precision initialVal, int, int nCol ) {
- bestVal[nCol] = initialVal;
+ (*bestVal)[nCol] = initialVal;
}
void operator()( Precision curVal, int, int nCol ) {
if( ComparisonFunctor()( curVal, (*bestVal)[nCol] ) ) {
- bestVal[nCol] = curVal;
+ (*bestVal)[nCol] = curVal;
}
}
Vector<Dynamic,Precision> ret() {
@@ -517,13 +517,13 @@
return
std::pair<Vector<Dynamic,Precision>,Vector<Dynamic,Precision> >( vEmpty, vEmpty
);
}
void initialise( Precision initialVal, int nRow, int nCol ) {
- bestVal[nCol] = initialVal;
- bestIndices[nCol] = nRow;
+ (*bestVal)[nCol] = initialVal;
+ (*bestIndices)[nCol] = nRow;
}
void operator()( Precision curVal, int nRow, int nCol ) {
if( ComparisonFunctor()( curVal, (*bestVal)[nCol] ) ) {
- bestVal[nCol] = curVal;
- bestIndices[nCol] = nRow;
+ (*bestVal)[nCol] = curVal;
+ (*bestIndices)[nCol] = nRow;
}
}
std::pair<Vector<Dynamic,Precision>,Vector<Dynamic,Precision> >
ret() {
@@ -551,11 +551,11 @@
return Vector<Dynamic,Precision>( 0 );
}
void initialise( Precision initialVal, int nRow, int ) {
- bestVal[nRow] = initialVal;
+ (*bestVal)[nRow] = initialVal;
}
void operator()( Precision curVal, int nRow, int ) {
if( ComparisonFunctor()( curVal, (*bestVal)[nRow] ) ) {
- bestVal[nRow] = curVal;
+ (*bestVal)[nRow] = curVal;
}
}
Vector<Dynamic,Precision> ret() {
@@ -585,13 +585,13 @@
return
std::pair<Vector<Dynamic,Precision>,Vector<Dynamic,Precision> >( vEmpty, vEmpty
);
}
void initialise( Precision initialVal, int nRow, int nCol ) {
- bestVal[nRow] = initialVal;
- bestIndices[nRow] = nCol;
+ (*bestVal)[nRow] = initialVal;
+ (*bestIndices)[nRow] = nCol;
}
void operator()( Precision curVal, int nRow, int nCol ) {
if( ComparisonFunctor()( curVal, (*bestVal)[nRow] ) ) {
- bestVal[nRow] = curVal;
- bestIndices[nRow] = nCol;
+ (*bestVal)[nRow] = curVal;
+ (*bestIndices)[nRow] = nCol;
}
}
std::pair<Vector<Dynamic,Precision>,Vector<Dynamic,Precision> >
ret() {