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
ee2f995378
Merge fastlib-armadillo/fastlib/optimization into fastlib-stl/fastlib/optimization
2010-06-18 17:41:50 +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
(no author)
f7bb3c05df
-
(no author)
07c79d9b37
-
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
(no author)
2986908ec7
-
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
James Cline
a20886ea1a
More untested yet compilable files.
2010-06-08 18:53:35 +00:00
James Cline
7cc3ed954d
More things that compile yet remain untested.
2010-06-08 16:18:45 +00:00
Bill March
59853f10d7
base case & output debugged, on to pruning
2010-06-08 15:38:40 +00:00
James Cline
d4224ab508
Reimplemented String's tokenizer for std::string.
...
dataset.* now compile, but are completely untested. There are certainly bugs and improvements to be made.
2010-06-08 15:18:40 +00:00
Bill March
5d12924758
wrote multi-matcher with inefficient base case
2010-06-07 19:56:02 +00:00
(no author)
208feb44f0
-
Dongryeol Lee
34de381cfc
Compile error fix.
2010-06-06 16:18:02 +00:00
(no author)
d2756f63a1
-
Dongryeol Lee
c774175261
Adding L-BFGS optimizer with the test.
2010-06-05 22:42:24 +00:00
(no author)
579de7b676
-
Dongryeol Lee
63f147f42e
Adding the metric object.
2010-06-05 19:41:11 +00:00
(no author)
b21448a079
-
(no author)
2d0ab8c266
-
Dongryeol Lee
32b761fff7
Back to FASTLIB.
2010-06-03 23:48:30 +00:00
(no author)
c0f479a761
-
(no author)
78ea59fe66
-
(no author)
99be022c9a
-
(no author)
a7039a0930
-
Ryan Curtin