Workplace bubbles

.gitignore

@@ -136,3 +136,4 @@ Protecs/src/main/resources/census_ipums.csv
 Protecs/src/main/resources/province_line_list.txt
 Protecs/src/main/resources/census_ipums_5perc.csv
 Protecs/src/main/resources/ipums_radiation_formatted.csv
+

Protecs/src/main/java/uk/ac/ucl/protecs/behaviours/Demography.java

@@ -6,6 +6,7 @@
 import sim.engine.SimState;
 import sim.engine.Steppable;
 import uk.ac.ucl.protecs.objects.Household;
+import uk.ac.ucl.protecs.objects.Workplace;
 import uk.ac.ucl.protecs.objects.Location;
 import uk.ac.ucl.protecs.objects.Person;
 import uk.ac.ucl.protecs.objects.Person.OCCUPATION;
@@ -208,6 +209,7 @@ private void createBirth(SimState arg0, boolean isAlive) {
 			SEX sexAssigned = sexList.get(world.random.nextInt(sexList.size()));
 			OCCUPATION babiesJob = OCCUPATION.UNEMPLOYED;
 			Household babyHousehold = target.getHouseholdAsType();
+			Workplace babyWorkplace = null;
 			Location babyAdminZone = target.getLocation();
 			boolean babySchooling = false;
 			int birthday = time;
@@ -218,6 +220,7 @@ private void createBirth(SimState arg0, boolean isAlive) {
 					babiesJob, // lower case all of the job titles
 					babySchooling,
 					babyHousehold, // household
+					babyWorkplace,
 					world
 					);				
 			// update the household and location to include the baby

Protecs/src/main/java/uk/ac/ucl/protecs/behaviours/MovementBehaviourFramework.java

@@ -6,6 +6,7 @@
 import sim.engine.Steppable;
 import swise.behaviours.BehaviourFramework;
 import swise.behaviours.BehaviourNode;
+import uk.ac.ucl.protecs.objects.Workplace;
 
 /**
  * The MovementBehaviourFramework is an extension on the basis of the BehaviourFramework which
@@ -50,9 +51,8 @@ public MovementBehaviourFramework(WorldBankCovid19Sim model){
 
 			@Override
 			public double next(Steppable s, double time) {
-
 				Person p = (Person) s;
-				
+
 				// the Person may have been sent home immobilised: update everything and don't schedule
 				// to run again until it has been un-immobilised!
 				if(p.isImmobilised()) {
@@ -72,49 +72,112 @@ public double next(Steppable s, double time) {
 				if(myWorld.random.nextDouble() > myEconStatProb)
 					return myWorld.params.ticks_per_day; // rest until tomorrow
 
-
-				// if it's morning, go out for the day
+				// if it's morning, go out for the day, reset the number of contacts they will have
 				if(hour >= myWorld.params.hour_start_day_weekday){ 
+					// reset occurs at hour 2
+					p.resetWorkplaceContacts();
 
-					Location target;
-					target = myWorld.params.getTargetMoveAdminZone(p, day, myWorld.random.nextDouble(), myWorld.lockedDown);
-					// define workday
-					boolean goToWork = (p.isSchoolGoer() || target == p.getCommunityLocation()) // schoolgoer or going to own admin zone
-							&& myWorld.params.isWeekday(day);
+					return determineDailyRoutine(p, hour, day);
+				}
+
+				return 1; // otherwise it's not the morning - stay home for now, but check in again later!
+			}
+
+			private double determineDailyRoutine(Person p, int hour, int day) {
+				Location target;
+				target = myWorld.params.getTargetMoveAdminZone(p, day, myWorld.random.nextDouble(), myWorld.lockedDown);
+				// then check if they are supposed to leave the admin zone they are currently in. If so, then they cannot go to work.
+				boolean stayingInHomeDistrict = target.getId().equals(p.getHousehold().getRootSuperLocation().getId());
+				// First check if they are visiting another district
+				if (!stayingInHomeDistrict) p.setVisiting(true);
+				if (p.visitingNow() & !stayingInHomeDistrict) {
+					// travelling to another district!
+					p.transferTo(target);
+					p.setActivityNode(communityNode);
+					p.setAtWork(false);
+					assert ! p.getHousehold().getSuper().equals(target) : 
+						"set to travel to a different district but didn't, home/target " + p.getHousehold().getSuper().getId() + " " + target.getId();
+					 // stay out until time to go home!
+					return myWorld.params.hour_end_day_otherday - hour;
+				}
+				// if they aren't visiting, are they at work or the community?
+				else {
+					// Check they are going to work
+					boolean goToWork = myWorld.random.nextDouble() < myWorld.params.prob_go_to_work;
 
+					// if unemployed or homemaker don't go to work
+					if (p.isUnemployed()) {
+						goToWork = false;
+					}
+					// first check if there is any constraints to this occupations movements. Note that if the model is using this code block then 
+					// this person has not been immobilised and if their movement is constrained it will mean that they only go to the community and not to work
+					boolean movementConstrained = myWorld.params.OccupationConstraintList.containsKey(p.getEconStatus());
+
 					if(myWorld.params.setting_perfectMixing) // in perfect mixing, just go to the community!
 						goToWork = false;
 
+					if (goToWork & !movementConstrained) target = p.getWorkLocation();
+
+
 					p.transferTo(target);
 					assert (p.getLocation().equals(target)) : "Transfer to target didn't work";
-
 					// update appropriately
 					if(goToWork){ // working
 						p.setActivityNode(workNode);
 						p.setAtWork(true);
 						p.setVisiting(false);
 						return myWorld.params.hours_at_work_weekday;
-					}
-
-					else if(target == p.getCommunityLocation()) { // in home admin zone, not working
+					}					
+					else { // in home district, not working
 						p.setActivityNode(communityNode);
 						p.setAtWork(false);	
+						p.setVisiting(false);
 						assert p.getHousehold().getSuper().getId().equals(target.getId()) : 
 							"set to travel to a within admin zone but didn't, home/target " + p.getHousehold().getSuper().getId() + " " + target.getId();
 						return myWorld.params.hour_end_day_otherday - hour; // stay out until time to go home!
 					}
-
-					else{ // travelling to another admin zone!
-						p.setActivityNode(communityNode);
-						p.setAtWork(false);
-						p.setVisiting(true);
-						assert ! p.getHousehold().getSuper().equals(target) : 
-							"set to travel to a different admin zone but didn't, home/target " + p.getHousehold().getSuper().getId() + " " + target.getId();
-						return myWorld.params.hour_end_day_otherday - hour; // stay out until time to go home!
-					}
-				}
-				return 1; // otherwise it's not the morning - stay home for now, but check in again later!
 			}
+			}
+
+//			private double oldDetermineDailyRoutine(Person p, int hour, int day) {
+//				Location target;
+//				target = myWorld.params.getTargetMoveDistrict(p, day, myWorld.random.nextDouble(), myWorld.lockedDown);
+//				assert target.getId().startsWith("d_"): "target is a null location";
+//				// define workday
+//				boolean goToWork = (p.isSchoolGoer() || target == p.getCommunityLocation()) // schoolgoer or going to own district
+//						&& myWorld.params.isWeekday(day);
+//
+//				if(myWorld.params.setting_perfectMixing) // in perfect mixing, just go to the community!
+//					goToWork = false;
+//				
+//				p.transferTo(target);
+//				assert (p.getLocation().equals(target)) : "Transfer to target didn't work";
+//
+//				// update appropriately
+//				if(goToWork){// working
+//					p.setActivityNode(workNode);
+//					p.setAtWork(true);
+//					p.setVisiting(false);
+//					return myWorld.params.hours_at_work_weekday;
+//				}
+//				
+//				else if(target == p.getCommunityLocation()) { // in home district, not working
+//					p.setActivityNode(communityNode);
+//					p.setAtWork(false);	
+//					assert p.getHousehold().getSuper().getId().equals(target.getId()) : 
+//						"set to travel to a within district but didn't, home/target " + p.getHousehold().getSuper().getId() + " " + target.getId();
+//					return myWorld.params.hour_end_day_otherday - hour; // stay out until time to go home!
+//				}
+//				
+//				else{ // travelling to another district!
+//					p.setActivityNode(communityNode);
+//					p.setAtWork(false);
+//					p.setVisiting(true);
+//					assert ! p.getHousehold().getSuper().equals(target) : 
+//						"set to travel to a different district but didn't, home/target " + p.getHousehold().getSuper().getId() + " " + target.getId();
+//					return myWorld.params.hour_end_day_otherday - hour; // stay out until time to go home!
+//				}
+//			}
 
 			@Override
 			public boolean isEndpoint() {
@@ -131,10 +194,9 @@ public boolean isEndpoint() {
 			public double next(Steppable s, double time) {
 
 				Person p = (Person) s;
-				
+
 				// extract time info
 				int hour = ((int)time) % Params.ticks_per_day;
-
 
 				// if it's too late, go straight home
 				if(hour > myWorld.params.hour_end_day_weekday){
@@ -171,7 +233,7 @@ public boolean isEndpoint() {
 			public double next(Steppable s, double time) {
 
 				Person p = (Person) s;
-				
+
 				// extract time info
 				int hour = ((int)time) % Params.ticks_per_day;
 

Protecs/src/main/java/uk/ac/ucl/protecs/objects/Household.java

@@ -8,7 +8,7 @@ public Household(String id, Location l){
 		super();
 		myId = "HH_" + id;
 		mySuperLocation = l;
-		category = LocationCategory.HOME;
+		setLocationType(LocationCategory.HOME);
 	}
 
 	/**

Protecs/src/main/java/uk/ac/ucl/protecs/objects/Location.java

@@ -2,6 +2,7 @@
 
 import java.util.HashSet;
 
+
 /**
  * A generic holder for spatial data. Locations keep track of the spatial location within which they exist.
  * TODO add relationships between/among locations.
@@ -14,6 +15,7 @@ public class Location {
 	Location mySuperLocation; // the Location within which this Location exists
 	HashSet <Person> personsHere;
 	Object [] personsHere_list;
+	LocationCategory myType;
 	boolean active = false;
 
 	public int metric_died_count;
@@ -24,29 +26,28 @@ public class Location {
 	public int metric_new_deaths;
 	public int metric_new_recovered;
 	public int metric_currently_infected;
-
 	public enum LocationCategory{
-		HOME("home"), WORK("work"), COMMUNITY("community");
+		HOME("home"), WORKPLACE("workplace"), COMMUNITY("community");
 
 		public String key;
 
 		LocationCategory(String key) { this.key = key; }
 
-        static LocationCategory getValue(String x) {
+        public static LocationCategory getValue(String x) {
 
         	switch (x) {
         	case "home":
         		return HOME;
         	case "work":
-        		return WORK;
+        		return WORKPLACE;
         	case "community":
         		return COMMUNITY;
         	default:
         		throw new IllegalArgumentException();
         	}
         }
 	}
-	LocationCategory category;
+
 	// CONSTRUCTORS
 
 	public Location(String id, Location mySuper){
@@ -76,7 +77,6 @@ public Location(String id){
 	public Location(){
 		this("", null);
 	}
-
 
 	/**
 	 * Add a person to the Location. Returns false if the Person is already there.
@@ -157,7 +157,10 @@ public void setActive(boolean b) {
 		active = b;
 	}
 	public boolean getActive() { return active; }
-
-	public void setLocationType(LocationCategory locationCategory) {this.category = locationCategory;}
-	public LocationCategory getLocationType() {return this.category;}
+
+	public void setLocationType(LocationCategory type) {
+		myType = type;		
+	}
+	public LocationCategory getLocationType() {return this.myType;}
+
 }