Commit Graph
199 Commits
Author SHA1 Message Date
Ryan Curtin 58670e68f6 Formatting pickiness changes from gcolon7's r6924 2011-01-28 23:08:12 +00:00
Ryan Curtin 7bb657af51 Test checkin from ryan to see if anonymous checkins are really allowed now 2011-01-28 22:55:53 +00:00
(no author) 4fe6fe7ef0 changed fastlib files using Math::Pow to std::pow and std::sqrt 2011-01-28 21:16:41 +00:00
(no author) 85319ce4da Changed contrib files using Math::Pow to std::pow and std::sqrt 2011-01-28 21:09:51 +00:00
(no author) de71c181ba converted general_type_bounds.h to using std::pow 2011-01-28 20:48:57 +00:00
(no author) 95cba1d383 Added support for cmath in fastlib.h
Changed all math::Pow<1,2> calls in mvu_objectives to std::sqrt
2011-01-28 20:37:36 +00:00
(no author) 81ee383e58 Removed math::Pow from bounds_aux.h 2011-01-28 20:33:09 +00:00
Ryan Curtin 2db893ab9e And I was so close to getting it all right! 2011-01-24 22:40:45 +00:00
Ryan Curtin 996315a9b8 Rewrite bits of HMM so that they compile. This is not tested at all (and not expected to work right), but the changes made here mainly serve to make the buildserver happy with this branch. 2011-01-24 22:38:29 +00:00
Ryan Curtin b290805ef3 Fix two bugs -- the first is a forgotten reference specifier. The second fix ensures the same tree is not built twice (if you pass the same matrix for queries and references); additionally it prevents the same point from being reported as its own nearest neighbor. 2011-01-21 20:43:04 +00:00
Ryan Curtin e59c15cc53 Add an overload of data::Save() that was necessary for trunk allnn. 2011-01-21 19:37:09 +00:00
Ryan Curtin ef82ad6ad7 Fix bug in TextLineReader::ReadLine_().
The method will loop until it finds \r or \n at the end of the string.  This is a valid approach,
but what happens when the length we chose to fgets() with only gets the \r?  We end up with a line
that's just \n and the whole thing crashes out.  Therefore, after every fgets() we have to check that
the \n isn't the next character.  If so, keep it; if not, step the file pointer back.

