Upate car_driver distance when building scenarios #108

ITHIM · Aug 30, 2022 · 325ad43 · 325ad43
1 parent bd8fb64
commit 325ad43
Showing 1 changed file with 2 additions and 17 deletions.
diff --git a/R/create_latam_scenarios.R b/R/create_latam_scenarios.R
@@ -87,16 +87,13 @@ create_latam_scenarios <- function(trip_set){
           rbind(rdr_copy[[j]][!rdr_copy[[j]]$trip_id %in% change_trip_ids,],
                 change_trips)
       }
-
-    } 
-    # End loop for distance bands
+    } # End loop for distance bands
     rdr_scen <- do.call(rbind,rdr_copy)
     rdr_scen <- rbind(rdr_scen,rdr_not_changeable)
 
     # Remove bus_driver from the dataset, to recalculate them
     rdr_scen <-  filter(rdr_scen, !trip_mode %in% 'bus_driver')
     rdr_scen <- add_ghost_trips(rdr_scen,
-<<<<<<< HEAD
                                 trip_mode = 'bus_driver',
                                 distance_ratio = BUS_TO_PASSENGER_RATIO * DISTANCE_SCALAR_PT,
                                 reference_mode = 'bus',
@@ -121,22 +118,10 @@ create_latam_scenarios <- function(trip_set){
 
     #print(car_dr_dist/car_dist)
 
-
+    
     # browser()
-=======
-                          trip_mode = 'bus_driver',
-                          distance_ratio = BUS_TO_PASSENGER_RATIO * DISTANCE_SCALAR_PT,
-                          reference_mode = 'bus',
-                          scenario = paste0('Scenario ',i))
-    bus_dr_dist <- sum(rdr_scen[rdr_scen$stage_mode=='bus_driver',]$stage_distance,na.rm=T)
-    bus_dist <- sum(rdr_scen[rdr_scen$stage_mode=='bus',]$stage_distance,na.rm=T)
-
->>>>>>> f47c5d992827ae87fe55038acc7e10618d849ad6
     rdr_scen$scenario <- paste0('Scenario ',i)
     rd_list[[i + 1]] <- rdr_scen
   } # End loop for scenarios
-
-
-
   return(rd_list)
 }