Commit Graph
1563 Commits
Author SHA1 Message Date
James Cline e4efc7eb33 Incorrect matrix access via [] instead of (x,y).
Why did this even compile?
2010-07-13 19:43:59 +00:00
James Cline fa6f9505ab Added some bounds checking 2010-07-13 14:28:36 +00:00
tqlong c7f543751e optim::NelderMead 2010-07-09 23:30:50 +00:00
James Cline 3ae08c385d A couple comment updates to reflect ArrayList -> std::vector change 2010-07-07 14:57:53 +00:00
James Cline c05622f441 Passes its test now.
Removed pointless \0 checks, unless they are explicitly in the file (why would they be?) this is unecessary.
Changed from manually resizing vectors to just clearing them.
2010-07-07 14:55:37 +00:00
James Cline 0338a1df20 The textfile_test now passes. 2010-06-30 18:45:56 +00:00
Ryan Curtin c6b583e301 Convert linalg__private::Center() to armadillo. Created unit test file, because damn, these things get complex and I want to know that they're working right. 2010-06-25 23:31:08 +00:00
Ryan Curtin 811eac3886 Remove Vector and Matrix and ArrayList uses from emst method. There is no test for emst, so that will have to be done. 2010-06-25 00:19:08 +00:00
Ryan Curtin 3076fa66a6 Build union_find_test target 2010-06-25 00:18:39 +00:00
Ryan Curtin 53cae8db56 Fix main executable to stop using Matrix or Vector or ArrayList entirely. 2010-06-24 00:13:01 +00:00
Ryan Curtin bc1baefb05 Fix allkfn to not use Matrix or Vector anywhere. This one was very easy because it's so similar to allknn. Could it be... time for refactoring into a sensible hierarchy to maximize code reuse and minimize the codebase? Well... not yet... 2010-06-24 00:10:31 +00:00
Ryan Curtin 64d5a146d7 We require different modifiable input matrices as input to AllkNN for now. That will have to be changed. (tree generation modifies the matrix) 2010-06-23 23:52:00 +00:00
Ryan Curtin 80513dfd59 THIS IS YOUR BRAIN ON DRUGS 2010-06-23 23:50:43 +00:00
Ryan Curtin fe5e17f822 Propagate change from trunk CMakeLists.txt to branch... properly use DEBUG definition when told to 2010-06-23 23:09:16 +00:00
Ryan Curtin 44b806ae1e Turns out this is a better way to define the DEBUG flag (and by better I mean... it works) 2010-06-23 23:08:26 +00:00
Ryan Curtin 66300a0d06 Add debug option to stl branch 2010-06-23 21:17:21 +00:00
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