Commit 7e15cbd6 authored by Simon Eismann's avatar Simon Eismann

AbstractContinuousDistribution --> AbstractDistribution

parent c164bc2d
......@@ -17,8 +17,8 @@ Require-Bundle: org.eclipse.ui,
org.dom4j;bundle-version="1.6.1",
org.jfreechart.core;bundle-version="1.0.12",
org.jfreechart.jcommon;bundle-version="1.0.15",
org.jfreechart.swt;bundle-version="1.0.12",
org.rosuda.JRI;bundle-version="0.5.0",
org.jfreechart.swt;
org.rosuda.JRI;
org.jaxen;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
Export-Package: de.tud.cs.qpe,
......
......@@ -34,3 +34,4 @@ Require-Bundle: org.dom4j;bundle-version="1.6.1",
edu.bonn.cs.net.jbarrier;bundle-version="1.0.0",
org.eclipse.equinox.concurrent;bundle-version="1.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.apache.commons.math.distribution
......@@ -52,7 +52,7 @@ package de.tud.cs.simqpn.kernel;
import java.util.LinkedList;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Empirical;
import cern.jet.random.EmpiricalWalker;
import cern.jet.random.Exponential;
......@@ -103,7 +103,7 @@ public class Queue {
public int tkMinResidPos; // PS queues: expPS==false: Index in QPlace.queueTokArrivTS[tkSchedCol] and QPlace.queueTokResidServTimes[tkSchedCol] of the token with the minimum residual service time.
public double lastEventClock; // PS queues: expPS==false: Time of the last event scheduling, i.e. time of the last event with effect on this queue.
public int lastEventTkCnt; // PS queues: expPS==false: Token population at the time of the last event scheduling.
public AbstractContinousDistribution[]
public AbstractDistribution[]
expRandServTimeGen; // PS queues: expPS==true: Random number generators for generating service times.
public EmpiricalWalker
randColorGen; // PS queues: expPS==true: Random number generator for generating token colors.
......
......@@ -70,6 +70,7 @@ import org.dom4j.Element;
import cern.colt.list.AbstractDoubleList;
import cern.colt.list.DoubleArrayList;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Exponential;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNConfiguration;
......@@ -493,6 +494,7 @@ public class QPlace extends Place {
*/
private void calculateServiceTimeIfFutureListIsEmpty(int color) {
if (futureList.get(color).isEmpty()) {
int concurrency = queueTokenPop[color];
double serviceTime = randServTimeGen[color].nextDouble();
if (serviceTime < 0) {
serviceTime = 0;
......
......@@ -43,7 +43,7 @@ package de.tud.cs.simqpn.kernel.entities.queue;
import org.apache.log4j.Logger;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Empirical;
import cern.jet.random.EmpiricalWalker;
import cern.jet.random.Exponential;
......@@ -124,7 +124,7 @@ public class PSQueue extends Queue {
* Requires expPS==true: Random number generators for generating service
* times.
*/
private AbstractContinousDistribution[] expRandServTimeGen;
private AbstractDistribution[] expRandServTimeGen;
/**
* Requires expPS==true: Random number generator for generating token
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Beta;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -52,7 +52,7 @@ public class BetaCreator extends DistributionCreator {
double beta = -1;
@Override
public AbstractContinousDistribution getDistribution() throws SimQPNException {
public AbstractDistribution getDistribution() throws SimQPNException {
return new Beta(alpha, beta, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.BreitWigner;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -60,7 +60,7 @@ public class BreitWignerCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new BreitWigner(mean, gamma, cut, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.BreitWignerMeanSquare;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -60,7 +60,7 @@ public class BreitWignerMeanSquareCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new BreitWignerMeanSquare(mean, gamma, cut, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.ChiSquare;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -56,7 +56,7 @@ public class ChiSquareCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new ChiSquare(freedom, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -40,7 +40,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
/**
* A deterministic distribution that always returns the double passed to the
......@@ -51,7 +51,7 @@ import cern.jet.random.AbstractContinousDistribution;
* @author Philipp Meier
*
*/
public class Deterministic extends AbstractContinousDistribution {
public class Deterministic extends AbstractDistribution {
private double value;
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import de.tud.cs.simqpn.kernel.SimQPNException;
public class DeterministicCreator extends DistributionCreator {
......@@ -58,7 +58,7 @@ public class DeterministicCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new Deterministic(p1);
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
import de.tud.cs.simqpn.kernel.util.LogUtil;
......@@ -62,7 +62,7 @@ public class EmpiricalCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new ScaledEmpirical( offset, scale, pdf, cern.jet.random.Empirical.LINEAR_INTERPOLATION,
RandomNumberGenerator.nextRandNumGen());
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Exponential;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -56,7 +56,7 @@ public class ExponentialCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new Exponential(lambda, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.ExponentialPower;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -57,7 +57,7 @@ public class ExponentialPowerCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new ExponentialPower(tau, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Gamma;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -58,7 +58,7 @@ public class GammaCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new Gamma(alpha, lambda, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Hyperbolic;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -59,7 +59,7 @@ public class HyperbolicCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new Hyperbolic(alpha, beta, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Logarithmic;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -60,7 +60,7 @@ public class LogarithmicCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new Logarithmic(p, RandomNumberGenerator.nextRandNumGen());
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Normal;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -58,7 +58,7 @@ public class NormalCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new Normal(mean, stdDev, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,9 +41,9 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
public class Periodical extends AbstractContinousDistribution {
public class Periodical extends AbstractDistribution {
private static final long serialVersionUID = -6171122408442436886L;
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import de.tud.cs.simqpn.kernel.SimQPNException;
import de.tud.cs.simqpn.kernel.util.LogUtil;
......@@ -57,7 +57,7 @@ public class PeriodicalCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new Periodical(pdf);
......
......@@ -40,10 +40,10 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
public class Replay extends AbstractContinousDistribution {
public class Replay extends AbstractDistribution {
private static final long serialVersionUID = 1L;
private double[] replayValues;
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import de.tud.cs.simqpn.kernel.SimQPNException;
public class ReplayCreator extends DistributionCreator {
......@@ -56,7 +56,7 @@ public class ReplayCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
String colorRefId = loadStringParam("id");
return new Replay(replayValues, colorRefId);
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.StudentT;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -57,7 +57,7 @@ public class StudentTCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new StudentT(freedom, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.Uniform;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -63,7 +63,7 @@ public class UniformCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new Uniform(min, max, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -41,7 +41,7 @@
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
import cern.jet.random.AbstractContinousDistribution;
import cern.jet.random.AbstractDistribution;
import cern.jet.random.VonMises;
import de.tud.cs.simqpn.kernel.RandomNumberGenerator;
import de.tud.cs.simqpn.kernel.SimQPNException;
......@@ -57,7 +57,7 @@ public class VonMisesCreator extends DistributionCreator {
}
@Override
public AbstractContinousDistribution getDistribution()
public AbstractDistribution getDistribution()
throws SimQPNException {
return new VonMises(freedom, RandomNumberGenerator.nextRandNumGen());
}
......
......@@ -40,6 +40,6 @@
*
*/
/**
* This package contains factory methods and extensions to cern.jet.random.AbstractContinousDistribution.
* This package contains factory methods and extensions to cern.jet.random.AbstractDistribution.
*/
package de.tud.cs.simqpn.kernel.loading.distributions;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment