Skip to content

First commit (code for example only) #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CorinStaves wants to merge 4 commits into
base: master
Choose a base branch
from
Open

First commit (code for example only) #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1daeb4e
First commit
CorinStaves Aug 17, 2020
932953e
updates after MSM meeting
CorinStaves Sep 7, 2020
6baa24e
Updates to Renjin model
CorinStaves Sep 11, 2020
322e9ad
Updated TripGen Models
CorinStaves Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,21 @@
<name>Java.net repository</name>
<url>http://download.java.net/maven/2</url>
</repository>
<repository>
<id>bedatadriven</id>
<name>bedatadriven public repo</name>
<url>https://nexus.bedatadriven.com/content/groups/public/</url>
</repository>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<build>
<plugins>
Expand Down Expand Up @@ -230,6 +245,22 @@
<artifactId>xchart</artifactId>
<version>3.6.3</version>
</dependency>
<dependency>
<groupId>org.renjin</groupId>
<artifactId>renjin-script-engine</artifactId>
<version>3.5-beta43</version>
</dependency>
<dependency>
<groupId>org.renjin.cran</groupId>
<artifactId>pscl</artifactId>
<version>1.5.2-b14</version>
</dependency>
<dependency>
<groupId>com.github.fommil.netlib</groupId>
<artifactId>all</artifactId>
<version>1.1.2</version>
<type>pom</type>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
208 changes: 208 additions & 0 deletions src/main/java/de/tum/bgu/msm/data/DataSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
import de.tum.bgu.msm.data.travelTimes.TravelTimes;
import de.tum.bgu.msm.modules.modeChoice.ModeChoiceCalibrationData;
import org.matsim.api.core.v01.population.Population;
import org.renjin.primitives.vector.RowNamesVector;
import org.renjin.sexp.*;

import java.util.*;
import java.util.function.Predicate;

public class DataSet {

Expand Down Expand Up @@ -186,6 +189,22 @@ public static int getStudentsForHousehold(MitoHousehold household) {

}

public static int countMembersByAttribute(MitoHousehold household,int minAge,int maxAge) {
return (int) household.getPersons().values().stream().filter(person ->
person.getAge() >= minAge & person.getAge() <= maxAge).count();
}

public static int countMembersByAttribute(MitoHousehold household,int minAge,int maxAge, MitoOccupationStatus occupation) {
return (int) household.getPersons().values().stream().filter(person ->
person.getAge() >= minAge & person.getAge() <= maxAge &
person.getMitoOccupationStatus().equals(occupation)).count();
}

public static int countMembersByFilter(MitoHousehold household, Predicate<MitoPerson> filter) {
return (int) household.getPersons().values().stream().filter(filter).count();
}


public static int getLicenseHoldersForHousehold(MitoHousehold household) {
return (int) household.getPersons().values().stream().filter(MitoPerson::hasDriversLicense).count();
}
Expand Down Expand Up @@ -242,6 +261,195 @@ public ModeChoiceCalibrationData getModeChoiceCalibrationData() {
return modeChoiceCalibrationData;
}

private int determineAreaType(MitoHousehold hh) {
int areaType = -1;
if (hh.getHomeZone() != null) {
areaType = hh.getHomeZone().getAreaTypeSG().code() / 10;
} else {
System.out.println("Home MitoZone for Household " + hh.getId() + " is null!");
}
return areaType;
}

private ListVector RDataFrame;
public ListVector getRdataFrame() {return this.RDataFrame; }

// Method to create R data frame
public void buildRdataFrame() {

//Create Builders for each Variable
IntArrayVector.Builder hhId = new IntArrayVector.Builder();

IntArrayVector.Builder hhSize = new IntArrayVector.Builder();
IntArrayVector.Builder hhSize1 = new IntArrayVector.Builder();
IntArrayVector.Builder hhSize2 = new IntArrayVector.Builder();
IntArrayVector.Builder hhSize3 = new IntArrayVector.Builder();
IntArrayVector.Builder hhSize23 = new IntArrayVector.Builder();
IntArrayVector.Builder hhSize4 = new IntArrayVector.Builder();
IntArrayVector.Builder hhSize5 = new IntArrayVector.Builder();
IntArrayVector.Builder hhSize345 = new IntArrayVector.Builder();
IntArrayVector.Builder hhSize45 = new IntArrayVector.Builder();

IntArrayVector.Builder hhPersons0to6 = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons6to17 = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons18to29_worker = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons18to29_student = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons18to29_unemployed = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons30to64_worker = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons30to64_student = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons18to64_student = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons30to64_unemployed = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons18to64_unemployed = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersons65up = new IntArrayVector.Builder();

IntArrayVector.Builder hhPersonsFemale = new IntArrayVector.Builder();
IntArrayVector.Builder hhPersonsWithMobilityRestriction = new IntArrayVector.Builder();

IntArrayVector.Builder hhEconomicStatus = new IntArrayVector.Builder();
IntArrayVector.Builder hhEconomicStatus2 = new IntArrayVector.Builder();
IntArrayVector.Builder hhEconomicStatus3 = new IntArrayVector.Builder();
IntArrayVector.Builder hhEconomicStatus23 = new IntArrayVector.Builder();
IntArrayVector.Builder hhEconomicStatus4 = new IntArrayVector.Builder();
IntArrayVector.Builder hhEconomicStatus5 = new IntArrayVector.Builder();
IntArrayVector.Builder hhEconomicStatus45 = new IntArrayVector.Builder();

IntArrayVector.Builder hhAutos = new IntArrayVector.Builder();
DoubleArrayVector.Builder hhPropAutos = new DoubleArrayVector.Builder();

IntArrayVector.Builder hhRegionType = new IntArrayVector.Builder();
IntArrayVector.Builder hhRegionType2 = new IntArrayVector.Builder();
IntArrayVector.Builder hhRegionType3 = new IntArrayVector.Builder();
IntArrayVector.Builder hhRegionType4 = new IntArrayVector.Builder();

// Loop through dataSet and assign values
final Iterator<MitoHousehold> iterator = this.getHouseholds().values().iterator();
for (; iterator.hasNext(); ) {
MitoHousehold hh = iterator.next();

hhId.add(hh.getId());
int householdSize = hh.getHhSize();
hhSize.add(householdSize);
hhSize1.add(householdSize == 1 ? 1 : 0);
hhSize2.add(householdSize == 2 ? 1 : 0);
hhSize23.add(householdSize == 2 | householdSize == 3 ? 1 : 0);
hhSize3.add(householdSize == 3 ? 1 : 0);
hhSize4.add(householdSize == 4 ? 1 : 0);
hhSize5.add(householdSize >= 5 ? 1 : 0);
hhSize345.add(householdSize >= 3 ? 1 : 0);
hhSize45.add(householdSize >= 4 ? 1 : 0);

hhPersons0to6.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() < 6));
hhPersons6to17.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 6 & mitoPerson.getAge() <= 17));
hhPersons18to29_worker.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 18 & mitoPerson.getAge() <= 29 &
mitoPerson.getMitoOccupationStatus().equals(MitoOccupationStatus.WORKER)));
hhPersons18to29_student.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 18 & mitoPerson.getAge() <= 29 &
mitoPerson.getMitoOccupationStatus().equals(MitoOccupationStatus.STUDENT)));
hhPersons18to29_unemployed.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 18 & mitoPerson.getAge() <= 29 &
mitoPerson.getMitoOccupationStatus().equals(MitoOccupationStatus.UNEMPLOYED)));
hhPersons30to64_worker.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 30 & mitoPerson.getAge() <= 64 &
mitoPerson.getMitoOccupationStatus().equals(MitoOccupationStatus.WORKER)));
hhPersons30to64_student.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 30 & mitoPerson.getAge() <= 64 &
mitoPerson.getMitoOccupationStatus().equals(MitoOccupationStatus.STUDENT)));
hhPersons18to64_student.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 18 & mitoPerson.getAge() <= 64 &
mitoPerson.getMitoOccupationStatus().equals(MitoOccupationStatus.STUDENT)));
hhPersons30to64_unemployed.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 30 & mitoPerson.getAge() <= 64 &
mitoPerson.getMitoOccupationStatus().equals(MitoOccupationStatus.UNEMPLOYED)));
hhPersons18to64_unemployed.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 18 & mitoPerson.getAge() <= 64 &
mitoPerson.getMitoOccupationStatus().equals(MitoOccupationStatus.UNEMPLOYED)));
hhPersons65up.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 65));


hhPersonsFemale.add(DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getMitoGender().equals(MitoGender.FEMALE)));
hhPersonsWithMobilityRestriction.add(0); //todo: include actual disability status (currently 0)

int economicStatus = hh.getEconomicStatus();
hhEconomicStatus.add(economicStatus);
hhEconomicStatus2.add(economicStatus == 2 ? 1 : 0);
hhEconomicStatus3.add(economicStatus == 3 ? 1 : 0);
hhEconomicStatus23.add(economicStatus == 2 || economicStatus == 3 ? 1 : 0);
hhEconomicStatus4.add(economicStatus == 4 ? 1 : 0);
hhEconomicStatus5.add(economicStatus == 5 ? 1 : 0);
hhEconomicStatus45.add(economicStatus >= 4 ? 1 : 0);

hhAutos.add(hh.getAutos());
hhPropAutos.add(Math.min(1.0,((double) hh.getAutos() / DataSet.countMembersByFilter(hh, mitoPerson ->
mitoPerson.getAge() >= 15))));

int hhAreaType = determineAreaType(hh);
hhRegionType.add(hhAreaType);
hhRegionType2.add(hhAreaType == 2 ? 1 : 0);
hhRegionType3.add(hhAreaType == 3 ? 1 : 0);
hhRegionType4.add(hhAreaType == 4 ? 1 : 0);
}

// Add all vectors to a R data frame
ListVector.NamedBuilder RModelDataBuilder = new ListVector.NamedBuilder();
RModelDataBuilder.setAttribute(Symbols.CLASS, StringVector.valueOf("data.frame"));
RModelDataBuilder.setAttribute(Symbols.ROW_NAMES, new RowNamesVector(this.getHouseholds().size()));
RModelDataBuilder.add("hh.id",hhId.build());
RModelDataBuilder.add("hh.size",hhSize.build());
RModelDataBuilder.add("hh.size_1",hhSize1.build());
RModelDataBuilder.add("hh.size_2",hhSize2.build());
RModelDataBuilder.add("hh.size_3",hhSize3.build());
RModelDataBuilder.add("hh.size_23",hhSize3.build());
RModelDataBuilder.add("hh.size_4",hhSize4.build());
RModelDataBuilder.add("hh.size_5",hhSize5.build());
RModelDataBuilder.add("hh.size_345",hhSize345.build());
RModelDataBuilder.add("hh.size_45",hhSize45.build());

RModelDataBuilder.add("hh.pers_under6",hhPersons0to6.build());
RModelDataBuilder.add("hh.pers_6to17",hhPersons6to17.build());
RModelDataBuilder.add("hh.pers_18to29_w",hhPersons18to29_worker.build());
RModelDataBuilder.add("hh.pers_18to29_s",hhPersons18to29_student.build());
RModelDataBuilder.add("hh.pers_18to29_u",hhPersons18to29_unemployed.build());
RModelDataBuilder.add("hh.pers_30to64_w",hhPersons30to64_worker.build());
RModelDataBuilder.add("hh.pers_30to64_s",hhPersons30to64_student.build());
RModelDataBuilder.add("hh.pers_18to64_s",hhPersons18to64_student.build());
RModelDataBuilder.add("hh.pers_30to64_u",hhPersons30to64_unemployed.build());
RModelDataBuilder.add("hh.pers_18to64_u",hhPersons18to64_unemployed.build());
RModelDataBuilder.add("hh.pers_65up",hhPersons65up.build());

RModelDataBuilder.add("hh.pers_female",hhPersonsFemale.build());
RModelDataBuilder.add("hh.pers_mobilityRestriction",hhPersonsWithMobilityRestriction.build());

RModelDataBuilder.add("hh.economicStatus",hhEconomicStatus.build());
RModelDataBuilder.add("hh.economicStatus_2",hhEconomicStatus2.build());
RModelDataBuilder.add("hh.economicStatus_3",hhEconomicStatus3.build());
RModelDataBuilder.add("hh.economicStatus_23",hhEconomicStatus23.build());
RModelDataBuilder.add("hh.economicStatus_4",hhEconomicStatus4.build());
RModelDataBuilder.add("hh.economicStatus_5",hhEconomicStatus5.build());

RModelDataBuilder.add("hh.autos",hhAutos.build());
RModelDataBuilder.add("hh.propAutos",hhPropAutos.build());

RModelDataBuilder.add("hh.BBSR",hhRegionType.build());
RModelDataBuilder.add("hh.BBSR_2",hhRegionType2.build());
RModelDataBuilder.add("hh.BBSR_3",hhRegionType3.build());
RModelDataBuilder.add("hh.BBSR_4",hhRegionType4.build());

this.RDataFrame = RModelDataBuilder.build();

}











Expand Down
78 changes: 0 additions & 78 deletions src/main/java/de/tum/bgu/msm/modules/tripGeneration/HouseholdType.java
View file
Open in desktop

This file was deleted.

Loading