apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,033 Commits 1 Branch 0 Tags
94de8cd4d7b3102b80dd89650a724f040188cb2d
Commit Graph
2397 Commits
Author SHA1 Message Date
Ryan Curtin ad8d868ca7 Remove Matrix, Vector, and ArrayList classes from allknn. Compiles, but test does not pass. 2010-06-23 21:17:05 +00:00
Ryan Curtin 6dde3d21e3 Remove last references and uses of Matrix from AllNN class. 2010-06-23 21:03:52 +00:00
Ryan Curtin b3ff9d9bdd Function specialization is no longer necessary 2010-06-23 21:02:29 +00:00
Ryan Curtin 037005d7e2 Changes in contrib/ affected and broke kde/, so don't bother with that for now 2010-06-23 18:50:22 +00:00
James Cline 9342b95518 It was dumb to not have done it this way to begin with. 2010-06-23 16:22:38 +00:00
James Cline 1aadb37adf Removed unecessary #include. 2010-06-23 14:20:46 +00:00
James Cline 04bb7a2a32 Removed useless Init method in rangset.h. 
Removed unused #include in tokenizer.h.
 2010-06-23 13:27:01 +00:00
Ryan Curtin 1fe20db49a Remove last instances of Matrix and Vector from allnn. 2010-06-23 00:44:04 +00:00
James Cline 3e6e2043eb Removed error checking for converting numbers to strings when unecessary. 
Made error checking for string -> number conversions more intuitive.
 2010-06-22 23:35:20 +00:00
Ryan Curtin 41f827f886 Custom DistanceSqEuclidean() function for arma::vec objects. 2010-06-22 23:16:03 +00:00
Ryan Curtin e07ae52aed Oops, we need to tell the compiler to set the DEBUG macro flag. 2010-06-22 05:42:01 +00:00
Ryan Curtin f4c89b8008 Compile with debugging information by default (so that DEBUG_ASSERT_MSG and similar macros will still work, as they are DEBUG_ONLY). 
Should make optimization the default for compilation when tagging for a release, but default debug is more convenient for development.
 2010-06-22 05:37:38 +00:00
Ryan Curtin e5ac749630 Remove ridiculous copypasta from AllNN::Init() and AllNN::InitNaive() (it could 
be trimmed further, even).  Change Matrix queries_ and references_ to arma::mat
type, but pointers were required to make it work right.

This entire class needs to be written in a more sensible and intuitive way.

Still a little left to do in terms of removing Matrix and Vectors.
 2010-06-22 00:14:52 +00:00
Ryan Curtin d91faacc17 Fix bug introduced a while ago; when quicksorting to build the tree, we have to keep our local matrix up to date (the temporary matrix we passed is modified) 2010-06-21 21:51:46 +00:00
Ryan Curtin 8b5f312fbd How did this happen? Oops... 2010-06-21 20:18:26 +00:00
James Cline f00f3dc33d Fixed tokenizer bug. Added a hopefully finished unit test for the tokenizer. 2010-06-21 19:52:01 +00:00
Dongryeol Lee 1b801e86ef Fixed L-BFGS test. 2010-06-20 05:16:13 +00:00
Ryan Curtin 9340904806 Remove fastlib-armadillo branch; it has been successfully merged into the 
fastlib-stl branch
 2010-06-18 23:09:35 +00:00
Ryan Curtin e03ad9302c Merge changes to CMakeLists.txt from fastlib-armadillo branch to fastlib-stl 
branch
 2010-06-18 23:07:52 +00:00
Ryan Curtin 0b72285c25 Merge CMake files from fastlib-armadillo into fastlib-stl 2010-06-18 23:07:29 +00:00
Ryan Curtin e0ea516dc4 Merge fastlib-armadillo/contrib into fastlib-stl 2010-06-18 23:06:34 +00:00
Ryan Curtin cc81ca5438 Merge last bits of fastlib-armadillo/mlpack into fastlib-stl/mlpack 2010-06-18 23:03:54 +00:00
Ryan Curtin 46f7b7b3ac Fix allkfn so allkfn_test compiles (however, it throws an error) 2010-06-18 22:58:25 +00:00
Ryan Curtin 20ba756bf8 Merge all??n methods from fastlib-armadillo/mlpack into fastlib-stl branch 2010-06-18 18:05:22 +00:00
Ryan Curtin 7e384edcaa Merge fastlib-armadillo/fastlib/tree with fastlib-stl/fastlib/tree. This should 
have been done earlier to prevent duplicated work (some functions had been
switched to arma::vec and std::vector in different functions; I stuck with
arma::vec because fixed-size vectors made more sense in those particular
cases)
 2010-06-18 17:59:54 +00:00
