From 3cfe5eaf175932a652fad18d1848a9494f679be3 Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Mon, 5 Mar 2018 14:00:34 +0100
Subject: [PATCH] Some fixes (Java is NOT C++ apparently)
---
.../ba/yoshikoWrapper/core/ParameterSet.java | 20 ++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java b/src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java
index f050e37..b027e29 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java
@@ -86,26 +86,32 @@ public class ParameterSet implements TunableValidator
*/
public ParameterSet() {
- ArrayList<CyColumn> columns = new ArrayList<CyColumn>();
+ ArrayList<CyColumn> numericColumns = new ArrayList<CyColumn>();
//Only numeric columns are relevant for weight mapping
for (CyColumn col : net.getDefaultEdgeTable().getColumns()) {
if (Number.class.isAssignableFrom(col.getType())) {
- columns.add(col);
+ numericColumns.add(col);
}
}
- weightColumn = new ListSingleSelection<CyColumn>(columns);
+ weightColumn = new ListSingleSelection<CyColumn>(numericColumns);
- columns.clear();
+ ArrayList<CyColumn> booleanColumns = new ArrayList<CyColumn>();
//Only boolean columns are relevant for forbidden/permanent mapping
for (CyColumn col : net.getDefaultEdgeTable().getColumns()) {
if (col.getType() == Boolean.class) {
- columns.add(col);
+ booleanColumns.add(col);
}
}
- forbiddenColumn = new ListSingleSelection<CyColumn>(columns);
- permanentColumn = new ListSingleSelection<CyColumn>(columns);
+ forbiddenColumn = new ListSingleSelection<CyColumn>(booleanColumns);
+ permanentColumn = new ListSingleSelection<CyColumn>(booleanColumns);
+
+ //Don't select any columns by default
+ weightColumn.setSelectedValue(null);
+ forbiddenColumn.setSelectedValue(null);
+ permanentColumn.setSelectedValue(null);
+
}
@Override
--
GitLab