From 98870cc4e82e76cd4ff1030217b3a24acde3d8b4 Mon Sep 17 00:00:00 2001
From: Hiroyuki Eguchi <h-eguchi@az.jp.nec.com>
Date: Sat, 11 Feb 2017 15:05:09 +0900
Subject: [PATCH] Add split method

Change-Id: Ib937b0e87bff50b8b3aa2746dd739856045f7730
---
 meteos_ui/api/client.py                       |  3 ++-
 .../datasets/create/dataset-model.js          |  2 ++
 .../datasets/create/spec/spec.html            | 24 ++++++++++++++++++-
 .../create/spec/template.spec.controller.js   |  3 ++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/meteos_ui/api/client.py b/meteos_ui/api/client.py
index 131516d..db84519 100644
--- a/meteos_ui/api/client.py
+++ b/meteos_ui/api/client.py
@@ -28,7 +28,8 @@ EXPERIMENT_CREATE_ATTRS = ['display_name', 'display_description', 'key_name',
                            'neutron_management_network', 'template_id']
 DATASET_CREATE_ATTRS = ['method', 'source_dataset_url', 'display_name',
                         'display_description', 'experiment_id', 'params',
-                        'swift_tenant', 'swift_username', 'swift_password']
+                        'percent_train', 'percent_test', 'swift_tenant',
+                        'swift_username', 'swift_password']
 MODEL_CREATE_ATTRS = ['source_dataset_url', 'display_name',
                       'display_description', 'experiment_id',
                       'model_type', 'model_params', 'dataset_format',
diff --git a/meteos_ui/static/dashboard/machine_learning/datasets/create/dataset-model.js b/meteos_ui/static/dashboard/machine_learning/datasets/create/dataset-model.js
index 068f90f..964c17c 100644
--- a/meteos_ui/static/dashboard/machine_learning/datasets/create/dataset-model.js
+++ b/meteos_ui/static/dashboard/machine_learning/datasets/create/dataset-model.js
@@ -41,6 +41,8 @@
         source_dataset_url: null,
         experiment_id: null,
         params: null,
+        percent_train: null,
+        percent_test: null,
         swift_tenant: null,
         swift_username: null,
         swift_password: null
diff --git a/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.html b/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.html
index 657aef3..145929c 100644
--- a/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.html
+++ b/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/spec.html
@@ -16,7 +16,29 @@
         </div>
       </div>
     </div>
-    <div class="col-xs-12">
+    <div class="col-xs-12"
+         ng-if="model.newDatasetSpec.method == 'split'">
+      <div class="form-group">
+        <label class="control-label" for="dataset-percent-train">
+          <translate>Percentage for Training</translate>
+          <span class="hz-icon-required fa fa-asterisk"></span>
+        </label>
+        <input name="dataset-percent-train" type="text" class="form-control" id="dataset-percent-train"
+               ng-model="model.newDatasetSpec.percent_train"
+               placeholder="{$ 'Percentage for Training.'|translate $}">
+      </div>
+      <div class="form-group">
+        <label class="control-label" for="dataset-percent-test">
+          <translate>Percentage for Evaluation</translate>
+          <span class="hz-icon-required fa fa-asterisk"></span>
+        </label>
+        <input name="dataset-percent-test" type="text" class="form-control" id="dataset-percent-test"
+               ng-model="model.newDatasetSpec.percent_test"
+               placeholder="{$ 'Percentage for Evaluation.'|translate $}">
+      </div>
+    </div>
+    <div class="col-xs-12"
+         ng-if="model.newDatasetSpec.method == 'parse'">
       <div class="form-group">
         <label class="control-label" for="dataset-params">
           <translate>Params</translate>
diff --git a/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/template.spec.controller.js b/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/template.spec.controller.js
index 074b27e..083ff42 100644
--- a/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/template.spec.controller.js
+++ b/meteos_ui/static/dashboard/machine_learning/datasets/create/spec/template.spec.controller.js
@@ -36,7 +36,8 @@
 
     ctrl.datasetMethodOptions = [
       { label: gettext('Download'), value: 'download' },
-      { label: gettext('Parse'), value: 'parse' }
+      { label: gettext('Parse'), value: 'parse' },
+      { label: gettext('Split'), value: 'split' }
     ];
 
   }