Cleanup

romainsacchi · Oct 5, 2020 · cd5279b · cd5279b
1 parent 1f86405
commit cd5279b
Show file tree

Hide file tree

Showing 61 changed files with 5 additions and 133,028 deletions.
diff --git a/README.md b/README.md
@@ -5,17 +5,17 @@
 </p>
 
 <p align="center">
-  <a href="https://badge.fury.io/py/carculator-truck" target="_blank"><img src="https://badge.fury.io/py/carculator-truck.svg"></a>
+  <a href="https://badge.fury.io/py/carculator-bus" target="_blank"><img src="https://badge.fury.io/py/carculator-bus.svg"></a>
   <a href="https://travis-ci.org/romainsacchi/carculator_bus" target="_blank"><img src="https://travis-ci.org/romainsacchi/carculator_bus.svg?branch=master"></a>
   <a href="https://ci.appveyor.com/project/romainsacchi/carculator_bus" target="_blank"><img src="https://ci.appveyor.com/api/projects/status/github/romainsacchi/carculator_bus?svg=true"></a>
   <a href="https://coveralls.io/github/romainsacchi/carculator_bus" target="_blank"><img src="https://coveralls.io/repos/github/romainsacchi/carculator_bus/badge.svg"></a>
   <a href="https://carculator_bus.readthedocs.io/en/latest/" target="_blank"><img src="https://readthedocs.org/projects/carculator_bus/badge/?version=latest"></a>
  </p>
 
