24.09., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

Commit da5638e7 authored by Marion Goedel's avatar Marion Goedel

Just corrected some comments.

parent d8646f68
......@@ -14,7 +14,7 @@ import org.vadere.state.scenario.Topography;
import org.vadere.util.opencl.OpenCLException;
/**
* IGaussianFilter is a refershable image processing calculator that can be used
* IGaussianFilter is a refreshable image processing calculator that can be used
* to solve a discrete convolution or other calculations that can be done by a
* image processing filter.
*
......
......@@ -20,10 +20,10 @@ public class TimeCostPedestrianDensityQueuing implements ITimeCostFunction {
/** the image processing filter to measure the weighted density. */
private final IGaussianFilter gaussianCalculator;
/** the decorator that is uesed by this decorator. */
/** the decorator that is used by this decorator. */
private ITimeCostFunction timeCostFunction;
private final double queueWidhtFactor;
private final double queueWidthFactor;
// private final static double EPSILON = 0.0001;
private final static double EPSILON = 0.000001;
......@@ -41,10 +41,10 @@ public class TimeCostPedestrianDensityQueuing implements ITimeCostFunction {
this.timeCostFunction = timeCostFunction;
this.gaussianCalculator = filter;
this.queueWidhtFactor = attributes.getQueueWidthLoading();
this.queueWidthFactor = attributes.getQueueWidthLoading();
logger.info("time cost attributes: " + attributes);
logger.info("queueWidhtFactor: " + queueWidhtFactor);
logger.info("queueWidthFactor: " + queueWidthFactor);
logger.info("filter: " + filter);
// the initial filtering (convolution)
......@@ -55,7 +55,7 @@ public class TimeCostPedestrianDensityQueuing implements ITimeCostFunction {
public double costAt(final VPoint p) {
long ms = System.currentTimeMillis();
double cost = queueWidhtFactor
double cost = queueWidthFactor
* gaussianCalculator.getFilteredValue(p.x, p.y);
runtime += System.currentTimeMillis() - ms;
......@@ -76,7 +76,7 @@ public class TimeCostPedestrianDensityQueuing implements ITimeCostFunction {
runtime = 0;
long ms = System.currentTimeMillis();
// refersh the filtered image
// refresh the filtered image
this.gaussianCalculator.filterImage();
runtime += System.currentTimeMillis() - ms;
}
......
......@@ -24,10 +24,10 @@ public class AttributesTimeCost extends Attributes {
/** a dynamic middle scale navigation (queuing). */
QUEUEING,
/** for the queuing game */
/** for the queueing game */
QUEUEING_GAME,
/** for the queuing game */
/** for the queueing game */
NAVIGATION_GAME,
/**
......@@ -41,12 +41,12 @@ public class AttributesTimeCost extends Attributes {
/** use one single loading for all pedestrians. */
CONSTANT,
/**
* use c_D and c_D' for differ pedestrains of the some target and other
* use c_D and c_D' for differ pedestrians of the some target and other
* target.
*/
CONSTANT_RESPECT_TARGETS,
/**
* use the dynamic loading strategy to calculate for each pedestrain an
* use the dynamic loading strategy to calculate for each pedestrian an
* individual loading.
*/
DYNAMIC,
......@@ -61,35 +61,35 @@ public class AttributesTimeCost extends Attributes {
private double obstacleDensityWeight = 3.5;
/**
* (hartmann-2012, c_D) = the weight of the pedestrian that has the some
* target as the potentialfield that will be generated.
* target as the potential field that will be generated.
*/
private double pedestrianSameTargetDensityWeight = 3.5;
/**
* (hartmann-2012, c_D') = the weight of the pedestrian that has on other
* target than the potentialfield that will be generated.
* target than the potential field that will be generated.
*/
private double pedestrianOtherTargetDensityWeight = 3.5;
/** the weight for the constant laoding c in hartmann-2012. */
/** the weight for the constant loading c in hartmann-2012. */
private double pedestrianWeight = 3.5;
/**
* (queuing only) the factor that influences the queue width. = 1 > means
* lower width. The value should be in the intervall [1;infty[.
* (queueing only) the factor that influences the queue width. = 1 > means
* lower width. The value should be in the interval [1;infty[.
*/
// @SerializedName("queueWidthLaoding")
// @SerializedName("queueWidthLoading")
private double queueWidthLoading = 1;
/** the laoding that will be multiplied to the dynamic loading. */
/** the loading that will be multiplied to the dynamic loading. */
private double pedestrianDynamicWeight = 6.0;
/**
* indicate that the dynamic potential field should calculate a individual
* loading for each pedestrian or uses a constant laoding strategy. This
* loading for each pedestrian or uses a constant loading strategy. This
* will be done by the loading strategies. If the
* loadingType=CONSTANT_RESPECT_TARGETS than
* pedestrianSameTargetDensityWeight and pedestrianOtherTargetDensityWeight
* has to be set. If loadingType=CONSTANT than pedestrianWeight has to be
* set.
*/
// @SerializedName("laodingType")
// @SerializedName("loadingType")
private LoadingType loadingType = LoadingType.CONSTANT;
// Getters...
......
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