Skip to content

Commit

Permalink
*VERSION 3.50 OF TOOLBOX*
Browse files Browse the repository at this point in the history
  • Loading branch information
pdollar committed May 12, 2016
1 parent 1cef3ce commit d7b7b97
Show file tree
Hide file tree
Showing 20 changed files with 99 additions and 53 deletions.
2 changes: 1 addition & 1 deletion classify/private/binaryTreeTrain1.cpp
Original file line number Diff line number Diff line change
@@ -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]
*******************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion detector/acfSweeps.m
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion detector/acfTrain.m
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
1 change: 1 addition & 0 deletions doc/detector/Contents.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ <h2><a name="_description"></a>DESCRIPTION <a href="#_top"><img alt="^" border="
<a href="acfDetect.html" class="code" title="function bbs = acfDetect( I, detector, fileName )">acfDetect</a> - Run aggregate channel features object detector on given image(s).
<a href="acfModify.html" class="code" title="function detector = acfModify( detector, varargin )">acfModify</a> - Modify aggregate channel features object detector.
<a href="acfReadme.html" class="code" title="">acfReadme</a> - Aggregate Channel Features Detector Overview.
<a href="acfSweeps.html" class="code" title="function acfSweeps">acfSweeps</a> - Parameter sweeps for ACF pedestrian detector.
<a href="acfTest.html" class="code" title="function [miss,roc,gt,dt] = acfTest( varargin )">acfTest</a> - Test aggregate channel features object detector given ground truth.
<a href="acfTrain.html" class="code" title="function detector = acfTrain( varargin )">acfTrain</a> - Train aggregate channel features object detector.

Expand Down
53 changes: 53 additions & 0 deletions doc/detector/acfSweeps.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
<title>Description of acfSweeps</title>
<meta name="keywords" content="acfSweeps">
<meta name="description" content="Parameter sweeps for ACF pedestrian detector.">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="generator" content="m2html &copy; 2003 Guillaume Flandin">
<meta name="robots" content="index, follow">
<link type="text/css" rel="stylesheet" href="../m2html.css">
</head>
<body>
<a name="_top"></a>
<!-- menu.html detector -->
<h1>acfSweeps
</h1>

<h2><a name="_name"></a>PURPOSE <a href="#_top"><img alt="^" border="0" src="../up.png"></a></h2>
<div class="box"><strong>Parameter sweeps for ACF pedestrian detector.</strong></div>

<h2><a name="_synopsis"></a>SYNOPSIS <a href="#_top"><img alt="^" border="0" src="../up.png"></a></h2>
<div class="box"><strong>function acfSweeps </strong></div>

<h2><a name="_description"></a>DESCRIPTION <a href="#_top"><img alt="^" border="0" src="../up.png"></a></h2>
<div class="fragment"><pre class="comment"> 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]</pre></div>





<!-- Start of Google Analytics Code -->
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
<script type="text/javascript">
var pageTracker = _gat._getTracker("UA-4884268-1");
pageTracker._initData();
pageTracker._trackPageview();
</script>
<!-- end of Google Analytics Code -->

<hr><address>Generated by <strong><a href="http://www.artefact.tk/software/matlab/m2html/" target="_parent">m2html</a></strong> &copy; 2003</address>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/detector/acfTrain.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ <h2><a name="_description"></a>DESCRIPTION <a href="#_top"><img alt="^" border="
See also <a href="acfReadme.html" class="code" title="">acfReadme</a>, <a href="acfDetect.html" class="code" title="function bbs = acfDetect( I, detector, fileName )">acfDetect</a>, <a href="acfDemoInria.html" class="code" title="">acfDemoInria</a>, <a href="acfModify.html" class="code" title="function detector = acfModify( detector, varargin )">acfModify</a>, <a href="acfTest.html" class="code" title="function [miss,roc,gt,dt] = acfTest( varargin )">acfTest</a>,
chnsCompute, chnsPyramid, adaBoostTrain, <a href="bbGt.html" class="code" title="function varargout = bbGt( action, varargin )">bbGt</a>, <a href="bbNms.html" class="code" title="function bbs = bbNms( bbs, varargin )">bbNms</a>, 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]</pre></div>