Ryan Curtin 0c216c8c7b Failed merge not noticed until template function instantiation... 2010-06-18 17:52:25 +00:00
Ryan Curtin f6674f8cfa More std::string usage 2010-06-18 17:47:41 +00:00
Ryan Curtin 11c091cb1f const char * --> std::string 2010-06-18 17:45:13 +00:00
Ryan Curtin d466acaae2 Merge fastlib-armadillo/fastlib/thor into fastlib-stl/fastlib/thor 2010-06-18 17:42:39 +00:00
Ryan Curtin 04ffcfc659 Fix bugs introduced into DatasetInfo of my own doing. 
* ReadPoint() is broken, but still works.  It checks for \0 characters, but std::string does not terminate with those.  Leaving it there for now until it gets handled by #37
 * When adding a class feature from ARFF... actually add it to the features_ vector in DatasetInfo.  Oops.
 2010-06-18 17:38:01 +00:00
Ryan Curtin 37f5f4967e Merge fastlib-armadillo/fastlib/data with fastlib-stl/fastlib/data. Runtime dataset_test fails, but it compiles ok. 2010-06-17 03:43:17 +00:00
Ryan Curtin 79ae6f6bd4 Merge branches/fastlib-armadillo/fastlib/file into fastlib-stl/fastlib/file 
(breaks build until I merge data/, in just a moment)
 2010-06-17 01:16:34 +00:00
Ryan Curtin 9a49e64e83 Merge fastlib-armadillo/fastlib/base into fastlib-stl/fastlib/base 2010-06-17 00:26:05 +00:00
Ryan Curtin 224983f60f Rewrite the ReadMatrix() code to be almost identical to that found in fastlib-armadillo. Should have merged them earlier... 2010-06-17 00:09:52 +00:00
Ryan Curtin b4dbd8b2fd Fix ReadMatrix() (it was trying to write to places that don't exist). I think the implementation in fastlib-armadillo is less bizarre and will end up being used here (arma::vec lends itself better to this task than std::vector). Need to merge those branches... 2010-06-16 22:23:02 +00:00
Ryan Curtin 06c40e5bf0 Initialize int correctly in SkipSpace_(). 
Also fix some logic in ReadFromArff(); re-adapt to use strcasecmp() == 0 instead of potentially confusing !strcasecmp() (the counter-intuitiveness may have actually caused one of the bugs fixed here)
 2010-06-16 22:14:59 +00:00
Ryan Curtin 6484b3a16a Add new parameter to tokenizeString that will save the last token if a stop character is encountered. Make it look a little nicer with a few comments and a using directive. Also, fix the last condition (should be || not &&) to capture the last token if necessary. 2010-06-16 22:09:08 +00:00
Ryan Curtin ada6228388 Preprocessor macros are bad when they make programs perform in ways users don't expect. 
Preprocessor macros are bad when they make programs perform in ways users don't expect.
Preprocessor macros are bad when they make programs perform in ways users don't expect.
Preprocessor macros are bad when they make programs perform in ways users don't expect.
Preprocessor macros are bad when they make programs perform in ways users don't expect.

In this case OBJECT_TRAVERSAL() had no idea what to do with a std::string, and it's generating all this weird copy constructor crap and things aren't handled right.
Todo: move away from InitCopy() everywhere.  And Init().  And InitXXX().  They make constructors for a reason, and we will assume our users are smart enough to not copy 2GB objects a bunch of times.
 2010-06-16 00:36:31 +00:00
James Cline 9b60acd638 More stuff compiles, all untested for correctness. 2010-06-15 21:31:33 +00:00
Bill March 6c50cd909a fixed small error in naive multi main 2010-06-14 18:22:48 +00:00
Ryan Curtin 2e2b5d601d Ugly hack to get around failure of math::MakeIdentityPermutation() -- should be using fixed-size arrays there (todo). 2010-06-09 22:50:29 +00:00
Ryan Curtin ee5f9a571d Correctly initialize DatasetFeature members during Init(); it should be noted that the features_ vector does not clear() itself upon calls to Init*() methods, but this will be irrelevant when we ditch the Init() style of methods and use constructors. 2010-06-09 22:19:05 +00:00
Bill March 3e9973a44e wrote code to time single matcher code over multiple matchers 2010-06-09 20:35:31 +00:00
Ryan Curtin d868f4b2e9 Remove last references to Vector class 2010-06-09 20:25:11 +00:00
James Cline 58d10b265b fastlib/thor compiles now, except for allnn.cc. 
Things in here are still very broken, even if the compiler doesn't complain.
 2010-06-09 16:48:25 +00:00
James Cline cb0f94e748 cmake target fastlib compiles, as do several of the tests before cmake gets to mlpack. 
fastlib/thor currently does _not_ compile and is commented out, the cachearray.h stuff is going to be painful.
 2010-06-09 15:35:45 +00:00
Bill March 6cb7a401d8 fixed memory leak, should be fine now 2010-06-09 15:34:49 +00:00
Bill March 755df756fd fixed a memory leak when copying arrays of GenMatrices 2010-06-09 15:33:57 +00:00
Bill March ee3d805996 improved pruning slightly 2010-06-08 20:07:35 +00:00
Bill March cc75654332 successfully debugged for small 2 and 3 point tests 2010-06-08 19:30:50 +00:00