Skip to content

O
opencv
Commit d046602e authored by Eduardo Arnold's avatar Eduardo Arnold
Browse files
Options

Enforced DecisionFunction vector indexes to be saved on SVM save/load methods

parent ff0d1158
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/ml/src/svm.cpp
View file @ d046602e
...@@ -2092,7 +2092,7 @@ public: ...@@ -2092,7 +2092,7 @@ public:
<< "alpha" << "[:"; << "alpha" << "[:";
fs.writeRaw("d", (const uchar*)&df_alpha[df.ofs], sv_count*sizeof(df_alpha[0])); fs.writeRaw("d", (const uchar*)&df_alpha[df.ofs], sv_count*sizeof(df_alpha[0]));
fs << "]"; fs << "]";
if( class_count > 2 ) if( class_count >= 2 )
{ {
fs << "index" << "[:"; fs << "index" << "[:";
fs.writeRaw("i", (const uchar*)&df_index[df.ofs], sv_count*sizeof(df_index[0])); fs.writeRaw("i", (const uchar*)&df_index[df.ofs], sv_count*sizeof(df_index[0]));
...@@ -2234,11 +2234,11 @@ public: ...@@ -2234,11 +2234,11 @@ public:
df_index.resize(ofs + sv_count); df_index.resize(ofs + sv_count);
df_alpha.resize(ofs + sv_count); df_alpha.resize(ofs + sv_count);
dfi["alpha"].readRaw("d", (uchar*)&df_alpha[ofs], sv_count*sizeof(df_alpha[0])); dfi["alpha"].readRaw("d", (uchar*)&df_alpha[ofs], sv_count*sizeof(df_alpha[0]));
if( class_count > 2 ) if( class_count >= 2 )
dfi["index"].readRaw("i", (uchar*)&df_index[ofs], sv_count*sizeof(df_index[0])); dfi["index"].readRaw("i", (uchar*)&df_index[ofs], sv_count*sizeof(df_index[0]));
decision_func.push_back(df); decision_func.push_back(df);
} }
if( class_count <= 2 ) if( class_count < 2 )
setRangeVector(df_index, sv_total); setRangeVector(df_index, sv_total);
if( (int)fn["optimize_linear"] != 0 ) if( (int)fn["optimize_linear"] != 0 )
optimize_linear_svm(); optimize_linear_svm();
......
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