From d7b7b978a6669d23919f9878c6a88d35638ec9b6 Mon Sep 17 00:00:00 2001 From: pdollar Date: Thu, 12 May 2016 16:49:24 -0700 Subject: [PATCH] *VERSION 3.50 OF TOOLBOX* --- classify/private/binaryTreeTrain1.cpp | 2 +- detector/acfSweeps.m | 2 +- detector/acfTrain.m | 2 +- doc/detector/Contents.html | 1 + doc/detector/acfSweeps.html | 53 +++++++++++++++++++ doc/detector/acfTrain.html | 2 +- doc/detector/menu.html | 2 +- doc/history.txt | 5 ++ doc/overview.html | 23 +++----- doc/videos/opticalFlow.html | 2 +- external/history.txt | 3 +- external/m2html/@template/get.m | 6 +-- external/m2html/@template/parse.m | 2 +- external/m2html/@template/private/finish.m | 2 +- external/m2html/@template/set.m | 12 ++--- external/m2html/@template/template.m | 2 +- external/m2html/private/mfileparse.m | 2 +- .../templates/frame-piotr/overview.html | 23 +++----- external/toolboxUpdateHeader.m | 4 +- videos/opticalFlow.m | 2 +- 20 files changed, 99 insertions(+), 53 deletions(-) create mode 100644 doc/detector/acfSweeps.html diff --git a/classify/private/binaryTreeTrain1.cpp b/classify/private/binaryTreeTrain1.cpp index b6b6ba40..67159067 100644 --- a/classify/private/binaryTreeTrain1.cpp +++ b/classify/private/binaryTreeTrain1.cpp @@ -1,5 +1,5 @@ /******************************************************************************* -* Piotr's Computer Vision Matlab Toolbox Version NEW +* Piotr's Computer Vision Matlab Toolbox Version 3.50 * Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ diff --git a/detector/acfSweeps.m b/detector/acfSweeps.m index 5c2edfa9..9b22479a 100755 --- a/detector/acfSweeps.m +++ b/detector/acfSweeps.m @@ -4,7 +4,7 @@ % Running the parameter sweeps requires altering internal flags. % The sweeps are not well documented, use at your own discretion. % -% Piotr's Computer Vision Matlab Toolbox Version NEW +% Piotr's Computer Vision Matlab Toolbox Version 3.50 % Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] diff --git a/detector/acfTrain.m b/detector/acfTrain.m index 12610b3c..12797a78 100644 --- a/detector/acfTrain.m +++ b/detector/acfTrain.m @@ -109,7 +109,7 @@ % See also acfReadme, acfDetect, acfDemoInria, acfModify, acfTest, % chnsCompute, chnsPyramid, adaBoostTrain, bbGt, bbNms, jitterImage % -% Piotr's Computer Vision Matlab Toolbox Version NEW +% Piotr's Computer Vision Matlab Toolbox Version 3.50 % Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] diff --git a/doc/detector/Contents.html b/doc/detector/Contents.html index 461d75ee..5f1a6b07 100644 --- a/doc/detector/Contents.html +++ b/doc/detector/Contents.html @@ -34,6 +34,7 @@

DESCRIPTION ^acfDetect - Run aggregate channel features object detector on given image(s). acfModify - Modify aggregate channel features object detector. acfReadme - Aggregate Channel Features Detector Overview. + acfSweeps - Parameter sweeps for ACF pedestrian detector. acfTest - Test aggregate channel features object detector given ground truth. acfTrain - Train aggregate channel features object detector. diff --git a/doc/detector/acfSweeps.html b/doc/detector/acfSweeps.html new file mode 100644 index 00000000..8fcb7b6a --- /dev/null +++ b/doc/detector/acfSweeps.html @@ -0,0 +1,53 @@ + + + + Description of acfSweeps + + + + + + + + + + +

acfSweeps +

+ +

PURPOSE ^

+
Parameter sweeps for ACF pedestrian detector.
+ +

SYNOPSIS ^

+
function acfSweeps
+ +

DESCRIPTION ^

+
 Parameter sweeps for ACF pedestrian detector.
+
+ Running the parameter sweeps requires altering internal flags.
+ The sweeps are not well documented, use at your own discretion.
+
+ Piotr's Computer Vision Matlab Toolbox      Version 3.50
+ Copyright 2014 Piotr Dollar.  [pdollar-at-gmail.com]
+ Licensed under the Simplified BSD License [see external/bsd.txt]
+ + + + + + + + + + +
Generated by m2html © 2003
+ + diff --git a/doc/detector/acfTrain.html b/doc/detector/acfTrain.html index 228d5a86..728c936c 100644 --- a/doc/detector/acfTrain.html +++ b/doc/detector/acfTrain.html @@ -133,7 +133,7 @@

DESCRIPTION ^acfReadme, acfDetect, acfDemoInria, acfModify, acfTest, chnsCompute, chnsPyramid, adaBoostTrain, bbGt, bbNms, jitterImage - Piotr's Computer Vision Matlab Toolbox Version 3.40 + Piotr's Computer Vision Matlab Toolbox Version 3.50 Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] Licensed under the Simplified BSD License [see external/bsd.txt] diff --git a/doc/detector/menu.html b/doc/detector/menu.html index deec0bec..d7838f12 100644 --- a/doc/detector/menu.html +++ b/doc/detector/menu.html @@ -19,7 +19,7 @@

Index for detector

Matlab files in this directory:

+
  • Contents
  • acfDemoCal
  • acfDemoInria
  • acfDetect
  • acfModify
  • acfReadme
  • acfSweeps
  • acfTest
  • acfTrain
  • bbApply
  • bbGt
  • bbLabeler
  • bbNms

    • Subsequent directories:

    diff --git a/doc/history.txt b/doc/history.txt index 6a07658f..358a0712 100644 --- a/doc/history.txt +++ b/doc/history.txt @@ -1,3 +1,8 @@ +Version 3.50 (12-May-2016) + -migrating documentation to github + -acfSweeps.m: Added ACF parameter sweep code to toolbox + -minor: opticalFlow, acfTrain, binaryTreeTrain1 + Version 3.40 (01-Nov-2014) -Added LDCF detector described in NIPS14 paper -acfReadme.m: added proper readme for detection code diff --git a/doc/overview.html b/doc/overview.html index e2a960f0..ad76475e 100644 --- a/doc/overview.html +++ b/doc/overview.html @@ -25,9 +25,9 @@

    CONTENTS^

    The toolbox is divided into 7 parts, arranged by directory:
    @@ -51,7 +51,7 @@

    DOWNLOAD^

    INSTALL^

    Simply unzip, then add all directories to the Matlab path: -
      >> addpath(genpath('c:\toolbox')); savepath;

    +
      >> addpath(genpath('path/to/toolbox/')); savepath;

    If needed, run the compile script for the mex files:
      >> toolboxCompile;
    Note: 64 bit Windows/Linux/Mac binaries are already included. @@ -64,18 +64,11 @@

    CITE^

    @misc{PMT,
       author = {Piotr Doll\'ar},
       title = {{P}iotr's {C}omputer {V}ision {M}atlab {T}oolbox ({PMT})}, -
       howpublished = {\url{http://vision.ucsd.edu/~pdollar/toolbox/doc/index.html}} +
       howpublished = {\url{https://github.com/pdollar/toolbox}}
    }

    Use of channels and detector packages requires separate citations.
    -

    CONTACT^

    -
    - If you have a question or a suggestion, or if you find a bug, - please email me at - pdollar-at-gmail.com -
    -