[mlpack-svn] r10044 - in mlpack/trunk/src/mlpack: . core methods/emst methods/fastica methods/hmm methods/infomax_ica methods/linear_regression methods/mog methods/naive_bayes methods/nca methods/neighbor_search methods/nnsvm methods/regression methods/svm
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Wed Oct 26 17:20:17 EDT 2011
Author: vlad321
Date: 2011-10-26 17:20:16 -0400 (Wed, 26 Oct 2011)
New Revision: 10044
Removed:
mlpack/trunk/src/mlpack/core/data/
Modified:
mlpack/trunk/src/mlpack/core.h
mlpack/trunk/src/mlpack/core/CMakeLists.txt
mlpack/trunk/src/mlpack/methods/emst/emst_main.cpp
mlpack/trunk/src/mlpack/methods/fastica/fastica_main.cpp
mlpack/trunk/src/mlpack/methods/fastica/lin_alg_test.cpp
mlpack/trunk/src/mlpack/methods/hmm/mixtureDST.cc
mlpack/trunk/src/mlpack/methods/hmm/support.cc
mlpack/trunk/src/mlpack/methods/infomax_ica/infomax_ica_test.cc
mlpack/trunk/src/mlpack/methods/infomax_ica/main.cc
mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression_main.cpp
mlpack/trunk/src/mlpack/methods/mog/mog_em_main.cc
mlpack/trunk/src/mlpack/methods/mog/mog_l2e_main.cc
mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_main.cc
mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_test.cc
mlpack/trunk/src/mlpack/methods/nca/nca_main.cc
mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cc
mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_test.cc
mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cc
mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_test.cc
mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_main.cpp
mlpack/trunk/src/mlpack/methods/regression/ridge_main.cc
mlpack/trunk/src/mlpack/methods/svm/svm_main.cc
Log:
Removed Dataset. Converted all data::Load and data::Save to armadillo's .load and .save.
Modified: mlpack/trunk/src/mlpack/core/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/core/CMakeLists.txt 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/core/CMakeLists.txt 2011-10-26 21:20:16 UTC (rev 10044)
@@ -2,7 +2,6 @@
set(DIRS
arma_extend
col
- data
file
io
kernels
Modified: mlpack/trunk/src/mlpack/core.h
===================================================================
--- mlpack/trunk/src/mlpack/core.h 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/core.h 2011-10-26 21:20:16 UTC (rev 10044)
@@ -90,7 +90,6 @@
#include <armadillo>
// Now MLPACK-specific includes.
-#include <mlpack/core/data/dataset.h>
#include <mlpack/core/math/math_lib.hpp>
#include <mlpack/core/math/range.hpp>
#include <mlpack/core/model/model.hpp>
Modified: mlpack/trunk/src/mlpack/methods/emst/emst_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/emst/emst_main.cpp 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/emst/emst_main.cpp 2011-10-26 21:20:16 UTC (rev 10044)
@@ -43,7 +43,7 @@
std::string data_file_name = CLI::GetParam<std::string>("emst/input_file");
arma::mat data_points;
- data::Load(data_file_name.c_str(), data_points);
+ data_points.load(data_file_name.c_str());
/////////////// Initialize DTB //////////////////////
DualTreeBoruvka dtb;
@@ -143,7 +143,7 @@
std::string naive_output_filename =
CLI::GetParam<std::string>("naive/output_file");
- data::Save(naive_output_filename.c_str(), naive_results);
+ naive_results.save(naive_output_filename.c_str());
}
//////////////// Output the Results ////////////////
@@ -151,7 +151,7 @@
std::string output_filename =
CLI::GetParam<std::string>("emst/output_file");
- data::Save(output_filename.c_str(), results);
+ results.save(output_filename.c_str());
}// end else (if using_thor)
Modified: mlpack/trunk/src/mlpack/methods/fastica/fastica_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/fastica/fastica_main.cpp 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/fastica/fastica_main.cpp 2011-10-26 21:20:16 UTC (rev 10044)
@@ -57,7 +57,7 @@
CLI::ParseCommandLine(argc, argv);
const char* data = CLI::GetParam<std::string>("fastica/input_file").c_str();
- data::Load(data, X);
+ X.load(data);
const char* ic_filename = CLI::GetParam<std::string>("fastica/ic_file").c_str();
const char* unmixing_filename =
@@ -69,8 +69,9 @@
if(fastica.Init(X) == true) {
arma::mat W, Y;
if(fastica.DoFastICA(W, Y) == true) {
- data::Save(unmixing_filename, trans(W));
- data::Save(ic_filename, Y);
+ Y.save(ic_filename);
+ arma::mat Z = trans(W);
+ Z.save(unmixing_filename);
success_status = true;
mlpack::Log::Debug << W << std::endl;
}
Modified: mlpack/trunk/src/mlpack/methods/fastica/lin_alg_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/fastica/lin_alg_test.cpp 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/fastica/lin_alg_test.cpp 2011-10-26 21:20:16 UTC (rev 10044)
@@ -84,7 +84,7 @@
// We are loading a matrix from an external file... bad choice.
mat tmp, tmp_centered, whitened, whitening_matrix;
- data::Load("fake.arff", tmp);
+ tmp.load("fake.arff");
Center(tmp, tmp_centered);
WhitenUsingEig(tmp_centered, whitened, whitening_matrix);
@@ -107,7 +107,7 @@
// Generate a random matrix; then, orthogonalize it and test if it's
// orthogonal.
mat tmp, orth;
- data::Load("fake.arff", tmp);
+ tmp.load("fake.arff");
Orthogonalize(tmp, orth);
// test orthogonality
Modified: mlpack/trunk/src/mlpack/methods/hmm/mixtureDST.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/mixtureDST.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/hmm/mixtureDST.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -75,14 +75,14 @@
void MixtureGauss::InitFromFile(const char* mean_fn, const char* covs_fn, const char* prior_fn) {
arma::mat meansmat;
- data::Load(mean_fn, meansmat);
+ meansmat.load(mean_fn);
mat2arrlst(meansmat, means);
size_t N = means[0].n_elem;
size_t K = means.size();
if (covs_fn != NULL) {
arma::mat covsmat;
- data::Load(covs_fn, covsmat);
+ covsmat.load(covs_fn);
mat2arrlstmat(N, covsmat, covs);
mlpack::Log::Assert(K == covs.size(), "MixtureGauss::InitFromFile(): sizes do not match!");
@@ -100,7 +100,7 @@
if (prior_fn != NULL) {
arma::mat priormat;
- data::Load(prior_fn, priormat);
+ priormat.load(prior_fn);
mlpack::Log::Assert(K == priormat.n_cols, "MixtureGauss::InitFromFile(): sizes do not match!");
Modified: mlpack/trunk/src/mlpack/methods/hmm/support.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/support.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/hmm/support.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -1,5 +1,6 @@
#include <mlpack/core.h>
#include <mlpack/core/kernels/lmetric.hpp>
+#include "../../core/col/tokenizer.h"
#include "support.h"
Modified: mlpack/trunk/src/mlpack/methods/infomax_ica/infomax_ica_test.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/infomax_ica/infomax_ica_test.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/infomax_ica/infomax_ica_test.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -22,7 +22,7 @@
int bb_ = 5;
double epsilonb_ = 0.001;
- data::Load("fake.arff", testdatab_);
+ testdatab_.load("fake.arff");
InfomaxICA icab_(lambdab_, bb_, epsilonb_);
@@ -39,7 +39,7 @@
// load some test data that has been verified using the matlab
// implementation of infomax
- data::Load("fake.arff", testdata_);
+ testdata_.load("fake.arff");
InfomaxICA ica_(lambda_, b_, epsilon_);
ica_.sampleCovariance(testdata_);
@@ -53,7 +53,7 @@
// load some test data that has been verified using the matlab
// implementation of infomax
- data::Load("fake.arff", testdata_);
+ testdata_.load("fake.arff");
InfomaxICA ica_(lambda_, b_, epsilon_);
arma::mat unmixing;
Modified: mlpack/trunk/src/mlpack/methods/infomax_ica/main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/infomax_ica/main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/infomax_ica/main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -22,7 +22,7 @@
double epsilon = CLI::GetParam<double>("info/epsilon");
arma::mat dataset;
- data::Load(data_file_name, dataset);
+ dataset.load(data_file_name);
InfomaxICA ica(lambda, B, epsilon);
ica.applyICA(dataset);
Modified: mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression_main.cpp 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/linear_regression/linear_regression_main.cpp 2011-10-26 21:20:16 UTC (rev 10044)
@@ -29,7 +29,7 @@
const std::string response_name =
CLI::GetParam<std::string>("linear_regression/responses");
- data::Load(train_name.c_str(), file);
+ file.load(train_name.c_str());
size_t n_cols = file.n_cols,
n_rows = file.n_rows;
@@ -42,7 +42,7 @@
else {
predictors = file;
// The initial predictors for y, Nx1
- data::Load(response_name.c_str(), responses);
+ responses.load(response_name.c_str());
if(responses.n_rows > 1) {
std::cerr << "Error: The responses must have one column.\n";
return 0;
@@ -54,7 +54,7 @@
}
}
- data::Load(test_name.c_str(), points);
+ points.load(test_name.c_str());
if(points.n_rows != n_rows) {
std::cerr << "Error: The test data must have the same number of cols as\
the training file.\n";
Modified: mlpack/trunk/src/mlpack/methods/mog/mog_em_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/mog/mog_em_main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/mog/mog_em_main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -39,7 +39,7 @@
////// READING PARAMETERS AND LOADING DATA //////
arma::mat data_points;
- data::Load(CLI::GetParam<std::string>("mog/data").c_str(), data_points);
+ data_points.load(CLI::GetParam<std::string>("mog/data").c_str());
////// MIXTURE OF GAUSSIANS USING EM //////
MoGEM mog;
Modified: mlpack/trunk/src/mlpack/methods/mog/mog_l2e_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/mog/mog_l2e_main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/mog/mog_l2e_main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -40,7 +40,7 @@
////// READING PARAMETERS AND LOADING DATA //////
arma::mat data_points;
- data::Load(CLI::GetParam<std::string>("mog_l2e/data").c_str(), data_points);
+ data_points.load(CLI::GetParam<std::string>("mog_l2e/data").c_str());
////// MIXTURE OF GAUSSIANS USING L2 ESTIMATCLIN //////
size_t number_of_gaussians = CLI::GetParam<int>("mog_l2e/k");
Modified: mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -78,11 +78,11 @@
const char *training_data_filename = CLI::GetParam<std::string>("nbc/train").c_str();
arma::mat training_data;
- data::Load(training_data_filename, training_data);
+ training_data.load(training_data_filename);
const char *testing_data_filename = CLI::GetParam<std::string>("nbc/test").c_str();
arma::mat testing_data;
- data::Load(testing_data_filename, testing_data);
+ testing_data.load(testing_data_filename);
////// SIMPLE NAIVE BAYES CLASSIFICATCLIN ASSUMING THE DATA TO BE UNIFORMLY DISTRIBUTED //////
@@ -110,7 +110,7 @@
////// OUTPUT RESULTS //////
std::string output_filename = CLI::GetParam<std::string>("nbc/output");
- data::Save(output_filename.c_str(), results);
+ results.save(output_filename.c_str());
return 1;
}
Modified: mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_test.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_test.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/naive_bayes/nbc_test.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -15,8 +15,8 @@
size_t number_of_classes_ = 2;
arma::mat train_data, train_res, calc_mat;
- data::Load(filename_train_, train_data);
- data::Load(train_result_, train_res);
+ train_data.load(filename_train_);
+ train_res.load(train_result_);
CLI::GetParam<int>("nbc/classes") = number_of_classes_;
SimpleNaiveBayesClassifier nbc_test_(train_data);
@@ -41,9 +41,8 @@
arma::mat test_data, test_res;
arma::vec test_res_vec, calc_vec;
- data::Load(filename_test_, test_data);
- data::Load(test_result_, test_res);
-
+ test_data.load(filename_test_);
+ test_res.load(test_result_);
nbc_test_.Classify(test_data, calc_vec);
size_t number_of_datum = test_data.n_cols;
Modified: mlpack/trunk/src/mlpack/methods/nca/nca_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/nca/nca_main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/nca/nca_main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -25,7 +25,7 @@
CLI::ParseCommandLine(argc, argv);
arma::mat data;
- data::Load(CLI::GetParam<string>("input_file").c_str(), data);
+ data.load(CLI::GetParam<string>("input_file").c_str());
arma::uvec labels(data.n_cols);
for (size_t i = 0; i < data.n_cols; i++)
@@ -39,5 +39,5 @@
nca.LearnDistance(distance);
- data::Save(CLI::GetParam<string>("output_file").c_str(), distance);
+ distance.save(CLI::GetParam<string>("output_file").c_str());
}
Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -52,7 +52,7 @@
arma::Mat<size_t> neighbors;
arma::mat distances;
- if (data::Load(reference_file.c_str(), reference_data) == false)
+ if (reference_data.load(reference_file.c_str()) == false)
Log::Fatal << "Reference file " << reference_file << "not found." << endl;
Log::Info << "Loaded reference data from " << reference_file << endl;
@@ -78,7 +78,7 @@
string query_file = CLI::GetParam<string>("query_file");
arma::mat query_data;
- if (data::Load(query_file.c_str(), query_data) == false)
+ if(query_data.load(query_file.c_str()) == false)
Log::Fatal << "Query file " << query_file << " not found" << endl;
Log::Info << "Query data loaded from " << query_file << endl;
Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_test.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_test.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/allkfn_test.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -323,7 +323,7 @@
arma::mat data_for_tree_;
// Hard-coded filename: bad!
- if (data::Load("test_data_3_1000.csv", data_for_tree_) != true)
+ if (data_for_tree_.load("test_data_3_1000.csv") !=true )
BOOST_FAIL("Cannot load test dataset test_data_3_1000.csv!");
// Set up matrices to work with.
@@ -364,7 +364,7 @@
// Hard-coded filename: bad!
// Code duplication: also bad!
- if (data::Load("test_data_3_1000.csv", data_for_tree_) != true)
+ if (data_for_tree_.quiet_load("test_data_3_1000.csv") !=true )
BOOST_FAIL("Cannot load test dataset test_data_3_1000.csv!");
// Set up matrices to work with (may not be necessary with no ALIAS_MATRIX?).
@@ -403,7 +403,7 @@
// Hard-coded filename: bad!
// Code duplication: also bad!
- if (data::Load("test_data_3_1000.csv", data_for_tree_) != true)
+ if (data_for_tree_.load("test_data_3_1000.csv") !=true )
BOOST_FAIL("Cannot load test dataset test_data_3_1000.csv!");
arma::mat single_query(data_for_tree_);
Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -52,7 +52,7 @@
arma::Mat<size_t> neighbors;
arma::mat distances;
- if (data::Load(reference_file.c_str(), reference_data) == false)
+ if (reference_data.load(reference_file.c_str()) == false)
Log::Fatal << "Reference file " << reference_file << " not found." << endl;
Log::Info << "Loaded reference data from " << reference_file << endl;
@@ -78,7 +78,7 @@
string query_file = CLI::GetParam<string>("query_file");
arma::mat query_data;
- if (data::Load(query_file.c_str(), query_data) == false)
+ if (query_data.load(query_file.c_str()) == false)
Log::Fatal << "Query file " << query_file << " not found" << endl;
Log::Info << "Query data loaded from " << query_file << endl;
Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_test.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_test.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/allknn_test.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -323,7 +323,7 @@
arma::mat data_for_tree_;
// Hard-coded filename: bad!
- if (data::Load("test_data_3_1000.csv", data_for_tree_) != true)
+ if (data_for_tree_.load("test_data_3_1000.csv") !=true )
BOOST_FAIL("Cannot load test dataset test_data_3_1000.csv!");
// Set up matrices to work with.
@@ -367,7 +367,7 @@
// Hard-coded filename: bad!
// Code duplication: also bad!
- if (data::Load("test_data_3_1000.csv", data_for_tree_) != true)
+ if (data_for_tree_.load("test_data_3_1000.csv") !=true )
BOOST_FAIL("Cannot load test dataset test_data_3_1000.csv!");
// Set up matrices to work with (may not be necessary with no ALIAS_MATRIX?).
@@ -408,7 +408,7 @@
// Hard-coded filename: bad!
// Code duplication: also bad!
- if (data::Load("test_data_3_1000.csv", data_for_tree_) != true)
+ if (data_for_tree_.load("test_data_3_1000.csv") !=true )
BOOST_FAIL("Cannot load test dataset test_data_3_1000.csv!");
// Set up matrices to work with (may not be necessary with no ALIAS_MATRIX?).
Modified: mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_main.cpp 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/nnsvm/nnsvm_main.cpp 2011-10-26 21:20:16 UTC (rev 10044)
@@ -47,7 +47,7 @@
std::string trainFile = CLI::GetParam<std::string>("nnsvm/train_data");
// Load training data
arma::mat dataSet;
- if (data::Load(trainFile.c_str(), dataSet) == false) // TODO:param_req
+ if (dataSet.load(trainFile.c_str()) == false) // TODO:param_req
{
/* TODO: eventually, we need better exception handling */
Log::Debug << "Could not open " << trainFile << " for reading" << std::endl;
@@ -74,7 +74,7 @@
/* Load testing data */
std::string testFile = CLI::GetParam<std::string>("nnsvm/test_data");
arma::mat testset;
- if (data::Load(testFile.c_str(), testset) == false) // TODO:param_req
+ if (testset.load(testFile.c_str()) == false)// TODO:param_req
{
/* TODO: eventually, we need better exception handling */
Log::Debug << "Could not open " << testFile << " for reading" <<
Modified: mlpack/trunk/src/mlpack/methods/regression/ridge_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/regression/ridge_main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/regression/ridge_main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -69,12 +69,12 @@
std::string predictions_file = CLI::GetParam<std::string>("ridge/predictions");
arma::mat predictors;
- if (data::Load(predictors_file.c_str(), predictors) == false) {
+ if (predictors.load(predictors_file.c_str()) == false) {
Log::Fatal << "Unable to open file " << predictors_file << std::endl;
}
arma::mat predictions;
- if (data::Load(predictions_file.c_str(), predictions) == false) {
+ if (predictions.load(predictions_file.c_str()) == false) {
Log::Fatal << "Unable to open file " << predictions_file << std::endl;
}
@@ -106,12 +106,10 @@
CLI::GetParam<std::string>("ridge/predictor_indices");
std::string prune_predictor_indices_file =
CLI::GetParam<std::string>("ridge/prune_predictor_indices");
- if(data::Load(predictor_indices_file.c_str(),
- predictor_indices_intermediate) == false) {
+ if (predictor_indices_intermediate.load(predictor_indices_file.c_str()) == false) {
Log::Fatal << "Unable to open file " << prune_predictor_indices_file << std::endl;
}
- if(data::Load(prune_predictor_indices_file.c_str(),
- prune_predictor_indices_intermediate) == false) {
+ if (prune_predictor_indices_intermediate.load(prune_predictor_indices_file.c_str()) == false) {
Log::Fatal << "Unable to open file " << prune_predictor_indices_file << std::endl;
}
@@ -135,7 +133,8 @@
engine.factors(&factors);
std::string factors_file = CLI::GetParam<std::string>("ridge/factors");
Log::Info << "Saving factors..." << std::endl;
- data::Save(factors_file.c_str(), factors);
+ factors.save(factors_file.c_str());
+// data::Save(factors_file.c_str(), factors);
return 0;
}
Modified: mlpack/trunk/src/mlpack/methods/svm/svm_main.cc
===================================================================
--- mlpack/trunk/src/mlpack/methods/svm/svm_main.cc 2011-10-26 20:34:57 UTC (rev 10043)
+++ mlpack/trunk/src/mlpack/methods/svm/svm_main.cc 2011-10-26 21:20:16 UTC (rev 10044)
@@ -94,7 +94,7 @@
Log::Info << "Training SVM..." << std::endl;
/* Load training data */
- if (data::Load(trainFile.c_str(), dataSet) == false)
+ if (dataSet.load(trainFile.c_str()) == false)
return 1;
/* Begin SVM Training | Training and Testing */
@@ -108,7 +108,7 @@
/* Load testing data */
arma::mat dataSet;
std::string testFile = CLI::GetParam<std::string>("svm/test_data");
- if (data::Load(testFile.c_str(), dataSet) == false)
+ if (dataSet.load(testFile.c_str()) == false)
return 1;
svm.BatchPredict(learner_typeid, dataSet, "predicted_values");
@@ -123,7 +123,7 @@
/* Load testing data */
arma::mat dataSet;
std::string testFile = CLI::GetParam<std::string>("svm/test_data");
- if (data::Load(testFile.c_str(), dataSet) == false)
+ if (dataSet.load(testFile.c_str()) == false)
return 1;
svm.BatchPredict(learner_typeid, dataSet, "predicted_values"); // TODO:param_req
@@ -138,7 +138,7 @@
/* Load testing data */
arma::mat dataSet;
std::string testFile = CLI::GetParam<std::string>("svm/test_data");
- if (data::Load(testFile.c_str(), dataSet) == false)
+ if (dataSet.load(testFile.c_str()) == false)
return 1;
/* Begin Prediction */
More information about the mlpack-svn
mailing list