version 1.6 - new parameterset based on mopv1.4 but without the need of

information about number of cars in household to create schedules

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java-library'
 apply plugin: 'maven'
 
 group = 'edu.kit.ifv.mobitopp'
-version = '1.52'
+version = '1.6'
 wrapper.gradleVersion = '4.10'
 
 task sourcesJar(type: Jar, dependsOn: classes) {

src/main/java/edu/kit/ifv/mobitopp/actitopp/ActiToppHousehold.java

@@ -24,7 +24,7 @@ public class ActiToppHousehold {
 
 	/**
 	 * 
-	 * constructor
+	 * constructor with number of cars in household
 	 *
 	 * @param householdIndex
 	 * @param children0_10
@@ -45,6 +45,27 @@ public ActiToppHousehold(int householdIndex, int children0_10, int children_u18,
 		this.householdmembers = new HashMap<Integer, ActitoppPerson>();
 	}
 
+	/**
+	 * 
+	 * constructor without number of cars in household
+	 *
+	 * @param householdIndex
+	 * @param children0_10
+	 * @param children_u18
+	 * @param areatype
+	 */
+	public ActiToppHousehold(int householdIndex, int children0_10, int children_u18, int areatype) {
+
+		super();
+		this.householdIndex = householdIndex;
+
+		this.children0_10 = children0_10;
+		this.children_u18 = children_u18;
+		this.areatype = areatype;
+
+		this.householdmembers = new HashMap<Integer, ActitoppPerson>();
+	}
+
 	/**
 	 * 
 	 * constructor used to "clone" household including all persons in the household

src/main/java/edu/kit/ifv/mobitopp/actitopp/ActitoppPerson.java

@@ -44,7 +44,7 @@ public class ActitoppPerson
 
 
 	/**
-	 * constructor to create a peron without household context
+	 * constructor to create a person without household context
 	 * 
 	 * @param PersIndex
 	 * @param children0_10
@@ -90,10 +90,56 @@ public ActitoppPerson(
 
 		this.addAttributetoMap("numbermodeledinhh", (double) (1));	
 		}
+
+
+	/**
+	 * constructor to create a person without household context
+	 * 
+	 * @param PersIndex
+	 * @param children0_10
+	 * @param children_u18
+	 * @param age
+	 * @param employment
+	 * @param gender
+	 * @param areatype
+	 */
+	public ActitoppPerson(
+			int PersIndex,
+			int children0_10,
+			int children_u18,
+			int age,
+			int employment,
+			int gender,
+			int areatype
+	) {
+
+		/*
+		 * Person can be generated without having household context.
+		 * To simplify the internal modeling process, a household object 
+		 * containing this person only will be created for these cases.
+		 */
+		this.household = new ActiToppHousehold(
+				PersIndex, 
+				children0_10, 
+				children_u18, 
+				areatype
+		);
+		this.household.addHouseholdmember(this, 1);
+
+		this.setPersIndex(PersIndex);
+		this.setAge(age);
+		this.setEmployment(employment);
+		this.setGender(gender);  
+
+		this.attributes = new HashMap<String, Double>();
+		this.jointActivitiesforConsideration = new ArrayList<HActivity>();
+
+		this.addAttributetoMap("numbermodeledinhh", (double) (1));	
+		}
 
 
 	/**
-	 * constructor to create a peron without household context but with commuting distances
+	 * constructor to create a person without household context but with commuting distances
 	 * 
 	 * @param PersIndex
 	 * @param children0_10
@@ -127,7 +173,39 @@ public ActitoppPerson(
 
 
 	/**
-	 * constructor to create a peron with household context
+	 * constructor to create a person without household context but with commuting distances
+	 * 
+	 * @param PersIndex
+	 * @param children0_10
+	 * @param children_u18
+	 * @param age
+	 * @param employment
+	 * @param gender
+	 * @param areatype
+	 * @param commutingdistance_work
+	 * @param commutingdistance_education
+	 */
+	public ActitoppPerson(
+			int PersIndex,
+			int children0_10,
+			int children_u18,
+			int age,
+			int employment,
+			int gender,
+			int areatype,
+			double commutingdistance_work,
+			double commutingdistance_education
+	) {
+
+		this(PersIndex,children0_10,children_u18,age,employment,gender,areatype);
+
+		this.setCommutingdistance_work(commutingdistance_work);
+		this.setCommutingdistance_education(commutingdistance_education);
+		}	
+
+
+	/**
+	 * constructor to create a person with household context
 	 * 
 	 * @param household
 	 * @param PersIndex
@@ -165,7 +243,7 @@ public ActitoppPerson(
 
 
   /**
-	 * constructor to create a peron with household context and commuting distances
+	 * constructor to create a person with household context and commuting distances
 	 * 
 	 * @param household
 	 * @param PersIndex

src/main/java/edu/kit/ifv/mobitopp/actitopp/Configuration.java

@@ -1,7 +1,5 @@
 package edu.kit.ifv.mobitopp.actitopp;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 
@@ -25,7 +23,7 @@ public class Configuration {
  * stuttgart			=	use parameter estimation of MOP 2004-2013 calibrated for stuttgart area (only actitopp version 1.0)	
  */
 
-	public static final String parameterset = "mopv14";
+	public static String parameterset = "mopv14_withpkwhh";
 
 /*
  * input parameter set for detailed modeling of activity purposes used by mobitopp (modeling step 98)
@@ -34,11 +32,11 @@ public class Configuration {
  * purposes_regiomove			= use parameter sets for regiomove project
  * 
  */
-	public static final String parameterset_purposes = "purposes_regiomove";
+	public static String parameterset_purposes = "purposes_regiomove";
 
 /*
  * when modeling a whole week, we need to consider stability aspects in behavior (e.g. leaving the house at the same time every morning).
- * To demonstrate the siginficance of this aspects, the coordination of the modeling can enabled and disabled.
+ * To demonstrate the significance of this aspects, the coordination of the modeling can enabled and disabled.
  * 
  * i.e: when disabled, different steps (e.g. 8A) will be skipped
  *