Fixes previous mistaken rebase

Author: Masterqsx

modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp

@@ -154,46 +154,45 @@ class CV_EXPORTS_W StaticSaliencyFineGrained : public StaticSaliency
   void getIntensity(Mat srcArg, Mat dstArg,  Mat dstOnArg,  Mat dstOffArg, bool generateOnOff);
 };
 
-/** @brief the Deep Gaze 1 Saliency approach from @cite
+/** @brief the Deep Gaze 1 Saliency approach from
 
 This method use the convolution layers of the pretrained AlexNet, linear combination, center bias and softmax to generate saliency map
 */
-
 class CV_EXPORTS_W DeepGaze1 : public StaticSaliency
 {
 private:
-	dnn::Net net;
-	std::vector<std::string> layers_names;
-	std::vector<double> weights;
+    dnn::Net net;
+    std::vector<std::string> layers_names;
+    std::vector<double> weights;
 
 public:
-	DeepGaze1();
-	DeepGaze1(std::string, std::string, std::vector<std::string>, unsigned);
-	virtual ~DeepGaze1();
-	CV_WRAP static Ptr<DeepGaze1> create()
-	{
-		return makePtr<DeepGaze1>();
-	}
-	bool computeSaliency(InputArray image, OutputArray saliencyMap)
-	{
-		if(image.empty())
-			return false;
-		return computeSaliencyImpl(image, saliencyMap);
-	}
-	Mat saliencyMapGenerator(Mat, Size = Size(227, 227));
-	void training(std::vector<Mat>&, std::vector<Mat>&, unsigned = 100, double = 0.9, double = 0.01, double = 0.01, Size = Size(227, 227));
-	double computeAUC(InputArray _saliencyMap, InputArray _fixtionMap);
-	void saliencyMapVisualize(InputArray _saliencyMap);
+    DeepGaze1();
+    DeepGaze1( std::string, std::string, std::vector<std::string>, unsigned );
+    virtual ~DeepGaze1();
+    CV_WRAP static Ptr<DeepGaze1> create()
+    {
+        return makePtr<DeepGaze1>();
+    }
+    CV_WRAP bool computeSaliency( InputArray image, OutputArray saliencyMap )
+    {
+        if( image.empty() )
+            return false;
+        return computeSaliencyImpl( image, saliencyMap );
+    }
+    Mat saliencyMapGenerator( Mat, Size = Size(227, 227) );
+    void training( std::vector<Mat>&, std::vector<Mat>&, unsigned = 100, double = 0.9, double = 0.01, double = 0.01, Size = Size(227, 227) );
+    double computeAUC( InputArray _saliencyMap, InputArray _fixtionMap );
+    void saliencyMapVisualize( InputArray _saliencyMap );
 protected:
-    bool computeSaliencyImpl(InputArray image, OutputArray saliencyMap);
-    std::vector<Mat> featureMapGenerator(Mat, Size);
-    static Mat comb(std::vector<Mat>&, std::vector<double>);
-    static Mat softmax(Mat);
-    static std::vector<double> evalGrad(std::vector<Mat>&, std::vector<unsigned>&, std::vector<double>, Size);
-    std::vector<unsigned> batchIndex(unsigned, unsigned);
-    static double loss(std::vector<double>, std::vector<double>);
-    static std::vector<double> mapSampler(Mat, std::vector<unsigned>);
-    std::vector<unsigned> fixationLoc(Mat, Size);
+    bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap );
+    std::vector<Mat> featureMapGenerator( Mat, Size );
+    static Mat comb( std::vector<Mat>&, std::vector<double> );
+    static Mat softmax( Mat );
+    static std::vector<double> evalGrad( std::vector<Mat>&, std::vector<unsigned>&, std::vector<double>, Size );
+    std::vector<unsigned> batchIndex( unsigned, unsigned );
+    static double loss( std::vector<double>, std::vector<double> );
+    static std::vector<double> mapSampler( Mat, std::vector<unsigned> );
+    std::vector<unsigned> fixationLoc( Mat, Size );
 };
 
 

