Skip to content

Commit d7b7b97

Browse files
pdollarpdollar
committed
*VERSION 3.50 OF TOOLBOX*
1 parent 1cef3ce commit d7b7b97

File tree

20 files changed

+99
-53
lines changed

20 files changed

+99
-53
lines changed

‎classify/private/binaryTreeTrain1.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Piotr's Computer Vision Matlab Toolbox Version NEW
2+
* Piotr's Computer Vision Matlab Toolbox Version 3.50
33
* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com]
44
* Licensed under the Simplified BSD License [see external/bsd.txt]
55
*******************************************************************************/

‎detector/acfSweeps.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
% Running the parameter sweeps requires altering internal flags.
55
% The sweeps are not well documented, use at your own discretion.
66
%
7-
% Piotr's Computer Vision Matlab Toolbox Version NEW
7+
% Piotr's Computer Vision Matlab Toolbox Version 3.50
88
% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com]
99
% Licensed under the Simplified BSD License [see external/bsd.txt]
1010

‎detector/acfTrain.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
% See also acfReadme, acfDetect, acfDemoInria, acfModify, acfTest,
110110
% chnsCompute, chnsPyramid, adaBoostTrain, bbGt, bbNms, jitterImage
111111
%
112-
% Piotr's Computer Vision Matlab Toolbox Version NEW
112+
% Piotr's Computer Vision Matlab Toolbox Version 3.50
113113
% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com]
114114
% Licensed under the Simplified BSD License [see external/bsd.txt]
115115

‎doc/detector/Contents.html

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ <h2><a name="_description"></a>DESCRIPTION <a href="#_top"><img alt="^" border="
3434
<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).
3535
<a href="acfModify.html" class="code" title="function detector = acfModify( detector, varargin )">acfModify</a> - Modify aggregate channel features object detector.
3636
<a href="acfReadme.html" class="code" title="">acfReadme</a> - Aggregate Channel Features Detector Overview.
37+
<a href="acfSweeps.html" class="code" title="function acfSweeps">acfSweeps</a> - Parameter sweeps for ACF pedestrian detector.
3738
<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.
3839
<a href="acfTrain.html" class="code" title="function detector = acfTrain( varargin )">acfTrain</a> - Train aggregate channel features object detector.
3940

‎doc/detector/acfSweeps.html

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2+
"http://www.w3.org/TR/REC-html40/loose.dtd">
3+
<html>
4+
<head>
5+
<title>Description of acfSweeps</title>
6+
<meta name="keywords" content="acfSweeps">
7+
<meta name="description" content="Parameter sweeps for ACF pedestrian detector.">
8+
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
9+
<meta name="generator" content="m2html &copy; 2003 Guillaume Flandin">
10+
<meta name="robots" content="index, follow">
11+
<link type="text/css" rel="stylesheet" href="../m2html.css">
12+
</head>
13+
<body>
14+
<a name="_top"></a>
15+
<!-- menu.html detector -->
16+
<h1>acfSweeps
17+
</h1>
18+
19+
<h2><a name="_name"></a>PURPOSE <a href="#_top"><img alt="^" border="0" src="../up.png"></a></h2>
20+
<div class="box"><strong>Parameter sweeps for ACF pedestrian detector.</strong></div>
21+
22+
<h2><a name="_synopsis"></a>SYNOPSIS <a href="#_top"><img alt="^" border="0" src="../up.png"></a></h2>
23+
<div class="box"><strong>function acfSweeps </strong></div>
24+
25+
<h2><a name="_description"></a>DESCRIPTION <a href="#_top"><img alt="^" border="0" src="../up.png"></a></h2>
26+
<div class="fragment"><pre class="comment"> Parameter sweeps for ACF pedestrian detector.
27+
28+
Running the parameter sweeps requires altering internal flags.
29+
The sweeps are not well documented, use at your own discretion.
30+
31+
Piotr's Computer Vision Matlab Toolbox Version 3.50
32+
Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com]
33+
Licensed under the Simplified BSD License [see external/bsd.txt]</pre></div>
34+
35+
36+
37+
38+
39+
<!-- Start of Google Analytics Code -->
40+
<script type="text/javascript">
41+
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
42+
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
43+
</script>
44+
<script type="text/javascript">
45+
var pageTracker = _gat._getTracker("UA-4884268-1");
46+
pageTracker._initData();
47+
pageTracker._trackPageview();
48+
</script>
49+
<!-- end of Google Analytics Code -->
50+
51+
<hr><address>Generated by <strong><a href="http://www.artefact.tk/software/matlab/m2html/" target="_parent">m2html</a></strong> &copy; 2003</address>
52+
</body>
53+
</html>

‎doc/detector/acfTrain.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ <h2><a name="_description"></a>DESCRIPTION <a href="#_top"><img alt="^" border="
133133
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>,
134134
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
135135

136-
Piotr's Computer Vision Matlab Toolbox Version 3.40
136+
Piotr's Computer Vision Matlab Toolbox Version 3.50
137137
Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com]
138138
Licensed under the Simplified BSD License [see external/bsd.txt]</pre></div>
139139

‎doc/detector/menu.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1>Index for detector</h1>
1919

2020
<h2>Matlab files in this directory:</h2>
2121
<ul style="list-style-image:url(../matlabicon.gif)">
22-
<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>
22+
<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>
2323

2424

2525
<h2>Subsequent directories:</h2>

