Fixed a bug in the time window rDNA code

leifeld · Mar 1, 2023 · 5bee8fe · 5bee8fe
1 parent 742255d
commit 5bee8fe
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 120 deletions.
diff --git a/build/bibliography.md b/build/bibliography.md
@@ -4,7 +4,7 @@ author:
 bibliography:
 - bibliography.bib
 csl: apa-numeric-superscript-brackets.csl
-date: 2023-02-24
+date: 2023-03-01
 title: "Discourse Network Analysis: Bibliography"
 ---
 

diff --git a/dna/src/main/java/dna/Dna.java b/dna/src/main/java/dna/Dna.java
@@ -27,8 +27,8 @@ public class Dna {
 	public static Dna dna;
 	public static Logger logger;
 	public static Sql sql;
-	public static final String date = "2023-02-24";
-	public static final String version = "3.0.10.e2";
+	public static final String date = "2023-03-01";
+	public static final String version = "3.0.10.e3";
 	public static final String operatingSystem = System.getProperty("os.name");
 	public static File workingDirectory = null;
 	public MainWindow mainWindow;

diff --git a/dna/src/main/java/export/Exporter.java b/dna/src/main/java/export/Exporter.java
@@ -1018,7 +1018,6 @@ public void filterStatements() {
 				pb.stepTo(i + 1);
 			}
 			this.filteredStatements = al;
-			System.out.println("Filtered statements in new version: " + this.filteredStatements.size());
 			pb.stepTo(this.originalStatements.size());
 		}
 	}
@@ -1669,7 +1668,6 @@ public void computeTimeWindowMatrices() {
 		ArrayList<ExportStatement> stopStatements = new ArrayList<ExportStatement>(); // holds all statements corresponding to the time stamp of the last statement in the window
 		ArrayList<ExportStatement> beforeStatements = new ArrayList<ExportStatement>(); // holds all statements between (and excluding) the time stamp of the first statement in the window and the focal statement
 		ArrayList<ExportStatement> afterStatements = new ArrayList<ExportStatement>(); // holds all statements between (and excluding) the focal statement and the time stamp of the last statement in the window
-		Matrix m;
 		if (this.timeWindow.equals("events")) {
 			try (ProgressBar pb = new ProgressBar("Time window matrices...", this.filteredStatements.size())) {
 				pb.stepTo(0);
@@ -1744,6 +1742,7 @@ public void computeTimeWindowMatrices() {
 										break;
 									}
 								}
+								Matrix m;
 								if (this.networkType.equals("twomode")) {
 									m = computeTwoModeMatrix(currentWindowStatements, first, last);
 									m.setDateTime(this.filteredStatements.get(t).getDateTime());
@@ -1827,6 +1826,7 @@ public void computeTimeWindowMatrices() {
 							}
 						}
 						if (currentWindowStatements.size() > 0) {
+							Matrix m;
 							if (this.networkType.equals("twomode")) {
 								m = computeTwoModeMatrix(currentWindowStatements, windowStart, windowStop);
 							} else {

diff --git a/rDNA/rDNA/DESCRIPTION b/rDNA/rDNA/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rDNA
 Version: 3.0.10
-Date: 2023-02-18
+Date: 2023-03-01
 Title: Discourse Network Analysis in R
 Authors@R: 
   c(person(given = "Philip",