Browse Source

Support newly added models

Some models and parameters have been added by below bp.

Add support models
https://blueprints.launchpad.net/meteos/+spec/add-support-models

Therefore, meteos-ui should support these models and params.

And set a initial value each model parameter.

These code are scheduled to be deleted
in the future by the below bp.
https://blueprints.launchpad.net/meteos/+spec/stored-model-type

implements blueprint add-support-models
Change-Id: Ia5788b63b76c703c54e3f5b92b81736111cfa065
changes/71/437271/2
Hiroyuki Eguchi 3 years ago
parent
commit
856f767a81
8 changed files with 50 additions and 29 deletions
  1. +3
    -3
      meteos_ui/static/dashboard/machine_learning/datasets/create/dataset-model.js
  2. +1
    -1
      meteos_ui/static/dashboard/machine_learning/learnings/create/learning-model.js
  3. +1
    -1
      meteos_ui/static/dashboard/machine_learning/model_evaluations/create/model_evaluation-model.js
  4. +15
    -14
      meteos_ui/static/dashboard/machine_learning/models/create/model-model.js
  5. +17
    -5
      meteos_ui/static/dashboard/machine_learning/models/create/spec/spec.html
  6. +4
    -0
      meteos_ui/static/dashboard/machine_learning/models/create/spec/template.spec.controller.js
  7. +8
    -4
      meteos_ui/static/dashboard/machine_learning/models/details/drawer.html
  8. +1
    -1
      meteos_ui/static/dashboard/machine_learning/templates/create/template-model.js

+ 3
- 3
meteos_ui/static/dashboard/machine_learning/datasets/create/dataset-model.js View File

@@ -41,8 +41,8 @@
source_dataset_url: null,
experiment_id: null,
params: null,
percent_train: null,
percent_test: null,
percent_train: 0.8,
percent_test: 0.2,
swift_tenant: null,
swift_username: null,
swift_password: null
@@ -50,7 +50,7 @@

model.newCommonDataset = {
location: null,
format: null,
format: 'csv',
dataset_uuid: null,
container_name: null,
object_name: null,

+ 1
- 1
meteos_ui/static/dashboard/machine_learning/learnings/create/learning-model.js View File

@@ -37,7 +37,7 @@
display_name: null,
display_description: null,
model_id: null,
method: null,
method: 'predict',
args: null
};
}

+ 1
- 1
meteos_ui/static/dashboard/machine_learning/model_evaluations/create/model_evaluation-model.js View File

@@ -46,7 +46,7 @@

model.newCommonDataset = {
location: null,
format: null,
format: 'csv',
dataset_uuid: null,
dataset_format: null,
container_name: null,

+ 15
- 14
meteos_ui/static/dashboard/machine_learning/models/create/model-model.js View File

@@ -50,7 +50,7 @@

model.newCommonDataset = {
location: null,
format: null,
format: 'csv',
dataset_uuid: null,
dataset_format: null,
container_name: null,
@@ -61,20 +61,21 @@
};

model.newParamsSpec = {
numIterations: null,
lambda: null,
numClasses: null,
runs: null,
mode: null,
rank: null,
step: null,
numIterations: '10',
lambda: '1.0',
numClasses: '2',
runs: '10',
mode: 'random',
rank: '10',
step: '0.00000001',
impurity: null,
maxDepth: null,
maxBins:null,
learningRate: null,
minCount: null,
minSupport: null,
limits:null
numTrees: '3',
maxDepth: '5',
maxBins: '32',
learningRate: '0.025',
minCount: '5',
minSupport: '0.2',
limits: '10'
};

}

+ 17
- 5
meteos_ui/static/dashboard/machine_learning/models/create/spec/spec.html View File

@@ -21,7 +21,7 @@
</label>
<input name="model-model-numIterations" type="text" class="form-control" id="model-model-numIterations"
ng-model="model.newParamsSpec.numIterations"
placeholder="{$ 'Parameters when creating model.'|translate $}">
placeholder="{$ 'Parameters when creating model.'|translate $}">
</div>
</div>
<div class="col-xs-12"
@@ -37,7 +37,7 @@
</div>
</div>
<div class="col-xs-12"
ng-if="model.newModelSpec.model_type == 'KMeans'">
ng-if="model.newModelSpec.model_type == 'KMeans' || model.newModelSpec.model_type.indexOf('Classification') != -1">
<div class="form-group">
<label class="control-label" for="model-model-numClasses">
<translate>NumClasses</translate>
@@ -85,7 +85,7 @@
</div>
</div>
<div class="col-xs-12"
ng-if="model.newModelSpec.model_type == 'LinearRegression'">
ng-if="model.newModelSpec.model_type == 'LinearRegression' || model.newModelSpec.model_type == 'RidgeRegression'">
<div class="form-group">
<label class="control-label" for="model-model-step">
<translate>Step</translate>
@@ -109,7 +109,19 @@
</div>
</div>
<div class="col-xs-12"
ng-if="model.newModelSpec.model_type == 'DecisionTreeRegression'">
ng-if="model.newModelSpec.model_type.indexOf('RandomForest') != -1">
<div class="form-group">
<label class="control-label" for="model-model-numTrees">
<translate>NumTrees</translate>
<span class="hz-icon-required fa fa-asterisk"></span>
</label>
<input name="model-model-numTrees" type="text" class="form-control" id="model-model-numTrees"
ng-model="model.newParamsSpec.numTrees"
placeholder="{$ 'Parameters when creating model.'|translate $}">
</div>
</div>
<div class="col-xs-12"
ng-if="model.newModelSpec.model_type.indexOf('Tree') != -1">
<div class="form-group">
<label class="control-label" for="model-model-maxDepth">
<translate>MaxDepth</translate>
@@ -121,7 +133,7 @@
</div>
</div>
<div class="col-xs-12"
ng-if="model.newModelSpec.model_type == 'DecisionTreeRegression'">
ng-if="model.newModelSpec.model_type.indexOf('Tree') != -1">
<div class="form-group">
<label class="control-label" for="model-model-maxBins">
<translate>MaxBins</translate>

+ 4
- 0
meteos_ui/static/dashboard/machine_learning/models/create/spec/template.spec.controller.js View File

@@ -38,7 +38,11 @@
'LogisticRegression',
'NaiveBayes',
'DecisionTreeRegression',
'DecisionTreeClassification',
'RandomForestRegression',
'RandomForestClassification',
'LinearRegression',
'RidgeRegression',
'KMeans',
'Recommendation',
'Word2Vec',

+ 8
- 4
meteos_ui/static/dashboard/machine_learning/models/details/drawer.html View File

@@ -1,4 +1,12 @@
<div ng-controller="horizon.dashboard.machine_learning.models.DrawerController as drawerCtrl">
<div class="row">
<span class="rsp-alt-p3">
<dl class="col-md-4">
<dt translate>Model Params</dt>
<dd>{$ item.params $}</dd>
</dl>
</span>
</div>
<div class="row">
<span class="rsp-alt-p3">
<dl class="col-md-4">
@@ -9,10 +17,6 @@
<dt translate>ID</dt>
<dd>{$ item.id $}</dd>
</dl>
<dl class="col-md-4">
<dt translate>Model Params</dt>
<dd>{$ item.params $}</dd>
</dl>
</span>
</div>
</div>

+ 1
- 1
meteos_ui/static/dashboard/machine_learning/templates/create/template-model.js View File

@@ -41,7 +41,7 @@
master_flavor_id: null,
worker_nodes_num: null,
worker_flavor_id: null,
spark_version: null,
spark_version: '1.6.0',
floating_ip_pool: null
};
}

Loading…
Cancel
Save