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 [r20931]  Maximize  Restore  History

refactoring, new energy consumption model added.

Authored by: rashid_waraich 2012-09-11

Browse code at this revision

Parent: [r20930]

Child: [r20932]

changed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/controllers/AddHandlerAtStartupControler.java
changed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/api/AbstractHybridElectricVehicle.java
changed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/api/AbstractVehicleWithBattery.java
changed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/api/Vehicle.java
added	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/AbstractInterpolatedEnergyConsumptionModel.java
renamed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/api/EnergyConsumptionModel.java -> /contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/EnergyConsumptionModel.java
renamed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/galus/EnergyConsumption.java -> /contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/EnergyConsumption.java
changed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/galus/EnergyConsumptionInterpolated.java
changed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/galus/EnergyConsumptionModelGalus.java
added	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/ricardoFaria2012
added	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/ricardoFaria2012/EnergyConsumptionModelRicardoFaria2012.java
changed	/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/impl/InductivelyChargableBatteryElectricVehicle.java
changed	/contrib/trunk/transEnergySim/src/test/java/org/matsim/contrib/transEnergySim/controllers/TestInductiveChargingController.java
changed	/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/PHEV/Utility/DESController.java
changed	/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
changed	/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/tryouts/zain/InductiveCharging.java
changed	/playgrounds/trunk/wrashid/src/test/java/playground/wrashid/PHEV/Utility/EnergyConsumptionSamplesTest.java

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/controllers/AddHandlerAtStartupControler.java Diff Switch to side-by-side view

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/api/AbstractHybridElectricVehicle.java Diff Switch to side-by-side view

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/api/AbstractVehicleWithBattery.java Diff Switch to side-by-side view

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

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/AbstractInterpolatedEnergyConsumptionModel.java Diff Switch to side-by-side view

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/api/EnergyConsumptionModel.java to /contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/EnergyConsumptionModel.java

File was renamed.

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/galus/EnergyConsumption.java to /contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/EnergyConsumption.java

File was renamed.

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

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

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/ricardoFaria2012

Directory.

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/energyConsumption/ricardoFaria2012/EnergyConsumptionModelRicardoFaria2012.java Diff Switch to side-by-side view

/contrib/trunk/transEnergySim/src/main/java/org/matsim/contrib/transEnergySim/vehicles/impl/InductivelyChargableBatteryElectricVehicle.java Diff Switch to side-by-side view

/contrib/trunk/transEnergySim/src/test/java/org/matsim/contrib/transEnergySim/controllers/TestInductiveChargingController.java Diff Switch to side-by-side view

/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 Diff Switch to side-by-side view

/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

/playgrounds/trunk/wrashid/src/main/java/playground/wrashid/tryouts/zain/InductiveCharging.java Diff Switch to side-by-side view

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