Permalink
Switch branches/tags
Nothing to show
Commits on May 18, 2011
  1. Include cluster.m as per the existing mex/linkagemex.cpp

    This completes the clustering functionality that OpenTLD needs.
    
    Note that this is a standard matlab .m file so unlike linkagemex.cpp its therefore not optimized. However this may not such be a concern as linkagemex is probably doing the most work by first building the cluster tree. The missing cluster() function then splits the cluster built be linkagemex.
    
    See:
    
    http://www.mathworks.com/help/toolbox/stats/linkage.html
    http://www.mathworks.com/help/toolbox/stats/cluster.html
    committed May 18, 2011
Commits on May 17, 2011
  1. Merge remote-tracking branch 'upstream-zk00006/master' into testing-i…

    …ntegration
    
    Conflicts:
    	README
    bilderbuchi committed May 17, 2011
Commits on May 16, 2011
  1. Apply a tweak reported by alanz

    Tracking (of the initial image, not re-acquisition) seems to work for a bit.
    Unfortunately, it turns out that the cluster() function is not implemented in octave, so no luck completing a tracking run.
    bilderbuchi committed May 16, 2011
Commits on Apr 18, 2011
Commits on Apr 17, 2011
  1. New README file.

    zk00006 committed Apr 17, 2011
  2. New README file.

    zk00006 committed Apr 17, 2011
  3. New README file.

    zk00006 committed Apr 17, 2011
Commits on Apr 15, 2011
  1. Update README.

    bilderbuchi committed Apr 15, 2011
Commits on Apr 14, 2011
  1. Consolidate branches on github.

    This should now compile/run on all 3 platforms with Matlab >=R2009a and octave. Only opencv version selection needs manual intervention (open to ideas here). For more info on limitations (on octave) see commitlog of 5f2b60.
    bilderbuchi committed Apr 14, 2011
  2. Merge remote branch 'upstream-zk00006/master' into testing-integration

    Conflicts:
    	README
    	compile.m
    bilderbuchi committed Apr 14, 2011
  3. Add testing comments.

    bilderbuchi committed Apr 14, 2011
  4. Merge remote branch 'upstream-pascalbertrand/matlabR2010a' into testi…

    …ng-integration
    
    Conflicts:
    	compile.m
    bilderbuchi committed Apr 14, 2011
  5. Improve/comment compile.m

    bilderbuchi committed Apr 14, 2011
  6. Replace ~ with dummy variables to be compatible to Matlab <R2009b.

    Tested, working on Ubuntu10.10 32bit, opencv 2.1, Matlab R2009a. 
    Runs on octave 3.4. Picture sequence is shown, tracking (blue dots) unsuccessful, process interruption with keypress doesn't work, Tracking output mostly NaN.
    bilderbuchi committed Apr 14, 2011
Commits on Apr 13, 2011
  1. Fix commented-out rectangle to still work in matlab.

    Code runs on octave3.4.0 and ubuntu64, even with opencv2.1, I see the pictures! Will test more later.
    bilderbuchi committed Apr 13, 2011
  2. Ignore output files

    bilderbuchi committed Apr 13, 2011
  3. Compile and run on OSX and Ubuntu 10.10 with matlabR2010a

    pascalbertrand committed Apr 13, 2011
  4. Undo previous commit.

    Was a version problem, this way was easier than rebasing or whatnot.
    bilderbuchi committed Apr 13, 2011
  5. Compilation under Linux

    zk00006 committed Apr 13, 2011
  6. Fix first runtime error.

    Don't know why the tildes were there, they're not a valid operator at that place.
    bilderbuchi committed Apr 13, 2011
  7. Fix non-valid Matlab syntax

    bilderbuchi committed Apr 13, 2011
  8. Fix .gitignore file

    bilderbuchi committed Apr 13, 2011
  9. More fixes to compilation procedure.

    Matlab compiles now. 
    I suspect Octave suppresses some output on compilation (warnings about undeclared functions)
    bilderbuchi committed Apr 13, 2011
  10. Refactor mex calls. Hard-code lib-argument for now. Verbose mex output.

    Signed-off-by: bilderbuchi <bilderbuchi@phononoia.at>
    bilderbuchi committed Apr 13, 2011