-Prospective environmental and economic life cycle assessment of medium and heavy duty vehicles.
+Prospective environmental and economic life cycle assessment of buses and coaches.
 
 A fully parameterized Python model developed by the [Technology Assessment group](https://www.psi.ch/en/ta) of the
-[Paul Scherrer Institut](https://www.psi.ch/en) to perform life cycle assessments (LCA) of medium and heavy duty trucks.
+[Paul Scherrer Institut](https://www.psi.ch/en) to perform life cycle assessments (LCA) of buses and coaches.
 Based on the Life Cycle Assessment tool for passenger vehicles [carculator](https://github.com/romainsacchi/carculator).
 
 See [the documentation](https://carculator_bus.readthedocs.io/en/latest/index.html) for more detail, validation, etc.

diff --git a/dev/180_lg.xlsx b/dev/180_lg.xlsx
diff --git a/dev/180_reg.xlsx b/dev/180_reg.xlsx
diff --git a/dev/180_urb.xlsx b/dev/180_urb.xlsx
diff --git a/dev/260_lg.xlsx b/dev/260_lg.xlsx
diff --git a/dev/260_reg.xlsx b/dev/260_reg.xlsx
diff --git a/dev/260_urb.xlsx b/dev/260_urb.xlsx
diff --git a/dev/35_lg.xlsx b/dev/35_lg.xlsx
diff --git a/dev/35_reg.xlsx b/dev/35_reg.xlsx
diff --git a/dev/35_urb.xlsx b/dev/35_urb.xlsx
diff --git a/dev/400_lg.xlsx b/dev/400_lg.xlsx
diff --git a/dev/400_reg.xlsx b/dev/400_reg.xlsx
diff --git a/dev/400_urb.xlsx b/dev/400_urb.xlsx
diff --git a/dev/75_lg.xlsx b/dev/75_lg.xlsx
diff --git a/dev/75_reg.xlsx b/dev/75_reg.xlsx
diff --git a/dev/75_urb.xlsx b/dev/75_urb.xlsx
diff --git a/dev/Class2_RigidTruck_ENG_180_Long_Haul+ES_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_180_Long_Haul+ES_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_180_Long_Haul+ES_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_180_Long_Haul+ES_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_180_Regional_Delivery_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_180_Regional_Delivery_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_180_Regional_Delivery_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_180_Regional_Delivery_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_180_Urban_Delivery_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_180_Urban_Delivery_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_180_Urban_Delivery_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_180_Urban_Delivery_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_260_Long_Haul+ES_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_260_Long_Haul+ES_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_260_Long_Haul+ES_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_260_Long_Haul+ES_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_260_Regional_Delivery_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_260_Regional_Delivery_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_260_Regional_Delivery_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_260_Regional_Delivery_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_260_Urban_Delivery_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_260_Urban_Delivery_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_260_Urban_Delivery_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_260_Urban_Delivery_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_35_Long_Haul+ES_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_35_Long_Haul+ES_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_35_Long_Haul+ES_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_35_Long_Haul+ES_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_35_Regional_Delivery_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_35_Regional_Delivery_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_35_Regional_Delivery_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_35_Regional_Delivery_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_35_Urban_Delivery_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_35_Urban_Delivery_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_35_Urban_Delivery_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_35_Urban_Delivery_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_75_Long_Haul+ES_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_75_Long_Haul+ES_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_75_Long_Haul+ES_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_75_Long_Haul+ES_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_75_Regional_Delivery_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_75_Regional_Delivery_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_75_Regional_Delivery_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_75_Regional_Delivery_1Hz_full.vmod
diff --git a/dev/Class2_RigidTruck_ENG_75_Urban_Delivery_1Hz_empty.vmod b/dev/Class2_RigidTruck_ENG_75_Urban_Delivery_1Hz_empty.vmod
diff --git a/dev/Class2_RigidTruck_ENG_75_Urban_Delivery_1Hz_full.vmod b/dev/Class2_RigidTruck_ENG_75_Urban_Delivery_1Hz_full.vmod
diff --git a/dev/Class5_Tractor_ENG_400_Long_Haul+ES_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_400_Long_Haul+ES_1Hz_empty.vmod
diff --git a/dev/Class5_Tractor_ENG_400_Long_Haul+ES_1Hz_full.vmod b/dev/Class5_Tractor_ENG_400_Long_Haul+ES_1Hz_full.vmod
diff --git a/dev/Class5_Tractor_ENG_400_Regional_Delivery_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_400_Regional_Delivery_1Hz_empty.vmod
diff --git a/dev/Class5_Tractor_ENG_400_Regional_Delivery_1Hz_full.vmod b/dev/Class5_Tractor_ENG_400_Regional_Delivery_1Hz_full.vmod
diff --git a/dev/Class5_Tractor_ENG_400_Urban_Delivery_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_400_Urban_Delivery_1Hz_empty.vmod
diff --git a/dev/Class5_Tractor_ENG_400_Urban_Delivery_1Hz_full.vmod b/dev/Class5_Tractor_ENG_400_Urban_Delivery_1Hz_full.vmod
diff --git a/dev/Class5_Tractor_ENG_600_Long_Haul+ES_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_600_Long_Haul+ES_1Hz_empty.vmod
diff --git a/dev/Class5_Tractor_ENG_600_Long_Haul+ES_1Hz_full.vmod b/dev/Class5_Tractor_ENG_600_Long_Haul+ES_1Hz_full.vmod
diff --git a/dev/Class5_Tractor_ENG_600_Regional_Delivery_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_600_Regional_Delivery_1Hz_empty.vmod
diff --git a/dev/Class5_Tractor_ENG_600_Regional_Delivery_1Hz_full.vmod b/dev/Class5_Tractor_ENG_600_Regional_Delivery_1Hz_full.vmod
diff --git a/dev/Class5_Tractor_ENG_600_Urban_Delivery_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_600_Urban_Delivery_1Hz_empty.vmod
diff --git a/dev/Class5_Tractor_ENG_600_Urban_Delivery_1Hz_full.vmod b/dev/Class5_Tractor_ENG_600_Urban_Delivery_1Hz_full.vmod
diff --git a/dev/Class5_Tractor_ENG_Long_Haul+ES_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_Long_Haul+ES_1Hz_empty.vmod
diff --git a/dev/Class5_Tractor_ENG_Regional_Delivery_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_Regional_Delivery_1Hz_empty.vmod
diff --git a/dev/Class5_Tractor_ENG_Urban_Delivery_1Hz_empty.vmod b/dev/Class5_Tractor_ENG_Urban_Delivery_1Hz_empty.vmod
diff --git a/dev/EFA_HOT_Subsegm_HGV.XLSX b/dev/EFA_HOT_Subsegm_HGV.XLSX
diff --git a/dev/Engine and gearbox efficiencies.ipynb b/dev/Engine and gearbox efficiencies.ipynb
diff --git a/dev/example_20_28t_diesel_truck_emissions.png b/dev/example_20_28t_diesel_truck_emissions.png
diff --git a/dev/trailers.xlsx b/dev/trailers.xlsx
diff --git a/dev/trucks_db.xlsx b/dev/trucks_db.xlsx
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@ def package_files(directory):
 
 setup(
     name="carculator_bus",
-    version="0.0.4",
+    version="0.0.1",
     packages=packages,
     author="Romain Sacchi <romain.sacchi@psi.ch>, Chris Mutel <christopher.mutel@psi.ch>",
     license=open("LICENSE").read(),
@@ -46,7 +46,7 @@ def package_files(directory):
         "prettytable"
     ],
     url="https://github.com/romainsacchi/carculator_bus",
-    description="Prospective environmental and economic life cycle assessment of public transport and heavy goods vehicles",
+    description="Prospective environmental and economic life cycle assessment of buses and coaches",
     classifiers=[
         "Intended Audience :: End Users/Desktop",
         "Intended Audience :: Developers",