Skip to content

refactor: corrected data loader #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sshojiro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: corrected data loader #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions +mml/+datasets/loadCargill.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,25 @@
% >> data = mml.datasets.loadShootout(false);
% >> data
% data =
% �t�B�[���h������ struct:
% calibrate_1: [1�~1 struct]
% calibrate_2: [1�~1 struct]
% calibrate_Y: [1�~1 struct]
% validate_1: [1�~1 struct]
% validate_2: [1�~1 struct]
% validate_Y: [1�~1 struct]
% test_1: [1�~1 struct]
% test_2: [1�~1 struct]
% test_Y: [1�~1 struct]
% �t�B�[���h������ struct:
% calibrate_1: [1�~1 struct]
% calibrate_2: [1�~1 struct]
% calibrate_Y: [1�~1 struct]
% validate_1: [1�~1 struct]
% validate_2: [1�~1 struct]
% validate_Y: [1�~1 struct]
% test_1: [1�~1 struct]
% test_2: [1�~1 struct]
% test_Y: [1�~1 struct]
Copy link
Contributor Author

@sshojiro sshojiro Sep 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SHIFT-JIS => UTF-8 errors.



warning('off', 'all');% turn off warnings.
if ~exist('returnXy', 'var'), returnXy=true; end

dataPath='+mml\+datasets\corn.mat';
pathnames = split(mfilename('fullpath'),'/');
dirname = join(pathnames(1:(end-1)),'/');
dataPath = [dirname{1} '/corn.mat'];

if exist(dataPath) ~= 2
url='http://www.eigenvector.com/data/Corn/corn.mat';
[A, cURL_out] = system(['curl ' url ' > ' dataPath]);
Expand Down
26 changes: 13 additions & 13 deletions +mml/+datasets/loadShootout.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
% >> data = mml.datasets.loadShootout(false);
% >> data
% data =
% �t�B�[���h������ struct:
% calibrate_1: [1�~1 struct]
% calibrate_2: [1�~1 struct]
% calibrate_Y: [1�~1 struct]
% validate_1: [1�~1 struct]
% validate_2: [1�~1 struct]
% validate_Y: [1�~1 struct]
% test_1: [1�~1 struct]
% test_2: [1�~1 struct]
% test_Y: [1�~1 struct]
% �t�B�[���h������ struct:
% calibrate_1: [1�~1 struct]
% calibrate_2: [1�~1 struct]
% calibrate_Y: [1�~1 struct]
% validate_1: [1�~1 struct]
% validate_2: [1�~1 struct]
% validate_Y: [1�~1 struct]
% test_1: [1�~1 struct]
% test_2: [1�~1 struct]
% test_Y: [1�~1 struct]
Copy link
Contributor Author

@sshojiro sshojiro Sep 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SHIFT-JIS => UTF-8 errors.



warning('off', 'all');% turn off warnings.
Expand All @@ -43,12 +43,12 @@
end

try
load('+mml\+datasets\nir_shootout_2002.mat');
load('+mml/+datasets/nir_shootout_2002.mat');
catch
warning('There is no nir_shootout_2002.mat file, so now downloading the file from eigenvector site.');
url='http://www.eigenvector.com/data/tablets/nir_shootout_2002.mat';
[A, cURL_out] = system(['curl ' url '> +mml/+datasets/nir_shootout_2002.mat']);
load('+mml\+datasets\nir_shootout_2002.mat');
[A, cURL_out] = system(['curl ' url ' > +mml/+datasets/nir_shootout_2002.mat']);
load('+mml/+datasets/nir_shootout_2002.mat');
end


Expand Down