Merge tag 'v0.6.0'

Author: Olivier Tournaire

Energy-ADE.xml

@@ -3,9 +3,9 @@
 ## Abstract
 The Application Domain Extension (ADE) Energy defines a standardized data model based on CityGML format for urban energy analyses, aiming to be a reference exchange data format between different urban modelling tools and expert databases.
 
-A documentation of each classes and parameters is in development on [iCloud](https://www.icloud.com/numbers/AwBWCAESEGokFkzrlOmbyLGSLf4aK1MaKml1UIi8WFdwYdhK0UTcW3yK1E1VdLPbAvkAdtkW6y9YHtsf7z8AYI2nqQMCUCAQEEICNf39VHMKgzmmsZDBWw4hJ1n2O0bfur2wdp6Xm6i0ZA#Definitionen).
+A documentation of each classes and parameters is in development as an [Excel sheet](./doc/Definitions_Energy-ADE.xlsx?raw=true).
 
-The latest ADE release is version 0.5.0. All releases can be found and downloaded on the [releases page](https://github.com/cstb/citygml-energy/releases) of the repository.
+The latest ADE release is version 0.6.0. All releases can be found and downloaded on the [releases page](https://github.com/cstb/citygml-energy/releases) of the repository.
 
 It has been developed since May 2014 by an international consortium of urban energy simulation developers and users:
 * Special Interest Group 3D (SIG3D)
@@ -22,67 +22,17 @@ It has been developed since May 2014 by an international consortium of urban ene
 * M.O.S.S Computer Grafik Systeme
 * Austrian Institute of Technology
 
-![Special Interest Group 3D](./doc/201309_SIG3D_Logo.png) ![University of Applied Sciences Stuttgart logo](./doc/hft.jpg)  ![Technische Universität München logo](./doc/tum.png)  ![Karlsruhe Institute für Technologie logo](./doc/kit.jpg)
-![RWTH Aachen University / E.ON Energy Research Center logo](./doc/rwth_eon.jpg)  ![HafenCityUniversität Hamburg logo](./doc/hcu.png)  ![European Institute for Energy Research logo](./doc/eifer.png)
-![Ecole Polytechnique Fédérale de Lausanne logo](./doc/epfl.png)  ![Centre Scientifique et Technique du Batiment logo](./doc/cstb.png)  ![Electricité de France logo](./doc/edf.jpg)
-![Sinergis logo](./doc/sinergis.png)  ![M.O.S.S Computer Grafik Systeme logo](./doc/moss.jpg)  ![Austrian Institute of Technology](./doc/ait.jpg)
-
-## Authors
-* Occupancy module
-	* Jean-Marie Bahu (EIFER)
-	* Esteban Munoz (Hafen City University)
-	* Romain Nouvel (HFT Stuttgart)
-	* Piergiorgio Cipriano (Sinergis)
-	* Luca Giovannini (Sinergis)
-* Core module
-	* Karl-Heinz Häfele (KIT)
-	* Joachim Benner (KIT)
-	* Marcel Bruse(HFT Stuttgart)
-	* Volker Coors (HFT Stuttgart)
-	* Robert Kaden (TUM)
-	* Moritz Lauster (RWTH Aachen)
-	* Henryk Wolisz (RWTH Aachen)
-	* Sawsan Mohamed (Universität Stuttgart)
-	* Romain Nouvel (HFT Stuttgart)
-	* Piergiorgio Cipriano (Sinergis)
-	* Luca Giovannini (Sinergis)
-	* Jean-Marie Bahu (EIFER Karlsruhe)
-	* Maryam Zirak (HFT Stuttgart)
-* Energy Systems module
-	* Moritz Lauster (RWTH Aachen)
-	* Peter Remmen (RWTH Aachen)
-	* Jean-Marie Bahu (EIFER)
-	* Eric Duminil (HFT Stuttgart)
-	* Dirk Monien (HFT Stuttgart)
-	* Diane Perez (EPFL)
-	* Romain Nouvel (HFT Stuttgart)
-	* Piergiorgio Cipriano (Sinergis)
-	* Luca Giovannini (Sinergis) 
-* Material module
-	* Karl-Heinz Häfele (KIT)
-	* Joachim Benner (KIT)
-* Enterprise Architect UML model
-	* Romain Nouvel (HFT Stuttgart)
-	* Marcel Bruse (HFT Stuttgart)
-	* Olivier Tournaire (CSTB)
-	* Joachim Benner (KIT)
-* UML model to XSD schema conversion
-	* Olivier Tournaire (CSTB)
-* Sample file
-	* Marcel Bruse (HFT Stuttgart)
+![Special Interest Group 3D](./doc/logos/201309_SIG3D_Logo.png) ![University of Applied Sciences Stuttgart logo](./doc/logos/hft.jpg)  ![Technische Universität München logo](./doc/logos/tum.png)  ![Karlsruhe Institute für Technologie logo](./doc/logos/kit.jpg)
+![RWTH Aachen University / E.ON Energy Research Center logo](./doc/logos/rwth_eon.jpg)  ![HafenCityUniversität Hamburg logo](./doc/logos/hcu.png)  ![European Institute for Energy Research logo](./doc/logos/eifer.png)
+![Ecole Polytechnique Fédérale de Lausanne logo](./doc/logos/epfl.png)  ![Centre Scientifique et Technique du Batiment logo](./doc/logos/cstb.png)  ![Electricité de France logo](./doc/logos/edf.jpg)
+![Sinergis logo](./doc/logos/sinergis.png)  ![M.O.S.S Computer Grafik Systeme logo](./doc/logos/moss.jpg)  ![Austrian Institute of Technology](./doc/logos/ait.jpg)
 
+<!--
+-->
 ## Guidelines
-A document which describes the guidelines can be downloaded from [this link](https://github.com/cstb/citygml-energy/raw/master/guidelines/Guidelines_EnergyADE.pdf). The guidelines can also be read [online](https://github.com/cstb/citygml-energy/blob/master/guidelines/Guidelines_EnergyADE.md).
+A document which describes the guidelines can be downloaded from [this link](./doc/guidelines/Guidelines_EnergyADE.pdf). The guidelines can also be read [online](./doc/guidelines/Guidelines_EnergyADE.md).
 
 ## UML diagrams
-The CityGML Energy ADE currently (v0.5.0) is implemented in a single XSD schema. The following diagrams give an overview of each modules.
-### Occupancy module
-![Occupancy module](./doc/UML_diagrams/Occupancy.png)
-### Building physics module (core)
-![Building physics module (core)](./doc/UML_diagrams/BuildingPhysics.png)
-### Time series and schedule module (core)
-![Time series and schedule module (core)](./doc/UML_diagrams/TimeSeriesAndSchedule.png)
-### Energy system module
-![Energy system module](./doc/UML_diagrams/EnergySystem.png)
-### Material module
-![Material module](./doc/UML_diagrams/Material.png)
+The CityGML Energy ADE currently (v0.6.0) is implemented in a single XSD schema. [This pdf file](./doc/UML-Diagrams_Energy-ADE.pdf) gives an overview of the class diagrams of the whole model. For more details about the modules, a complete description can be found in the [guidelines](./doc/guidelines/Guidelines_EnergyADE.md).
+
+