diff --git a/build.gradle b/build.gradle index 578b244..44b1aaf 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java-library' apply plugin: 'maven' group = 'edu.kit.ifv.mobitopp' -version = '1.x' +version = '1.51' wrapper.gradleVersion = '4.10' task sourcesJar(type: Jar, dependsOn: classes) { diff --git a/src/main/java/edu/kit/ifv/mobitopp/actitopp/Configuration.java b/src/main/java/edu/kit/ifv/mobitopp/actitopp/Configuration.java index 44e7d1c..6bd6567 100644 --- a/src/main/java/edu/kit/ifv/mobitopp/actitopp/Configuration.java +++ b/src/main/java/edu/kit/ifv/mobitopp/actitopp/Configuration.java @@ -140,7 +140,7 @@ public class Configuration { } /* - * steps that use lineare regression modeling + * steps that use linear regression modeling */ public static final HashSet linregsteps_filenames; static @@ -150,13 +150,6 @@ public class Configuration { } - - -/* - * activity types - */ - public static final ArrayList ACTIVITY_TYPES_mobiTopp = new ArrayList(Arrays.asList((byte)1,(byte)2,(byte)3,(byte)6,(byte)7,(byte)11,(byte)12,(byte)41,(byte)42,(byte)51,(byte)52,(byte)53,(byte)77)); - /* * activity durations - categories diff --git a/src/main/java/edu/kit/ifv/mobitopp/actitopp/HActivity.java b/src/main/java/edu/kit/ifv/mobitopp/actitopp/HActivity.java index 545caa4..3a9081b 100644 --- a/src/main/java/edu/kit/ifv/mobitopp/actitopp/HActivity.java +++ b/src/main/java/edu/kit/ifv/mobitopp/actitopp/HActivity.java @@ -194,13 +194,11 @@ public int getEstimatedTripTimeAfterActivity() public byte getMobiToppActType() { - assert Configuration.ACTIVITY_TYPES_mobiTopp.contains(mobiToppActType) : "unknown mobitopp format activity type"; return mobiToppActType; } public void setMobiToppActType(byte mobiToppActType) { - assert Configuration.ACTIVITY_TYPES_mobiTopp.contains(mobiToppActType) : "unknown mobitopp format activity type"; this.mobiToppActType = mobiToppActType; }