diff --git a/client/templates/main.html b/client/templates/main.html index b243b9da..f7fcc3a0 100644 --- a/client/templates/main.html +++ b/client/templates/main.html @@ -180,7 +180,10 @@

- @@ -562,7 +579,6 @@

linear_bias_selector.addEventListener("change", () => { setModelView("irrelevant") const parameters = getParametersFromNode(last_selected_node_id) - console.log("last id: " + last_selected_layer_id) const new_value = document.getElementById("bias-parameter").value for (i in parameters) { @@ -584,7 +600,6 @@

linear_inFeatures_input.addEventListener("change", () => { setModelView("irrelevant") const parameters = getParametersFromNode(last_changed_parameters_layer_id) - console.log("last id: " + last_selected_layer_id) const new_value = document.getElementById("linear-inFeatures-parameter").value for (i in parameters) { @@ -604,7 +619,6 @@

linear_outFeatures_input.addEventListener("change", () => { setModelView("irrelevant") const parameters = getParametersFromNode(last_changed_parameters_layer_id) - console.log("last id: " + last_selected_layer_id) const new_value = document.getElementById("linear-outFeatures-parameter").value for (i in parameters) { @@ -624,7 +638,6 @@

special_width_input.addEventListener("change", () => { setModelView("irrelevant") const parameters = getParametersFromNode(last_changed_parameters_layer_id) - console.log("last id: " + last_selected_layer_id) const new_value = document.getElementById("special-width-parameter").value for (i in parameters) { @@ -640,6 +653,21 @@

last_changed_parameters_layer_id = last_selected_node_id }) + const loss_type_selector = document.getElementById("loss-type-parameter") + loss_type_selector.addEventListener("change", () => { + setModelView("irrelevant") + const parameters = getParametersFromNode(last_selected_node_id) + const new_value = loss_type_selector.value + + for (i in parameters) { + if (parameters[i][0] == "type") { + parameters[i][1] = new_value + joinUpdatedLayerParameters(parameters, last_selected_node_id) + break + } + } + }) + /* DRAG EVENT */ /* Mouse and Touch Actions */ let elements = document.getElementsByClassName("drag-drawflow") @@ -1142,13 +1170,16 @@

pathsWithWrittenID = [] } - function getSortableInputList(layerClass) { - switch (layerClass) { + function getSortableInputList(layer) { + switch (layer.class) { case "linear": return document.querySelector("#linear-inputs-sortable-list") case "relu": return document.querySelector("#relu-inputs-sortable-list") case "special": + if (layer.name == "Loss") { + return document.querySelector("#loss-inputs-sortable-list") + } return document.querySelector("#special-inputs-sortable-list") } } @@ -1168,7 +1199,7 @@

// Input selection writeIdOnConnections(correct_id) - let sortable_list = getSortableInputList(node.class) + let sortable_list = getSortableInputList(node) let child = sortable_list.lastElementChild while (child) { @@ -1230,42 +1261,77 @@

}) document.getElementById("layer-data").style.display = "block" - document.getElementById("layer-id").innerHTML = "ID: " + layer_dbid.toString() + setupLayerParameters(node, correct_id) + } - const layer_parameters = getParametersFromNode(correct_id) + function setupLayerParameters(layer, layer_id) { + let layer_parameters = getParametersFromNode(layer_id) - if (node.class == "linear") { - document.querySelector("#linear-layer-parameters").style.display = "block" + switch (layer.class) { + case "linear": + document.querySelector("#linear-layer-parameters").style.display = "block" - for (i in layer_parameters) { - if (layer_parameters[i][0] == "bias") { - document.querySelector("#bias-parameter").value = layer_parameters[i][1] == "1" - } - if (layer_parameters[i][0] == "inFeatures") { - document.querySelector("#linear-inFeatures-parameter").value = layer_parameters[i][1] + for (i in layer_parameters) { + switch (layer_parameters[i][0]) { + case "bias": + document.querySelector("#bias-parameter").value = layer_parameters[i][1] == "1" + break + case "inFeatures": + document.querySelector("#linear-inFeatures-parameter").value = layer_parameters[i][1] + break + case "outFeatures": + document.querySelector("#linear-outFeatures-parameter").value = layer_parameters[i][1] + break + } } - if (layer_parameters[i][0] == "outFeatures") { - document.querySelector("#linear-outFeatures-parameter").value = layer_parameters[i][1] + break + + case "special": + if (layer.name == "Loss") { + document.querySelector("#loss-layer-parameters").style.display = "block" + for (i in layer_parameters) { + switch (layer_parameters[i][0]) { + case "width": + document.querySelector("#loss-width-parameter").value = layer_parameters[i][1] + break + case "type": + document.querySelector("#loss-type-parameter").value = layer_parameters[i][1] + break + } + } + } else { + document.querySelector("#special-layer-parameters").style.display = "block" + for (i in layer_parameters) { + switch (layer_parameters[i][0]) { + case "width": + document.querySelector("#special-width-parameter").value = layer_parameters[i][1] + break + case "type": + document.querySelector("#loss-type-parameter").value = layer_parameters[i][1] + break + } + } } - } - } else if (node.class == "special") { - document.querySelector("#special-layer-parameters").style.display = "block" + break - for (i in layer_parameters) { - if (layer_parameters[i][0] == "width") { - document.querySelector("#special-width-parameter").value = layer_parameters[i][1] + case "relu": + document.querySelector("#relu-layer-parameters").style.display = "block" + for (i in layer_parameters) { + if (layer_parameters[i][0] == "width") { + document.querySelector("#relu-width-parameter").value = layer_parameters[i][1] + } } - } - } else if (node.class == "relu") { - document.querySelector("#relu-layer-parameters").style.display = "block" + break } } + function hideLayerInfo() { document.getElementById("layer-data").style.display = "none" document.querySelector("#linear-layer-parameters").style.display = "none" document.querySelector("#special-layer-parameters").style.display = "none" document.querySelector("#relu-layer-parameters").style.display = "none" + document.querySelector("#loss-layer-parameters").style.display = "none" deleteIdOnConnections() }