Stop re-exporting stuff from synthpop in sim

Author: dabreegster

Cargo.lock

@@ -21,5 +21,6 @@ rand  = "0.8.3"
 rand_xorshift = "0.3.0"
 serde = "1.0.123"
 sim = { path = "../sim" }
+synthpop = { path = "../synthpop" }
 structopt = "0.3.23"
 tokio = { version = "1.1.1", features = ["full"] }

cli/Cargo.toml

@@ -5,7 +5,7 @@ use rand_xorshift::XorShiftRng;
 use abstutil::{prettyprint_usize, Timer};
 use geom::{Distance, Duration, FindClosest};
 use map_model::{AmenityType, BuildingID, Map};
-use sim::{IndividTrip, Scenario, TripEndpoint, TripMode, TripPurpose};
+use synthpop::{IndividTrip, Scenario, TripEndpoint, TripMode, TripPurpose};
 
 pub fn run(
     input_scenario: String,

cli/src/augment_scenario.rs

@@ -4,7 +4,9 @@ use serde::Deserialize;
 use abstutil::{prettyprint_usize, Timer};
 use geom::{Duration, LonLat, Time};
 use map_model::Map;
-use sim::{ExternalPerson, ExternalTrip, ExternalTripEndpoint, Scenario, TripMode, TripPurpose};
+use synthpop::{
+    ExternalPerson, ExternalTrip, ExternalTripEndpoint, Scenario, TripMode, TripPurpose,
+};
 
 pub fn run(csv_path: String, map: String) -> Result<()> {
     let mut timer = Timer::new("import grid2demand");

cli/src/import_grid2demand.rs

@@ -2,7 +2,7 @@ use serde::Deserialize;
 
 use abstutil::{prettyprint_usize, Timer};
 use map_model::Map;
-use sim::{ExternalPerson, Scenario};
+use synthpop::{ExternalPerson, Scenario};
 
 pub fn run(input: String, map: String, skip_problems: bool) {
     let mut timer = Timer::new("import traffic demand data");

cli/src/import_scenario.rs

@@ -321,7 +321,7 @@ fn dump_json(path: String) {
         return;
     }
     if let Ok(scenario) =
-        abstio::maybe_read_binary::<sim::Scenario>(path.clone(), &mut Timer::throwaway())
+        abstio::maybe_read_binary::<synthpop::Scenario>(path.clone(), &mut Timer::throwaway())
     {
         println!("{}", abstutil::to_json(&scenario));
         return;

cli/src/main.rs

@@ -16,7 +16,8 @@ use map_gui::tools::CameraState;
 use map_gui::ID;
 use map_model::AreaType;
 use map_model::{BufferType, IntersectionID, LaneType, Map, Traversable};
-use sim::{AgentID, Analytics, Scenario, Sim, SimCallback, SimFlags, VehicleType};
+use sim::{AgentID, Analytics, Sim, SimCallback, SimFlags, VehicleType};
+use synthpop::Scenario;
 use widgetry::mapspace::ToggleZoomed;
 use widgetry::{Cached, Canvas, EventCtx, GfxCtx, Prerender, SharedAppState, State};
 

game/src/app.rs

@@ -4,7 +4,8 @@ use abstio::MapName;
 use abstutil::{prettyprint_usize, Timer};
 use geom::{Duration, Time};
 use map_model::Map;
-use sim::{AlertHandler, Scenario, ScenarioGenerator, Sim, SimFlags, SimOptions};
+use sim::{AlertHandler, ScenarioGenerator, Sim, SimFlags, SimOptions};
+use synthpop::Scenario;
 
 use crate::sandbox::TutorialState;
 

game/src/challenges/prebake.rs

@@ -13,7 +13,8 @@ use map_model::{
     osm, ControlTrafficSignal, IntersectionID, PathConstraints, Perimeter, Position, RoadID,
     NORMAL_LANE_THICKNESS,
 };
-use sim::{Sim, TripEndpoint};
+use sim::Sim;
+use synthpop::TripEndpoint;
 use widgetry::{
     lctrl, Cached, Choice, Color, DrawBaselayer, Drawable, EventCtx, GeomBatch, GfxCtx,
     HorizontalAlignment, Key, Line, Outcome, Panel, State, Text, Toggle, UpdateType,

game/src/debug/mod.rs

@@ -9,7 +9,7 @@ use map_model::{
     DirectedRoadID, Direction, PathRequest, PathfinderCaching, RoadID, RoutingParams, Traversable,
     NORMAL_LANE_THICKNESS,
 };
-use sim::{TripEndpoint, TripMode};
+use synthpop::{TripEndpoint, TripMode};
 use widgetry::mapspace::ToggleZoomed;
 use widgetry::{
     Color, Drawable, EventCtx, GeomBatch, GfxCtx, HorizontalAlignment, Key, Line, Outcome, Panel,