Expand Down
2 changes: 1 addition & 1 deletion doc/detector/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1>Index for detector</h1>

<h2>Matlab files in this directory:</h2>
<ul style="list-style-image:url(../matlabicon.gif)">
<li><a href="Contents.html" target="function" title="DETECTOR">Contents </a></li><li><a href="acfDemoCal.html" target="function" title="Demo for aggregate channel features object detector on Caltech dataset.">acfDemoCal </a></li><li><a href="acfDemoInria.html" target="function" title="Demo for aggregate channel features object detector on Inria dataset.">acfDemoInria </a></li><li><a href="acfDetect.html" target="function" title="Run aggregate channel features object detector on given image(s).">acfDetect </a></li><li><a href="acfModify.html" target="function" title="Modify aggregate channel features object detector.">acfModify </a></li><li><a href="acfReadme.html" target="function" title="Aggregate Channel Features Detector Overview.">acfReadme </a></li><li><a href="acfTest.html" target="function" title="Test aggregate channel features object detector given ground truth.">acfTest </a></li><li><a href="acfTrain.html" target="function" title="Train aggregate channel features object detector.">acfTrain </a></li><li><a href="bbApply.html" target="function" title="Functions for manipulating bounding boxes (bb).">bbApply </a></li><li><a href="bbGt.html" target="function" title="Bounding box (bb) annotations struct, evaluation and sampling routines.">bbGt </a></li><li><a href="bbLabeler.html" target="function" title="Bounding box or ellipse labeler for static images.">bbLabeler </a></li><li><a href="bbNms.html" target="function" title="Bounding box (bb) non-maximal suppression (nms).">bbNms </a></li></ul>
<li><a href="Contents.html" target="function" title="DETECTOR">Contents </a></li><li><a href="acfDemoCal.html" target="function" title="Demo for aggregate channel features object detector on Caltech dataset.">acfDemoCal </a></li><li><a href="acfDemoInria.html" target="function" title="Demo for aggregate channel features object detector on Inria dataset.">acfDemoInria </a></li><li><a href="acfDetect.html" target="function" title="Run aggregate channel features object detector on given image(s).">acfDetect </a></li><li><a href="acfModify.html" target="function" title="Modify aggregate channel features object detector.">acfModify </a></li><li><a href="acfReadme.html" target="function" title="Aggregate Channel Features Detector Overview.">acfReadme </a></li><li><a href="acfSweeps.html" target="function" title="Parameter sweeps for ACF pedestrian detector.">acfSweeps </a></li><li><a href="acfTest.html" target="function" title="Test aggregate channel features object detector given ground truth.">acfTest </a></li><li><a href="acfTrain.html" target="function" title="Train aggregate channel features object detector.">acfTrain </a></li><li><a href="bbApply.html" target="function" title="Functions for manipulating bounding boxes (bb).">bbApply </a></li><li><a href="bbGt.html" target="function" title="Bounding box (bb) annotations struct, evaluation and sampling routines.">bbGt </a></li><li><a href="bbLabeler.html" target="function" title="Bounding box or ellipse labeler for static images.">bbLabeler </a></li><li><a href="bbNms.html" target="function" title="Bounding box (bb) non-maximal suppression (nms).">bbNms </a></li></ul>


