From 5f9e449c7cf12c84489c25f2896bf9184e0dbfb2 Mon Sep 17 00:00:00 2001
From: Anne Tilloy <anne.tilloy@rte-france.com>
Date: Mon, 27 Jan 2020 13:57:23 +0100
Subject: [PATCH 1/4] First import of roadmap 2020.

Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
---
 ROADMAP.md | 79 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 3b76e72..62e0c75 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,78 +1,91 @@
 # Roadmap
 
-  * [Documentation](#documentation)
-  * [Demonstrator](#demonstrator)
-  * [Converters](#converters)
-  * [Grid Modeling](#grid-modeling)
-  * [Simulators](#simulators)
-  * [Data management](#data-management)
-  * [Viewing](#viewing)
-  * [High level services](#high-level-services)
+* [Documentation](#documentation)
+* [Demonstrator](#demonstrator)
+* [Converters](#converters)
+* [Grid Modeling](#grid-modeling)
+* [Simulators](#simulators)
+* [Data management](#data-management)
+* [Viewing](#viewing)
+* [High level services](#high-level-services)
+* [Functional tests](#functional-tests)
 
 
 ## Documentation
-- Functional documentation
-- User stories
+- Improve our functional documentation
+- More and more user stories
 - More and more tutorials
-- A new website
+- A more logical plan for the website
 
 ## Demonstrator
-- Create web-based demos packaged as docker images to show the world what is PowSyBl
+We have started to create a web-based demonstrator packaged as [docker images](https://hub.docker.com/search?q=powsybl&type=image) to show the world what PowSyBl is. It will be available for everyone to experiment (the URL is coming soon !), with some great features:
+- Import networks (we are working on TSOs part of the European network)
+- Display networks on a map using CIM-CGMES Geographical Location (GL) profile
+- Display substations
+- Apply simple modifications to the network topology (tap changes, target changes, status of switches)
+- Run power flows and display the calculation results
+- Run security analyses and display violations on the network map and in a synthetic table
 
 ## Converters
 
 ### CIM-CGMES
 &rarr; Importer
-- End of basic importer
+- End of basic importer (operational limits and HVDC conversions improvement and voltage remote regulations)
 - Diagram layout (DL) profile management
 - Geographical location (GL) profile management
 - Generation and Load Shift Keys (GLSK) and Contingency list, Remedial Actions and additional Constraints (CRAC) management
-- Merging
+- Merging through the merging view
 
 &larr; Exporter
-- Incremental export: Export back to a CIM-CGMES file, a network imported from a CIM-CGMES file
-- Full export: Export to a CIM-CGMES file, a network imported from any supported format
+- Incremental export: Export back to a CIM-CGMES file, a network imported from a CIM-CGMES file.
+- Full export: Export to a CIM-CGMES file, a network imported from any supported format.
 
 ### XIIDM
 &rarr; Importer
-- Extensions management in separate files
-- Partial import of datasets
-- C++ implementation
+- Extensions management in separate files.
+- Versionning management.
+- The C++ implementation is almost finished and will be in open source in Feburary 2020. Then, we have planned to work on versionning management.
 
 &larr; Exporter
-- Extensions management in separate files
-- Partial export of datasets
-- C++ implementation
-
+- Extensions management in separate files.
+- Versionning management.
+- C++ implementation is almost finished and will be in open source in Feburary 2020. Then, we have planned to work on versionning management.
 
 ### UCTE
 &larr; Exporter
-- almost done, validation in progress
+- Done !
 
 ### JSON
 &rarr; Importer
 - to be done
 
 ## Grid Modeling
-- Backward compatibility management
-- Three windings transformers modeling improvement: validation in progress
+The backward compatibility management has been done last year. We have now a strong basis to change the core network model:
+- Three windings transformers modeling improvement: almost done.
 - HVDC modeling improvement
-- DC network modeling
-- Battery modeling: done !
-- Merging view when several networks are merged
-- A listener that records events occurring on the network
+- Operational limits modeling
+- Linear and non linear shunt compensators
+- Extenstions for automatic generation control, for monitoring
+- DC network modeling (maybe for 2021)
+- Merging view when several networks are merged.
+- A listener that records events occurring on the network has been implemented. We have planned to functionally validate it.
 
 ## Simulators
-- Integration of [Dynawo](https://dynawo.github.io/)
-- Improving our simple load-flow used for experimental purposes
+- Integration of [Dynawo](https://dynawo.github.io/): work in progress.
+- Improving our open load flow used for tests, experimental and collaboration purposes. For more information, please read the [README file](https://github.com/powsybl/powsybl-open-loadflow/blob/master/README.md);
 
 ## Data management
-- Web services implementation in order to manage data stored in the Application File System (AFS)
+- A persistent implementation of the network core model (IIDM)
+- A persistent implementation of the triple store
 
 ## Viewing
 - Voltage level view: display clean, pretty and interactive drawings of voltage levels
 - Substation view: display clean, pretty and interactive drawings of substations
 - Improvement of the graphical charter of electro-technical components
+- A geographical view of the network
 
 ## High level services
 - Package and distribute computation services based on spring, as docker images
+
+## Functional tests
+We plan to validate a CIM-CGMES based workflow, focusing on the functional validation, the computation time and the memory management. The CIM-CGMES workflow consists in import networks (also called Individual Grid Model), run a power flow, merge the newtorks (topologicaly at least), run a power flow on the merged network (also called Common Grid Model), apply modifications and export the updated network(s).

From 92fa2549d02677d3cb30298200edae405d9d7cf9 Mon Sep 17 00:00:00 2001
From: Anne Tilloy <anne.tilloy@rte-france.com>
Date: Mon, 27 Jan 2020 14:13:22 +0100
Subject: [PATCH 2/4] Fixes.

Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
---
 ROADMAP.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 62e0c75..6052baa 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -30,7 +30,7 @@ We have started to create a web-based demonstrator packaged as [docker images](h
 
 ### CIM-CGMES
 &rarr; Importer
-- End of basic importer (operational limits and HVDC conversions improvement and voltage remote regulations)
+- End of basic importer (operational limits and HVDC conversions improvement)
 - Diagram layout (DL) profile management
 - Geographical location (GL) profile management
 - Generation and Load Shift Keys (GLSK) and Contingency list, Remedial Actions and additional Constraints (CRAC) management
@@ -65,18 +65,19 @@ The backward compatibility management has been done last year. We have now a str
 - HVDC modeling improvement
 - Operational limits modeling
 - Linear and non linear shunt compensators
-- Extenstions for automatic generation control, for monitoring
+- Extenstions for automatic generation control and for monitoring
 - DC network modeling (maybe for 2021)
 - Merging view when several networks are merged.
 - A listener that records events occurring on the network has been implemented. We have planned to functionally validate it.
 
 ## Simulators
 - Integration of [Dynawo](https://dynawo.github.io/): work in progress.
-- Improving our open load flow used for tests, experimental and collaboration purposes. For more information, please read the [README file](https://github.com/powsybl/powsybl-open-loadflow/blob/master/README.md);
+- Improving our open load flow used for tests, experimental and collaboration purposes. For more information, please read the [README file](https://github.com/powsybl/powsybl-open-loadflow/blob/master/README.md).
 
 ## Data management
 - A persistent implementation of the network core model (IIDM)
 - A persistent implementation of the triple store
+- Persistent implementation of the extensions
 
 ## Viewing
 - Voltage level view: display clean, pretty and interactive drawings of voltage levels
@@ -88,4 +89,4 @@ The backward compatibility management has been done last year. We have now a str
 - Package and distribute computation services based on spring, as docker images
 
 ## Functional tests
-We plan to validate a CIM-CGMES based workflow, focusing on the functional validation, the computation time and the memory management. The CIM-CGMES workflow consists in import networks (also called Individual Grid Model), run a power flow, merge the newtorks (topologicaly at least), run a power flow on the merged network (also called Common Grid Model), apply modifications and export the updated network(s).
+We plan to validate a CIM-CGMES based workflow, focusing on the functional validation, the computation time and the memory management. The CIM-CGMES workflow consists in importing networks (also called Individual Grid Model), running a power flow, merging the newtorks (topologicaly at least), running a power flow on the merged network (also called Common Grid Model), applying modifications and exporting the updated network(s).

From 6b7b09de98f63effc77c7e83e4434a87a1b617a2 Mon Sep 17 00:00:00 2001
From: Anne Tilloy <anne.tilloy@rte-france.com>
Date: Mon, 27 Jan 2020 16:20:36 +0100
Subject: [PATCH 3/4] AFS and GSE roadmaps

Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
---
 ROADMAP.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 6052baa..076b433 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -78,12 +78,18 @@ The backward compatibility management has been done last year. We have now a str
 - A persistent implementation of the network core model (IIDM)
 - A persistent implementation of the triple store
 - Persistent implementation of the extensions
+- A permissions and quotas management in the AFS
+- A log collector in the AFS
 
 ## Viewing
 - Voltage level view: display clean, pretty and interactive drawings of voltage levels
 - Substation view: display clean, pretty and interactive drawings of substations
 - Improvement of the graphical charter of electro-technical components
-- A geographical view of the network
+- A geographical web view of the network
+
+## Grid Study Environment
+- A nice view of dependant objects
+- Provide the new features of AFS in the Grid Study Environment
 
 ## High level services
 - Package and distribute computation services based on spring, as docker images

From 69be0db674411e3aa9a7f146f1368a86f90b5198 Mon Sep 17 00:00:00 2001
From: Mathieu BAGUE <mathieu.bague@rte-france.com>
Date: Tue, 28 Jan 2020 14:20:56 +0100
Subject: [PATCH 4/4] Small typo fixes

Signed-off-by: Mathieu BAGUE <mathieu.bague@rte-france.com>
---
 ROADMAP.md | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 076b433..fee7f8f 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -3,7 +3,7 @@
 * [Documentation](#documentation)
 * [Demonstrator](#demonstrator)
 * [Converters](#converters)
-* [Grid Modeling](#grid-modeling)
+* [Grid modeling](#grid-modeling)
 * [Simulators](#simulators)
 * [Data management](#data-management)
 * [Viewing](#viewing)
@@ -21,8 +21,8 @@
 We have started to create a web-based demonstrator packaged as [docker images](https://hub.docker.com/search?q=powsybl&type=image) to show the world what PowSyBl is. It will be available for everyone to experiment (the URL is coming soon !), with some great features:
 - Import networks (we are working on TSOs part of the European network)
 - Display networks on a map using CIM-CGMES Geographical Location (GL) profile
-- Display substations
-- Apply simple modifications to the network topology (tap changes, target changes, status of switches)
+- Display substations (single line diagram) using CIM-CGMES Diagram Layout (DL) profile
+- Apply simple modifications to the network topology (tap changes, setpoints changes, status of switches)
 - Run power flows and display the calculation results
 - Run security analyses and display violations on the network map and in a synthetic table
 
@@ -42,14 +42,12 @@ We have started to create a web-based demonstrator packaged as [docker images](h
 
 ### XIIDM
 &rarr; Importer
-- Extensions management in separate files.
-- Versionning management.
-- The C++ implementation is almost finished and will be in open source in Feburary 2020. Then, we have planned to work on versionning management.
+- Version management (backward and forward compatibility).
+- The C++ implementation is almost finished and will be in open source in February 2020. Then, we have planned to work on version management.
 
 &larr; Exporter
-- Extensions management in separate files.
-- Versionning management.
-- C++ implementation is almost finished and will be in open source in Feburary 2020. Then, we have planned to work on versionning management.
+- Version management.
+- C++ implementation is almost finished and will be in open source in February 2020. Then, we have planned to work on version management.
 
 ### UCTE
 &larr; Exporter
@@ -59,7 +57,10 @@ We have started to create a web-based demonstrator packaged as [docker images](h
 &rarr; Importer
 - to be done
 
-## Grid Modeling
+&larr; Exporter
+- to be done
+
+## Grid modeling
 The backward compatibility management has been done last year. We have now a strong basis to change the core network model:
 - Three windings transformers modeling improvement: almost done.
 - HVDC modeling improvement
@@ -71,13 +72,13 @@ The backward compatibility management has been done last year. We have now a str
 - A listener that records events occurring on the network has been implemented. We have planned to functionally validate it.
 
 ## Simulators
-- Integration of [Dynawo](https://dynawo.github.io/): work in progress.
+- Integration of [Dynawo](https://dynawo.github.io): work in progress.
 - Improving our open load flow used for tests, experimental and collaboration purposes. For more information, please read the [README file](https://github.com/powsybl/powsybl-open-loadflow/blob/master/README.md).
 
 ## Data management
-- A persistent implementation of the network core model (IIDM)
+- A persistent implementation of the network core model (IIDM) based on [Apache Cassandra](http://cassandra.apache.org)
 - A persistent implementation of the triple store
-- Persistent implementation of the extensions
+- A Persistent implementation of the extensions
 - A permissions and quotas management in the AFS
 - A log collector in the AFS
 
@@ -88,11 +89,11 @@ The backward compatibility management has been done last year. We have now a str
 - A geographical web view of the network
 
 ## Grid Study Environment
-- A nice view of dependant objects
+- A nice view of dependencies between objects
 - Provide the new features of AFS in the Grid Study Environment
 
 ## High level services
 - Package and distribute computation services based on spring, as docker images
 
 ## Functional tests
-We plan to validate a CIM-CGMES based workflow, focusing on the functional validation, the computation time and the memory management. The CIM-CGMES workflow consists in importing networks (also called Individual Grid Model), running a power flow, merging the newtorks (topologicaly at least), running a power flow on the merged network (also called Common Grid Model), applying modifications and exporting the updated network(s).
+We plan to validate a CIM-CGMES based workflow, focusing on the functional validation, the computation time and the memory consumption. The CIM-CGMES workflow consists in importing networks (also called Individual Grid Model), running a power flow, merging the networks (topologically at least), running a power flow on the merged network (also called Common Grid Model), applying modifications and exporting the updated network(s).