Skip to content

Commit 9f65ac5

Browse files
committed
Merge pull request #25 from yllieth/fix-used-dataset-learning
Fix used dataset learning
2 parents 3e12a3e + f08485d commit 9f65ac5

File tree

6 files changed

+27
-19
lines changed

6 files changed

+27
-19
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "predicsis_ml_sdk-javascript",
3-
"version": "0.4.2",
3+
"version": "0.4.3",
44
"authors": [
55
"Yllieth <[email protected]>",
66
"Dehau"

dist/predicsis-jsSDK.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ angular
9393

9494
/**
9595
* @ngdoc service
96-
* @name predicsis.jsSDK.models.Datafile
96+
* @name predicsis.jsSDK.models.Datafiles
9797
* @requires $q
9898
* @requires Restangular
9999
* @description
@@ -111,7 +111,7 @@ angular
111111
* </tr>
112112
* <tr>
113113
* <td><span class="badge get">get</span> <kbd>/data_files/:id/signed_url</kbd></td>
114-
* <td><kbd>{@link predicsis.jsSDK.models.Datafiles#methods_get_signed_url Datafiles.getSignedUrl()}</kbd></td>
114+
* <td><kbd>{@link predicsis.jsSDK.models.Datafiles#methods_getsignedurl Datafiles.getSignedUrl()}</kbd></td>
115115
* <td></td>
116116
* </tr>
117117
* <tr>
@@ -2680,12 +2680,16 @@ angular
26802680
* @return {Object} Promise of a report
26812681
*/
26822682
this.createUnivariateSupervisedReport = function(project) {
2683-
return self.create({
2684-
type: 'univariate_supervised',
2685-
dataset_id: project.learning_dataset_id,
2686-
dictionary_id: project.dictionary_id,
2687-
variable_id: project.target_variable_id
2688-
});
2683+
var Datasets = $injector.get('Datasets');
2684+
return Datasets.getChildren(project.learning_dataset_id, project.dictionary_id)
2685+
.then(function(children) {
2686+
return self.create({
2687+
type: 'univariate_supervised',
2688+
dataset_id: children.train.id,
2689+
dictionary_id: project.dictionary_id,
2690+
variable_id: project.target_variable_id
2691+
});
2692+
});
26892693
};
26902694

26912695
/**

dist/predicsis-jsSDK.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/predicsis-jsSDK.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/model/Reports.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,16 @@ angular
153153
* @return {Object} Promise of a report
154154
*/
155155
this.createUnivariateSupervisedReport = function(project) {
156-
return self.create({
157-
type: 'univariate_supervised',
158-
dataset_id: project.learning_dataset_id,
159-
dictionary_id: project.dictionary_id,
160-
variable_id: project.target_variable_id
161-
});
156+
var Datasets = $injector.get('Datasets');
157+
return Datasets.getChildren(project.learning_dataset_id, project.dictionary_id)
158+
.then(function(children) {
159+
return self.create({
160+
type: 'univariate_supervised',
161+
dataset_id: children.train.id,
162+
dictionary_id: project.dictionary_id,
163+
variable_id: project.target_variable_id
164+
});
165+
});
162166
};
163167

164168
/**

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "predicsis_ml_sdk-javascript",
3-
"version": "0.4.2",
3+
"version": "0.4.3",
44
"description": "Javascript SDK for PredicSis ML API",
55
"main": "index.js",
66
"scripts": {
@@ -42,4 +42,4 @@
4242
"load-grunt-tasks": "^3.1.0",
4343
"phantomjs": "^1.9.16"
4444
}
45-
}
45+
}

0 commit comments

Comments
 (0)