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
This commit is contained in:
Hiroyuki Eguchi 2017-02-23 17:20:30 +09:00
parent 9b9233a693
commit 856f767a81
8 changed files with 50 additions and 29 deletions

View File

@ -41,8 +41,8 @@
source_dataset_url: null, source_dataset_url: null,
experiment_id: null, experiment_id: null,
params: null, params: null,
percent_train: null, percent_train: 0.8,
percent_test: null, percent_test: 0.2,
swift_tenant: null, swift_tenant: null,
swift_username: null, swift_username: null,
swift_password: null swift_password: null
@ -50,7 +50,7 @@
model.newCommonDataset = { model.newCommonDataset = {
location: null, location: null,
format: null, format: 'csv',
dataset_uuid: null, dataset_uuid: null,
container_name: null, container_name: null,
object_name: null, object_name: null,

View File

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

View File

@ -46,7 +46,7 @@
model.newCommonDataset = { model.newCommonDataset = {
location: null, location: null,
format: null, format: 'csv',
dataset_uuid: null, dataset_uuid: null,
dataset_format: null, dataset_format: null,
container_name: null, container_name: null,

View File

@ -50,7 +50,7 @@
model.newCommonDataset = { model.newCommonDataset = {
location: null, location: null,
format: null, format: 'csv',
dataset_uuid: null, dataset_uuid: null,
dataset_format: null, dataset_format: null,
container_name: null, container_name: null,
@ -61,20 +61,21 @@
}; };
model.newParamsSpec = { model.newParamsSpec = {
numIterations: null, numIterations: '10',
lambda: null, lambda: '1.0',
numClasses: null, numClasses: '2',
runs: null, runs: '10',
mode: null, mode: 'random',
rank: null, rank: '10',
step: null, step: '0.00000001',
impurity: null, impurity: null,
maxDepth: null, numTrees: '3',
maxBins:null, maxDepth: '5',
learningRate: null, maxBins: '32',
minCount: null, learningRate: '0.025',
minSupport: null, minCount: '5',
limits:null minSupport: '0.2',
limits: '10'
}; };
} }

View File

@ -21,7 +21,7 @@
</label> </label>
<input name="model-model-numIterations" type="text" class="form-control" id="model-model-numIterations" <input name="model-model-numIterations" type="text" class="form-control" id="model-model-numIterations"
ng-model="model.newParamsSpec.numIterations" ng-model="model.newParamsSpec.numIterations"
placeholder="{$ 'Parameters when creating model.'|translate $}"> placeholder="{$ 'Parameters when creating model.'|translate $}">
</div> </div>
</div> </div>
<div class="col-xs-12" <div class="col-xs-12"
@ -37,7 +37,7 @@
</div> </div>
</div> </div>
<div class="col-xs-12" <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"> <div class="form-group">
<label class="control-label" for="model-model-numClasses"> <label class="control-label" for="model-model-numClasses">
<translate>NumClasses</translate> <translate>NumClasses</translate>
@ -85,7 +85,7 @@
</div> </div>
</div> </div>
<div class="col-xs-12" <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"> <div class="form-group">
<label class="control-label" for="model-model-step"> <label class="control-label" for="model-model-step">
<translate>Step</translate> <translate>Step</translate>
@ -109,7 +109,19 @@
</div> </div>
</div> </div>
<div class="col-xs-12" <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"> <div class="form-group">
<label class="control-label" for="model-model-maxDepth"> <label class="control-label" for="model-model-maxDepth">
<translate>MaxDepth</translate> <translate>MaxDepth</translate>
@ -121,7 +133,7 @@
</div> </div>
</div> </div>
<div class="col-xs-12" <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"> <div class="form-group">
<label class="control-label" for="model-model-maxBins"> <label class="control-label" for="model-model-maxBins">
<translate>MaxBins</translate> <translate>MaxBins</translate>

View File

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

View File

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

View File

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