From: <bl...@us...> - 2008-11-15 18:14:46
|
Revision: 3554 http://hugin.svn.sourceforge.net/hugin/?rev=3554&view=rev Author: blimbo Date: 2008-11-15 18:14:41 +0000 (Sat, 15 Nov 2008) Log Message: ----------- Debug stuff for OSX Modified Paths: -------------- hugin/trunk/src/celeste/Celeste.cpp Modified: hugin/trunk/src/celeste/Celeste.cpp =================================================================== --- hugin/trunk/src/celeste/Celeste.cpp 2008-11-14 16:14:14 UTC (rev 3553) +++ hugin/trunk/src/celeste/Celeste.cpp 2008-11-15 18:14:41 UTC (rev 3554) @@ -211,6 +211,8 @@ for (int j = 0; j < gNumLocs; j++){ + cout << "Start of loop. j:" << j << "/" << gNumLocs << endl; + int pixel_number = gLocations[j][0] + (in.width() * (gLocations[j][1] - 1)) - 1; unsigned int feature = 1; double score = 0; @@ -289,12 +291,16 @@ gabor_responses[feature-1].value = v_values[pixel_number]; //cout << feature << ":" << v_values[pixel_number] << " " << endl; gabor_responses[feature].index = -1; - + + cout << "Running svm_predict_probability..." << endl; score = svm_predict_probability(model,gabor_responses,prob_estimates); - //cout << score << " " << prob_estimates[0] << endl; + cout << "Scores/Prob. est.:" << score << " " << prob_estimates[0] << endl; + cout << "Pushing score onto response vector..." << endl; + cout << "Current size:" << svm_responses.size() << endl; + svm_responses.push_back(prob_estimates[0]); + cout << "Done. New size:" << svm_responses.size() << endl; + cout << "End of loop." << endl; - svm_responses.push_back(prob_estimates[0]); - } delete[] response; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bl...@us...> - 2008-12-17 14:03:49
|
Revision: 3566 http://hugin.svn.sourceforge.net/hugin/?rev=3566&view=rev Author: blimbo Date: 2008-12-17 14:03:45 +0000 (Wed, 17 Dec 2008) Log Message: ----------- Celeste support for 16bit images Modified Paths: -------------- hugin/trunk/src/celeste/Celeste.cpp Modified: hugin/trunk/src/celeste/Celeste.cpp =================================================================== --- hugin/trunk/src/celeste/Celeste.cpp 2008-11-29 17:46:45 UTC (rev 3565) +++ hugin/trunk/src/celeste/Celeste.cpp 2008-12-17 14:03:45 UTC (rev 3566) @@ -71,7 +71,8 @@ vigra::ImageImportInfo info(imagefile.c_str()); // Create RGB images of appropriate size - vigra::FRGBImage in(info.width(), info.height()); + //vigra::FRGBImage in(info.width(), info.height()); + vigra::UInt16RGBImage in(info.width(), info.height()); // Import the image importImage(info, destImage(in)); @@ -123,7 +124,8 @@ cout << "New dimensions:\t\t" << nw << " x " << nh << endl; // create a RGB image of appropriate size - vigra::FRGBImage out(nw, nh); + //vigra::FRGBImage out(nw, nh); + vigra::UInt16RGBImage out(nw, nh); // resize the image, using a bi-cubic spline algorithm resizeImageNoInterpolation(srcImageRange(in),destImageRange(out)); @@ -131,11 +133,15 @@ in = out; } + //exportImage(srcImageRange(in), ImageExportInfo("test.tif").setPixelType("UINT16")); // Convert to LUV colour space - FRGBImage luv(in.width(),in.height()); - transformImage(srcImageRange(in), destImage(luv), RGBPrime2LuvFunctor<double>() ); + UInt16RGBImage luv(in.width(),in.height()); + transformImage(srcImageRange(in), destImage(luv), RGB2LuvFunctor<double>() ); + //transformImage(srcImageRange(in), destImage(luv), RGBPrime2LuvFunctor<double>() ); + //exportImage(srcImageRange(luv), ImageExportInfo("test_luv.tif").setPixelType("UINT16")); + // Prepare Gabor API array float *frameBuf = new float[in.width()*in.height()]; float *u_values = new float[in.width()*in.height()]; @@ -144,7 +150,9 @@ // Do something with each pixel... unsigned int counter = 0; - vigra::FRGBImage::iterator img_iter(luv.begin()),end(luv.end()); + vigra::UInt16RGBImage::iterator img_iter(luv.begin()),end(luv.end()); + //vigra::FRGBImage::iterator img_iter(luv.begin()),end(luv.end()); + for(; img_iter != end; ++img_iter) { // [0] is L, [1] is U, [2] is V @@ -318,7 +326,7 @@ cout << "Generating mask:\t" << mask_name << endl; // Create mask of same dimensions vigra::BRGBImage mask_out(nw, nh); - + // Set mask to white vigra::initImage(srcIterRange(mask_out.upperLeft(), mask_out.upperLeft() + vigra::Diff2D(nw,nh)), @@ -364,7 +372,7 @@ } } - + // Add extra FP at the end of each row in case nh % spacing if (nh % spacing){ @@ -380,8 +388,9 @@ //cout << "Total FPs:\t" << gNumLocs << endl; - int len = 0; - //cout << "Pre-response " << in.height() << ","<< in.width() << endl; + int len = 0; + + //cout << "Pre-response " << in.height() << ","<< in.width() << " " << gNumLocs << endl; mask_response = ProcessChannel( pixels, in.height(), in.width(), mask_response, &len, basename ); //cout << "Post-response" << endl; @@ -483,7 +492,7 @@ if (prob_estimates[0] >= threshold){ - //cout << "Cloud\t\t(score " << m.classify(feature_vector.c_str()) << " > " << threshold << ")" << endl; + //cout << "Cloud\t\t(score " << prob_estimates[0] << " > " << threshold << ")" << endl; unsigned int sub_x0 = gLocations[j][0] - gRadius; unsigned int sub_y0 = gLocations[j][1] - gRadius; @@ -498,7 +507,7 @@ RGB(0,0,0) ); }else{ - //cout << "Non-cloud\t(score " << m.classify(feature_vector.c_str()) << " <= " << threshold << ")" << endl; + //cout << "Non-cloud\t(score " << prob_estimates[0] << " <= " << threshold << ")" << endl; } //cout << feature_vector << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |