Revize 55515be9

re #8113 re #7885 bug fixes, list generation re #8134 changed row indentations in previous commit; re #8154 nothing; no comments

src/main/java/vldc/aswi/utils/Converter.java

@@ -38 +38 @@
     public List<ContingencyTableRow> convertTableColumnsToContingencyTableRows() {
         long startTime = System.nanoTime();
 
+        long startTime1 = System.nanoTime();
         columnNodes = new ArrayList<>();
         List<List<String>> values = new ArrayList<>();
         for(NameUserName nameUserName : columnNames) {
@@ -48 +49 @@
         Node startNode = new Node();
         generateColumns(0, values, columnNodes, startNode);
 
+        long stopTime1 = System.nanoTime();
+        System.out.println("Colums list:" + TimeUnit.MILLISECONDS.convert((stopTime1 - startTime1), TimeUnit.NANOSECONDS));
+
         List<ContingencyTableRow> contingencyTableRows = new ArrayList<>();
 
         long startTime2 = System.nanoTime();
@@ -87 +91 @@
      * @return list of contingency table rows
      */
     private List<ContingencyTableRow> createHeaderOnlyRows() {
-        //columnNodes = new ArrayList<>();
         List<ContingencyTableRow> headerRows = new ArrayList<>();
 
-//        List<String> valueOptions = new ArrayList<>();
-//
-//        for (ValueFunction valueFunction : valueFunctions) {
-//            if (!valueFunctions.get(0).getType().equals("Seznam")) {
-//                valueOptions.add(valueFunction.getFunction() + " z " + valueFunction.getName());
-//            }
-//            else if (valueFunctions.get(0).getType().equals("Seznam") && columnNames.size() > 0) {
-//                valueOptions.add("NIC z nic");
-//            }
-//        }
-
-        //values.add(valueOptions);
         headerRows.add(new ContingencyTableRow(true, 0));
 
         for (int i = 0; i < columnNames.size(); i++) {
-            //NameUserName ignored = columnNames.get(i);
-            //TableColumn column = tableColumns.get(nameUserName.getName());
             headerRows.add(new ContingencyTableRow(true, 0));
         }
 
-        if (valueFunctions.get(0).getType().equals("Seznam")) {
+        if (valueFunctions.get(0).getFunction() != null && valueFunctions.get(0).getFunction().equals("NIC") &&
+                columnNames.size() == 0) {
             headerRows.get(0).addTableRowCell(new ContingencyTableRowCell("Seznam", 1));
+
             return headerRows;
         }
 
@@ -154 +145 @@
                 }
 
                 prevSize = columnNode.getValues().size();
-                prevValues.remove(prevValues.size() - 1);
+
+                if (!prevValues.isEmpty()) {
+                    prevValues.remove(prevValues.size() - 1);
+                }
             }
         }
 
@@ -166 +160 @@
                     " z " + valueFunction.getName(), 1));
         }
 
-
-
-        long startTime = System.nanoTime();
-        long stopTime = System.nanoTime();
-        System.out.println("Colums list:" + TimeUnit.MILLISECONDS.convert((stopTime - startTime), TimeUnit.NANOSECONDS));
-
         return headerRows;
     }
 
@@ -220 +208 @@
 
         dataRows.removeAll(rowsToBeRemoved);
 
-        if (!valueFunctions.get(0).getType().equals("Seznam") ||
-                (valueFunctions.get(0).getType().equals("Seznam") && columnNames.size() > 0)) {
+        if (valueFunctions.get(0).getFunction() != null && (!valueFunctions.get(0).getFunction().equals("NIC") ||
+                (valueFunctions.get(0).getFunction().equals("NIC") && columnNames.size() > 0))) {
             dataRows.add(createFinalRow());
         }
 
@@ -303 +291 @@
 
         List<Integer> usableIDs = getUsableIDs(node);
 
-        if (valueFunctions.get(0).getType().equals("Seznam") && !usableIDs.isEmpty()) {
+        if (valueFunctions.get(0).getFunction() != null && valueFunctions.get(0).getFunction().equals("NIC") &&
+                !usableIDs.isEmpty()) {
             return true;
         }
 
@@ -314 +303 @@
         initializeWrapperField(totalsAvgSum);
 
         boolean[] isFilledValueCells = new boolean[valueFunctions.size()];
-        int columnIndex = 0;
         //hodnota
         for (int v = 0; v < valueFunctions.size(); v++) {
+            if (valueFunctions.get(v).getFunction() != null && (valueFunctions.get(v).getFunction().equals("") ||
+                    valueFunctions.get(v).getFunction().equals("NIC"))) {
+                isRowUsable = true;
+                break;
+            }
             BooleanWrapper isFirstMinMaxTotal = new BooleanWrapper(true);
             ValueFunction valueFunction = valueFunctions.get(v);
             //sloupec v kont. tabulce
@@ -364 +357 @@
                     row.addTableRowCell(generateFilledCell(valueFunction.getFunction(), result.getValue(), result.getValue(), result.getValue(),
                             result.getValue(), resultAvgSum.getValue(), result.getValue()));
                 }
-                columnIndex++;
             }
         }
         for (int i = 0; i < valueFunctions.size(); i++) {
-            if (valueFunctions.get(i).getType().equals("Seznam")) {
+            if (valueFunctions.get(i).getFunction() != null && valueFunctions.get(i).getFunction().equals("NIC")) {
                 break;
             }
             if (!isFilledValueCells[i]) {
@@ -583 +575 @@
         ContingencyTableRow finalRow = new ContingencyTableRow(false, 0);
         finalRow.addTableRowCell(new ContingencyTableRowCell("Celkem", 1));
 
+        if (valueFunctions.get(0).getFunction() != null && valueFunctions.get(0).getFunction().equals("NIC")) {
+            return finalRow;
+        }
+
         List<ContingencyTableRowCell> valueCells = new ArrayList<>();
         for (ValueFunction valueFunction : valueFunctions) {
             for (Node columnNode : columnNodes) {