merge master

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
     "java.configuration.updateBuildConfiguration": "interactive",
     "[java]": {
-        "editor.defaultFormatter": "serikb.google-java-format",
+        "editor.defaultFormatter": "redhat.java",
         "editor.formatOnSave": true,
     },
     "java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml",

pom.xml

@@ -58,7 +58,13 @@
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.14.2.0</version>
+			<version>10.15.2.0</version>
+		</dependency>
+		<dependency>
+ 			<groupId>org.apache.derby</groupId>
+			<artifactId>derbytools</artifactId>
+			<version>10.15.2.0</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.ejml</groupId>

src/main/java/neqsim/MathLib/generalMath/TDMAsolve.java

@@ -3,6 +3,7 @@
  *
  * Created on 4. desember 2000, 22:34
  */
+
 package neqsim.MathLib.generalMath;
 
 /**
@@ -14,35 +15,35 @@
  * @version $Id: $Id
  */
 public class TDMAsolve {
-    /**
-     * <p>
-     * solve.
-     * </p>
-     *
-     * @param a an array of {@link double} objects
-     * @param b an array of {@link double} objects
-     * @param c an array of {@link double} objects
-     * @param r an array of {@link double} objects
-     * @return an array of {@link double} objects
-     */
-    public static double[] solve(double a[], double b[], double c[], double r[]) {
-        int length = a.length;
-        double[] u = new double[length];
-        double bet = 0;
-        double gam[] = new double[length];
+  /**
+   * <p>
+   * solve.
+   * </p>
+   *
+   * @param a an array of {@link double} objects
+   * @param b an array of {@link double} objects
+   * @param c an array of {@link double} objects
+   * @param r an array of {@link double} objects
+   * @return an array of {@link double} objects
+   */
+  public static double[] solve(double a[], double b[], double c[], double r[]) {
+    int length = a.length;
+    double[] u = new double[length];
+    double bet = 0;
+    double gam[] = new double[length];
 
-        bet = b[0];
-        u[0] = r[0] / bet;
+    bet = b[0];
+    u[0] = r[0] / bet;
 
-        for (int j = 1; j < length; j++) {
-            gam[j] = c[j - 1] / bet;
-            bet = b[j] - a[j] * gam[j];
-            u[j] = (r[j] - a[j] * u[j - 1]) / bet;
-        }
+    for (int j = 1; j < length; j++) {
+      gam[j] = c[j - 1] / bet;
+      bet = b[j] - a[j] * gam[j];
+      u[j] = (r[j] - a[j] * u[j - 1]) / bet;
+    }
 
-        for (int j = (length - 2); j >= 0; j--) {
-            u[j] -= gam[j + 1] * u[j + 1];
-        }
-        return u;
+    for (int j = (length - 2); j >= 0; j--) {
+      u[j] -= gam[j + 1] * u[j + 1];
     }
+    return u;
+  }
 }

src/main/java/neqsim/MathLib/nonLinearSolver/NumericalDerivative.java

@@ -3,6 +3,7 @@
  *
  * Created on 28. juli 2000, 15:39
  */
+
 package neqsim.MathLib.nonLinearSolver;
 
 import neqsim.thermo.component.ComponentInterface;

src/main/java/neqsim/MathLib/nonLinearSolver/NumericalIntegration.java

@@ -3,6 +3,7 @@
  *
  * Created on 6. september 2002, 21:49
  */
+
 package neqsim.MathLib.nonLinearSolver;
 
 /**