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 f050e37004277cd841ce03810ea04eb9c6bf0519..b027e2986c3adcf3ebebef10a727ae6d33eaf2fc 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