modules/saliency/samples/DeepGaze1Sample.cpp

@@ -8,57 +8,59 @@
 #include <opencv2/saliency.hpp>
 #include <vector>
 #include <string>
-#include <dirent.h>
+//#include <dirent.h>
 #include <iostream>
 #include <fstream>
 
 using namespace std;
 using namespace cv;
 using namespace cv::dnn;
+using namespace cv::saliency;
 /* Find best class for the blob (i. e. class with maximal probability) */
 
-int main(int argc, char **argv)
+int main()
 {
-	DeepGaze1 g = DeepGaze1();
-	vector<Mat> images;
-	vector<Mat> fixs;
+    DeepGaze1 g = DeepGaze1();
+    vector<Mat> images;
+    vector<Mat> fixs;
 
 //Download mit1003 saliency dataset in the working directory
 //ALLSTIMULI folder store images
 //ALLFIXATIONMAPS foler store training eye fixation
-	DIR *dp;
-	struct dirent *dirp;
-	if((dp = opendir("ALLSTIMULI")) == NULL)
-	{
-		cout << "Can not open dataset directory" << endl;
-	}
-	unsigned n = 0;
-	while((dirp = readdir(dp)) != NULL)
-	{
-		if(dirp->d_type != 8) continue;
-		if((n++) >= 400) break;
-		string f_name(dirp->d_name);
-		images.push_back(imread("ALLSTIMULI/" + f_name));
-		fixs.push_back(imread("ALLFIXATIONMAPS/" + f_name.substr(0, f_name.find_first_of('.')) + "_fixPts.jpg", 0));
-	}
+//************ Code only work in linux platform ****
+/*    DIR *dp;
+    struct dirent *dirp;
+    if ( ( dp = opendir( "ALLSTIMULI" ) ) == NULL )
+    {
+        cout << "Can not open dataset directory" << endl;
+    }
+    unsigned n = 0;
+    while ( ( dirp = readdir( dp ) ) != NULL )
+    {
+        if ( dirp->d_type != 8 ) continue;
+        if ( (n++) >= 400 ) break;
+        string f_name( dirp->d_name );
+        images.push_back( imread( "ALLSTIMULI/" + f_name ) );
+        fixs.push_back( imread( "ALLFIXATIONMAPS/" + f_name.substr( 0, f_name.find_first_of('.') ) + "_fixPts.jpg", 0 ) );
+    }
 
-	g.training(images, fixs);
-	ofstream file;
-	Mat res2;
-	g.computeSaliency(imread("ALLSTIMULI/i05june05_static_street_boston_p1010764.jpeg"), res2);
-	log(res2, res2);
-	resize(res2, res2, Size(1024, 768));
-	cout << "AUC = " << g.computeAUC(res2, imread("ALLSTIMULI/i05june05_static_street_boston_p1010764_fixPts.jpeg", 0)) << endl;;
-	g.saliencyMapVisualize(res2);
-	file.open("saliency.csv");
-	for (int i = 0;i < res2.rows;i++)
-	{
-		for (int j=0;j < res2.cols;j++)
-		{
-			file << res2.at<double>(i, j) << " ";
-		}
-		file << endl;
-	}
-	file.close();
+    g.training( images, fixs );*/
+    ofstream file;
+    Mat res2;
+    g.computeSaliency( imread( "ALLSTIMULI/i05june05_static_street_boston_p1010764.jpeg"), res2 );
+    log( res2, res2 );
+    resize( res2, res2, Size( 1024, 768 ) );
+    cout << "AUC = " << g.computeAUC( res2, imread( "ALLFIXATIONMAPS/i05june05_static_street_boston_p1010764_fixPts.jpeg", 0 ) ) << endl;;
+    g.saliencyMapVisualize( res2 );
+    file.open( "saliency.csv" );
+    for ( int i = 0; i < res2.rows; i++)
+    {
+        for ( int j=0; j < res2.cols; j++)
+        {
+            file << res2.at<double>( i, j ) << " ";
+        }
+        file << endl;
+    }
+    file.close();
     return 0;
 } //main