Changeset 19 for bdm/stat/libDS.cpp

Timestamp:

02/16/08 15:12:24 (16 years ago)

Author:

smidl

Message:

Switch to CMake

Files:

• bdm/stat/libDS.cpp (modified) (3 diffs)

bdm/stat/libDS.cpp

@@ -2 +2 @@
 #include "libDS.h"
 
-using namespace itpp;
+//using namespace itpp;
 
 void MemDS::getdata(vec &dt){
+        int i;
+        
         it_assert_debug(dt.length()==rowid.length(), "MemDS:getdata incompatible dt");
         for(i=0;i<rowid.length();i++){
@@ -12 +14 @@
 
 void MemDS::getdata(vec &dt,ivec &indeces){
-        int j;
+        int j,i;
         it_assert_debug(dt.length()==indeces.length(), "MemDS:getdata incompatible dt");
         for(i=0;i<indeces.length();i++){
@@ -32 +34 @@
 }
 
-MemDS::MemDS(vec &Dat, ivec &rowid, ivec &delays){
-        it_assert_debug(max(rowid)<=Dat.rows,"MemDS rowid is too high for given Dat.")
-        it_assert_debug(max(delays)<Dat.cols,"MemDS delays are too high.")
+MemDS::MemDS(mat &Dat, ivec &rowid, ivec &delays){
+        it_assert_debug(max(rowid)<=Dat.rows(),"MemDS rowid is too high for given Dat.");
+        it_assert_debug(max(delays)<Dat.cols(),"MemDS delays are too high.");
         
-        time = max(delayes); 
+        time = max(delays); 
         Data = Dat;
 }