And this is precisely why we should be depending on something else to do this for us, not our own code.
2011-01-21 19:36:52 +00:00
Ryan Curtin 3ce979d6f4 Refactor AllNN into header and source file since it's not a templated class (that may change). Copy the main executable over from trunk, where I modified it more heavily, then transition to armadillo components. 2011-01-21 19:34:10 +00:00
James Cline 9e3ec57a5f Converted to stl stuff, still some bugs 2011-01-20 19:26:05 +00:00
James Cline a0856989ec Nothing in this file is used anymore. 2011-01-18 19:42:40 +00:00
Ryan Curtin e22ce23214 arma::Mat<eT>::unsafe_col() was introduced in Armadillo 0.9.90 (require that). Only problem is, that hasn't yet been packaged by the Ubuntu maintainers. 2010-12-15 18:14:29 +00:00
Ryan Curtin 7f92073913 Use source root directory as include directory instead of ${CMAKE_BINARY_DIR}/include. With the latter, the compilation will look inside of the built include files. Therefore, if a user makes a change to an included file, it isn't reflected in the build. This change fixes that. 2010-12-14 21:36:26 +00:00
Ryan Curtin 77e9f73d3f Set up optimization CMake configuration correctly 2010-12-14 21:35:09 +00:00
Ryan Curtin 952cca271b Update regexes to correctly parse version information for older versions of Armadillo. 2010-11-18 22:12:10 +00:00
Ryan Curtin a93c694cb7 First pass at version requirements for Armadillo. One thing left to do; when looking at version.hpp (not arma_version.hpp) the syntax is different, so I need to rewrite the regular expressions. 2010-11-18 19:56:32 +00:00
gcolon7 ca61cfa603 Undid a horrible mistake 2010-11-18 19:00:57 +00:00
gcolon7 a329202aef changed math::Pow for std::pow wherever it was called in the mlpack and contrib directories 2010-11-17 20:53:08 +00:00
gcolon7 825270e1fe Missed a math::Pow to std::pow in optimization/lbfgs/optimization_utils.h 2010-11-17 20:14:11 +00:00
gcolon7 012b3724f8 Fixed optimization/lbfgs/lbfgs_impl.h & optimization_utils.h so that they use std::pow instead of math::Pow. Also added a cmath include in fastlib.h 2010-11-17 20:12:20 +00:00
Ryan Curtin a5cd1457cc Fix "translation" errors in DeflationGaussUpdate_() and fix spelling in comment. 2010-11-15 19:05:48 +00:00
Ryan Curtin aaf45a7d79 Remove some amount of debugging output. Fix DeflationLogCoshUpdate_() (was missing a "- n" term) so that FastICA now performs nearly identically to the trunk implementation.
Sometimes signs of output components will be different, but any other differences are trivial; it extracts independent components successfully.
2010-11-15 17:03:40 +00:00
Ryan Curtin 424f749c1a Apply changes from r5648 to fastlib-stl branch (allow selection of number of independent components). 2010-11-01 20:00:34 +00:00
Ryan Curtin e95f4ec8c7 Include arma_extend files in build and then install them to the include/ directory. 2010-11-01 03:53:33 +00:00
Ryan Curtin 14af8cb147 Apply use of unsafe_col() to allnn and allkfn for speed improvements. 2010-10-27 21:47:25 +00:00
Ryan Curtin e7909a2d9d Improve speed of AllkNN methods by using new armadillo mat::unsafe_col() method (returns an arma::vec alias which uses shared memory from the matrix).
The code now requires armadillo-0.9.90, since that function was new as of that version.
2010-10-27 20:46:16 +00:00
Ryan Curtin a241f43683 Speed improvements for MinDistanceSq(). 2010-10-27 20:44:55 +00:00
Ryan Curtin b7ddec5249 Significantly improve (by a factor of 1.5 or more) DistanceSqEuclidean function. 2010-10-26 18:32:10 +00:00
ssharfraz3 9c28da0de6 2010-10-20 16:23:21 +00:00
ssharfraz3 38803c0d60 2010-10-20 13:07:42 +00:00
ssharfraz3 f4d43965c8 2010-10-20 12:37:01 +00:00
ssharfraz3 848718dc30 2010-10-20 12:05:47 +00:00
ssharfraz3 52445dd863 2010-10-20 04:15:59 +00:00
James Cline 6b6d0a31fe Uses data::Save to save as a CSV file 2010-10-07 16:32:13 +00:00
James Cline 84057f3d60 Works correctly now, just need to get the output to be in csv format. 2010-10-05 19:21:25 +00:00
James Cline f515b272d2 naive_bayes compiles now. Currently untested. Could also possibly use some cleaning up still.
Changed out Matrix -> arma::mat, Vector -> arma::vec, added std::vector where appropriate. Some std::vectors might should be changed to arma::vec. 
No longer need math_functions.h for this.
2010-09-30 18:05:37 +00:00
Ryan Curtin 3b3502bc06 FastICA now compiles, but I'm sure it doesn't work, and it hasn't been tested. The vast majority of methods from lin_alg.h have been pruned as they are no longer necessary. 2010-09-22 15:53:31 +00:00
James Cline 27d9f5cb2d assert() undefined, added #include <assert.h> 2010-09-22 14:10:49 +00:00
Ryan Curtin ab03ff3233 Rewrite FastICA Orthogonalize() method and write a test for it. 2010-09-16 18:08:51 +00:00
Ryan Curtin 5b6bd24750 Extend functionality of Armadillo; cov() operates like Octave, but what we want is
cov(trans()).  However, that incurs a speed penalty with trans(), so I wrote ccov()
(column-based covariance) which does what we want without that speed penalty.  I'll
submit the patch to Armadillo sometime, but for now we'll just include it with
arma_extend.h.
2010-09-16 18:07:26 +00:00
Ryan Curtin 074c8e6495 Rewrite WhitenUsingEig(). Fix simple (yet fatal) bug in Center(). Test case for WhitenUsingEig() also added, but perhaps at some point should be made more thorough. 2010-09-08 21:56:38 +00:00
Ryan Curtin 38176998dc No. We will not be outputting BLACK text. No. 2010-09-02 17:30:33 +00:00
James Cline 9c336105b9 Switched over kernel_pca stuff to use arma & std.
Does not compile, needs changes to be made to la and SparseMatrix.
2010-08-24 15:31:48 +00:00
James Cline 7935acce6d Make parameter passing to SMO::InitPara sane. 2010-07-27 18:50:30 +00:00
James Cline 1413db1d5f The svm_r learner now "works" for linear and gaussian kernels for training and testing.
After fixing the runtime error in trunk, the results were verified to be identical.
2010-07-27 16:45:45 +00:00
James Cline a9313711c8 Works for svm_c learner, linear or gaussian kernels for training and testing.
svm_r learner is broken, even in trunk, it seems.
2010-07-27 15:37:02 +00:00