Skip to content

Commit

Permalink
rename packages
Browse files Browse the repository at this point in the history
  • Loading branch information
asmfstatoil committed Oct 16, 2024
1 parent 667f800 commit a50f8b4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -22,7 +22,8 @@ public class ViscosityFunction extends LevenbergMarquardtFunction {
* Constructor for ViscosityFunction.
* </p>
*/
public ViscosityFunction() {}
public ViscosityFunction() {
}

/** {@inheritDoc} */
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a50f8b4

Please sign in to comment.