diff --git a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java index da1e881cb..3f53525de 100644 --- a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearLiquidModel; +package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel; import java.sql.ResultSet; import java.util.ArrayList; @@ -42,7 +42,7 @@ public static void main(String[] args) { ViscosityFunction function = new ViscosityFunction(); // double guess[] = {-66.2, 11810, 0.1331, -0.0000983}; //mdea // double guess[] = {-5.771E1, 7.647E3, 1.442E-1, -1.357E-4}; //water - double guess[] = {-10.14, 3868.803, -0.00550507}; // ,0.000001}; //,0.001}; //MEG + double guess[] = { -10.14, 3868.803, -0.00550507 }; // ,0.000001}; //,0.001}; //MEG // double guess[] = { -53.92523097004079, 9741.992308,0,0.106066223998382}; // //TEG function.setInitialGuess(guess); @@ -55,8 +55,8 @@ public static void main(String[] args) { double temp = Double.parseDouble(dataSet.getString("Temperature")); testSystem.setTemperature(temp); testSystem.init(0); - double sample1[] = {temp}; - double standardDeviation1[] = {0.1}; + double sample1[] = { temp }; + double standardDeviation1[] = { 0.1 }; SampleValue sample = new SampleValue(Double.parseDouble(dataSet.getString("Viscosity")), Double.parseDouble(dataSet.getString("StdDev")), sample1, standardDeviation1); sample.setFunction(function); diff --git a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java index 3b475a0b9..351ef48af 100644 --- a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java @@ -4,7 +4,7 @@ * Created on 24. januar 2001, 23:30 */ -package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearLiquidModel; +package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel; import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; @@ -22,7 +22,8 @@ public class ViscosityFunction extends LevenbergMarquardtFunction { * Constructor for ViscosityFunction. *

*/ - public ViscosityFunction() {} + public ViscosityFunction() { + } /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java index a6a0ae5cd..3860c23a1 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearLiquidModel.ViscosityFunction; +import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel.ViscosityFunction; import neqsim.statistics.parameterfitting.SampleSet; import neqsim.statistics.parameterfitting.SampleValue; import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java index 2416e88f6..8d723da4e 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearLiquidModel.ViscosityFunction; +import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel.ViscosityFunction; import neqsim.statistics.parameterfitting.SampleSet; import neqsim.statistics.parameterfitting.SampleValue; import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java index 26c7187ef..2b5f41821 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearLiquidModel.ViscosityFunction; +import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel.ViscosityFunction; import neqsim.statistics.parameterfitting.SampleSet; import neqsim.statistics.parameterfitting.SampleValue; import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt;