MATSim Code

Brought to you by: jwjoubert, laemmel, michaz, mrieser, and 3 others

• Summary
• Files
• Reviews
• Support
• Mailing Lists
• Code

Menu ▾ ▴

 

• Browse Commits
• Browse Files

Commit [r20692]  Maximize  Restore  History

adding energy consumption module galus

Authored by: rashid_waraich 2012-08-25

Browse code at this revision

Parent: [r20691]

Child: [r20693]

renamed	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/controllers/EMobInductiveChargingControler.java -> /playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/controllers/EMobInductiveChargingController.java
changed	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/api/HybridElectricVehicle.java
changed	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/api/Vehicle.java
changed	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/api/VehicleWithBattery.java
renamed	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/EnergyConsumptionModel.java -> /playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/api/EnergyConsumptionModel.java
added	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/api
added	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/galus
added	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/galus/EnergyConsumptionInterpolated.java
added	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/galus/EnergyConsumptionModelGalus.java
changed	/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/impl/IC_BEV.java
renamed	/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/AverageSpeedEnergyConsumption.java -> /playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/galus/EnergyConsumption.java
changed	/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/DESController.java
copied	/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/EnergyConsumptionSamples.java -> /playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/EnergyConsumptionSamples.java
changed	/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/MobSimController.java
changed	/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PSF/data/energyConsumption/AverageEnergyConsumptionGalus.java

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/controllers/EMobInductiveChargingControler.java to /playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/controllers/EMobInductiveChargingController.java

File was renamed.

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/api/HybridElectricVehicle.java Diff Switch to side-by-side view

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/api/Vehicle.java Diff Switch to side-by-side view

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/api/VehicleWithBattery.java Diff Switch to side-by-side view

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/EnergyConsumptionModel.java to /playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/api/EnergyConsumptionModel.java

File was renamed.

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/api

Directory.

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/galus

Directory.

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/galus/EnergyConsumptionInterpolated.java Diff Switch to side-by-side view

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/galus/EnergyConsumptionModelGalus.java Diff Switch to side-by-side view

/playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/impl/IC_BEV.java Diff Switch to side-by-side view

/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/AverageSpeedEnergyConsumption.java to /playgrounds/trunk/wrashid/src/main/java/org/matsim/contrib/eMob/vehicles/energyConsumption/galus/EnergyConsumption.java

File was renamed.

/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/DESController.java Diff Switch to side-by-side view

/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/EnergyConsumptionSamples.java to /playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/EnergyConsumptionSamples.java

File was copied.

/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/MobSimController.java Diff Switch to side-by-side view

/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PSF/data/energyConsumption/AverageEnergyConsumptionGalus.java Diff Switch to side-by-side view