<h2>Subsequent directories:</h2>
Expand Down
5 changes: 5 additions & 0 deletions doc/history.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
23 changes: 8 additions & 15 deletions doc/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ <h2>CONTENTS<a href="#_top"><img alt=^ src="up.png" border=0 /></a></h2>
<div class=box>
<strong>The toolbox is divided into 7 parts, arranged by directory:</strong>
<ul style="LIST-STYLE-IMAGE: url(./matlabicon.gif)">
<li><a href="channels/Contents.html">channels</a> Robust image features, including HOG, for fast object detection.<img alt='' src="new.gif" height="14px"></li>
<li><a href="channels/Contents.html">channels</a> Robust image features, including HOG, for fast object detection.</li>
<li><a href="classify/Contents.html">classify</a> Fast clustering, random ferns, RBF functions, PCA, etc.</li>
<li><a href="detector/Contents.html">detector</a> Aggregate Channel Features (ACF) object detection code.<img alt='' src="new.gif" height="14px"></li>
<li><a href="detector/Contents.html">detector</a> Aggregate Channel Features (ACF) object detection code.</li>
<li><a href="filters/Contents.html">filters</a> Routines for filtering images.</li>
<li><a href="images/Contents.html">images</a> Routines for manipulating and displaying images.</li>
<li><a href="matlab/Contents.html">matlab</a> General Matlab functions that should have been a part of Matlab.</li>
Expand All @@ -40,18 +40,18 @@ <h2>DOWNLOAD<a href="#_top"><img alt=^ src="up.png" border=0 /></a></h2>
<p><strong>For version history click <a href="history.txt">here.</a>
This code is licensed under the <a href="http://en.wikipedia.org/wiki/BSD_licenses" target="blank">Simplified BSD License.</a></strong></p>
<ul>
<li>Latest version available on <a href="https://github.com/pdollar/toolbox" target="blank">GitHub</a>.<img alt='' src="new.gif" height="14px"></li>
<li><a href="../piotr_toolbox.zip">Version 3.40</a> &nbsp; Nov. 01, 2014 &nbsp; [current stable version]
<li><a href="../piotr_toolbox_V1.03.zip">Version 1.03</a> &nbsp; May. 03, 2006 &nbsp; [compatible with cuboids code]
<li><a href="../">All Versions</a>
<li><b>Recommended</b>: download the latest version from <a href="https://github.com/pdollar/toolbox" target="blank">GitHub</a></li>
<li><a href="archive/piotr_toolbox.zip">Version 3.50</a> &nbsp; May 12, 2016 &nbsp; [current stable version]</li>
<li><a href="archive/piotr_toolbox_V1.03.zip">Version 1.03</a> &nbsp; May. 03, 2006 &nbsp; [compatible with cuboids code]</li>
<li><a href="archive/">Previous Versions</a>
</ul>
<p>Requires Matlab 2011b or later and Matlab's Image Processing Toolbox.</p>
</div>

