suppress debug out for soft cascade Octave

pull/322/head
marina.kolpakova 12 years ago
parent e35eebd4d4
commit dc12b4476a
  1. 2
      apps/sft/sft.cpp
  2. 11
      modules/ml/include/opencv2/ml/ml.hpp
  3. 2
      modules/ml/src/octave.cpp

@ -130,7 +130,7 @@ int main(int argc, char** argv)
cv::Octave boost(boundingBox, npositives, nnegatives, *it, shrinkage);
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))
{

@ -2175,16 +2175,8 @@ public:
virtual void setRejectThresholds(OutputArray thresholds);
virtual void write( CvFileStorage* fs, string name) 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;
int logScale;
virtual ~Octave();
protected:
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());
@ -2197,6 +2189,7 @@ private:
void traverse(const CvBoostTree* tree, cv::FileStorage& fs, int& nfeatures, int* used, const double* th) const;
virtual void initial_weights(double (&p)[2]);
int logScale;
cv::Rect boundingBox;
int npositives;

@ -43,7 +43,7 @@
#include "precomp.hpp"
#include <queue>
#define WITH_DEBUG_OUT
//#define WITH_DEBUG_OUT
#if defined WITH_DEBUG_OUT
# include <stdio.h>

Loading…
Cancel
Save