refactor of training view #120

Zukkari · Feb 3, 2018 · 07a735f · 07a735f
1 parent 1f112bc
commit 07a735f
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 53 deletions.
diff --git a/src/main/kotlin/cs/ut/logging/NirdLogger.kt b/src/main/kotlin/cs/ut/logging/NirdLogger.kt
@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest
 
 class NirdLogger(private val id: String = "GLOBAL", caller: Class<Any>) {
 
-    val log = Logger.getLogger(caller)!!
+    val log = Logger.getLogger(caller::class.java)!!
 
     fun debug(msg: Any?) {
         log.debug("[${this.id}] $msg")

diff --git a/src/main/kotlin/cs/ut/ui/controllers/TrainingController.kt b/src/main/kotlin/cs/ut/ui/controllers/TrainingController.kt
@@ -58,23 +58,25 @@ class TrainingController : SelectorComposer<Component>(), Redirectable {
     private lateinit var gridContainer: Vlayout
 
     @Wire
-    private lateinit var thresholdContainer: Hbox
+    private lateinit var genDataSetParam: A
 
     @Wire
-    private lateinit var genDataSetParam: A
+    private lateinit var radioGroup: Radiogroup
 
     @Wire
-    private lateinit var trainingGrid: Grid
+    private lateinit var avgRadio: Radio
 
-    private lateinit var radioGroup: Radiogroup
+    @Wire
+    private lateinit var customRadio: Radio
+
+    @Wire
+    private lateinit var customBox: Doublebox
 
     private lateinit var gridController: ModeController
 
     override fun doAfterCompose(comp: Component?) {
         super.doAfterCompose(comp)
 
-        radioGroup = Radiogroup()
-
         initClientLogs()
         if (initPredictions()) {
             genDataSetParam.isDisabled = false
@@ -85,9 +87,9 @@ class TrainingController : SelectorComposer<Component>(), Redirectable {
     private fun getLogFileName(): String = (clientLogs.selectedItem.getValue() as File).nameWithoutExtension
 
     private fun initPredictions(): Boolean {
-        radioGroup.getChildren<Component>().clear()
-        thresholdContainer.getChildren<Component>().clear()
-        thresholdContainer.isVisible = false
+        customBox.isDisabled = true
+        avgRadio.isDisabled = true
+        customRadio.isDisabled = true
 
         predictionType.items.clear()
         log.debug("Cleared prediction type items")
@@ -126,11 +128,15 @@ class TrainingController : SelectorComposer<Component>(), Redirectable {
             val param = (e.selectedItems.first() as Comboitem).getValue() as ModelParameter
             log.debug("Prediction type model changed to $param")
             if (param.id == OUTCOME) {
-                thresholdContainer.isVisible = true
+                customBox.isDisabled = false
+                avgRadio.isDisabled = false
+                customRadio.isDisabled = false
                 log.debug("Prediciton type is $OUTCOME generating radio buttons")
             } else {
                 log.debug("Clearing thresholdContainer")
-                thresholdContainer.isVisible = false
+                customBox.isDisabled = true
+                avgRadio.isDisabled = true
+                customRadio.isDisabled = true
             }
         })
 
@@ -140,33 +146,24 @@ class TrainingController : SelectorComposer<Component>(), Redirectable {
     }
 
     private fun ModelParameter.setUpRadioButtons() {
-        val avg = radioGroup.appendItem(NirdizatiUtil.localizeText("threshold.avg"), this.parameter)
-        avg.setValue(this.parameter.toDouble())
-        radioGroup.selectedItem = avg
-
-        val custom = radioGroup.appendItem(NirdizatiUtil.localizeText("threshold.custom"), this.parameter)
-        custom.setValue(DEFAULT)
-        val customBox = Doublebox()
-        customBox.width = "60px"
+        avgRadio.setValue(this.parameter.toDouble())
+        customRadio.setValue(DEFAULT)
         customBox.setValue(DEFAULT)
-        customBox.style = "padding-top: 10px"
-        customBox.vflex = "1"
+
         customBox.addEventListener(Events.ON_CHANGE, { _ ->
             log.debug("New value for custom threshold ${customBox.value}")
             val res: Double? = customBox.value
 
             if (res == null || res <= 0) {
-                custom.setValue(DEFAULT)
+                customRadio.setValue(DEFAULT)
                 customBox.setValue(DEFAULT)
                 customBox.errorMessage = NirdizatiUtil.localizeText("threshold.custom_error", 0)
             } else {
                 customBox.clearErrorMessage()
-                custom.setValue(res)
+                customBox.setValue(res)
+                customRadio.setValue(res)
             }
         })
-
-        thresholdContainer.appendChild(radioGroup)
-        thresholdContainer.appendChild(customBox)
     }
 
     private fun initClientLogs() {

diff --git a/src/main/kotlin/cs/ut/util/Const.kt b/src/main/kotlin/cs/ut/util/Const.kt
@@ -36,7 +36,7 @@ const val PAGE_TRAINING = "training"
 const val PAGE_VALIDATION = "validation"
 
 const val LAST_STATE = "last_state"
-const val PREFIX = "prefix_lenght_based"
+const val PREFIX = "prefix_length_based"
 const val FREQUENCY = "frequency"
 const val COMBINED = "combined"
 const val INDEX = "index_based"

diff --git a/src/main/resources/configuration.xml b/src/main/resources/configuration.xml
@@ -282,7 +282,7 @@
                 </properties>
             </modelparam>
             <modelparam>
-                <id>prefix_lenght_based</id>
+                <id>prefix_length_based</id>
                 <parameter>prefix</parameter>
                 <type>bucketing</type>
                 <enabled>true</enabled>

diff --git a/src/main/webapp/WEB-INF/zk-label.properties b/src/main/webapp/WEB-INF/zk-label.properties
@@ -16,7 +16,7 @@ header.validation=Validation
 header.admin=Admin view
 training.selected_log=Currently selected log:
 training.prediction_type=What do you want to predict?
-training.advanced=Multiple models
+training.advanced=Multiple models: 
 training.start_training=Train model
 training.file_not_found=File with such name could not be found
 training.empty_prediction=Prediction type cannot be empty
@@ -35,7 +35,7 @@ encoding.index_based=Index based
 bucketing.zero=Zero
 bucketing.state_based=State based
 bucketing.clustering=Clustering
-bucketing.prefix_lenght_based=Prefix lenght based
+bucketing.prefix_length_based=Prefix length based
 learner.random_forest=Random forest
 learner.gradient_boosting=Gradient boosting
 learner.decision_tree=Decision tree

diff --git a/src/main/webapp/css/main.sass b/src/main/webapp/css/main.sass
@@ -41,6 +41,9 @@
 .no-hor-overflow
   overflow-x: hidden
 
+.no-overflow
+  overflow: hidden
+
 .padding-bottom-20px
   padding-bottom: 20px
 

diff --git a/src/main/webapp/views/training.zul b/src/main/webapp/views/training.zul
@@ -1,28 +1,30 @@
-<vbox hflex="1" vflex="1" align="center" apply="cs.ut.ui.controllers.TrainingController"
-      xmlns="http://www.zkoss.org/2005/zul">
-    <hlayout hflex="1" vflex="1" sclass="padding-bottom-20px">
-        <grid id="trainingGrid" vflex="1" sclass="max-height max-width">
-            <columns>
-                <column hflex="min" align="center"/>
-                <column hflex="min" align="center"/>
-            </columns>
-            <rows vflex="1">
-                <row>
-                    <label hflex="1" value="${labels.training.selected_log}" sclass="label-combo"/>
+<vbox align="center" vflex="1" hflex="1" apply="cs.ut.ui.controllers.TrainingController">
+    <hlayout hflex="1" vflex="1">
+        <grid id="trainingGrid" vflex="min" hflex="min" sclass="max-height max-width">
+            <rows>
+                <row align="center">
+                    <label value="${labels.training.selected_log}" sclass="label-combo"/>
                     <combobox id="clientLogs"/>
                 </row>
-                <row>
-                    <label value="${labels.training.prediction_type}" hflex="1"/>
+                <row align="center">
+                    <label value="${labels.training.prediction_type}"/>
                     <combobox id="predictionType"/>
                 </row>
-                <row vflex="1">
-                    <hlayout>
-                        <hlayout>
-                            <label value="${labels.training.advanced}" hflex="1"/>
-                            <checkbox id="advancedMode" zclass="toggle" sclass="switch toggle-round-flat" hflex="1"/>
-                        </hlayout>
-                        <hbox align="center" vflex="1" id="thresholdContainer" visible="false"/>
-                    </hlayout>
+                <row align="center">
+                    <label value="${labels.threshold.threshold_msg}"/>
+                    <hbox align="center">
+                        <radiogroup id="radioGroup">
+                            <radio id="avgRadio" label="${labels.threshold.avg}" selected="true" radiogroup="radioGroup"/>
+                            <radio id="customRadio" label="${labels.threshold.custom}" radiogroup="radioGroup"/>
+                        </radiogroup>
+                        <doublebox id="customBox" width="60px" disabled="true"/>
+                    </hbox>
+                </row>
+                <row align="center">
+                    <hbox hflex="1" vflex="1" align="center" pack="center">
+                        <label value="${labels.training.advanced}"/>
+                        <checkbox id="advancedMode" zclass="toggle" sclass="switch toggle-round-flat"/>
+                    </hbox>
                     <a id="genDataSetParam" label="${labels.training.gen_dataset_para}"
                        onClick="generateNewDatasetParams"
                        hflex="1"/>
@@ -35,7 +37,7 @@
 
     <hlayout id="hyperParamGridContainer" vflex="1" hflex="1"/>
 
-    <hbox hflex="min" vflex="1" align="center" pack="center">
+    <hbox hflex="1" vflex="1" align="center" pack="center">
         <vlayout hflex="min" vflex="min">
             <button id="startTraining" sclass="n-btn" label="${labels.training.start_training}"/>
         </vlayout>