‎doc/history.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Version 3.50 (12-May-2016)
2+
-migrating documentation to github
3+
-acfSweeps.m: Added ACF parameter sweep code to toolbox
4+
-minor: opticalFlow, acfTrain, binaryTreeTrain1
5+
16
Version 3.40 (01-Nov-2014)
27
-Added LDCF detector described in NIPS14 paper
38
-acfReadme.m: added proper readme for detection code

‎doc/overview.html

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

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

72-
<h2>CONTACT<a href="#_top"><img alt=^ src="up.png" border=0 /></a></h2>
73-
<div class=box>
74-
If you have a question or a suggestion, or if you find a bug,
75-
please email me at<font style="BACKGROUND-COLOR: #f5f5f5" color=#0000ff>
76-
pdollar-at-gmail.com</font>
77-
</div>
78-
7972
<!-- Start of Google Analytics Code -->
8073
<script type="text/javascript">
8174
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

‎doc/videos/opticalFlow.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ <h2><a name="_description"></a>DESCRIPTION <a href="#_top"><img alt="^" border="
8787

8888
See also convTri, imtransform2, medfilt2
8989

90-
Piotr's Computer Vision Matlab Toolbox Version 3.24
90+
Piotr's Computer Vision Matlab Toolbox Version 3.50
9191
Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com]
9292
Licensed under the Simplified BSD License [see external/bsd.txt]</pre></div>
9393

‎external/history.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Version NEW
1+
Version 3.50 (12-May-2016)
2+
-migrating documentation to github
23
-acfSweeps.m: Added ACF parameter sweep code to toolbox
34
-minor: opticalFlow, acfTrain, binaryTreeTrain1
45

‎external/m2html/@template/get.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
88
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $
99

10-
error(nargchk(2,3,nargin));
10+
narginchk(2,3);
1111

1212
switch lower(action)
1313
case 'var'
14-
error(nargchk(2,3,nargin));
14+
narginchk(2,3);
1515
if nargin == 2
1616
varargout{1} = tpl.varvals;
1717
elseif iscellstr(varargin{1})
@@ -31,7 +31,7 @@
3131
varargout{1} = '';
3232
end
3333
case 'undefined'
34-
error(nargchk(3,3,nargin));
34+
narginchk(3,3);
3535
tpl = loadtpl(tpl,varargin{1});
3636
str = get(tpl,'var',varargin{1});
3737
varargout{1} = {};

‎external/m2html/@template/parse.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
1212
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $
1313

14-
error(nargchk(3,4,nargin));
14+
narginchk(3,4);
1515
if nargin == 3
1616
append = 0;
1717
end

‎external/m2html/@template/private/finish.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
1414
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $
1515

16-
error(nargchk(2,2,nargin));
16+
narginchk(2,2);
1717

1818
switch lower(unknowns)
1919
case 'keep'

‎external/m2html/@template/set.m

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@
1010
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
1111
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $
1212

13-
error(nargchk(3,5,nargin));
13+
narginchk(3,5);
1414

1515
switch lower(action)
1616
case 'root'
17-
error(nargchk(3,3,nargin));
17+
narginchk(3,3);
1818
if exist(varargin{1},'dir')
1919
tpl.root = varargin{1};
2020
else
2121
error('[Template] No such directory.');
2222
end
2323
case 'unknowns'
24-
error(nargchk(3,3,nargin));
24+
narginchk(3,3);
2525
if ismember(varargin{1},{'remove' 'comment' 'keep'})
2626
tpl.unknowns = varargin{1};
2727
else
2828
error('[Template] Unknowns: ''remove'', ''comment'' or ''keep''.');
2929
end
3030
case 'file'
31-
error(nargchk(4,4,nargin));
31+
narginchk(4,4);
3232
if iscellstr(varargin{1})
3333
for i=1:length(varargin{1})
3434
ind = find(ismember(tpl.handles,varargin{1}{i}));
@@ -53,7 +53,7 @@
5353
error('[Template] Badly formed handles.');
5454
end
5555
case 'block'
56-
error(nargchk(4,5,nargin));
56+
narginchk(4,5);
5757
tpl = loadtpl(tpl,varargin{1});
5858
if nargin == 4
5959
name = varargin{2};
@@ -85,7 +85,7 @@
8585
tpl = set(tpl,'var',varargin{2},blk);
8686
tpl = set(tpl,'var',varargin{1},str);
8787
case 'var'
88-
error(nargchk(3,4,nargin));
88+
narginchk(3,4);
8989
if iscellstr(varargin{1})
9090
for i=1:length(varargin{1})
9191
ind = find(ismember(tpl.varkeys,varargin{1}{i}));

‎external/m2html/@template/template.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
2323
% $Revision: 1.0 $Date: 2003/05/05 22:19:51 $
2424

25-
error(nargchk(0,2,nargin));
25+
narginchk(0,2);
2626

2727
switch nargin
2828
case 0

‎external/m2html/private/mfileparse.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
% Copyright (C) 2003 Guillaume Flandin <[email protected]>
1919
% $Revision: 1.0 $Date: 2003/29/04 17:33:43 $
2020

21-
error(nargchk(3,4,nargin));
21+
narginchk(3,4);
2222
if nargin == 3,
2323
options = struct('verbose',1, 'globalHypertextLinks',0, 'todo',0);
2424
end

0 commit comments

Comments
 (0)