Commit dc12b447 authored by marina.kolpakova's avatar marina.kolpakova

suppress debug out for soft cascade Octave

parent e35eebd4
...@@ -130,7 +130,7 @@ int main(int argc, char** argv) ...@@ -130,7 +130,7 @@ int main(int argc, char** argv)
cv::Octave boost(boundingBox, npositives, nnegatives, *it, shrinkage); cv::Octave boost(boundingBox, npositives, nnegatives, *it, shrinkage);
std::string path = cfg.trainPath; std::string path = cfg.trainPath;
sft::ScaledDataset dataset(path, boost.logScale); sft::ScaledDataset dataset(path, *it);
if (boost.train(&dataset, &pool, cfg.weaks, cfg.treeDepth)) if (boost.train(&dataset, &pool, cfg.weaks, cfg.treeDepth))
{ {
......
...@@ -2175,16 +2175,8 @@ public: ...@@ -2175,16 +2175,8 @@ public:
virtual void setRejectThresholds(OutputArray thresholds); virtual void setRejectThresholds(OutputArray thresholds);
virtual void write( CvFileStorage* fs, string name) const; virtual void write( CvFileStorage* fs, string name) const;
virtual void write( cv::FileStorage &fs, const FeaturePool* pool, InputArray thresholds) const; virtual void write( cv::FileStorage &fs, const FeaturePool* pool, InputArray thresholds) const;
virtual ~Octave();
virtual float predict( InputArray _sample, InputArray _votes, bool raw_mode, bool return_sum ) const; virtual float predict( InputArray _sample, InputArray _votes, bool raw_mode, bool return_sum ) const;
virtual ~Octave();
int logScale;
protected: protected:
virtual bool train( const cv::Mat& trainData, const cv::Mat& responses, const cv::Mat& varIdx=cv::Mat(), virtual bool train( const cv::Mat& trainData, const cv::Mat& responses, const cv::Mat& varIdx=cv::Mat(),
const cv::Mat& sampleIdx=cv::Mat(), const cv::Mat& varType=cv::Mat(), const cv::Mat& missingDataMask=cv::Mat()); const cv::Mat& sampleIdx=cv::Mat(), const cv::Mat& varType=cv::Mat(), const cv::Mat& missingDataMask=cv::Mat());
...@@ -2197,6 +2189,7 @@ private: ...@@ -2197,6 +2189,7 @@ private:
void traverse(const CvBoostTree* tree, cv::FileStorage& fs, int& nfeatures, int* used, const double* th) const; void traverse(const CvBoostTree* tree, cv::FileStorage& fs, int& nfeatures, int* used, const double* th) const;
virtual void initial_weights(double (&p)[2]); virtual void initial_weights(double (&p)[2]);
int logScale;
cv::Rect boundingBox; cv::Rect boundingBox;
int npositives; int npositives;
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include <queue> #include <queue>
#define WITH_DEBUG_OUT //#define WITH_DEBUG_OUT
#if defined WITH_DEBUG_OUT #if defined WITH_DEBUG_OUT
# include <stdio.h> # include <stdio.h>
......
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