Commit 795b6d63 authored by Michael Zbyszyński's avatar Michael Zbyszyński

Getting ready to release 2.1. Silenced some warnings

parent abe92fd4
......@@ -114,7 +114,7 @@ public:
void addObservation(vector<float> observation, int templateIndex = 0){
if (observation.size() != inputDimensions)
inputDimensions = observation.size();
inputDimensions = int(observation.size());
// check we have a valid templateIndex and correct number of input dimensions
assert(templateIndex <= templatesRaw.size());
......@@ -178,7 +178,7 @@ public:
}
int getNumberOfTemplates(){
return templatesRaw.size();
return int(templatesRaw.size());
}
int getNumberDimensions(){
......@@ -186,11 +186,11 @@ public:
}
int getTemplateLength(int templateIndex = 0){
return templatesRaw[templateIndex].size();
return int(templatesRaw[templateIndex].size());
}
int getTemplateDimension(int templateIndex = 0){
return templatesRaw[templateIndex][0].size();
return int(templatesRaw[templateIndex][0].size());
}
vector<float>& getLastObservation(int templateIndex = 0){
......
......@@ -82,8 +82,8 @@ inline void initMat(vector< vector<T> > & M, int rows, int cols){
// init matrix and copy values from another matrix
template <typename T>
inline void setMat(vector< vector<T> > & C, vector< vector<float> > & M){
int rows = M.size();
int cols = M[0].size();
int rows = int(M.size());
int cols = int(M[0].size());
//C.resize(rows);
C = vector<vector<T> >(rows);
for (int n=0; n<rows; n++){
......@@ -150,7 +150,7 @@ inline void initVec(vector<T> & V, int rows){
//--------------------------------------------------------------
template <typename T>
inline void setVec(vector<T> & C, vector<int> &V){
int rows = V.size();
int rows = int(V.size());
C = vector<T>(rows);
//C.resize(rows);
for (int n=0; n<rows; n++){
......@@ -161,7 +161,7 @@ inline void setVec(vector<T> & C, vector<int> &V){
//--------------------------------------------------------------
template <typename T>
inline void setVec(vector<T> & C, vector<float> & V){
int rows = V.size();
int rows = int(V.size());
C.resize(rows);
for (int n=0; n<rows; n++){
C[n] = V[n];
......
Subproject commit f5cfd55793699b3a8ed9a2ac08cd8db9b9082732
Subproject commit 1162c2a6e89b5adaea2685b3ff2b844aa9cacff4
RapidLib @ 19fd1435
Subproject commit 2abc1917881df9fcbbdbb39b594e2a08e38dc9f4
Subproject commit 19fd14352871f6795f2511123c4b438a67cec197
Markdown is supported
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