krlhBlupine/iBioSim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reverted initial zone and fixed uniform mean calc

Browse source
This commit is contained in:
Chris Myers 2018-07-12 13:50:00 -06:00
parent 261944f4a7
commit 415b419719
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dataModels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/util/SBMLutilities.java
View file

@ -5267,7 +5267,7 @@ public class SBMLutilities extends CoreObservable
double upperBound = FastMath.max(leftChildValue, rightChildValue); double upperBound = FastMath.max(leftChildValue, rightChildValue);
//return prng.nextDouble(lowerBound, upperBound); //return prng.nextDouble(lowerBound, upperBound);
return ((upperBound-lowerBound) / 2); return ((upperBound+lowerBound) / 2);
} }
else if (nodeName.equals("exponential")) else if (nodeName.equals("exponential"))
{ {

6
verification/src/main/java/edu/utah/ece/async/lema/verification/timed_state_exploration/zoneProject/Zone.java
View file

@ -990,12 +990,10 @@ public class Zone implements Equivalence{
String contValue = v.getInitValue(); String contValue = v.getInitValue();
IntervalPair bound = parseRate(contValue); IntervalPair bound = parseRate(contValue);
// Set upper bound (DBM entry (0, x) where x is the index of the variable v). // Set upper bound (DBM entry (0, x) where x is the index of the variable v).
setDbmEntryByPair(LPNTransitionPair.ZERO_TIMER_PAIR, ltPair, setDbmEntryByPair(LPNTransitionPair.ZERO_TIMER_PAIR, ltPair, bound.get_UpperBound());
ContinuousUtilities.chkDiv(bound.get_UpperBound(),range.get_LowerBound(),true));
// Set lower bound (DBM entry (x, 0) where x is the index of the variable v). // Set lower bound (DBM entry (x, 0) where x is the index of the variable v).
setDbmEntryByPair(ltPair, LPNTransitionPair.ZERO_TIMER_PAIR, setDbmEntryByPair(ltPair, LPNTransitionPair.ZERO_TIMER_PAIR, -1*bound.get_LowerBound());
ContinuousUtilities.chkDiv(-1*bound.get_LowerBound(),range.get_LowerBound(),true));