Skip to content

Commit

Permalink
Merge branch 'master' of github.com:LinguaPhylo/linguaPhylo
Browse files Browse the repository at this point in the history
  • Loading branch information
zjzxiaohei committed Apr 23, 2024
2 parents 1ae01df + f22089d commit e06a09d
Showing 1 changed file with 2 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,10 @@ private double rombergIntegrator(UnivariateFunction function, double t) {
@Override
public double getInverseIntensity(double x) {
double targetIntensity = x;
//double targetIntensity = 1000;

double proportionForT1 = 0.01;
double proportionForT50 = 0.5;
double time = 0;

double t1 = getTimeForGivenProportion(proportionForT1);
double t50 = getTimeForGivenProportion(proportionForT50);
Expand All @@ -230,7 +230,7 @@ public double getInverseIntensity(double x) {

double deltaTime = growthPhaseTime / 100;

double time = Math.max(t1,0);
//double time = Math.max(t1,0);
double intensity = getIntensity(time);
System.out.println("t1 = " + t1);

Expand All @@ -249,17 +249,12 @@ public double getInverseIntensity(double x) {
System.err.println("Solver failed: " + e.getMessage());
return Double.NaN;
}


// return time;
//return Math.max(time, 0);
}






@Override
public boolean isAnalytical() {
return false; //use numerical method here
Expand Down

0 comments on commit e06a09d

Please sign in to comment.