fix small bugs

minjk-bl · minjk-bl · commit 94baf2559404 · 2022-03-14T17:44:57.000+09:00
diff --git a/data/m_ml/mlLibrary.js b/data/m_ml/mlLibrary.js
@@ -499,8 +499,8 @@ define([
         /** Auto ML */
         'auto-sklearn-rgs': {
             name: 'AutoSklearnRegressor (Linux only)',
-            install: 'pip install auto-sklearn',
-            import: 'from autosklearn import AutoSklearnRegressor',
+            install: '!pip install auto-sklearn',
+            import: 'from autosklearn.regression import AutoSklearnRegressor',
             link: 'https://automl.github.io/auto-sklearn/master/api.html#regression',
             code: 'AutoSklearnRegressor(${etc})',
             options: [
@@ -509,7 +509,7 @@ define([
         },
         'tpot-rgs': {
             name: 'TPOTRegressor',
-            install: 'pip install tpot',
+            install: '!pip install tpot',
             import: 'from tpot import TPOTRegressor',
             code: 'TPOTRegressor(${generation}${population_size}${cv}${random_state}${etc})',
             options: [
@@ -521,8 +521,8 @@ define([
         },
         'auto-sklearn-clf': {
             name: 'AutoSklearnClassifier (Linux only)',
-            install: 'pip install auto-sklearn',
-            import: 'from autosklearn import AutoSklearnClassifier',
+            install: '!pip install auto-sklearn',
+            import: 'from autosklearn.classification import AutoSklearnClassifier',
             link: 'https://automl.github.io/auto-sklearn/master/api.html#classification',
             code: 'AutoSklearnClassifier(${etc})',
             options: [
@@ -531,7 +531,7 @@ define([
         },
         'tpot-clf': {
             name: 'TPOTClassifier',
-            install: 'pip install tpot',
+            install: '!pip install tpot',
             import: 'from tpot import TPOTClassifier',
             code: 'TPOTClassifier(${generation}${population_size}${cv}${random_state}${etc})',
             options: [
diff --git a/js/com/com_util.js b/js/com/com_util.js
@@ -230,6 +230,12 @@ define([
         return String(text).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
     }
 
+    var optionToLabel = function(label) {
+        label = label.replaceAll('_', ' ');
+        label = label.charAt(0).toUpperCase() + label.slice(1);
+        return label;
+    }
+
     return {
         getUUID: getUUID,
         loadCss: loadCss,
@@ -238,6 +244,7 @@ define([
         addVariable: addVariable,
         formatString: formatString,
         convertToStr: convertToStr,
+        optionToLabel: optionToLabel,
 
         removeHeadScript: removeHeadScript,
         renderModal: renderModal,
diff --git a/js/com/component/ModelEditor.js b/js/com/component/ModelEditor.js
@@ -551,6 +551,8 @@ define([
                     if (opt.label != undefined) {
                         label = opt.label;
                     }
+                    // fix label
+                    label = com_util.optionToLabel(label);
                     optBox.appendFormatLine('<label for="{0}" title="{1}">{2}</label>'
                         , opt.name, opt.name, label);
                     let content = com_generator.renderContent(this, opt.component[0], opt, this.pageThis.state);

Original file line number	Diff line number	Diff line change
`@@ -551,6 +551,8 @@ define([`
`551`	`551`	`if (opt.label != undefined) {`
`552`	`552`	`label = opt.label;`
`553`	`553`	`}`
	`554`	`+ // fix label`
	`555`	`+ label = com_util.optionToLabel(label);`
`554`	`556`	`optBox.appendFormatLine('<label for="{0}" title="{1}">{2}</label>'`
`555`	`557`	`, opt.name, opt.name, label);`
`556`	`558`	`let content = com_generator.renderContent(this, opt.component[0], opt, this.pageThis.state);`