diff --git a/openbr/plugins/slidingwindow.cpp b/openbr/plugins/slidingwindow.cpp index a7eb243..8063f46 100644 --- a/openbr/plugins/slidingwindow.cpp +++ b/openbr/plugins/slidingwindow.cpp @@ -257,10 +257,10 @@ BR_REGISTER(Transform, BuildScalesTransform) /*! * \ingroup transforms - * \brief Sample detection bounding boxes from integral images + * \brief Sample detection bounding boxes from without resizing * \author Josh Klontz \cite jklontz */ -class IntegralDetector : public Transform +class Detector : public Transform { Q_OBJECT Q_PROPERTY(br::Transform *transform READ get_transform WRITE set_transform RESET reset_transform) @@ -268,7 +268,10 @@ class IntegralDetector : public Transform void train(const TemplateList &data) { - transform->train(cropTrainingSamples(data, getAspectRatio(data))); + const float aspectRatio = getAspectRatio(data); + TemplateList cropped = cropTrainingSamples(data, aspectRatio); + cropped.first().file.set("aspectRatio", aspectRatio); + transform->train(cropped); } void project(const Template &src, Template &dst) const @@ -277,7 +280,7 @@ class IntegralDetector : public Transform } }; -BR_REGISTER(Transform, IntegralDetector) +BR_REGISTER(Transform, Detector) /*! * \ingroup transforms diff --git a/scripts/pedestrianBaselineLBP.sh b/scripts/pedestrianBaselineLBP.sh index a991592..e5e70e6 100755 --- a/scripts/pedestrianBaselineLBP.sh +++ b/scripts/pedestrianBaselineLBP.sh @@ -12,8 +12,8 @@ fi ALG="Open+Cvt(Gray)+Rename(neg,0)+BuildScales(Blur(2)+LBP(1,2)+SlidingWindow(Hist(59)+Cat+LDA(isBinary=true),windowWidth=10,takeLargestScale=false,threshold=2),windowWidth=10,takeLargestScale=false,minScale=4)+ConsolidateDetections+Discard" -# Josh's new algorithm in progress -# ALG2="Open+Cvt(Gray)+Gradient+Bin(0,360,9,true)+Merge+Integral+IntegralDetector" +# Josh's new algorithm (in progress) +# ALG2="Open+Cvt(Gray)+Detector(Gradient+Bin(0,360,9,true)+Merge+Integral+SlidingWindow(Identity))" br -useGui 0 \ -algorithm "${ALG}" \