Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 6e02d206 authored by Jakob Schöttl's avatar Jakob Schöttl
Browse files

Add comment, remove unnecessary default constructors

parent 21cecb1b
......@@ -4,7 +4,9 @@ package org.vadere.state.attributes;
* Abstract class for all static simulation attributes. Provides reflection
* based methods to convert the fields and values of the Attributes classes from
* and to key-value store.
*
* Implementations must provide a no-arg default contstructor (either implicitly
* or explicitly) to enable deserialization from JSON.
*/
public abstract class Attributes {
}
......@@ -19,8 +19,6 @@ public class AttributesSimulation extends Attributes {
private boolean useRandomSeed = true;
private long randomSeed = 1;
public AttributesSimulation() {}
// Getter...
public double getFinishTime() {
......
......@@ -49,8 +49,6 @@ public class AttributesBHM extends Attributes {
private double spaceToKeep = 0.01;
private boolean stepAwayFromCollisions = false;
public AttributesBHM() {}
public double getStepLengthIntercept() {
return stepLengthIntercept;
}
......
......@@ -6,12 +6,11 @@ import java.util.List;
import org.vadere.state.attributes.Attributes;
public class AttributesCGM extends Attributes {
private double groupMemberRepulsionFactor = 0.01;
private double leaderAttractionFactor = 0.003;
private List<Double> groupSizeDistribution = Arrays.asList(0.0, 0.0, 1.0);
public AttributesCGM() {}
public double getGroupMemberRepulsionFactor() {
return groupMemberRepulsionFactor;
}
......
......@@ -4,7 +4,6 @@ import org.vadere.state.attributes.Attributes;
public class AttributesGFM extends Attributes {
private double gravityFactor = 1;
private double normalParticleStiffness = 5000;
private double dampingParticle = 40;
......@@ -26,9 +25,6 @@ public class AttributesGFM extends Attributes {
private double momOfInertia = 1;
private double startOmega = 0;
public AttributesGFM() {}
public double getGravityFactor() {
return gravityFactor;
}
......
......@@ -4,6 +4,7 @@ import org.vadere.state.attributes.Attributes;
import org.vadere.state.types.GradientProviderType;
public class AttributesGNM extends Attributes {
private AttributesODEIntegrator attributesODEIntegrator;
private GradientProviderType floorGradientProviderType = GradientProviderType.FLOOR_EIKONAL_DISCRETE;
......
......@@ -18,8 +18,6 @@ public class AttributesODEIntegrator extends Attributes {
private double toleranceAbsolute = 1e-5;
private double toleranceRelative = 1e-4;
public AttributesODEIntegrator() {}
// Getters...
public IntegratorType getSolverType() {
return solverType;
......
......@@ -22,8 +22,6 @@ public class AttributesPotentialCompactSoftshell extends Attributes {
return intimateSpaceFactor;
}
public AttributesPotentialCompactSoftshell() {}
public double getPedPotentialIntimateSpaceWidth() {
return pedPotentialIntimateSpaceWidth;
}
......
......@@ -14,8 +14,6 @@ public class AttributesPotentialGNM extends Attributes {
private double obstacleBodyPotential = 20.1;
private double obstacleRepulsionStrength = 0.25;
public AttributesPotentialGNM() {}
// Getters...
public double getPedestrianBodyPotential() {
......
......@@ -22,8 +22,6 @@ public class AttributesPotentialOSM extends Attributes {
private double aObsOSM = 3.5;
private double bObsOSM = 0.2;
public AttributesPotentialOSM() {}
// Getters...
public double getPedestrianBodyPotential() {
......
......@@ -14,8 +14,6 @@ public class AttributesPotentialParticles extends Attributes {
private double obstacleBodyPotential = 20.1;
private double obstacleRepulsionStrength = 0.25;
public AttributesPotentialParticles() {}
// Getters...
public double getPedestrianBodyPotential() {
......
......@@ -13,10 +13,6 @@ public class AttributesPotentialRingExperiment extends Attributes {
private double allowedTrajectoryWidth = 0.1;
private double pedestrianRadius = 0.5;
public AttributesPotentialRingExperiment() {
}
public VPoint getCenter() {
return center;
}
......
......@@ -14,8 +14,6 @@ public class AttributesPotentialSFM extends Attributes {
private double obstacleBodyPotential = 20.1;
private double obstacleRepulsionStrength = 0.25;
public AttributesPotentialSFM() {}
// Getters...
public double getPedestrianBodyPotential() {
......
......@@ -10,8 +10,6 @@ public class AttributesQueuingGame extends Attributes {
private double expectedGentleTimeInSec;
private double expectedCompetitiveTimeInSec;
public AttributesQueuingGame() {}
public AttributesFloorField getNavigationFloorField() {
return navigationFloorField;
}
......
......@@ -12,8 +12,6 @@ public class AttributesSTOM extends Attributes {
private String tactics = null;
private String strategy = null;
public AttributesSTOM() {}
// Getters...
public String getOperation() {
return operation;
......
......@@ -5,8 +5,6 @@ import org.vadere.state.attributes.Attributes;
public class AttributesSingleTargetStrategy extends Attributes {
private int targetID = 0;
public AttributesSingleTargetStrategy() {}
public int getTargetID() {
return targetID;
}
......
......@@ -12,7 +12,6 @@ public class AttributesTimeCost extends Attributes {
* The different time cost function types that represents different scenario
* types.
*
*
*/
public enum TimeCostFunctionType {
/** a static middle scale navigation. */
......@@ -91,8 +90,6 @@ public class AttributesTimeCost extends Attributes {
// @SerializedName("laodingType")
private LoadingType loadingType = LoadingType.CONSTANT;
public AttributesTimeCost() {}
// Getters...
public double getStandardDerivation() {
return standardDerivation;
......
......@@ -19,7 +19,7 @@ public class AttributesAgent extends AttributesDynamicElement {
private double acceleration = 2.0;
public AttributesAgent() {
super(-1);
this(-1);
}
public AttributesAgent(final int id) {
......
......@@ -17,7 +17,7 @@ public class AttributesCar extends AttributesAgent {
}
public AttributesCar() {
super(-1);
this(-1);
}
public AttributesCar(final int id) {
......
......@@ -48,14 +48,6 @@ public class AttributesSource extends Attributes {
*/
private DynamicElementType dynamicElementType = DynamicElementType.PEDESTRIAN;
/**
* This (private) default constructor is used by Jackson.
* TODO is this still correct for Jackson (for Gson it was)?
*
* Without it, the initial field assignments
* above have no effect. In other words, no default values for fields are possible without a
* default constructor.
*/
@SuppressWarnings("unused")
private AttributesSource() {}
......
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