Updated libraries

mroodschild · Oct 12, 2021 · caeaa5b · caeaa5b
1 parent fb86696
commit caeaa5b
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 66 deletions.
diff --git a/.classpath b/.classpath
@@ -1,31 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1633973986429</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.gitia</groupId>
     <artifactId>JDataAnalysis</artifactId>
-    <version>0.5</version>
+    <version>0.5.1</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -98,12 +98,12 @@
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-all</artifactId>
-            <version>0.37</version>
+            <version>0.41</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
         </dependency>
         <dependency>
             <groupId>net.sf.opencsv</groupId>
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
-            <version>2.9.9</version>
+            <version>2.13.0</version>
         </dependency>
         <dependency>
             <groupId>io.bretty</groupId>

diff --git a/src/main/java/org/gitia/jdataanalysis/CSV.java b/src/main/java/org/gitia/jdataanalysis/CSV.java
@@ -38,7 +38,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.IntStream;
 import org.ejml.simple.SimpleMatrix;
 
 /**

diff --git a/src/main/java/org/gitia/jdataanalysis/JDataAnalysis.java b/src/main/java/org/gitia/jdataanalysis/JDataAnalysis.java
@@ -361,16 +361,6 @@ public void showAll() {
      * @param size
      */
     public void show(int size) {
-//        int size = files;
-//        if (files > data.length) {
-//            size = data.length;
-//        }
-//        String[][] selected = getFeatureString(size);
-//        TextTable textTable = new TextTable(columnNames, selected);
-//        textTable.printTable();
-//        System.out.println("...");
-//        System.out.println("Records (" + data.length + " x " + data[0].length + ")\n");//parser.getHeaderMap().size() + ")\n");
-
         String[][] selected = getFeatureString(size);
         Double[][] o = new Double[selected.length][selected[0].length];
         for (int i = 0; i < o.length; i++) {
@@ -390,12 +380,6 @@ public void show(int size) {
      * @param features
      */
     public void show(String... features) {
-//        String[][] selected = getFeaturesString(features);
-//        TextTable textTable = new TextTable(features, selected);
-//        textTable.printTable();
-//        System.out.println("...");
-//        System.out.println("Records (" + data.length + " x " + data[0].length + ")\n");
-
         String[][] selected = getFeaturesString(features);
         Double[][] o = new Double[selected.length][selected[0].length];
         for (int i = 0; i < o.length; i++) {

diff --git a/src/main/java/org/gitia/jdataanalysis/Util.java b/src/main/java/org/gitia/jdataanalysis/Util.java
@@ -29,7 +29,7 @@
 
 //import dnl.utils.text.table.TextTable;
 import java.util.Arrays;
-import javafx.scene.chart.XYChart;
+//import javafx.scene.chart.XYChart;
 import org.ejml.simple.SimpleMatrix;
 
 /**
@@ -177,15 +177,15 @@ public static double[][] matrizQuitarUltimaColumna(double[][] datos) {
         return salida;
     }
 
-    /**
-     *
-     * @param serie
-     */
-    public static void mostrarXYChartSeries(XYChart.Series serie) {
-        for (int i = 0; i < serie.getData().size(); i++) {
-            System.out.println(serie.getData().get(i).toString());
-        }
-    }
+    // /**
+    //  *
+    //  * @param serie
+    //  */
+    // public static void mostrarXYChartSeries(XYChart.Series serie) {
+    //     // for (int i = 0; i < serie.getData().size(); i++) {
+    //     //     System.out.println(serie.getData().get(i).toString());
+    //     // }
+    // }
 
     /**
      *

diff --git a/src/test/java/org/gitia/jdataanalysis/ImageReaderTest.java b/src/test/java/org/gitia/jdataanalysis/ImageReaderTest.java
@@ -24,7 +24,6 @@
 package org.gitia.jdataanalysis;
 
 import java.awt.Image;
-import java.awt.image.BufferedImage;
 import org.junit.AfterClass;
 import org.junit.Test;
 import static org.junit.Assert.*;

diff --git a/src/test/java/org/gitia/jdataanalysis/data/stats/MeanTest.java b/src/test/java/org/gitia/jdataanalysis/data/stats/MeanTest.java
@@ -27,7 +27,6 @@
  */
 package org.gitia.jdataanalysis.data.stats;
 
-import org.gitia.jdataanalysis.data.stats.Mean;
 import org.ejml.simple.SimpleMatrix;
 import org.junit.After;
 import org.junit.AfterClass;

diff --git a/src/test/java/org/gitia/jdataanalysis/data/stats/STDTest.java b/src/test/java/org/gitia/jdataanalysis/data/stats/STDTest.java
@@ -27,7 +27,6 @@
  */
 package org.gitia.jdataanalysis.data.stats;
 
-import org.gitia.jdataanalysis.data.stats.STD;
 import org.ejml.simple.SimpleMatrix;
 import org.junit.After;
 import org.junit.AfterClass;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		org.eclipse.jdt.apt.aptEnabled=false