search

matsim-vsp / freight-dfg17

GNU General Public License v2.0
0 stars 1 forks source link

Fix after MATSim1330; Use carrierScenarioElement from MATSim-freight instead of defining a new one internally #31

Closed kt86 closed 3 years ago

kt86 commented 3 years ago

This PR

  1. fixes compile errors after matsim-org/matsim-libs#1330 (taking out carriers from the carrierModule constructor). close #30
  2. removes the internal definition of an Carrier_Scenario_Elementwithin the RecieverUtils class. I replaced it by using the infrastructure from the MATSim freight contrib: FreightUtils.getOrCreateCarriers(scenario) ... This was done because after 1.) I got some errors because the scenarioElement was spelled differently in Freight and here (carriers vs Carriers). This can be avoided by using the central one and avoid the local naming of the scenarioElement. To reach this I did some inlining, replacements and commented out the previous code and no longer needed code within ReceiverUtils.