From f8fe8fc68d78d6ed92e30a6577e80d67f64e3ec5 Mon Sep 17 00:00:00 2001 From: Kai Martins-Turner Date: Fri, 13 Oct 2023 09:54:25 +0200 Subject: [PATCH] move test input to correct location --- .../output_allVehicles.xml.gz | Bin .../output_carriers.xml.gz | Bin .../output_events.xml.gz | Bin .../output_network.xml.gz | Bin .../Carrier_stats.tsv | 0 .../Load_perVehicle.tsv | 0 .../TimeDistance_perVehicle.tsv | 0 .../TimeDistance_perVehicleType.tsv | 0 .../compareResults/carrierStats.tsv | 0 .../compareResults/carrier_##carrier1_tripStats.tsv | 0 .../carrier_##carrier1_vehicleStats.tsv | 0 .../carrier_carrier1_ServiceStats.tsv | 0 .../carrier_carrier1_ShipmentStats.tsv | 0 .../carrier_carrier1_VehicleTypeStats.tsv | 0 .../compareResults/freightVehicleStats.tsv | 0 .../compareResults/freightVehicleTripStats.tsv | 0 .../compareResults/serviceStats.tsv | 0 .../compareResults/shipmentStats.tsv | 0 .../RunFreightAnalysisIT/output_allVehicles.xml.gz | Bin .../RunFreightAnalysisIT/output_carriers.xml.gz | Bin .../RunFreightAnalysisIT/output_events.xml.gz | Bin .../RunFreightAnalysisIT/output_network.xml.gz | Bin .../compareResults/shipment/carrierStats.tsv | 0 .../shipment/carrier_##carrier1_tripStats.tsv | 0 .../shipment/carrier_##carrier1_vehicleStats.tsv | 0 .../shipment/carrier_carrier1_ShipmentStats.tsv | 0 .../shipment/carrier_carrier1_VehicleTypeStats.tsv | 0 .../compareResults/shipment/freightVehicleStats.tsv | 0 .../shipment/freightVehicleTripStats.tsv | 0 .../shipment/output_allVehicles.xml.gz | Bin .../shipment/output_carriers.xml.gz | Bin .../shipment/output_events.xml.gz | Bin .../shipment/output_network.xml.gz | Bin 33 files changed, 0 insertions(+), 0 deletions(-) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest/output_allVehicles.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest/output_carriers.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest/output_events.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest/output_network.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Carrier_stats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Load_perVehicle.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicle.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicleType.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/carrierStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_tripStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_vehicleStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ServiceStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ShipmentStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_VehicleTypeStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/freightVehicleStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/freightVehicleTripStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/serviceStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/compareResults/shipmentStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/output_allVehicles.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/output_carriers.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/output_events.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisIT/output_network.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrierStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_tripStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_vehicleStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_ShipmentStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_VehicleTypeStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleTripStats.tsv (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_allVehicles.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_carriers.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_events.xml.gz (100%) rename contribs/vsp/test/input/org/matsim/freight/{ => carriers}/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_network.xml.gz (100%) diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/output_allVehicles.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_allVehicles.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/output_allVehicles.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_allVehicles.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/output_carriers.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_carriers.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/output_carriers.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_carriers.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/output_events.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_events.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/output_events.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_events.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/output_network.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_network.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/output_network.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/output_network.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Carrier_stats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Carrier_stats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Carrier_stats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Carrier_stats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Load_perVehicle.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Load_perVehicle.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Load_perVehicle.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/Load_perVehicle.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicle.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicle.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicle.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicle.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicleType.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicleType.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicleType.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/FreightAnalysisEventBasedTest/runFreightAnalysisEventBasedTest/TimeDistance_perVehicleType.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrierStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrierStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrierStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrierStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_tripStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_tripStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_tripStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_tripStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_vehicleStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_vehicleStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_vehicleStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_##carrier1_vehicleStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ServiceStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ServiceStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ServiceStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ServiceStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ShipmentStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ShipmentStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ShipmentStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_ShipmentStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_VehicleTypeStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_VehicleTypeStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_VehicleTypeStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/carrier_carrier1_VehicleTypeStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/freightVehicleStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/freightVehicleStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/freightVehicleStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/freightVehicleStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/freightVehicleTripStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/freightVehicleTripStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/freightVehicleTripStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/freightVehicleTripStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/serviceStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/serviceStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/serviceStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/serviceStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/shipmentStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/shipmentStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/compareResults/shipmentStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/compareResults/shipmentStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/output_allVehicles.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/output_allVehicles.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/output_allVehicles.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/output_allVehicles.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/output_carriers.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/output_carriers.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/output_carriers.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/output_carriers.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/output_events.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/output_events.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/output_events.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/output_events.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/output_network.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/output_network.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisIT/output_network.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisIT/output_network.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrierStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrierStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrierStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrierStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_tripStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_tripStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_tripStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_tripStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_vehicleStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_vehicleStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_vehicleStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_##carrier1_vehicleStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_ShipmentStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_ShipmentStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_ShipmentStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_ShipmentStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_VehicleTypeStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_VehicleTypeStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_VehicleTypeStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/carrier_carrier1_VehicleTypeStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleTripStats.tsv b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleTripStats.tsv similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleTripStats.tsv rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/compareResults/shipment/freightVehicleTripStats.tsv diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_allVehicles.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_allVehicles.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_allVehicles.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_allVehicles.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_carriers.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_carriers.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_carriers.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_carriers.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_events.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_events.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_events.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_events.xml.gz diff --git a/contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_network.xml.gz b/contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_network.xml.gz similarity index 100% rename from contribs/vsp/test/input/org/matsim/freight/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_network.xml.gz rename to contribs/vsp/test/input/org/matsim/freight/carriers/analysis/RunFreightAnalysisWithShipmentTest/shipment/output_network.xml.gz