From 07089c4884b71f965edf7fc6a531a46d57ca5462 Mon Sep 17 00:00:00 2001 From: Philip Leifeld Date: Mon, 4 Feb 2019 03:04:01 +0000 Subject: [PATCH] Fixing indentation of network stdout output in DNA further --- DNA/src/dna/export/ExportHelper.java | 4 ++-- DNA/src/dna/export/ExporterR.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DNA/src/dna/export/ExportHelper.java b/DNA/src/dna/export/ExportHelper.java index 0d27e4e7..4296f5f8 100644 --- a/DNA/src/dna/export/ExportHelper.java +++ b/DNA/src/dna/export/ExportHelper.java @@ -733,15 +733,15 @@ Matrix computeTwoModeMatrix(ArrayList statements, ArrayList Integer key = (Integer) keyIterator.next(); ArrayList values = combinations.get(key); if (verbose == true) { - System.out.print("An edge weight of " + key + " corresponds to the following combination of integers in the DNA coding: "); + System.out.print("\n An edge weight of " + key + " maps onto integer combination: "); for (int i = 0; i < values.size(); i++) { if (verbose == true) { System.out.print(values.get(i) + " "); } } - System.out.print("\n"); } } + System.out.print("\n"); } // normalization diff --git a/DNA/src/dna/export/ExporterR.java b/DNA/src/dna/export/ExporterR.java index 236db795..f7442101 100644 --- a/DNA/src/dna/export/ExporterR.java +++ b/DNA/src/dna/export/ExporterR.java @@ -616,7 +616,11 @@ public void rNetwork(String networkType, String statementType, String variable1, } } if (verbose == true) { - System.out.print("Done.\n"); + if (qualifierAggregation.equals("combine")) { + System.out.print(" Done.\n"); + } else { + System.out.print("Done.\n"); + } int step = 5; if (networkType.equals("Event list")) { step = 4;