<h2>INSTALL<a href="#_top"><img alt=^ src="up.png" border=0 /></a></h2>
<div class=box>
<p><strong>Simply unzip, then add all directories to the Matlab path:</strong>
<br/>&nbsp; &gt;&gt; addpath(genpath('c:\toolbox')); savepath;</p>
<br/>&nbsp; &gt;&gt; addpath(genpath('path/to/toolbox/')); savepath;</p>
<p>If needed, run the compile script for the mex files:
<br/>&nbsp; &gt;&gt; toolboxCompile;
<br/>Note: 64 bit Windows/Linux/Mac binaries are already included.
Expand All @@ -64,18 +64,11 @@ <h2>CITE<a href="#_top"><img alt=^ src="up.png" border=0 /></a></h2>
@misc{PMT,
<br/>&nbsp;&nbsp; author = {Piotr Doll\'ar},
<br/>&nbsp;&nbsp; title = {{P}iotr's {C}omputer {V}ision {M}atlab {T}oolbox ({PMT})},
<br/>&nbsp;&nbsp; howpublished = {\url{http://vision.ucsd.edu/~pdollar/toolbox/doc/index.html}}
<br/>&nbsp;&nbsp; howpublished = {\url{https://github.com/pdollar/toolbox}}
<br/>}
<br/><br/>Use of <a href="channels/Contents.html">channels</a> and <a href="detector/Contents.html">detector</a> packages requires separate citations.
</div>

<h2>CONTACT<a href="#_top"><img alt=^ src="up.png" border=0 /></a></h2>
<div class=box>
If you have a question or a suggestion, or if you find a bug,
please email me at<font style="BACKGROUND-COLOR: #f5f5f5" color=#0000ff>
pdollar-at-gmail.com</font>
</div>

<!-- Start of Google Analytics Code -->
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
Expand Down
2 changes: 1 addition & 1 deletion doc/videos/opticalFlow.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h2><a name="_description"></a>DESCRIPTION <a href="#_top"><img alt="^" border="

See also convTri, imtransform2, medfilt2

Piotr's Computer Vision Matlab Toolbox Version 3.24
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]</pre></div>

Expand Down
3 changes: 2 additions & 1 deletion external/history.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Version NEW
Version 3.50 (12-May-2016)
-migrating documentation to github
-acfSweeps.m: Added ACF parameter sweep code to toolbox
-minor: opticalFlow, acfTrain, binaryTreeTrain1

Expand Down
6 changes: 3 additions & 3 deletions external/m2html/@template/get.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $

error(nargchk(2,3,nargin));
narginchk(2,3);

switch lower(action)
case 'var'
error(nargchk(2,3,nargin));
narginchk(2,3);
if nargin == 2
varargout{1} = tpl.varvals;
elseif iscellstr(varargin{1})
Expand All @@ -31,7 +31,7 @@
varargout{1} = '';
end
case 'undefined'
error(nargchk(3,3,nargin));
narginchk(3,3);
tpl = loadtpl(tpl,varargin{1});
str = get(tpl,'var',varargin{1});
varargout{1} = {};
Expand Down
2 changes: 1 addition & 1 deletion external/m2html/@template/parse.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $

error(nargchk(3,4,nargin));
narginchk(3,4);
if nargin == 3
append = 0;
end
Expand Down
2 changes: 1 addition & 1 deletion external/m2html/@template/private/finish.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $

error(nargchk(2,2,nargin));
narginchk(2,2);

switch lower(unknowns)
case 'keep'
Expand Down
12 changes: 6 additions & 6 deletions external/m2html/@template/set.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $

error(nargchk(3,5,nargin));
narginchk(3,5);

switch lower(action)
case 'root'
error(nargchk(3,3,nargin));
narginchk(3,3);
if exist(varargin{1},'dir')
tpl.root = varargin{1};
else
error('[Template] No such directory.');
end
case 'unknowns'
error(nargchk(3,3,nargin));
narginchk(3,3);
if ismember(varargin{1},{'remove' 'comment' 'keep'})
tpl.unknowns = varargin{1};
else
error('[Template] Unknowns: ''remove'', ''comment'' or ''keep''.');
end
case 'file'
error(nargchk(4,4,nargin));
narginchk(4,4);
if iscellstr(varargin{1})
for i=1:length(varargin{1})
ind = find(ismember(tpl.handles,varargin{1}{i}));
Expand All @@ -53,7 +53,7 @@
error('[Template] Badly formed handles.');
end
case 'block'
error(nargchk(4,5,nargin));
narginchk(4,5);
tpl = loadtpl(tpl,varargin{1});
if nargin == 4
name = varargin{2};
Expand Down Expand Up @@ -85,7 +85,7 @@
tpl = set(tpl,'var',varargin{2},blk);
tpl = set(tpl,'var',varargin{1},str);
case 'var'
error(nargchk(3,4,nargin));
narginchk(3,4);
if iscellstr(varargin{1})
for i=1:length(varargin{1})
ind = find(ismember(tpl.varkeys,varargin{1}{i}));
Expand Down
2 changes: 1 addition & 1 deletion external/m2html/@template/template.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $

error(nargchk(0,2,nargin));
narginchk(0,2);

switch nargin
case 0
Expand Down
2 changes: 1 addition & 1 deletion external/m2html/private/mfileparse.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
% $Revision: 1.0 $Date: 2003/29/04 17:33:43 $

error(nargchk(3,4,nargin));
narginchk(3,4);
if nargin == 3,
options = struct('verbose',1, 'globalHypertextLinks',0, 'todo',0);
end
Expand Down
Loading

0 comments on commit d7b7b97

Please sign in to comment.