From 7ad68038d6fca4774c0cd57059e99303022c40e6 Mon Sep 17 00:00:00 2001
From: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
Date: Fri, 6 Dec 2024 17:32:56 +0100
Subject: [PATCH 01/31] fix(tasks): fix frozen task with load balanced pgpool
 (#2263)

This work aims at fixing issues encountered with load balanced pgpool,
where a commit is not always instantly visible in another session (when
read from replica).

Fixes are:
- restore a workaround which consists in re-trying the read until success
- ensure exceptions occurring in the task execution thread are
  ALL caught

Also removing a technical debt:
- remove optional session from task job repo which was just used in tests.
  It did not work with code which uses both the repo and also the session
  from the singleton db.session.

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
---
 antarest/core/tasks/repository.py |  15 +----
 antarest/core/tasks/service.py    | 105 +++++++++++++++++-------------
 antarest/core/utils/utils.py      |   2 +-
 tests/core/test_tasks.py          |  46 ++++++-------
 4 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/antarest/core/tasks/repository.py b/antarest/core/tasks/repository.py
index 0a2028db33..74c9e84b78 100644
--- a/antarest/core/tasks/repository.py
+++ b/antarest/core/tasks/repository.py
@@ -27,15 +27,6 @@ class TaskJobRepository:
     Database connector to manage Tasks/Jobs entities.
     """
 
-    def __init__(self, session: t.Optional[Session] = None):
-        """
-        Initialize the repository.
-
-        Args:
-            session: Optional SQLAlchemy session to be used.
-        """
-        self._session = session
-
     @property
     def session(self) -> Session:
         """
@@ -44,11 +35,7 @@ def session(self) -> Session:
         Returns:
             SQLAlchemy session.
         """
-        if self._session is None:
-            # Get or create the session from a context variable (thread local variable)
-            return db.session
-        # Get the user-defined session
-        return self._session
+        return db.session
 
     def save(self, task: TaskJob) -> TaskJob:
         session = self.session
diff --git a/antarest/core/tasks/service.py b/antarest/core/tasks/service.py
index f992e227c6..a97a2fedf5 100644
--- a/antarest/core/tasks/service.py
+++ b/antarest/core/tasks/service.py
@@ -38,6 +38,7 @@
 )
 from antarest.core.tasks.repository import TaskJobRepository
 from antarest.core.utils.fastapi_sqlalchemy import db
+from antarest.core.utils.utils import retry
 from antarest.worker.worker import WorkerTaskCommand, WorkerTaskResult
 
 logger = logging.getLogger(__name__)
@@ -390,35 +391,41 @@ def _run_task(
         task_id: str,
         custom_event_messages: t.Optional[CustomTaskEventMessages] = None,
     ) -> None:
-        # attention: this function is executed in a thread, not in the main process
-        with db():
-            task = db.session.query(TaskJob).get(task_id)
-            task_type = task.type
-            study_id = task.ref_id
+        # We need to catch all exceptions so that the calling thread is guaranteed
+        # to not die
+        try:
+            # attention: this function is executed in a thread, not in the main process
+            with db():
+                # Important to keep this retry for now,
+                # in case commit is not visible (read from replica ...)
+                task = retry(lambda: self.repo.get_or_raise(task_id))
+                task_type = task.type
+                study_id = task.ref_id
 
-        self.event_bus.push(
-            Event(
-                type=EventType.TASK_RUNNING,
-                payload=TaskEventPayload(
-                    id=task_id,
-                    message=custom_event_messages.running
-                    if custom_event_messages is not None
-                    else f"Task {task_id} is running",
-                    type=task_type,
-                    study_id=study_id,
-                ).model_dump(),
-                permissions=PermissionInfo(public_mode=PublicMode.READ),
-                channel=EventChannelDirectory.TASK + task_id,
+            self.event_bus.push(
+                Event(
+                    type=EventType.TASK_RUNNING,
+                    payload=TaskEventPayload(
+                        id=task_id,
+                        message=custom_event_messages.running
+                        if custom_event_messages is not None
+                        else f"Task {task_id} is running",
+                        type=task_type,
+                        study_id=study_id,
+                    ).model_dump(),
+                    permissions=PermissionInfo(public_mode=PublicMode.READ),
+                    channel=EventChannelDirectory.TASK + task_id,
+                )
             )
-        )
 
-        logger.info(f"Starting task {task_id}")
-        with db():
-            db.session.query(TaskJob).filter(TaskJob.id == task_id).update({TaskJob.status: TaskStatus.RUNNING.value})
-            db.session.commit()
-        logger.info(f"Task {task_id} set to RUNNING")
+            logger.info(f"Starting task {task_id}")
+            with db():
+                db.session.query(TaskJob).filter(TaskJob.id == task_id).update(
+                    {TaskJob.status: TaskStatus.RUNNING.value}
+                )
+                db.session.commit()
+            logger.info(f"Task {task_id} set to RUNNING")
 
-        try:
             with db():
                 # We must use the DB session attached to the current thread
                 result = callback(TaskLogAndProgressRecorder(task_id, db.session, self.event_bus))
@@ -463,29 +470,35 @@ def _run_task(
             err_msg = f"Task {task_id} failed: Unhandled exception {exc}"
             logger.error(err_msg, exc_info=exc)
 
-            with db():
-                result_msg = f"{err_msg}\nSee the logs for detailed information and the error traceback."
-                db.session.query(TaskJob).filter(TaskJob.id == task_id).update(
-                    {
-                        TaskJob.status: TaskStatus.FAILED.value,
-                        TaskJob.result_msg: result_msg,
-                        TaskJob.result_status: False,
-                        TaskJob.completion_date: datetime.datetime.utcnow(),
-                    }
+            try:
+                with db():
+                    result_msg = f"{err_msg}\nSee the logs for detailed information and the error traceback."
+                    db.session.query(TaskJob).filter(TaskJob.id == task_id).update(
+                        {
+                            TaskJob.status: TaskStatus.FAILED.value,
+                            TaskJob.result_msg: result_msg,
+                            TaskJob.result_status: False,
+                            TaskJob.completion_date: datetime.datetime.utcnow(),
+                        }
+                    )
+                    db.session.commit()
+
+                message = err_msg if custom_event_messages is None else custom_event_messages.end
+                self.event_bus.push(
+                    Event(
+                        type=EventType.TASK_FAILED,
+                        payload=TaskEventPayload(
+                            id=task_id, message=message, type=task_type, study_id=study_id
+                        ).model_dump(),
+                        permissions=PermissionInfo(public_mode=PublicMode.READ),
+                        channel=EventChannelDirectory.TASK + task_id,
+                    )
                 )
-                db.session.commit()
-
-            message = err_msg if custom_event_messages is None else custom_event_messages.end
-            self.event_bus.push(
-                Event(
-                    type=EventType.TASK_FAILED,
-                    payload=TaskEventPayload(
-                        id=task_id, message=message, type=task_type, study_id=study_id
-                    ).model_dump(),
-                    permissions=PermissionInfo(public_mode=PublicMode.READ),
-                    channel=EventChannelDirectory.TASK + task_id,
+            except Exception as inner_exc:
+                logger.error(
+                    f"An exception occurred while handling execution error of task {task_id}: {inner_exc}",
+                    exc_info=inner_exc,
                 )
-            )
 
     def get_task_progress(self, task_id: str, params: RequestParameters) -> t.Optional[int]:
         task = self.repo.get_or_raise(task_id)
diff --git a/antarest/core/utils/utils.py b/antarest/core/utils/utils.py
index c748420549..2940db582a 100644
--- a/antarest/core/utils/utils.py
+++ b/antarest/core/utils/utils.py
@@ -105,7 +105,7 @@ def retry(func: t.Callable[[], T], attempts: int = 10, interval: float = 0.5) ->
             attempt += 1
             return func()
         except Exception as e:
-            logger.info(f"💤 Sleeping {interval} second(s)...")
+            logger.info(f"💤 Sleeping {interval} second(s) before retry...", exc_info=e)
             time.sleep(interval)
             caught_exception = e
     raise caught_exception or ShouldNotHappenException()
diff --git a/tests/core/test_tasks.py b/tests/core/test_tasks.py
index 139db56691..5a8b490047 100644
--- a/tests/core/test_tasks.py
+++ b/tests/core/test_tasks.py
@@ -204,21 +204,22 @@ def _execute_task(self, task_info: WorkerTaskCommand) -> TaskResult:
         return TaskResult(success=True, message="")
 
 
-def test_repository(db_session: Session) -> None:
+@with_db_context
+def test_repository() -> None:
     # Prepare two users in the database
     user1_id = 9
-    db_session.add(User(id=user1_id, name="John"))
+    db.session.add(User(id=user1_id, name="John"))
     user2_id = 10
-    db_session.add(User(id=user2_id, name="Jane"))
-    db_session.commit()
+    db.session.add(User(id=user2_id, name="Jane"))
+    db.session.commit()
 
     # Create a RawStudy in the database
     study_id = "e34fe4d5-5964-4ef2-9baf-fad66dadc512"
-    db_session.add(RawStudy(id=study_id, name="foo", version="860"))
-    db_session.commit()
+    db.session.add(RawStudy(id=study_id, name="foo", version="860"))
+    db.session.commit()
 
     # Create a TaskJobService
-    task_job_repo = TaskJobRepository(db_session)
+    task_job_repo = TaskJobRepository()
 
     new_task = TaskJob(name="foo", owner_id=user1_id, type=TaskType.COPY)
 
@@ -282,10 +283,10 @@ def test_repository(db_session: Session) -> None:
     assert len(new_task.logs) == 2
     assert new_task.logs[0].message == "hello"
 
-    assert len(db_session.query(TaskJobLog).where(TaskJobLog.task_id == new_task.id).all()) == 2
+    assert len(db.session.query(TaskJobLog).where(TaskJobLog.task_id == new_task.id).all()) == 2
 
     task_job_repo.delete(new_task.id)
-    assert len(db_session.query(TaskJobLog).where(TaskJobLog.task_id == new_task.id).all()) == 0
+    assert len(db.session.query(TaskJobLog).where(TaskJobLog.task_id == new_task.id).all()) == 0
     assert task_job_repo.get(new_task.id) is None
 
 
@@ -390,21 +391,22 @@ def test_cancel_orphan_tasks(
             assert (datetime.datetime.utcnow() - updated_task_job.completion_date).seconds <= max_diff_seconds
 
 
-def test_get_progress(db_session: Session, admin_user: JWTUser, core_config: Config, event_bus: IEventBus) -> None:
+@with_db_context
+def test_get_progress(admin_user: JWTUser, core_config: Config, event_bus: IEventBus) -> None:
     # Prepare two users in the database
     user1_id = 9
-    db_session.add(User(id=user1_id, name="John"))
+    db.session.add(User(id=user1_id, name="John"))
     user2_id = 10
-    db_session.add(User(id=user2_id, name="Jane"))
-    db_session.commit()
+    db.session.add(User(id=user2_id, name="Jane"))
+    db.session.commit()
 
     # Create a RawStudy in the database
     study_id = "e34fe4d5-5964-4ef2-9baf-fad66dadc512"
-    db_session.add(RawStudy(id=study_id, name="foo", version="860"))
-    db_session.commit()
+    db.session.add(RawStudy(id=study_id, name="foo", version="860"))
+    db.session.commit()
 
     # Create a TaskJobService
-    task_job_repo = TaskJobRepository(db_session)
+    task_job_repo = TaskJobRepository()
 
     # User 1 launches a ts generation
     first_task = TaskJob(
@@ -451,12 +453,12 @@ def test_get_progress(db_session: Session, admin_user: JWTUser, core_config: Con
         service.get_task_progress(wrong_id, RequestParameters(user))
 
 
+@with_db_context
 def test_ts_generation_task(
     tmp_path: Path,
     core_config: Config,
     admin_user: JWTUser,
     raw_study_service: RawStudyService,
-    db_session: Session,
 ) -> None:
     # =======================
     #  SET UP
@@ -465,7 +467,7 @@ def test_ts_generation_task(
     event_bus = DummyEventBusService()
 
     # Create a TaskJobService and add tasks
-    task_job_repo = TaskJobRepository(db_session)
+    task_job_repo = TaskJobRepository()
 
     # Create a TaskJobService
     task_job_service = TaskJobService(config=core_config, repository=task_job_repo, event_bus=event_bus)
@@ -474,8 +476,8 @@ def test_ts_generation_task(
     raw_study_path = tmp_path / "study"
 
     regular_user = User(id=99, name="regular")
-    db_session.add(regular_user)
-    db_session.commit()
+    db.session.add(regular_user)
+    db.session.commit()
 
     raw_study = RawStudy(
         id="my_raw_study",
@@ -490,8 +492,8 @@ def test_ts_generation_task(
         path=str(raw_study_path),
     )
     study_metadata_repository = StudyMetadataRepository(Mock(), None)
-    db_session.add(raw_study)
-    db_session.commit()
+    db.session.add(raw_study)
+    db.session.commit()
 
     # Set up the Raw Study
     raw_study_service.create(raw_study)

From a5a2e1e3d8d018fb8bef2fd06c778918873b2128 Mon Sep 17 00:00:00 2001
From: MartinBelthle <martin.belthle@rte-france.com>
Date: Tue, 10 Dec 2024 13:58:11 +0100
Subject: [PATCH 02/31] feat(clusters): convert cluster groups and names to
 lower case (#2182)

Implementation note:
groups and cluster names are converted to lower case as soon
as possible when at the borders of the application (using LowerCaseStr):
in the API, in the properties classes read from files, in the command
data from database ...
This way, we don't have to bother about it inside the application
logic.

[ANT-2311]
---
 antarest/core/model.py                        |   4 +
 .../extensions/adequacy_patch/extension.py    |   2 +-
 antarest/study/business/area_management.py    |   3 +-
 .../business/areas/renewable_management.py    |  30 ++--
 .../business/areas/st_storage_management.py   |  14 +-
 .../business/areas/thermal_management.py      |  49 +++---
 .../business/binding_constraint_management.py |   6 +-
 antarest/study/business/district_manager.py   |   2 +-
 .../study/business/table_mode_management.py   |   7 +-
 .../model/filesystem/config/cluster.py        |   7 +-
 .../filesystem/config/field_validators.py     |  27 +++-
 .../rawstudy/model/filesystem/config/files.py |   6 +-
 .../model/filesystem/config/identifier.py     |  32 +---
 .../rawstudy/model/filesystem/config/model.py |  20 ---
 .../model/filesystem/config/renewable.py      |  44 ++++--
 .../model/filesystem/config/st_storage.py     |  40 +++--
 .../model/filesystem/config/thermal.py        |  57 ++++---
 .../root/input/thermal/prepro/area/area.py    |   5 +-
 .../business/command_extractor.py             |   2 +-
 .../variantstudy/business/command_reverter.py |   4 +-
 .../variantstudy/model/command/create_area.py |   8 +-
 .../command/create_binding_constraint.py      |  14 +-
 .../model/command/create_cluster.py           |  86 +++++------
 .../model/command/create_district.py          |  15 +-
 .../command/create_renewables_cluster.py      |  52 ++++---
 .../model/command/create_st_storage.py        |  50 ++++---
 .../model/command/remove_cluster.py           |   5 +-
 .../variantstudy/model/command/remove_link.py |   5 +-
 .../command/remove_renewables_cluster.py      |   6 +-
 .../model/command/remove_st_storage.py        |   3 +-
 antarest/study/web/study_data_blueprint.py    |  12 +-
 tests/integration/assets/base_study.zip       | Bin 305876 -> 331678 bytes
 tests/integration/assets/variant_study.zip    | Bin 311282 -> 309622 bytes
 .../test_synthesis/raw_study.synthesis.json   |  72 ++++-----
 .../variant_study.synthesis.json              |  72 ++++-----
 .../test_binding_constraints.py               |  16 +-
 .../study_data_blueprint/test_renewable.py    |  28 ++--
 .../study_data_blueprint/test_st_storage.py   |  36 +++--
 .../study_data_blueprint/test_table_mode.py   | 108 +++++++-------
 .../study_data_blueprint/test_thermal.py      |  45 +++---
 tests/integration/test_integration.py         |  59 ++++----
 .../test_integration_token_end_to_end.py      |  18 +--
 .../test_renewable_cluster.py                 |  38 ++---
 .../variant_blueprint/test_st_storage.py      |   2 +-
 .../variant_blueprint/test_thermal_cluster.py |   4 +-
 .../business/test_study_version_upgrader.py   |   2 +-
 .../filesystem/config/test_utils.py           |   5 +-
 .../areas/test_st_storage_management.py       |  14 +-
 .../business/areas/test_thermal_management.py |   6 +-
 .../rawstudy/test_raw_study_service.py        |  21 ++-
 .../variantstudy/test_snapshot_generator.py   |  52 +++++--
 .../test_variant_study_service.py             |  22 ++-
 .../model/command/test_create_area.py         |   3 +-
 .../model/command/test_create_cluster.py      |  44 +++---
 .../model/command/test_create_link.py         |   2 +-
 .../command/test_create_renewables_cluster.py |  37 +++--
 .../model/command/test_create_st_storage.py   | 139 +++++++-----------
 .../test_manage_binding_constraints.py        |   2 +-
 .../model/command/test_manage_district.py     |   2 +-
 .../model/command/test_remove_area.py         |   2 +-
 .../model/command/test_remove_cluster.py      |  12 +-
 .../model/command/test_remove_link.py         |   4 +-
 .../command/test_remove_renewables_cluster.py |   5 +-
 .../model/command/test_remove_st_storage.py   |  19 +--
 .../model/command/test_replace_matrix.py      |   2 +-
 .../model/command/test_update_config.py       |   2 +-
 tests/variantstudy/test_command_factory.py    |  84 +++++------
 67 files changed, 834 insertions(+), 762 deletions(-)

diff --git a/antarest/core/model.py b/antarest/core/model.py
index 78aa7a1e82..adb554e542 100644
--- a/antarest/core/model.py
+++ b/antarest/core/model.py
@@ -13,6 +13,9 @@
 import enum
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 
+import typing_extensions as te
+from pydantic import StringConstraints
+
 from antarest.core.serialization import AntaresBaseModel
 
 if TYPE_CHECKING:
@@ -22,6 +25,7 @@
 JSON = Dict[str, Any]
 ELEMENT = Union[str, int, float, bool, bytes]
 SUB_JSON = Union[ELEMENT, JSON, List[Any], None]
+LowerCaseStr = te.Annotated[str, StringConstraints(to_lower=True)]
 
 
 class PublicMode(enum.StrEnum):
diff --git a/antarest/launcher/extensions/adequacy_patch/extension.py b/antarest/launcher/extensions/adequacy_patch/extension.py
index 20cd3407cd..bb4d19f323 100644
--- a/antarest/launcher/extensions/adequacy_patch/extension.py
+++ b/antarest/launcher/extensions/adequacy_patch/extension.py
@@ -23,7 +23,7 @@
 from antarest.core.utils.utils import assert_this
 from antarest.launcher.extensions.interface import ILauncherExtension
 from antarest.study.service import StudyService
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 
 logger = logging.getLogger(__name__)
diff --git a/antarest/study/business/area_management.py b/antarest/study/business/area_management.py
index 5220b0e8e1..e2b89f7979 100644
--- a/antarest/study/business/area_management.py
+++ b/antarest/study/business/area_management.py
@@ -32,7 +32,8 @@
     ThermalAreasProperties,
     UIProperties,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, DistrictSet, transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, DistrictSet
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.storage_service import StudyStorageService
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
diff --git a/antarest/study/business/areas/renewable_management.py b/antarest/study/business/areas/renewable_management.py
index 2063750ca3..14ba0e60e7 100644
--- a/antarest/study/business/areas/renewable_management.py
+++ b/antarest/study/business/areas/renewable_management.py
@@ -22,12 +22,13 @@
 from antarest.study.business.enum_ignore_case import EnumIgnoreCase
 from antarest.study.business.utils import execute_or_add_commands
 from antarest.study.model import Study
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.renewable import (
     RenewableConfig,
     RenewableConfigType,
     RenewableProperties,
     create_renewable_config,
+    create_renewable_properties,
 )
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.storage_service import StudyStorageService
@@ -274,7 +275,6 @@ def update_cluster(
         Raises:
             RenewableClusterNotFound: If the cluster to update is not found.
         """
-
         study_version = StudyVersion.parse(study.version)
         file_study = self._get_file_study(study)
         path = _CLUSTER_PATH.format(area_id=area_id, cluster_id=cluster_id)
@@ -284,19 +284,19 @@ def update_cluster(
         except KeyError:
             raise RenewableClusterNotFound(path, cluster_id) from None
         else:
-            old_config = create_renewable_config(study_version, **values)
+            old_properties = create_renewable_properties(study_version, **values)
 
         # use Python values to synchronize Config and Form values
         new_values = cluster_data.model_dump(by_alias=False, exclude_none=True)
-        new_config = old_config.copy(exclude={"id"}, update=new_values)
-        new_data = new_config.model_dump(mode="json", by_alias=True, exclude={"id"})
+        new_properties = old_properties.copy(exclude={"id"}, update=new_values)
 
         # create the dict containing the new values using aliases
         data: t.Dict[str, t.Any] = {}
-        for field_name, field in new_config.model_fields.items():
-            if field_name in new_values:
-                name = field.alias if field.alias else field_name
-                data[name] = new_data[name]
+        for updated_field, updated_value in new_values.items():
+            if updated_field in old_properties.model_fields:
+                field_info = old_properties.model_fields[updated_field]
+                field_name = field_info.alias if field_info.alias else updated_field
+                data[field_name] = updated_value
 
         # create the update config commands with the modified data
         command_context = self.storage_service.variant_study_service.command_factory.command_context
@@ -308,7 +308,7 @@ def update_cluster(
         ]
         execute_or_add_commands(study, file_study, commands, self.storage_service)
 
-        values = new_config.model_dump(by_alias=False)
+        values = new_properties.model_dump(by_alias=False)
         return RenewableClusterOutput(**values, id=cluster_id)
 
     def delete_clusters(self, study: Study, area_id: str, cluster_ids: t.Sequence[str]) -> None:
@@ -357,9 +357,8 @@ def duplicate_cluster(
         Raises:
             DuplicateRenewableCluster: If a cluster with the new name already exists in the area.
         """
-        new_id = transform_name_to_id(new_cluster_name, lower=False)
-        lower_new_id = new_id.lower()
-        if any(lower_new_id == cluster.id.lower() for cluster in self.get_clusters(study, area_id)):
+        new_id = transform_name_to_id(new_cluster_name)
+        if any(new_id == cluster.id for cluster in self.get_clusters(study, area_id)):
             raise DuplicateRenewableCluster(area_id, new_id)
 
         # Cluster duplication
@@ -371,9 +370,8 @@ def duplicate_cluster(
         create_cluster_cmd = self._make_create_cluster_cmd(area_id, new_config, study_version)
 
         # Matrix edition
-        lower_source_id = source_id.lower()
-        source_path = f"input/renewables/series/{area_id}/{lower_source_id}/series"
-        new_path = f"input/renewables/series/{area_id}/{lower_new_id}/series"
+        source_path = f"input/renewables/series/{area_id}/{source_id}/series"
+        new_path = f"input/renewables/series/{area_id}/{new_id}/series"
 
         # Prepare and execute commands
         storage_service = self.storage_service.get_storage(study)
diff --git a/antarest/study/business/areas/st_storage_management.py b/antarest/study/business/areas/st_storage_management.py
index b0ef5322ab..5786b4183b 100644
--- a/antarest/study/business/areas/st_storage_management.py
+++ b/antarest/study/business/areas/st_storage_management.py
@@ -33,7 +33,7 @@
 from antarest.study.business.all_optional_meta import all_optional_model, camel_case_model
 from antarest.study.business.utils import execute_or_add_commands
 from antarest.study.model import STUDY_VERSION_8_8, Study
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import (
     STStorage880Config,
     STStorage880Properties,
@@ -305,7 +305,7 @@ def _make_create_cluster_cmd(
     ) -> CreateSTStorage:
         command = CreateSTStorage(
             area_id=area_id,
-            parameters=cluster,
+            parameters=cluster.model_dump(mode="json", by_alias=True, exclude={"id"}),
             command_context=self.storage_service.variant_study_service.command_factory.command_context,
             study_version=study_version,
         )
@@ -551,8 +551,7 @@ def duplicate_cluster(self, study: Study, area_id: str, source_id: str, new_clus
             ClusterAlreadyExists: If a cluster with the new name already exists in the area.
         """
         new_id = transform_name_to_id(new_cluster_name)
-        lower_new_id = new_id.lower()
-        if any(lower_new_id == storage.id.lower() for storage in self.get_storages(study, area_id)):
+        if any(new_id == storage.id for storage in self.get_storages(study, area_id)):
             raise DuplicateSTStorage(area_id, new_id)
 
         # Cluster duplication
@@ -571,16 +570,13 @@ def duplicate_cluster(self, study: Study, area_id: str, source_id: str, new_clus
         create_cluster_cmd = self._make_create_cluster_cmd(area_id, new_config, study_version)
 
         # Matrix edition
-        lower_source_id = source_id.lower()
         # noinspection SpellCheckingInspection
         ts_names = ["pmax_injection", "pmax_withdrawal", "lower_rule_curve", "upper_rule_curve", "inflows"]
         source_paths = [
-            _STORAGE_SERIES_PATH.format(area_id=area_id, storage_id=lower_source_id, ts_name=ts_name)
-            for ts_name in ts_names
+            _STORAGE_SERIES_PATH.format(area_id=area_id, storage_id=source_id, ts_name=ts_name) for ts_name in ts_names
         ]
         new_paths = [
-            _STORAGE_SERIES_PATH.format(area_id=area_id, storage_id=lower_new_id, ts_name=ts_name)
-            for ts_name in ts_names
+            _STORAGE_SERIES_PATH.format(area_id=area_id, storage_id=new_id, ts_name=ts_name) for ts_name in ts_names
         ]
 
         # Prepare and execute commands
diff --git a/antarest/study/business/areas/thermal_management.py b/antarest/study/business/areas/thermal_management.py
index cbd0f7e997..150dd7adfa 100644
--- a/antarest/study/business/areas/thermal_management.py
+++ b/antarest/study/business/areas/thermal_management.py
@@ -28,12 +28,13 @@
 from antarest.study.business.all_optional_meta import all_optional_model, camel_case_model
 from antarest.study.business.utils import execute_or_add_commands
 from antarest.study.model import STUDY_VERSION_8_7, Study
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.thermal import (
     Thermal870Config,
     Thermal870Properties,
     ThermalConfigType,
     create_thermal_config,
+    create_thermal_properties,
 )
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.storage_service import StudyStorageService
@@ -348,7 +349,6 @@ def update_cluster(
             ThermalClusterNotFound: If the provided `cluster_id` does not match the ID of the cluster
             in the provided cluster_data.
         """
-
         study_version = StudyVersion.parse(study.version)
         file_study = self._get_file_study(study)
         path = _CLUSTER_PATH.format(area_id=area_id, cluster_id=cluster_id)
@@ -357,19 +357,19 @@ def update_cluster(
         except KeyError:
             raise ThermalClusterNotFound(path, cluster_id) from None
         else:
-            old_config = create_thermal_config(study_version, **values)
+            old_properties = create_thermal_properties(study_version, **values)
 
         # Use Python values to synchronize Config and Form values
         new_values = cluster_data.model_dump(mode="json", by_alias=False, exclude_none=True)
-        new_config = old_config.copy(exclude={"id"}, update=new_values)
-        new_data = new_config.model_dump(mode="json", by_alias=True, exclude={"id"})
+        new_properties = old_properties.copy(exclude={"id"}, update=new_values)
 
         # create the dict containing the new values using aliases
         data: t.Dict[str, t.Any] = {}
-        for field_name, field in new_config.model_fields.items():
-            if field_name in new_values:
-                name = field.alias if field.alias else field_name
-                data[name] = new_data[name]
+        for updated_field, updated_value in new_values.items():
+            if updated_field in old_properties.model_fields:
+                field_info = old_properties.model_fields[updated_field]
+                field_name = field_info.alias if field_info.alias else updated_field
+                data[field_name] = updated_value
 
         # create the update config commands with the modified data
         command_context = self.storage_service.variant_study_service.command_factory.command_context
@@ -381,7 +381,7 @@ def update_cluster(
         ]
         execute_or_add_commands(study, file_study, commands, self.storage_service)
 
-        values = {**new_config.model_dump(mode="json", by_alias=False), "id": cluster_id}
+        values = {**new_properties.model_dump(mode="json", by_alias=False), "id": cluster_id}
         return ThermalClusterOutput.model_validate(values)
 
     def delete_clusters(self, study: Study, area_id: str, cluster_ids: t.Sequence[str]) -> None:
@@ -431,9 +431,8 @@ def duplicate_cluster(
         Raises:
             ClusterAlreadyExists: If a cluster with the new name already exists in the area.
         """
-        new_id = transform_name_to_id(new_cluster_name, lower=False)
-        lower_new_id = new_id.lower()
-        if any(lower_new_id == cluster.id.lower() for cluster in self.get_clusters(study, area_id)):
+        new_id = transform_name_to_id(new_cluster_name)
+        if any(new_id == cluster.id for cluster in self.get_clusters(study, area_id)):
             raise DuplicateThermalCluster(area_id, new_id)
 
         # Cluster duplication
@@ -445,23 +444,22 @@ def duplicate_cluster(
         create_cluster_cmd = self._make_create_cluster_cmd(area_id, new_config, study_version)
 
         # Matrix edition
-        lower_source_id = source_id.lower()
         source_paths = [
-            f"input/thermal/series/{area_id}/{lower_source_id}/series",
-            f"input/thermal/prepro/{area_id}/{lower_source_id}/modulation",
-            f"input/thermal/prepro/{area_id}/{lower_source_id}/data",
+            f"input/thermal/series/{area_id}/{source_id}/series",
+            f"input/thermal/prepro/{area_id}/{source_id}/modulation",
+            f"input/thermal/prepro/{area_id}/{source_id}/data",
         ]
         new_paths = [
-            f"input/thermal/series/{area_id}/{lower_new_id}/series",
-            f"input/thermal/prepro/{area_id}/{lower_new_id}/modulation",
-            f"input/thermal/prepro/{area_id}/{lower_new_id}/data",
+            f"input/thermal/series/{area_id}/{new_id}/series",
+            f"input/thermal/prepro/{area_id}/{new_id}/modulation",
+            f"input/thermal/prepro/{area_id}/{new_id}/data",
         ]
         study_version = StudyVersion.parse(study.version)
         if study_version >= STUDY_VERSION_8_7:
-            source_paths.append(f"input/thermal/series/{area_id}/{lower_source_id}/CO2Cost")
-            source_paths.append(f"input/thermal/series/{area_id}/{lower_source_id}/fuelCost")
-            new_paths.append(f"input/thermal/series/{area_id}/{lower_new_id}/CO2Cost")
-            new_paths.append(f"input/thermal/series/{area_id}/{lower_new_id}/fuelCost")
+            source_paths.append(f"input/thermal/series/{area_id}/{source_id}/CO2Cost")
+            source_paths.append(f"input/thermal/series/{area_id}/{source_id}/fuelCost")
+            new_paths.append(f"input/thermal/series/{area_id}/{new_id}/CO2Cost")
+            new_paths.append(f"input/thermal/series/{area_id}/{new_id}/fuelCost")
 
         # Prepare and execute commands
         commands: t.List[t.Union[CreateCluster, ReplaceMatrix]] = [create_cluster_cmd]
@@ -479,8 +477,7 @@ def duplicate_cluster(
         return ThermalClusterOutput(**new_config.model_dump(mode="json", by_alias=False))
 
     def validate_series(self, study: Study, area_id: str, cluster_id: str) -> bool:
-        lower_cluster_id = cluster_id.lower()
-        thermal_cluster_path = Path(f"input/thermal/series/{area_id}/{lower_cluster_id}")
+        thermal_cluster_path = Path(f"input/thermal/series/{area_id}/{cluster_id.lower()}")
         series_path = [thermal_cluster_path / "series"]
         if StudyVersion.parse(study.version) >= STUDY_VERSION_8_7:
             series_path.append(thermal_cluster_path / "CO2Cost")
diff --git a/antarest/study/business/binding_constraint_management.py b/antarest/study/business/binding_constraint_management.py
index 19e9c0f782..de461cf681 100644
--- a/antarest/study/business/binding_constraint_management.py
+++ b/antarest/study/business/binding_constraint_management.py
@@ -30,7 +30,7 @@
     MatrixWidthMismatchError,
     WrongMatrixHeightError,
 )
-from antarest.core.model import JSON
+from antarest.core.model import JSON, LowerCaseStr
 from antarest.core.requests import CaseInsensitiveDict
 from antarest.core.serialization import AntaresBaseModel
 from antarest.core.utils.string import to_camel_case
@@ -44,7 +44,7 @@
     BindingConstraintFrequency,
     BindingConstraintOperator,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.storage_service import StudyStorageService
 from antarest.study.storage.variantstudy.business.matrix_constants.binding_constraint.series_after_v87 import (
@@ -340,7 +340,7 @@ class ConstraintOutput830(ConstraintOutputBase):
 
 
 class ConstraintOutput870(ConstraintOutput830):
-    group: str = DEFAULT_GROUP
+    group: LowerCaseStr = DEFAULT_GROUP
 
 
 # WARNING: Do not change the order of the following line, it is used to determine
diff --git a/antarest/study/business/district_manager.py b/antarest/study/business/district_manager.py
index 2cfec172d8..9147fb22f2 100644
--- a/antarest/study/business/district_manager.py
+++ b/antarest/study/business/district_manager.py
@@ -16,7 +16,7 @@
 from antarest.core.serialization import AntaresBaseModel
 from antarest.study.business.utils import execute_or_add_commands
 from antarest.study.model import Study
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.storage_service import StudyStorageService
 from antarest.study.storage.variantstudy.model.command.create_district import CreateDistrict, DistrictBaseFilter
 from antarest.study.storage.variantstudy.model.command.remove_district import RemoveDistrict
diff --git a/antarest/study/business/table_mode_management.py b/antarest/study/business/table_mode_management.py
index aba99c9b57..e7a12b0289 100644
--- a/antarest/study/business/table_mode_management.py
+++ b/antarest/study/business/table_mode_management.py
@@ -217,7 +217,9 @@ def update_table_data(
             thermals_by_areas = collections.defaultdict(dict)
             for key, values in data.items():
                 area_id, cluster_id = key.split(" / ")
-                thermals_by_areas[area_id][cluster_id] = ThermalClusterInput(**values)
+                # Thermal clusters ids were not lowered at the time.
+                # So to ensure this endpoint still works with old scripts we have to lower the id at first.
+                thermals_by_areas[area_id][cluster_id.lower()] = ThermalClusterInput(**values)
             thermals_map = self._thermal_manager.update_thermals_props(study, thermals_by_areas)
             data = {
                 f"{area_id} / {cluster_id}": cluster.model_dump(by_alias=True, exclude={"id", "name"})
@@ -230,7 +232,8 @@ def update_table_data(
             renewables_by_areas = collections.defaultdict(dict)
             for key, values in data.items():
                 area_id, cluster_id = key.split(" / ")
-                renewables_by_areas[area_id][cluster_id] = RenewableClusterInput(**values)
+                # Same reason as for thermal clusters
+                renewables_by_areas[area_id][cluster_id.lower()] = RenewableClusterInput(**values)
             renewables_map = self._renewable_manager.update_renewables_props(study, renewables_by_areas)
             data = {
                 f"{area_id} / {cluster_id}": cluster.model_dump(by_alias=True, exclude={"id", "name"})
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/cluster.py b/antarest/study/storage/rawstudy/model/filesystem/config/cluster.py
index f2a6349d90..238012858e 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/cluster.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/cluster.py
@@ -21,6 +21,7 @@
 
 from pydantic import Field
 
+from antarest.core.model import LowerCaseStr
 from antarest.core.serialization import AntaresBaseModel
 
 
@@ -47,9 +48,9 @@ class ItemProperties(
     [('group-A', 'cluster-01'), ('GROUP-A', 'cluster-02'), ('Group-B', 'CLUSTER-01')]
     """
 
-    group: str = Field(default="", description="Cluster group")
+    group: LowerCaseStr = Field(default="", description="Cluster group")
 
-    name: str = Field(description="Cluster name", pattern=r"[a-zA-Z0-9_(),& -]+")
+    name: LowerCaseStr = Field(description="Cluster name", pattern=r"[a-zA-Z0-9_(),& -]+")
 
     def __lt__(self, other: t.Any) -> bool:
         """
@@ -58,7 +59,7 @@ def __lt__(self, other: t.Any) -> bool:
         This method may be used to sort and group clusters by `group` and `name`.
         """
         if isinstance(other, ItemProperties):
-            return (self.group.upper(), self.name.upper()).__lt__((other.group.upper(), other.name.upper()))
+            return (self.group, self.name).__lt__((other.group, other.name))
         return NotImplemented
 
 
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/field_validators.py b/antarest/study/storage/rawstudy/model/filesystem/config/field_validators.py
index f6a371769b..5761cdc587 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/field_validators.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/field_validators.py
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-
+import re
 import typing as t
 
 _ALL_FILTERING = ["hourly", "daily", "weekly", "monthly", "annual"]
@@ -87,3 +87,28 @@ def validate_color_rgb(v: t.Any) -> str:
         raise TypeError(f"Invalid type for 'color_rgb': {type(v)}")
 
     return f"#{r:02X}{g:02X}{b:02X}"
+
+
+# Invalid chars was taken from Antares Simulator (C++).
+_sub_invalid_chars = re.compile(r"[^a-zA-Z0-9_(),& -]+").sub
+
+
+def transform_name_to_id(name: str) -> str:
+    """
+    Transform a name into an identifier by replacing consecutive
+    invalid characters by a single white space, then whitespaces
+    are striped from both ends and the id is lowered.
+
+    Valid characters are `[a-zA-Z0-9_(),& -]` (including space).
+
+    Args:
+        name: The name to convert.
+    """
+    return _sub_invalid_chars(" ", name).strip().lower()
+
+
+def validate_id_against_name(name: str) -> str:
+    to_return = transform_name_to_id(name)
+    if not to_return:
+        raise ValueError("Cluster name must only contains [a-zA-Z0-9],&,-,_,(,) characters")
+    return to_return
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/files.py b/antarest/study/storage/rawstudy/model/filesystem/config/files.py
index 8f23fecd25..4d65f380b9 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/files.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/files.py
@@ -42,7 +42,10 @@
     SimulationParsingError,
     XpansionParsingError,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import extract_filtering
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import (
+    extract_filtering,
+    transform_name_to_id,
+)
 from antarest.study.storage.rawstudy.model.filesystem.config.model import (
     Area,
     BindingConstraintDTO,
@@ -50,7 +53,6 @@
     FileStudyTreeConfig,
     Link,
     Simulation,
-    transform_name_to_id,
 )
 from antarest.study.storage.rawstudy.model.filesystem.config.renewable import (
     RenewableConfigType,
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/identifier.py b/antarest/study/storage/rawstudy/model/filesystem/config/identifier.py
index ab428fca75..66e69fc7d1 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/identifier.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/identifier.py
@@ -14,12 +14,12 @@
 
 from pydantic import Field, model_validator
 
-__all__ = ("IgnoreCaseIdentifier", "LowerCaseIdentifier")
+__all__ = "LowerCaseIdentifier"
 
 from antarest.core.serialization import AntaresBaseModel
 
 
-class IgnoreCaseIdentifier(
+class LowerCaseIdentifier(
     AntaresBaseModel,
     extra="forbid",
     validate_assignment=True,
@@ -43,9 +43,9 @@ def generate_id(cls, name: str) -> str:
             The ID of the section.
         """
         # Avoid circular imports
-        from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+        from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 
-        return transform_name_to_id(name, lower=False)
+        return transform_name_to_id(name)
 
     @model_validator(mode="before")
     def validate_id(cls, values: t.MutableMapping[str, t.Any]) -> t.Mapping[str, t.Any]:
@@ -74,27 +74,3 @@ def validate_id(cls, values: t.MutableMapping[str, t.Any]) -> t.Mapping[str, t.A
             else:
                 raise ValueError(f"Invalid name '{name}'.")
         return values
-
-
-class LowerCaseIdentifier(IgnoreCaseIdentifier):
-    """
-    Base class for all configuration sections with a lower case ID.
-    """
-
-    id: str = Field(description="ID (section name)", pattern=r"[a-z0-9_(),& -]+")
-
-    @classmethod
-    def generate_id(cls, name: str) -> str:
-        """
-        Generate an ID from a name.
-
-        Args:
-            name: Name of a section read from an INI file
-
-        Returns:
-            The ID of the section.
-        """
-        # Avoid circular imports
-        from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
-
-        return transform_name_to_id(name, lower=True)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/model.py b/antarest/study/storage/rawstudy/model/filesystem/config/model.py
index 2f96b845a2..938cddaba3 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/model.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/model.py
@@ -285,26 +285,6 @@ def get_filters_year(self, area: str, link: t.Optional[str] = None) -> t.List[st
         return self.areas[area].filters_year
 
 
-# Invalid chars was taken from Antares Simulator (C++).
-_sub_invalid_chars = re.compile(r"[^a-zA-Z0-9_(),& -]+").sub
-
-
-def transform_name_to_id(name: str, lower: bool = True) -> str:
-    """
-    Transform a name into an identifier by replacing consecutive
-    invalid characters by a single white space, and then whitespaces
-    are striped from both ends.
-
-    Valid characters are `[a-zA-Z0-9_(),& -]` (including space).
-
-    Args:
-        name: The name to convert.
-        lower: The flag used to turn the identifier in lower case.
-    """
-    valid_id = _sub_invalid_chars(" ", name).strip()
-    return valid_id.lower() if lower else valid_id
-
-
 class FileStudyTreeConfigDTO(AntaresBaseModel):
     study_path: Path
     path: Path
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/renewable.py b/antarest/study/storage/rawstudy/model/filesystem/config/renewable.py
index e796ed1beb..dcd7e6f16c 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/renewable.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/renewable.py
@@ -18,7 +18,7 @@
 from antarest.study.business.enum_ignore_case import EnumIgnoreCase
 from antarest.study.model import STUDY_VERSION_8_1
 from antarest.study.storage.rawstudy.model.filesystem.config.cluster import ClusterProperties
-from antarest.study.storage.rawstudy.model.filesystem.config.identifier import IgnoreCaseIdentifier
+from antarest.study.storage.rawstudy.model.filesystem.config.identifier import LowerCaseIdentifier
 
 
 class TimeSeriesInterpretation(EnumIgnoreCase):
@@ -44,15 +44,15 @@ class RenewableClusterGroup(EnumIgnoreCase):
     If not specified, the renewable cluster will be part of the group "Other RES 1".
     """
 
-    THERMAL_SOLAR = "Solar Thermal"
-    PV_SOLAR = "Solar PV"
-    ROOFTOP_SOLAR = "Solar Rooftop"
-    WIND_ON_SHORE = "Wind Onshore"
-    WIND_OFF_SHORE = "Wind Offshore"
-    OTHER1 = "Other RES 1"
-    OTHER2 = "Other RES 2"
-    OTHER3 = "Other RES 3"
-    OTHER4 = "Other RES 4"
+    THERMAL_SOLAR = "solar thermal"
+    PV_SOLAR = "solar pv"
+    ROOFTOP_SOLAR = "solar rooftop"
+    WIND_ON_SHORE = "wind onshore"
+    WIND_OFF_SHORE = "wind offshore"
+    OTHER1 = "other res 1"
+    OTHER2 = "other res 2"
+    OTHER3 = "other res 3"
+    OTHER4 = "other res 4"
 
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}.{self.name}"
@@ -65,7 +65,7 @@ def _missing_(cls, value: object) -> t.Optional["RenewableClusterGroup"]:
         if isinstance(value, str):
             # Check if any group value matches the input value ignoring case sensitivity.
             # noinspection PyUnresolvedReferences
-            if any(value.upper() == group.value.upper() for group in cls):
+            if any(value.lower() == group.value for group in cls):
                 return t.cast(RenewableClusterGroup, super()._missing_(value))
             # If a group is not found, return the default group ('OTHER1' by default).
             return cls.OTHER1
@@ -91,7 +91,7 @@ class RenewableProperties(ClusterProperties):
     )
 
 
-class RenewableConfig(RenewableProperties, IgnoreCaseIdentifier):
+class RenewableConfig(RenewableProperties, LowerCaseIdentifier):
     """
     Configuration of a renewable cluster.
 
@@ -110,6 +110,7 @@ class RenewableConfig(RenewableProperties, IgnoreCaseIdentifier):
 
 
 RenewableConfigType = RenewableConfig
+RenewablePropertiesType = RenewableProperties
 
 
 def get_renewable_config_cls(study_version: StudyVersion) -> t.Type[RenewableConfig]:
@@ -127,6 +128,25 @@ def get_renewable_config_cls(study_version: StudyVersion) -> t.Type[RenewableCon
     raise ValueError(f"Unsupported study version {study_version}, required 810 or above.")
 
 
+def create_renewable_properties(study_version: StudyVersion, **kwargs: t.Any) -> RenewablePropertiesType:
+    """
+    Factory method to create renewable properties.
+
+    Args:
+        study_version: The version of the study.
+        **kwargs: The properties to be used to initialize the model.
+
+    Returns:
+        The renewable properties.
+
+    Raises:
+        ValueError: If the study version is not supported.
+    """
+    if study_version >= STUDY_VERSION_8_1:
+        return RenewableProperties.model_validate(kwargs)
+    raise ValueError(f"Unsupported study version {study_version}, required 810 or above.")
+
+
 def create_renewable_config(study_version: StudyVersion, **kwargs: t.Any) -> RenewableConfigType:
     """
     Factory method to create a renewable configuration model.
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/st_storage.py b/antarest/study/storage/rawstudy/model/filesystem/config/st_storage.py
index 426e263baa..74df0803ac 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/st_storage.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/st_storage.py
@@ -34,15 +34,15 @@ class STStorageGroup(EnumIgnoreCase):
         - OTHER1...OTHER5: Represents other energy storage systems.
     """
 
-    PSP_OPEN = "PSP_open"
-    PSP_CLOSED = "PSP_closed"
-    PONDAGE = "Pondage"
-    BATTERY = "Battery"
-    OTHER1 = "Other1"
-    OTHER2 = "Other2"
-    OTHER3 = "Other3"
-    OTHER4 = "Other4"
-    OTHER5 = "Other5"
+    PSP_OPEN = "psp_open"
+    PSP_CLOSED = "psp_closed"
+    PONDAGE = "pondage"
+    BATTERY = "battery"
+    OTHER1 = "other1"
+    OTHER2 = "other2"
+    OTHER3 = "other3"
+    OTHER4 = "other4"
+    OTHER5 = "other5"
 
 
 # noinspection SpellCheckingInspection
@@ -161,6 +161,28 @@ class STStorage880Config(STStorage880Properties, LowerCaseIdentifier):
 # NOTE: In the following Union, it is important to place the older version first,
 # because otherwise, creating a short term storage always creates a v8.8 one.
 STStorageConfigType = t.Union[STStorageConfig, STStorage880Config]
+STStoragePropertiesType = t.Union[STStorageProperties, STStorage880Properties]
+
+
+def create_st_storage_properties(study_version: StudyVersion, **kwargs: t.Any) -> STStoragePropertiesType:
+    """
+    Factory method to create st_storage properties.
+
+    Args:
+        study_version: The version of the study.
+        **kwargs: The properties to be used to initialize the model.
+
+    Returns:
+        The short term storage properties.
+
+    Raises:
+        ValueError: If the study version is not supported.
+    """
+    if study_version >= STUDY_VERSION_8_8:
+        return STStorage880Properties.model_validate(kwargs)
+    elif study_version >= STUDY_VERSION_8_6:
+        return STStorageProperties.model_validate(kwargs)
+    raise ValueError(f"Unsupported study version: {study_version}")
 
 
 def get_st_storage_config_cls(study_version: StudyVersion) -> t.Type[STStorageConfigType]:
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/thermal.py b/antarest/study/storage/rawstudy/model/filesystem/config/thermal.py
index ff095c2b2e..5093c9c289 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/thermal.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/thermal.py
@@ -13,11 +13,11 @@
 import typing as t
 
 from antares.study.version import StudyVersion
-from pydantic import Field
+from pydantic import Field, ValidationError
 
 from antarest.study.business.enum_ignore_case import EnumIgnoreCase
 from antarest.study.storage.rawstudy.model.filesystem.config.cluster import ClusterProperties
-from antarest.study.storage.rawstudy.model.filesystem.config.identifier import IgnoreCaseIdentifier
+from antarest.study.storage.rawstudy.model.filesystem.config.identifier import LowerCaseIdentifier
 
 
 class LocalTSGenerationBehavior(EnumIgnoreCase):
@@ -58,16 +58,16 @@ class ThermalClusterGroup(EnumIgnoreCase):
     The group `OTHER1` is used by default.
     """
 
-    NUCLEAR = "Nuclear"
-    LIGNITE = "Lignite"
-    HARD_COAL = "Hard Coal"
-    GAS = "Gas"
-    OIL = "Oil"
-    MIXED_FUEL = "Mixed Fuel"
-    OTHER1 = "Other 1"
-    OTHER2 = "Other 2"
-    OTHER3 = "Other 3"
-    OTHER4 = "Other 4"
+    NUCLEAR = "nuclear"
+    LIGNITE = "lignite"
+    HARD_COAL = "hard coal"
+    GAS = "gas"
+    OIL = "oil"
+    MIXED_FUEL = "mixed fuel"
+    OTHER1 = "other 1"
+    OTHER2 = "other 2"
+    OTHER3 = "other 3"
+    OTHER4 = "other 4"
 
     def __repr__(self) -> str:  # pragma: no cover
         return f"{self.__class__.__name__}.{self.name}"
@@ -80,10 +80,8 @@ def _missing_(cls, value: object) -> t.Optional["ThermalClusterGroup"]:
         if isinstance(value, str):
             # Check if any group value matches the input value ignoring case sensitivity.
             # noinspection PyUnresolvedReferences
-            if any(value.upper() == group.value.upper() for group in cls):
+            if any(value.lower() == group.value for group in cls):
                 return t.cast(ThermalClusterGroup, super()._missing_(value))
-            # If a group is not found, return the default group ('OTHER1' by default).
-            # Note that 'OTHER' is an alias for 'OTHER1'.
             return cls.OTHER1
         return t.cast(t.Optional["ThermalClusterGroup"], super()._missing_(value))
 
@@ -330,7 +328,7 @@ class Thermal870Properties(Thermal860Properties):
     )
 
 
-class ThermalConfig(ThermalProperties, IgnoreCaseIdentifier):
+class ThermalConfig(ThermalProperties, LowerCaseIdentifier):
     """
     Thermal properties with section ID.
 
@@ -351,7 +349,7 @@ class ThermalConfig(ThermalProperties, IgnoreCaseIdentifier):
     AttributeError: 'ThermalConfig' object has no attribute 'nh3'"""
 
 
-class Thermal860Config(Thermal860Properties, IgnoreCaseIdentifier):
+class Thermal860Config(Thermal860Properties, LowerCaseIdentifier):
     """
     Thermal properties for study in version 860
 
@@ -373,7 +371,7 @@ class Thermal860Config(Thermal860Properties, IgnoreCaseIdentifier):
     """
 
 
-class Thermal870Config(Thermal870Properties, IgnoreCaseIdentifier):
+class Thermal870Config(Thermal870Properties, LowerCaseIdentifier):
     """
     Thermal properties for study in version 8.7 or above.
 
@@ -404,6 +402,7 @@ class Thermal870Config(Thermal870Properties, IgnoreCaseIdentifier):
 # NOTE: In the following Union, it is important to place the most specific type first,
 # because the type matching generally occurs sequentially from left to right within the union.
 ThermalConfigType = t.Union[Thermal870Config, Thermal860Config, ThermalConfig]
+ThermalPropertiesType = t.Union[Thermal870Properties, Thermal860Properties, ThermalProperties]
 
 
 def get_thermal_config_cls(study_version: StudyVersion) -> t.Type[ThermalConfigType]:
@@ -424,6 +423,28 @@ def get_thermal_config_cls(study_version: StudyVersion) -> t.Type[ThermalConfigT
         return ThermalConfig
 
 
+def create_thermal_properties(study_version: StudyVersion, **kwargs: t.Any) -> ThermalPropertiesType:
+    """
+    Factory method to create thermal properties.
+
+    Args:
+        study_version: The version of the study.
+        **kwargs: The properties to be used to initialize the model.
+
+    Returns:
+        The thermal properties.
+
+    Raises:
+        ValueError: If the study version is not supported.
+    """
+    if study_version >= 870:
+        return Thermal870Properties.model_validate(kwargs)
+    elif study_version == 860:
+        return Thermal860Properties.model_validate(kwargs)
+    else:
+        return ThermalProperties.model_validate(kwargs)
+
+
 def create_thermal_config(study_version: StudyVersion, **kwargs: t.Any) -> ThermalConfigType:
     """
     Factory method to create a thermal configuration model.
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/area.py
index daba4ac183..a804f5dbae 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/area.py
@@ -30,11 +30,8 @@ def __init__(
         self.area = area
 
     def build(self) -> TREE:
-        # Note that cluster IDs are case-insensitive, but series IDs are in lower case.
-        # For instance, if your cluster ID is "Base", then the series ID will be "base".
-        series_ids = map(str.lower, self.config.get_thermal_ids(self.area))
         children: TREE = {
             series_id: InputThermalPreproAreaThermal(self.context, self.config.next_file(series_id))
-            for series_id in series_ids
+            for series_id in self.config.get_thermal_ids(self.area)
         }
         return children
diff --git a/antarest/study/storage/variantstudy/business/command_extractor.py b/antarest/study/storage/variantstudy/business/command_extractor.py
index 2da4ac4271..0f034f8a37 100644
--- a/antarest/study/storage/variantstudy/business/command_extractor.py
+++ b/antarest/study/storage/variantstudy/business/command_extractor.py
@@ -222,7 +222,7 @@ def _extract_cluster(self, study: FileStudy, area_id: str, cluster_id: str, rene
             create_cluster_command(
                 area_id=area_id,
                 cluster_name=cluster.id,
-                parameters=cluster.model_dump(by_alias=True, exclude_defaults=True, exclude={"id"}),
+                parameters=cluster.model_dump(mode="json", by_alias=True, exclude={"id"}),
                 command_context=self.command_context,
                 study_version=study_tree.config.version,
             ),
diff --git a/antarest/study/storage/variantstudy/business/command_reverter.py b/antarest/study/storage/variantstudy/business/command_reverter.py
index 7b585f46b5..c7e88f83af 100644
--- a/antarest/study/storage/variantstudy/business/command_reverter.py
+++ b/antarest/study/storage/variantstudy/business/command_reverter.py
@@ -15,7 +15,7 @@
 from pathlib import Path
 
 from antarest.core.exceptions import ChildNotFoundError
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
@@ -222,7 +222,7 @@ def _revert_create_st_storage(
         history: t.List["ICommand"],
         base: FileStudy,
     ) -> t.List[ICommand]:
-        storage_id = base_command.parameters.id
+        storage_id = base_command.storage_id
         return [
             RemoveSTStorage(
                 area_id=base_command.area_id,
diff --git a/antarest/study/storage/variantstudy/model/command/create_area.py b/antarest/study/storage/variantstudy/model/command/create_area.py
index 8dfd782f43..1eefb00d1a 100644
--- a/antarest/study/storage/variantstudy/model/command/create_area.py
+++ b/antarest/study/storage/variantstudy/model/command/create_area.py
@@ -16,12 +16,8 @@
 
 from antarest.core.model import JSON
 from antarest.study.model import STUDY_VERSION_6_5, STUDY_VERSION_8_1, STUDY_VERSION_8_3, STUDY_VERSION_8_6
-from antarest.study.storage.rawstudy.model.filesystem.config.model import (
-    Area,
-    EnrModelling,
-    FileStudyTreeConfig,
-    transform_name_to_id,
-)
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, EnrModelling, FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput, FilteringOptions
 from antarest.study.storage.variantstudy.model.command.icommand import MATCH_SIGNATURE_SEPARATOR, ICommand
diff --git a/antarest/study/storage/variantstudy/model/command/create_binding_constraint.py b/antarest/study/storage/variantstudy/model/command/create_binding_constraint.py
index 7fe37187b6..93a65ff25a 100644
--- a/antarest/study/storage/variantstudy/model/command/create_binding_constraint.py
+++ b/antarest/study/storage/variantstudy/model/command/create_binding_constraint.py
@@ -18,6 +18,7 @@
 from antares.study.version import StudyVersion
 from pydantic import Field, field_validator, model_validator
 
+from antarest.core.model import LowerCaseStr
 from antarest.core.serialization import AntaresBaseModel
 from antarest.matrixstore.model import MatrixData
 from antarest.study.business.all_optional_meta import all_optional_model, camel_case_model
@@ -29,8 +30,11 @@
     BindingConstraintFrequency,
     BindingConstraintOperator,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import validate_filtering
-from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig, transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import (
+    transform_name_to_id,
+    validate_filtering,
+)
+from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.matrix_constants_generator import GeneratorMatrixConstants
 from antarest.study.storage.variantstudy.business.utils import validate_matrix
@@ -117,7 +121,7 @@ def _validate_filtering(cls, v: t.Any) -> str:
 
 
 class BindingConstraintProperties870(BindingConstraintProperties830):
-    group: str = DEFAULT_GROUP
+    group: LowerCaseStr = DEFAULT_GROUP
 
 
 BindingConstraintProperties = t.Union[
@@ -339,8 +343,8 @@ def apply_binding_constraint(
                 elif "." in link_or_cluster:
                     # Cluster IDs are stored in lower case in the binding constraints file.
                     area, cluster_id = link_or_cluster.split(".")
-                    thermal_ids = {thermal.id.lower() for thermal in study_data.config.areas[area].thermals}
-                    if area not in study_data.config.areas or cluster_id.lower() not in thermal_ids:
+                    thermal_ids = {thermal.id for thermal in study_data.config.areas[area].thermals}
+                    if area not in study_data.config.areas or cluster_id not in thermal_ids:
                         return CommandOutput(
                             status=False,
                             message=f"Cluster '{link_or_cluster}' does not exist in binding constraint '{bd_id}'",
diff --git a/antarest/study/storage/variantstudy/model/command/create_cluster.py b/antarest/study/storage/variantstudy/model/command/create_cluster.py
index ab76488049..779d85ee3c 100644
--- a/antarest/study/storage/variantstudy/model/command/create_cluster.py
+++ b/antarest/study/storage/variantstudy/model/command/create_cluster.py
@@ -12,18 +12,19 @@
 
 import typing as t
 
-from pydantic import Field, ValidationInfo, field_validator
+from pydantic import Field, model_validator
 
-from antarest.core.model import JSON
+from antarest.core.model import JSON, LowerCaseStr
 from antarest.core.utils.utils import assert_this
 from antarest.matrixstore.model import MatrixData
 from antarest.study.model import STUDY_VERSION_8_7
-from antarest.study.storage.rawstudy.model.filesystem.config.model import (
-    Area,
-    FileStudyTreeConfig,
-    transform_name_to_id,
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
+from antarest.study.storage.rawstudy.model.filesystem.config.thermal import (
+    ThermalPropertiesType,
+    create_thermal_config,
+    create_thermal_properties,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.thermal import create_thermal_config
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.utils import strip_matrix_protocol, validate_matrix
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
@@ -47,44 +48,30 @@ class CreateCluster(ICommand):
     # ==================
 
     area_id: str
-    cluster_name: str
-    parameters: t.Dict[str, t.Any]
+    cluster_name: LowerCaseStr
+    parameters: ThermalPropertiesType
     prepro: t.Optional[t.Union[t.List[t.List[MatrixData]], str]] = Field(None, validate_default=True)
     modulation: t.Optional[t.Union[t.List[t.List[MatrixData]], str]] = Field(None, validate_default=True)
 
-    @field_validator("cluster_name", mode="before")
-    def validate_cluster_name(cls, val: str) -> str:
-        valid_name = transform_name_to_id(val, lower=False)
-        if valid_name != val:
-            raise ValueError("Cluster name must only contains [a-zA-Z0-9],&,-,_,(,) characters")
-        return val
-
-    @field_validator("prepro", mode="before")
-    def validate_prepro(
-        cls,
-        v: t.Optional[t.Union[t.List[t.List[MatrixData]], str]],
-        values: t.Union[t.Dict[str, t.Any], ValidationInfo],
-    ) -> t.Optional[t.Union[t.List[t.List[MatrixData]], str]]:
-        new_values = values if isinstance(values, dict) else values.data
-        if v is None:
-            v = new_values["command_context"].generator_matrix_constants.get_thermal_prepro_data()
-            return v
+    @model_validator(mode="before")
+    def validate_model(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
+        # Validate parameters
+        args = {"name": values["cluster_name"], **values["parameters"]}
+        values["parameters"] = create_thermal_properties(values["study_version"], **args)
+
+        # Validate prepro
+        if "prepro" in values:
+            values["prepro"] = validate_matrix(values["prepro"], values)
         else:
-            return validate_matrix(v, new_values)
-
-    @field_validator("modulation", mode="before")
-    def validate_modulation(
-        cls,
-        v: t.Optional[t.Union[t.List[t.List[MatrixData]], str]],
-        values: t.Union[t.Dict[str, t.Any], ValidationInfo],
-    ) -> t.Optional[t.Union[t.List[t.List[MatrixData]], str]]:
-        new_values = values if isinstance(values, dict) else values.data
-        if v is None:
-            v = new_values["command_context"].generator_matrix_constants.get_thermal_prepro_modulation()
-            return v
+            values["prepro"] = values["command_context"].generator_matrix_constants.get_thermal_prepro_data()
 
+        # Validate modulation
+        if "modulation" in values:
+            values["modulation"] = validate_matrix(values["modulation"], values)
         else:
-            return validate_matrix(v, new_values)
+            values["modulation"] = values["command_context"].generator_matrix_constants.get_thermal_prepro_modulation()
+
+        return values
 
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         # Search the Area in the configuration
@@ -125,12 +112,11 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         if not output.status:
             return output
 
-        # default values
-        self.parameters.setdefault("name", self.cluster_name)
+        version = study_data.config.version
 
         cluster_id = data["cluster_id"]
         config = study_data.tree.get(["input", "thermal", "clusters", self.area_id, "list"])
-        config[cluster_id] = self.parameters
+        config[cluster_id] = self.parameters.model_dump(mode="json", by_alias=True)
 
         # Series identifiers are in lower case.
         series_id = cluster_id.lower()
@@ -151,7 +137,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
                 }
             }
         }
-        if study_data.config.version >= STUDY_VERSION_8_7:
+        if version >= STUDY_VERSION_8_7:
             new_cluster_data["input"]["thermal"]["series"][self.area_id][series_id]["CO2Cost"] = null_matrix
             new_cluster_data["input"]["thermal"]["series"][self.area_id][series_id]["fuelCost"] = null_matrix
         study_data.tree.save(new_cluster_data)
@@ -164,7 +150,7 @@ def to_dto(self) -> CommandDTO:
             args={
                 "area_id": self.area_id,
                 "cluster_name": self.cluster_name,
-                "parameters": self.parameters,
+                "parameters": self.parameters.model_dump(mode="json", by_alias=True),
                 "prepro": strip_matrix_protocol(self.prepro),
                 "modulation": strip_matrix_protocol(self.modulation),
             },
@@ -186,9 +172,11 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
         simple_match = self.area_id == other.area_id and self.cluster_name == other.cluster_name
         if not equal:
             return simple_match
+        self_params = self.parameters.model_dump(mode="json", by_alias=True)
+        other_params = other.parameters.model_dump(mode="json", by_alias=True)
         return (
             simple_match
-            and self.parameters == other.parameters
+            and self_params == other_params
             and self.prepro == other.prepro
             and self.modulation == other.modulation
         )
@@ -199,7 +187,7 @@ def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         from antarest.study.storage.variantstudy.model.command.update_config import UpdateConfig
 
         # Series identifiers are in lower case.
-        series_id = transform_name_to_id(self.cluster_name, lower=True)
+        series_id = transform_name_to_id(self.cluster_name)
         commands: t.List[ICommand] = []
         if self.prepro != other.prepro:
             commands.append(
@@ -219,11 +207,13 @@ def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
                     study_version=self.study_version,
                 )
             )
-        if self.parameters != other.parameters:
+        self_params = self.parameters.model_dump(mode="json", by_alias=True)
+        other_params = other.parameters.model_dump(mode="json", by_alias=True)
+        if self_params != other_params:
             commands.append(
                 UpdateConfig(
                     target=f"input/thermal/clusters/{self.area_id}/list/{self.cluster_name}",
-                    data=other.parameters,
+                    data=other_params,
                     command_context=self.command_context,
                     study_version=self.study_version,
                 )
diff --git a/antarest/study/storage/variantstudy/model/command/create_district.py b/antarest/study/storage/variantstudy/model/command/create_district.py
index 5ed1fc8469..e8ed7f69d9 100644
--- a/antarest/study/storage/variantstudy/model/command/create_district.py
+++ b/antarest/study/storage/variantstudy/model/command/create_district.py
@@ -15,11 +15,9 @@
 
 from pydantic import field_validator
 
-from antarest.study.storage.rawstudy.model.filesystem.config.model import (
-    DistrictSet,
-    FileStudyTreeConfig,
-    transform_name_to_id,
-)
+from antarest.core.model import LowerCaseStr
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.model import DistrictSet, FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
 from antarest.study.storage.variantstudy.model.command.icommand import MATCH_SIGNATURE_SEPARATOR, ICommand
@@ -52,13 +50,6 @@ class CreateDistrict(ICommand):
     output: bool = True
     comments: str = ""
 
-    @field_validator("name")
-    def validate_district_name(cls, val: str) -> str:
-        valid_name = transform_name_to_id(val, lower=False)
-        if valid_name != val:
-            raise ValueError("Area name must only contains [a-zA-Z0-9],&,-,_,(,) characters")
-        return val
-
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         district_id = transform_name_to_id(self.name)
         if district_id in study_data.sets:
diff --git a/antarest/study/storage/variantstudy/model/command/create_renewables_cluster.py b/antarest/study/storage/variantstudy/model/command/create_renewables_cluster.py
index 9a1413665b..6c0c6381c8 100644
--- a/antarest/study/storage/variantstudy/model/command/create_renewables_cluster.py
+++ b/antarest/study/storage/variantstudy/model/command/create_renewables_cluster.py
@@ -12,16 +12,15 @@
 
 import typing as t
 
-from pydantic import field_validator
-
-from antarest.core.model import JSON
-from antarest.study.storage.rawstudy.model.filesystem.config.model import (
-    Area,
-    EnrModelling,
-    FileStudyTreeConfig,
-    transform_name_to_id,
+from pydantic import model_validator
+
+from antarest.core.model import JSON, LowerCaseStr
+from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, EnrModelling, FileStudyTreeConfig
+from antarest.study.storage.rawstudy.model.filesystem.config.renewable import (
+    RenewableProperties,
+    create_renewable_config,
+    create_renewable_properties,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.renewable import create_renewable_config
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
 from antarest.study.storage.variantstudy.model.command.icommand import MATCH_SIGNATURE_SEPARATOR, ICommand
@@ -44,15 +43,15 @@ class CreateRenewablesCluster(ICommand):
     # ==================
 
     area_id: str
-    cluster_name: str
-    parameters: t.Dict[str, t.Any]
+    cluster_name: LowerCaseStr
+    parameters: RenewableProperties
 
-    @field_validator("cluster_name")
-    def validate_cluster_name(cls, val: str) -> str:
-        valid_name = transform_name_to_id(val, lower=False)
-        if valid_name != val:
-            raise ValueError("Area name must only contains [a-zA-Z0-9],&,-,_,(,) characters")
-        return val
+    @model_validator(mode="before")
+    def validate_model(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
+        # Validate parameters
+        args = {"name": values["cluster_name"], **values["parameters"]}
+        values["parameters"] = create_renewable_properties(values["study_version"], **args)
+        return values
 
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         if EnrModelling(study_data.enr_modelling) != EnrModelling.CLUSTERS:
@@ -106,14 +105,9 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         if not output.status:
             return output
 
-        # default values
-        if "ts-interpretation" not in self.parameters:
-            self.parameters["ts-interpretation"] = "power-generation"
-        self.parameters.setdefault("name", self.cluster_name)
-
         cluster_id = data["cluster_id"]
         config = study_data.tree.get(["input", "renewables", "clusters", self.area_id, "list"])
-        config[cluster_id] = self.parameters
+        config[cluster_id] = self.parameters.model_dump(mode="json", by_alias=True)
 
         # Series identifiers are in lower case.
         series_id = cluster_id.lower()
@@ -139,7 +133,7 @@ def to_dto(self) -> CommandDTO:
             args={
                 "area_id": self.area_id,
                 "cluster_name": self.cluster_name,
-                "parameters": self.parameters,
+                "parameters": self.parameters.model_dump(mode="json", by_alias=True),
             },
             study_version=self.study_version,
         )
@@ -159,18 +153,22 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
         simple_match = self.area_id == other.area_id and self.cluster_name == other.cluster_name
         if not equal:
             return simple_match
-        return simple_match and self.parameters == other.parameters
+        self_params = self.parameters.model_dump(mode="json", by_alias=True)
+        other_params = other.parameters.model_dump(mode="json", by_alias=True)
+        return simple_match and self_params == other_params
 
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         other = t.cast(CreateRenewablesCluster, other)
         from antarest.study.storage.variantstudy.model.command.update_config import UpdateConfig
 
         commands: t.List[ICommand] = []
-        if self.parameters != other.parameters:
+        self_params = self.parameters.model_dump(mode="json", by_alias=True)
+        other_params = other.parameters.model_dump(mode="json", by_alias=True)
+        if self_params != other_params:
             commands.append(
                 UpdateConfig(
                     target=f"input/renewables/clusters/{self.area_id}/list/{self.cluster_name}",
-                    data=other.parameters,
+                    data=other_params,
                     command_context=self.command_context,
                     study_version=self.study_version,
                 )
diff --git a/antarest/study/storage/variantstudy/model/command/create_st_storage.py b/antarest/study/storage/variantstudy/model/command/create_st_storage.py
index ae39cf8c28..8d15d5c625 100644
--- a/antarest/study/storage/variantstudy/model/command/create_st_storage.py
+++ b/antarest/study/storage/variantstudy/model/command/create_st_storage.py
@@ -15,11 +15,16 @@
 import numpy as np
 from pydantic import Field, ValidationInfo, model_validator
 
-from antarest.core.model import JSON
+from antarest.core.model import JSON, LowerCaseStr
 from antarest.matrixstore.model import MatrixData
 from antarest.study.model import STUDY_VERSION_8_6
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
-from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import STStorageConfigType
+from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import (
+    STStoragePropertiesType,
+    create_st_storage_config,
+    create_st_storage_properties,
+)
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.matrix_constants_generator import GeneratorMatrixConstants
 from antarest.study.storage.variantstudy.business.utils import strip_matrix_protocol, validate_matrix
@@ -58,8 +63,8 @@ class CreateSTStorage(ICommand):
     # Command parameters
     # ==================
 
-    area_id: str = Field(description="Area ID", pattern=r"[a-z0-9_(),& -]+")
-    parameters: STStorageConfigType
+    area_id: LowerCaseStr = Field(description="Area ID", pattern=r"[a-z0-9_(),& -]+")
+    parameters: STStoragePropertiesType
     pmax_injection: t.Optional[t.Union[MatrixType, str]] = Field(
         default=None,
         description="Charge capacity (modulation)",
@@ -84,13 +89,18 @@ class CreateSTStorage(ICommand):
     @property
     def storage_id(self) -> str:
         """The normalized version of the storage's name used as the ID."""
-        return self.parameters.id
+        return transform_name_to_id(self.storage_name)
 
     @property
     def storage_name(self) -> str:
         """The label representing the name of the storage for the user."""
         return self.parameters.name
 
+    @model_validator(mode="before")
+    def validate_model(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
+        values["parameters"] = create_st_storage_properties(values["study_version"], **values["parameters"])
+        return values
+
     @staticmethod
     def validate_field(
         v: t.Optional[t.Union[MatrixType, str]], values: t.Dict[str, t.Any], field: str
@@ -173,6 +183,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
         """
 
         # Check if the study version is above the minimum required version.
+        storage_id = self.storage_id
         version = study_data.version
         if version < REQUIRED_VERSION:
             return (
@@ -195,7 +206,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
         area: Area = study_data.areas[self.area_id]
 
         # Check if the short-term storage already exists in the area
-        if any(s.id == self.storage_id for s in area.st_storages):
+        if any(s.id == storage_id for s in area.st_storages):
             return (
                 CommandOutput(
                     status=False,
@@ -205,14 +216,17 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
             )
 
         # Create a new short-term storage and add it to the area
-        area.st_storages.append(self.parameters)
+        storage_config = create_st_storage_config(
+            self.study_version, **self.parameters.model_dump(mode="json", by_alias=True)
+        )
+        area.st_storages.append(storage_config)
 
         return (
             CommandOutput(
                 status=True,
                 message=f"Short-term st_storage '{self.storage_name}' successfully added to area '{self.area_id}'.",
             ),
-            {"storage_id": self.storage_id},
+            {"storage_id": storage_id},
         )
 
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
@@ -227,6 +241,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         Returns:
             The output of the command execution.
         """
+        storage_id = self.storage_id
         output, _ = self._apply_config(study_data.config)
         if not output.status:
             return output
@@ -234,13 +249,13 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         # Fill-in the "list.ini" file with the parameters.
         # On creation, it's better to write all the parameters in the file.
         config = study_data.tree.get(["input", "st-storage", "clusters", self.area_id, "list"])
-        config[self.storage_id] = self.parameters.model_dump(mode="json", by_alias=True, exclude={"id"})
+        config[storage_id] = self.parameters.model_dump(mode="json", by_alias=True)
 
         new_data: JSON = {
             "input": {
                 "st-storage": {
                     "clusters": {self.area_id: {"list": config}},
-                    "series": {self.area_id: {self.storage_id: {attr: getattr(self, attr) for attr in _MATRIX_NAMES}}},
+                    "series": {self.area_id: {storage_id: {attr: getattr(self, attr) for attr in _MATRIX_NAMES}}},
                 }
             }
         }
@@ -256,12 +271,11 @@ def to_dto(self) -> CommandDTO:
         Returns:
             The DTO object representing the current command.
         """
-        parameters = self.parameters.model_dump(mode="json", by_alias=True, exclude={"id"})
         return CommandDTO(
             action=self.command_name.value,
             args={
                 "area_id": self.area_id,
-                "parameters": parameters,
+                "parameters": self.parameters.model_dump(mode="json", by_alias=True),
                 **{attr: strip_matrix_protocol(getattr(self, attr)) for attr in _MATRIX_NAMES},
             },
             study_version=self.study_version,
@@ -312,9 +326,10 @@ def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         from antarest.study.storage.variantstudy.model.command.update_config import UpdateConfig
 
         other = t.cast(CreateSTStorage, other)
+        storage_id = self.storage_id
         commands: t.List[ICommand] = [
             ReplaceMatrix(
-                target=f"input/st-storage/series/{self.area_id}/{self.storage_id}/{attr}",
+                target=f"input/st-storage/series/{self.area_id}/{storage_id}/{attr}",
                 matrix=strip_matrix_protocol(getattr(other, attr)),
                 command_context=self.command_context,
                 study_version=self.study_version,
@@ -322,12 +337,13 @@ def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
             for attr in _MATRIX_NAMES
             if getattr(self, attr) != getattr(other, attr)
         ]
-        if self.parameters != other.parameters:
-            data: t.Dict[str, t.Any] = other.parameters.model_dump(mode="json", by_alias=True, exclude={"id"})
+        self_params = self.parameters.model_dump(mode="json", by_alias=True)
+        other_params = other.parameters.model_dump(mode="json", by_alias=True)
+        if self_params != other_params:
             commands.append(
                 UpdateConfig(
-                    target=f"input/st-storage/clusters/{self.area_id}/list/{self.storage_id}",
-                    data=data,
+                    target=f"input/st-storage/clusters/{self.area_id}/list/{storage_id}",
+                    data=other_params,
                     command_context=self.command_context,
                     study_version=self.study_version,
                 )
diff --git a/antarest/study/storage/variantstudy/model/command/remove_cluster.py b/antarest/study/storage/variantstudy/model/command/remove_cluster.py
index eba5aec285..b64bbdfc39 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_cluster.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_cluster.py
@@ -12,6 +12,9 @@
 
 import typing as t
 
+from pydantic import Field
+
+from antarest.core.model import LowerCaseStr
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.utils_binding_constraint import (
@@ -38,7 +41,7 @@ class RemoveCluster(ICommand):
     # ==================
 
     area_id: str
-    cluster_id: str
+    cluster_id: LowerCaseStr = Field(description="Cluster ID", pattern=r"[a-z0-9_(),& -]+")
 
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         """
diff --git a/antarest/study/storage/variantstudy/model/command/remove_link.py b/antarest/study/storage/variantstudy/model/command/remove_link.py
index e1cee3a518..9b372e906f 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_link.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_link.py
@@ -15,7 +15,8 @@
 from pydantic import field_validator, model_validator
 
 from antarest.study.model import STUDY_VERSION_8_2
-from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig, transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
 from antarest.study.storage.variantstudy.model.command.icommand import MATCH_SIGNATURE_SEPARATOR, ICommand, OutputTuple
@@ -46,7 +47,7 @@ class RemoveLink(ICommand):
     def _validate_id(cls, area: str) -> str:
         if isinstance(area, str):
             # Area IDs must be in lowercase and not empty.
-            area_id = transform_name_to_id(area, lower=True)
+            area_id = transform_name_to_id(area)
             if area_id:
                 return area_id
             # Valid characters are `[a-zA-Z0-9_(),& -]` (including space).
diff --git a/antarest/study/storage/variantstudy/model/command/remove_renewables_cluster.py b/antarest/study/storage/variantstudy/model/command/remove_renewables_cluster.py
index bb378fc1d1..592b75bfbb 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_renewables_cluster.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_renewables_cluster.py
@@ -12,6 +12,10 @@
 
 import typing as t
 
+from pydantic import Field, field_validator
+
+from antarest.core.model import LowerCaseStr
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import validate_id_against_name
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
@@ -35,7 +39,7 @@ class RemoveRenewablesCluster(ICommand):
     # ==================
 
     area_id: str
-    cluster_id: str
+    cluster_id: LowerCaseStr = Field(description="Cluster ID", pattern=r"[a-z0-9_(),& -]+")
 
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         """
diff --git a/antarest/study/storage/variantstudy/model/command/remove_st_storage.py b/antarest/study/storage/variantstudy/model/command/remove_st_storage.py
index b369612ace..f27ebc5a58 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_st_storage.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_st_storage.py
@@ -14,6 +14,7 @@
 
 from pydantic import Field
 
+from antarest.core.model import LowerCaseStr
 from antarest.study.model import STUDY_VERSION_8_6
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
@@ -41,7 +42,7 @@ class RemoveSTStorage(ICommand):
     # ==================
 
     area_id: str = Field(description="Area ID", pattern=r"[a-z0-9_(),& -]+")
-    storage_id: str = Field(description="Short term storage ID", pattern=r"[a-z0-9_(),& -]+")
+    storage_id: LowerCaseStr = Field(description="Short term storage ID", pattern=r"[a-z0-9_(),& -]+")
 
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         """
diff --git a/antarest/study/web/study_data_blueprint.py b/antarest/study/web/study_data_blueprint.py
index 9f267df774..ba9d2034a4 100644
--- a/antarest/study/web/study_data_blueprint.py
+++ b/antarest/study/web/study_data_blueprint.py
@@ -21,7 +21,7 @@
 
 from antarest.core.config import Config
 from antarest.core.jwt import JWTUser
-from antarest.core.model import JSON, StudyPermissionType
+from antarest.core.model import JSON, LowerCaseStr, StudyPermissionType
 from antarest.core.requests import RequestParameters
 from antarest.core.utils.utils import sanitize_uuid
 from antarest.core.utils.web import APITag
@@ -81,7 +81,7 @@
     BindingConstraintFrequency,
     BindingConstraintOperator,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.ruleset_matrices import TableForm as SBTableForm
 
 logger = logging.getLogger(__name__)
@@ -1955,7 +1955,7 @@ def create_renewable_cluster(
     def update_renewable_cluster(
         uuid: str,
         area_id: str,
-        cluster_id: str,
+        cluster_id: LowerCaseStr,
         cluster_data: RenewableClusterInput,
         current_user: JWTUser = Depends(auth.get_current_user),
     ) -> RenewableClusterOutput:
@@ -2129,7 +2129,7 @@ def create_thermal_cluster(
     def update_thermal_cluster(
         uuid: str,
         area_id: str,
-        cluster_id: str,
+        cluster_id: LowerCaseStr,
         cluster_data: ThermalClusterInput,
         current_user: JWTUser = Depends(auth.get_current_user),
     ) -> ThermalClusterOutput:
@@ -2556,8 +2556,8 @@ def duplicate_cluster(
         uuid: str,
         area_id: str,
         cluster_type: ClusterType,
-        source_cluster_id: str,
-        new_cluster_name: str = Query(..., alias="newName", title="New Cluster Name"),
+        source_cluster_id: LowerCaseStr,
+        new_cluster_name: LowerCaseStr = Query(..., alias="newName", title="New Cluster Name"),
         current_user: JWTUser = Depends(auth.get_current_user),
     ) -> t.Union[STStorageOutput, ThermalClusterOutput, RenewableClusterOutput]:
         logger.info(
diff --git a/tests/integration/assets/base_study.zip b/tests/integration/assets/base_study.zip
index 3b282beb1693044a666fc204fee083eb453c18ba..95665329911994489ba14d3331315d03ca2909b9 100644
GIT binary patch
delta 75253
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
Y`F;IRgrkn54)(E+&y}`t0*BB41AqhW$N&HU

delta 61139
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
X^Tt&LC^(Kgk2`a}aX97yhQslH2yMnz

diff --git a/tests/integration/assets/variant_study.zip b/tests/integration/assets/variant_study.zip
index 4526fc900f0abdfa80347895cd8880f9fe986eb9..9cfb20f19e0c1b7a02be8955bbd64c1375535e64 100644
GIT binary patch
literal 309622
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

literal 311282
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
PGd_*4G0Z0PYZ&JLI8X)c

diff --git a/tests/integration/studies_blueprint/assets/test_synthesis/raw_study.synthesis.json b/tests/integration/studies_blueprint/assets/test_synthesis/raw_study.synthesis.json
index c0d5635c70..a164d8a163 100644
--- a/tests/integration/studies_blueprint/assets/test_synthesis/raw_study.synthesis.json
+++ b/tests/integration/studies_blueprint/assets/test_synthesis/raw_study.synthesis.json
@@ -18,7 +18,7 @@
       "thermals": [
         {
           "id": "01_solar",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "01_solar",
           "enabled": true,
           "unitcount": 1,
@@ -42,7 +42,7 @@
         },
         {
           "id": "02_wind_on",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "02_wind_on",
           "enabled": true,
           "unitcount": 1,
@@ -66,7 +66,7 @@
         },
         {
           "id": "03_wind_off",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "03_wind_off",
           "enabled": true,
           "unitcount": 1,
@@ -90,7 +90,7 @@
         },
         {
           "id": "04_res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "04_res",
           "enabled": true,
           "unitcount": 1,
@@ -114,7 +114,7 @@
         },
         {
           "id": "05_nuclear",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "05_nuclear",
           "enabled": true,
           "unitcount": 1,
@@ -138,7 +138,7 @@
         },
         {
           "id": "06_coal",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "06_coal",
           "enabled": true,
           "unitcount": 1,
@@ -162,7 +162,7 @@
         },
         {
           "id": "07_gas",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "07_gas",
           "enabled": true,
           "unitcount": 1,
@@ -186,7 +186,7 @@
         },
         {
           "id": "08_non-res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "08_non-res",
           "enabled": true,
           "unitcount": 1,
@@ -210,7 +210,7 @@
         },
         {
           "id": "09_hydro_pump",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "09_hydro_pump",
           "enabled": true,
           "unitcount": 1,
@@ -258,7 +258,7 @@
       "thermals": [
         {
           "id": "01_solar",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "01_solar",
           "enabled": true,
           "unitcount": 1,
@@ -282,7 +282,7 @@
         },
         {
           "id": "02_wind_on",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "02_wind_on",
           "enabled": true,
           "unitcount": 1,
@@ -306,7 +306,7 @@
         },
         {
           "id": "03_wind_off",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "03_wind_off",
           "enabled": true,
           "unitcount": 1,
@@ -330,7 +330,7 @@
         },
         {
           "id": "04_res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "04_res",
           "enabled": true,
           "unitcount": 1,
@@ -354,7 +354,7 @@
         },
         {
           "id": "05_nuclear",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "05_nuclear",
           "enabled": true,
           "unitcount": 1,
@@ -378,7 +378,7 @@
         },
         {
           "id": "06_coal",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "06_coal",
           "enabled": true,
           "unitcount": 1,
@@ -402,7 +402,7 @@
         },
         {
           "id": "07_gas",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "07_gas",
           "enabled": true,
           "unitcount": 1,
@@ -426,7 +426,7 @@
         },
         {
           "id": "08_non-res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "08_non-res",
           "enabled": true,
           "unitcount": 1,
@@ -450,7 +450,7 @@
         },
         {
           "id": "09_hydro_pump",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "09_hydro_pump",
           "enabled": true,
           "unitcount": 1,
@@ -498,7 +498,7 @@
       "thermals": [
         {
           "id": "01_solar",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "01_solar",
           "enabled": true,
           "unitcount": 1,
@@ -522,7 +522,7 @@
         },
         {
           "id": "02_wind_on",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "02_wind_on",
           "enabled": true,
           "unitcount": 1,
@@ -546,7 +546,7 @@
         },
         {
           "id": "03_wind_off",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "03_wind_off",
           "enabled": true,
           "unitcount": 1,
@@ -570,7 +570,7 @@
         },
         {
           "id": "04_res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "04_res",
           "enabled": true,
           "unitcount": 1,
@@ -594,7 +594,7 @@
         },
         {
           "id": "05_nuclear",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "05_nuclear",
           "enabled": true,
           "unitcount": 1,
@@ -618,7 +618,7 @@
         },
         {
           "id": "06_coal",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "06_coal",
           "enabled": true,
           "unitcount": 1,
@@ -642,7 +642,7 @@
         },
         {
           "id": "07_gas",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "07_gas",
           "enabled": true,
           "unitcount": 1,
@@ -666,7 +666,7 @@
         },
         {
           "id": "08_non-res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "08_non-res",
           "enabled": true,
           "unitcount": 1,
@@ -690,7 +690,7 @@
         },
         {
           "id": "09_hydro_pump",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "09_hydro_pump",
           "enabled": true,
           "unitcount": 1,
@@ -726,7 +726,7 @@
       "thermals": [
         {
           "id": "01_solar",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "01_solar",
           "enabled": true,
           "unitcount": 1,
@@ -750,7 +750,7 @@
         },
         {
           "id": "02_wind_on",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "02_wind_on",
           "enabled": true,
           "unitcount": 1,
@@ -774,7 +774,7 @@
         },
         {
           "id": "03_wind_off",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "03_wind_off",
           "enabled": true,
           "unitcount": 1,
@@ -798,7 +798,7 @@
         },
         {
           "id": "04_res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "04_res",
           "enabled": true,
           "unitcount": 1,
@@ -822,7 +822,7 @@
         },
         {
           "id": "05_nuclear",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "05_nuclear",
           "enabled": true,
           "unitcount": 1,
@@ -846,7 +846,7 @@
         },
         {
           "id": "06_coal",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "06_coal",
           "enabled": true,
           "unitcount": 1,
@@ -870,7 +870,7 @@
         },
         {
           "id": "07_gas",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "07_gas",
           "enabled": true,
           "unitcount": 1,
@@ -894,7 +894,7 @@
         },
         {
           "id": "08_non-res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "08_non-res",
           "enabled": true,
           "unitcount": 1,
@@ -918,7 +918,7 @@
         },
         {
           "id": "09_hydro_pump",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "09_hydro_pump",
           "enabled": true,
           "unitcount": 1,
diff --git a/tests/integration/studies_blueprint/assets/test_synthesis/variant_study.synthesis.json b/tests/integration/studies_blueprint/assets/test_synthesis/variant_study.synthesis.json
index 2d3c3baf2a..f16fba25eb 100644
--- a/tests/integration/studies_blueprint/assets/test_synthesis/variant_study.synthesis.json
+++ b/tests/integration/studies_blueprint/assets/test_synthesis/variant_study.synthesis.json
@@ -18,7 +18,7 @@
       "thermals": [
         {
           "id": "01_solar",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "01_solar",
           "enabled": true,
           "unitcount": 1,
@@ -42,7 +42,7 @@
         },
         {
           "id": "02_wind_on",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "02_wind_on",
           "enabled": true,
           "unitcount": 1,
@@ -66,7 +66,7 @@
         },
         {
           "id": "03_wind_off",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "03_wind_off",
           "enabled": true,
           "unitcount": 1,
@@ -90,7 +90,7 @@
         },
         {
           "id": "04_res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "04_res",
           "enabled": true,
           "unitcount": 1,
@@ -114,7 +114,7 @@
         },
         {
           "id": "05_nuclear",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "05_nuclear",
           "enabled": true,
           "unitcount": 1,
@@ -138,7 +138,7 @@
         },
         {
           "id": "06_coal",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "06_coal",
           "enabled": true,
           "unitcount": 1,
@@ -162,7 +162,7 @@
         },
         {
           "id": "07_gas",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "07_gas",
           "enabled": true,
           "unitcount": 1,
@@ -186,7 +186,7 @@
         },
         {
           "id": "08_non-res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "08_non-res",
           "enabled": true,
           "unitcount": 1,
@@ -210,7 +210,7 @@
         },
         {
           "id": "09_hydro_pump",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "09_hydro_pump",
           "enabled": true,
           "unitcount": 1,
@@ -258,7 +258,7 @@
       "thermals": [
         {
           "id": "01_solar",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "01_solar",
           "enabled": true,
           "unitcount": 1,
@@ -282,7 +282,7 @@
         },
         {
           "id": "02_wind_on",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "02_wind_on",
           "enabled": true,
           "unitcount": 1,
@@ -306,7 +306,7 @@
         },
         {
           "id": "03_wind_off",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "03_wind_off",
           "enabled": true,
           "unitcount": 1,
@@ -330,7 +330,7 @@
         },
         {
           "id": "04_res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "04_res",
           "enabled": true,
           "unitcount": 1,
@@ -354,7 +354,7 @@
         },
         {
           "id": "05_nuclear",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "05_nuclear",
           "enabled": true,
           "unitcount": 1,
@@ -378,7 +378,7 @@
         },
         {
           "id": "06_coal",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "06_coal",
           "enabled": true,
           "unitcount": 1,
@@ -402,7 +402,7 @@
         },
         {
           "id": "07_gas",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "07_gas",
           "enabled": true,
           "unitcount": 1,
@@ -426,7 +426,7 @@
         },
         {
           "id": "08_non-res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "08_non-res",
           "enabled": true,
           "unitcount": 1,
@@ -450,7 +450,7 @@
         },
         {
           "id": "09_hydro_pump",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "09_hydro_pump",
           "enabled": true,
           "unitcount": 1,
@@ -498,7 +498,7 @@
       "thermals": [
         {
           "id": "01_solar",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "01_solar",
           "enabled": true,
           "unitcount": 1,
@@ -522,7 +522,7 @@
         },
         {
           "id": "02_wind_on",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "02_wind_on",
           "enabled": true,
           "unitcount": 1,
@@ -546,7 +546,7 @@
         },
         {
           "id": "03_wind_off",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "03_wind_off",
           "enabled": true,
           "unitcount": 1,
@@ -570,7 +570,7 @@
         },
         {
           "id": "04_res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "04_res",
           "enabled": true,
           "unitcount": 1,
@@ -594,7 +594,7 @@
         },
         {
           "id": "05_nuclear",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "05_nuclear",
           "enabled": true,
           "unitcount": 1,
@@ -618,7 +618,7 @@
         },
         {
           "id": "06_coal",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "06_coal",
           "enabled": true,
           "unitcount": 1,
@@ -642,7 +642,7 @@
         },
         {
           "id": "07_gas",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "07_gas",
           "enabled": true,
           "unitcount": 1,
@@ -666,7 +666,7 @@
         },
         {
           "id": "08_non-res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "08_non-res",
           "enabled": true,
           "unitcount": 1,
@@ -690,7 +690,7 @@
         },
         {
           "id": "09_hydro_pump",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "09_hydro_pump",
           "enabled": true,
           "unitcount": 1,
@@ -726,7 +726,7 @@
       "thermals": [
         {
           "id": "01_solar",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "01_solar",
           "enabled": true,
           "unitcount": 1,
@@ -750,7 +750,7 @@
         },
         {
           "id": "02_wind_on",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "02_wind_on",
           "enabled": true,
           "unitcount": 1,
@@ -774,7 +774,7 @@
         },
         {
           "id": "03_wind_off",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "03_wind_off",
           "enabled": true,
           "unitcount": 1,
@@ -798,7 +798,7 @@
         },
         {
           "id": "04_res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "04_res",
           "enabled": true,
           "unitcount": 1,
@@ -822,7 +822,7 @@
         },
         {
           "id": "05_nuclear",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "05_nuclear",
           "enabled": true,
           "unitcount": 1,
@@ -846,7 +846,7 @@
         },
         {
           "id": "06_coal",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "06_coal",
           "enabled": true,
           "unitcount": 1,
@@ -870,7 +870,7 @@
         },
         {
           "id": "07_gas",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "07_gas",
           "enabled": true,
           "unitcount": 1,
@@ -894,7 +894,7 @@
         },
         {
           "id": "08_non-res",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "08_non-res",
           "enabled": true,
           "unitcount": 1,
@@ -918,7 +918,7 @@
         },
         {
           "id": "09_hydro_pump",
-          "group": "Other 1",
+          "group": "other 1",
           "name": "09_hydro_pump",
           "enabled": true,
           "unitcount": 1,
diff --git a/tests/integration/study_data_blueprint/test_binding_constraints.py b/tests/integration/study_data_blueprint/test_binding_constraints.py
index c5e8d17b5b..36fe4602e5 100644
--- a/tests/integration/study_data_blueprint/test_binding_constraints.py
+++ b/tests/integration/study_data_blueprint/test_binding_constraints.py
@@ -192,8 +192,8 @@ def test_lifecycle__nominal(self, client: TestClient, user_access_token: str, st
         clusters_list = preparer.get_thermals(study_id, area1_id)
         assert len(clusters_list) == 1
         assert clusters_list[0]["id"] == cluster_id
-        assert clusters_list[0]["name"] == "Cluster 1"
-        assert clusters_list[0]["group"] == "Nuclear"
+        assert clusters_list[0]["name"] == "cluster 1"
+        assert clusters_list[0]["group"] == "nuclear"
 
         if study_type == "variant":
             study_id = preparer.create_variant(study_id, name="Variant 1")
@@ -635,7 +635,7 @@ def test_for_version_870(self, client: TestClient, user_access_token: str, study
         # Creation of bc with a group
         bc_id_w_group = "binding_constraint_2"
         args["operator"], operator_2 = "greater", "gt"
-        properties = preparer.create_binding_constraint(study_id, name=bc_id_w_group, group="specific_grp", **args)
+        properties = preparer.create_binding_constraint(study_id, name=bc_id_w_group, group="Specific_GRP", **args)
         assert properties["group"] == "specific_grp"
 
         # Creation of bc with a matrix
@@ -805,13 +805,13 @@ def test_for_version_870(self, client: TestClient, user_access_token: str, study
         # =============================
 
         # Add a group
-        grp_name = "random_grp"
+        grp_name = "RandOM_grp"
         res = client.put(
             f"/v1/studies/{study_id}/bindingconstraints/{bc_id_w_matrix}",
             json={"group": grp_name},
         )
         assert res.status_code == 200, res.json()
-        assert res.json()["group"] == grp_name
+        assert res.json()["group"] == grp_name.lower()
 
         # check that updating of a binding constraint that has an operator "equal"
         # with a greater matrix will raise an error 422
@@ -1131,15 +1131,15 @@ def test_for_version_870(self, client: TestClient, user_access_token: str, study
         res = client.get(f"/v1/studies/{study_id}/constraint-groups")
         assert res.status_code in {200, 201}, res.json()
         groups = res.json()
-        assert set(groups) == {"default", "random_grp", "Group 1", "Group 2"}
-        assert groups["Group 2"] == [
+        assert set(groups) == {"default", "random_grp", "group 1", "group 2"}
+        assert groups["group 2"] == [
             {
                 "comments": "New API",
                 "terms": [],
                 "enabled": True,
                 "filterSynthesis": "",
                 "filterYearByYear": "",
-                "group": "Group 2",
+                "group": "group 2",
                 "id": "second bc",
                 "name": "Second BC",
                 "operator": "less",
diff --git a/tests/integration/study_data_blueprint/test_renewable.py b/tests/integration/study_data_blueprint/test_renewable.py
index 8e3fb8051b..cc962d09c7 100644
--- a/tests/integration/study_data_blueprint/test_renewable.py
+++ b/tests/integration/study_data_blueprint/test_renewable.py
@@ -45,7 +45,7 @@
 
 from antarest.core.tasks.model import TaskStatus
 from antarest.core.utils.string import to_camel_case
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.renewable import RenewableProperties
 from tests.integration.utils import wait_task_completion
 
@@ -129,9 +129,14 @@ def test_lifecycle(
         )
         assert res.status_code == 200, res.json()
         fr_solar_pv_id = res.json()["id"]
-        assert fr_solar_pv_id == transform_name_to_id(fr_solar_pv, lower=False)
+        assert fr_solar_pv_id == transform_name_to_id(fr_solar_pv)
         # noinspection SpellCheckingInspection
-        fr_solar_pv_cfg = {"id": fr_solar_pv_id, **fr_solar_pv_props}
+        fr_solar_pv_cfg = {
+            "id": fr_solar_pv_id,
+            **fr_solar_pv_props,
+            "name": fr_solar_pv.lower(),
+            "group": fr_solar_pv_props["group"].lower(),
+        }
         assert res.json() == fr_solar_pv_cfg
 
         # reading the properties of a renewable cluster
@@ -177,18 +182,19 @@ def test_lifecycle(
         assert res.json() == EXISTING_CLUSTERS + [fr_solar_pv_cfg]
 
         # updating properties
+        old_name = "fr solar pv old 1"
         res = client.patch(
             f"/v1/studies/{internal_study_id}/areas/{area_id}/clusters/renewable/{fr_solar_pv_id}",
             headers={"Authorization": f"Bearer {user_access_token}"},
             json={
-                "name": "FR Solar pv old 1",
+                "name": old_name,
                 "nominalCapacity": 5132,
             },
         )
         assert res.status_code == 200, res.json()
         fr_solar_pv_cfg = {
             **fr_solar_pv_cfg,
-            "name": "FR Solar pv old 1",
+            "name": old_name,
             "nominalCapacity": 5132,
         }
         assert res.json() == fr_solar_pv_cfg
@@ -254,8 +260,8 @@ def test_lifecycle(
         # asserts the config is the same
         assert res.status_code in {200, 201}, res.json()
         duplicated_config = dict(fr_solar_pv_cfg)
-        duplicated_config["name"] = new_name
-        duplicated_id = transform_name_to_id(new_name, lower=False)
+        duplicated_config["name"] = new_name.lower()
+        duplicated_id = transform_name_to_id(new_name)
         duplicated_config["id"] = duplicated_id
         assert res.json() == duplicated_config
 
@@ -425,7 +431,7 @@ def test_lifecycle(
         assert res.status_code == 200, res.json()
         obj = res.json()
         # If a group is not found, return the default group ("Other RES 1" by default).
-        assert obj["group"] == "Other RES 1"
+        assert obj["group"] == "other res 1"
 
         # Check PATCH with the wrong `area_id`
         res = client.patch(
@@ -499,7 +505,7 @@ def test_lifecycle(
         assert res.status_code == 409, res.json()
         obj = res.json()
         description = obj["description"]
-        assert other_cluster_name.upper() in description
+        assert other_cluster_name.lower() in description
         assert obj["exception"] == "DuplicateRenewableCluster"
 
     @pytest.fixture(name="base_study_id")
@@ -580,14 +586,14 @@ def test_variant_lifecycle(self, client: TestClient, user_access_token: str, var
         )
         assert res.status_code in {200, 201}, res.json()
         cluster_cfg = res.json()
-        assert cluster_cfg["name"] == new_name
+        assert cluster_cfg["name"] == new_name.lower()
         new_id = cluster_cfg["id"]
 
         # Check that the duplicate has the right properties
         res = client.get(f"/v1/studies/{variant_id}/areas/{area_id}/clusters/renewable/{new_id}")
         assert res.status_code == 200, res.json()
         cluster_cfg = res.json()
-        assert cluster_cfg["group"] == "Wind Offshore"
+        assert cluster_cfg["group"] == "wind offshore"
         assert cluster_cfg["unitCount"] == 15
         assert cluster_cfg["nominalCapacity"] == 42500
 
diff --git a/tests/integration/study_data_blueprint/test_st_storage.py b/tests/integration/study_data_blueprint/test_st_storage.py
index 8d83d12f37..2780e098cf 100644
--- a/tests/integration/study_data_blueprint/test_st_storage.py
+++ b/tests/integration/study_data_blueprint/test_st_storage.py
@@ -21,7 +21,7 @@
 
 from antarest.core.tasks.model import TaskStatus
 from antarest.study.business.areas.st_storage_management import create_storage_output
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import create_st_storage_config
 from tests.integration.utils import wait_task_completion
 
@@ -148,8 +148,7 @@ def test_lifecycle__nominal(
         # We can create a short-term storage with the following properties.
         # Unfilled properties will be set to their default values.
         siemens_properties = {
-            "name": siemens_battery,
-            "group": "Battery",
+            "group": "battery",
             "injectionNominalCapacity": 1450,
             "withdrawalNominalCapacity": 1350,
             "reservoirCapacity": 1500,
@@ -157,12 +156,17 @@ def test_lifecycle__nominal(
         res = client.post(
             f"/v1/studies/{internal_study_id}/areas/{area_id}/storages",
             headers=user_headers,
-            json=siemens_properties,
+            json={"name": siemens_battery, **siemens_properties},
         )
         assert res.status_code == 200, res.json()
         siemens_battery_id = res.json()["id"]
         assert siemens_battery_id == transform_name_to_id(siemens_battery)
-        siemens_output = {**default_output, **siemens_properties, "id": siemens_battery_id}
+        siemens_output = {
+            **default_output,
+            **siemens_properties,
+            "id": siemens_battery_id,
+            "name": siemens_battery.lower(),
+        }
         assert res.json() == siemens_output
 
         # reading the properties of a short-term storage
@@ -234,7 +238,7 @@ def test_lifecycle__nominal(
         assert res.status_code == 200, res.json()
         siemens_output = {
             **siemens_output,
-            "name": "New Siemens Battery",
+            "name": "new siemens battery",
             "reservoirCapacity": 2500,
         }
         assert res.json() == siemens_output
@@ -300,7 +304,7 @@ def test_lifecycle__nominal(
         assert res.status_code in {200, 201}, res.json()
         # asserts the config is the same
         duplicated_output = dict(siemens_output)
-        duplicated_output["name"] = new_name
+        duplicated_output["name"] = new_name.lower()
         duplicated_id = transform_name_to_id(new_name)
         duplicated_output["id"] = duplicated_id
         assert res.json() == duplicated_output
@@ -385,6 +389,10 @@ def test_lifecycle__nominal(
         assert res.status_code == 200, res.json()
         siemens_output = {**default_output, **siemens_properties, "id": siemens_battery_id}
         grand_maison_output = {**default_output, **grand_maison_properties, "id": grand_maison_id}
+        # assert we return name and group as lower values
+        for key in ["name", "group"]:
+            grand_maison_output[key] = grand_maison_properties[key].lower()
+            siemens_output[key] = siemens_properties[key].lower()
         assert res.json() == [duplicated_output, siemens_output, grand_maison_output]
 
         # We can delete the three short-term storages at once.
@@ -612,7 +620,7 @@ def test__default_values(
         )
         assert res.status_code == 200, res.json()
         tesla_battery_id = res.json()["id"]
-        tesla_output = {**default_output, "id": tesla_battery_id, "name": tesla_battery, "group": "Battery"}
+        tesla_output = {**default_output, "id": tesla_battery_id, "name": tesla_battery.lower(), "group": "battery"}
         assert res.json() == tesla_output
 
         # Use the Debug mode to make sure that the initialLevel and initialLevelOptim properties
@@ -623,7 +631,7 @@ def test__default_values(
         )
         assert res.status_code == 200, res.json()
         actual = res.json()
-        expected = {**default_config, "name": tesla_battery, "group": "Battery"}
+        expected = {**default_config, "name": tesla_battery.lower(), "group": "battery"}
         assert actual == expected
 
         # We want to make sure that the default properties are applied to a study variant.
@@ -653,7 +661,7 @@ def test__default_values(
             "action": "create_st_storage",
             "args": {
                 "area_id": "fr",
-                "parameters": {**default_config, "name": siemens_battery, "group": "Battery"},
+                "parameters": {**default_config, "name": siemens_battery.lower(), "group": "battery"},
                 "pmax_injection": ANY,
                 "pmax_withdrawal": ANY,
                 "lower_rule_curve": ANY,
@@ -728,8 +736,8 @@ def test__default_values(
         actual = res.json()
         expected = {
             **default_config,
-            "name": siemens_battery,
-            "group": "Battery",
+            "name": siemens_battery.lower(),
+            "group": "battery",
             "injectionnominalcapacity": 1600,
             "initiallevel": 0.0,
         }
@@ -814,14 +822,14 @@ def test_variant_lifecycle(self, client: TestClient, user_access_token: str, var
         )
         assert res.status_code in {200, 201}, res.json()
         cluster_cfg = res.json()
-        assert cluster_cfg["name"] == new_name
+        assert cluster_cfg["name"] == new_name.lower()
         new_id = cluster_cfg["id"]
 
         # Check that the duplicate has the right properties
         res = client.get(f"/v1/studies/{variant_id}/areas/{area_id}/storages/{new_id}")
         assert res.status_code == 200, res.json()
         cluster_cfg = res.json()
-        assert cluster_cfg["group"] == "Battery"
+        assert cluster_cfg["group"] == "battery"
         assert cluster_cfg["injectionNominalCapacity"] == 4500
         assert cluster_cfg["withdrawalNominalCapacity"] == 4230
         assert cluster_cfg["reservoirCapacity"] == 5600
diff --git a/tests/integration/study_data_blueprint/test_table_mode.py b/tests/integration/study_data_blueprint/test_table_mode.py
index 17133f63be..a7a398ed52 100644
--- a/tests/integration/study_data_blueprint/test_table_mode.py
+++ b/tests/integration/study_data_blueprint/test_table_mode.py
@@ -412,7 +412,7 @@ def test_lifecycle__nominal(
                 "enabled": True,
                 "fixedCost": 0,
                 "genTs": "use global",
-                "group": "Other 2",
+                "group": "other 2",
                 "lawForced": "uniform",
                 "lawPlanned": "uniform",
                 "marginalCost": 10,
@@ -439,7 +439,7 @@ def test_lifecycle__nominal(
                 "enabled": True,
                 "fixedCost": 0,
                 "genTs": "use global",
-                "group": "Nuclear",
+                "group": "nuclear",
                 "lawForced": "uniform",
                 "lawPlanned": "uniform",
                 "marginalCost": 20,
@@ -484,42 +484,42 @@ def test_lifecycle__nominal(
         assert res.status_code == 200, res.json()
         expected: t.Dict[str, t.Dict[str, t.Any]]
         expected = {
-            "de / 01_solar": {"group": "Other 2", "nominalCapacity": 500000, "unitCount": 17},
-            "de / 02_wind_on": {"group": "Nuclear", "nominalCapacity": 314159, "unitCount": 15},
-            "de / 03_wind_off": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "de / 04_res": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "de / 05_nuclear": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "de / 06_coal": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "de / 07_gas": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "de / 08_non-res": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "de / 09_hydro_pump": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 01_solar": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 02_wind_on": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 03_wind_off": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 04_res": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 05_nuclear": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 06_coal": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 07_gas": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 08_non-res": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "es / 09_hydro_pump": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 01_solar": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 02_wind_on": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 03_wind_off": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 04_res": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 05_nuclear": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 06_coal": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 07_gas": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 08_non-res": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "fr / 09_hydro_pump": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 01_solar": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 02_wind_on": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 03_wind_off": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 04_res": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 05_nuclear": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 06_coal": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 07_gas": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 08_non-res": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
-            "it / 09_hydro_pump": {"group": "Other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "de / 01_solar": {"group": "other 2", "nominalCapacity": 500000, "unitCount": 17},
+            "de / 02_wind_on": {"group": "nuclear", "nominalCapacity": 314159, "unitCount": 15},
+            "de / 03_wind_off": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "de / 04_res": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "de / 05_nuclear": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "de / 06_coal": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "de / 07_gas": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "de / 08_non-res": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "de / 09_hydro_pump": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 01_solar": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 02_wind_on": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 03_wind_off": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 04_res": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 05_nuclear": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 06_coal": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 07_gas": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 08_non-res": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "es / 09_hydro_pump": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 01_solar": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 02_wind_on": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 03_wind_off": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 04_res": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 05_nuclear": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 06_coal": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 07_gas": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 08_non-res": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "fr / 09_hydro_pump": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 01_solar": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 02_wind_on": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 03_wind_off": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 04_res": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 05_nuclear": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 06_coal": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 07_gas": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 08_non-res": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
+            "it / 09_hydro_pump": {"group": "other 1", "nominalCapacity": 1000000, "unitCount": 1},
         }
         if study_version >= 860:
             for key in expected:
@@ -640,12 +640,12 @@ def test_lifecycle__nominal(
             )
             assert res.status_code == 200, res.json()
             expected = {
-                "fr / Dieppe": {"enabled": False, "group": "Wind Offshore", "nominalCapacity": 8, "unitCount": 62},
-                "fr / La Rochelle": {"enabled": True, "group": "Solar PV", "nominalCapacity": 3.1, "unitCount": 2},
-                "fr / Oleron": {"enabled": True, "group": "Wind Offshore", "nominalCapacity": 15, "unitCount": 70},
-                "it / Pouilles": {"enabled": False, "group": "Wind Onshore", "nominalCapacity": 11, "unitCount": 40},
-                "it / Sardaigne": {"enabled": True, "group": "Wind Offshore", "nominalCapacity": 12, "unitCount": 86},
-                "it / Sicile": {"enabled": True, "group": "Solar PV", "nominalCapacity": 1.8, "unitCount": 1},
+                "fr / dieppe": {"enabled": False, "group": "wind offshore", "nominalCapacity": 8, "unitCount": 62},
+                "fr / la rochelle": {"enabled": True, "group": "solar pv", "nominalCapacity": 3.1, "unitCount": 2},
+                "fr / oleron": {"enabled": True, "group": "wind offshore", "nominalCapacity": 15, "unitCount": 70},
+                "it / pouilles": {"enabled": False, "group": "wind onshore", "nominalCapacity": 11, "unitCount": 40},
+                "it / sardaigne": {"enabled": True, "group": "wind offshore", "nominalCapacity": 12, "unitCount": 86},
+                "it / sicile": {"enabled": True, "group": "solar pv", "nominalCapacity": 1.8, "unitCount": 1},
             }
             actual = res.json()
             assert actual == expected
@@ -748,7 +748,7 @@ def test_lifecycle__nominal(
                     # "name": "Siemens",
                     "efficiency": 1,
                     "enabled": None,
-                    "group": "Battery",
+                    "group": "battery",
                     "initialLevel": 0.5,
                     "initialLevelOptim": False,
                     "injectionNominalCapacity": 1550,
@@ -760,7 +760,7 @@ def test_lifecycle__nominal(
                     # "name": "Tesla",
                     "efficiency": 0.75,
                     "enabled": None,
-                    "group": "Battery",
+                    "group": "battery",
                     "initialLevel": 0.89,
                     "initialLevelOptim": False,
                     "injectionNominalCapacity": 1200,
@@ -772,7 +772,7 @@ def test_lifecycle__nominal(
                     # "name": "storage3",
                     "efficiency": 1,
                     "enabled": None,
-                    "group": "Pondage",
+                    "group": "pondage",
                     "initialLevel": 1,
                     "initialLevelOptim": False,
                     "injectionNominalCapacity": 1234,
@@ -784,7 +784,7 @@ def test_lifecycle__nominal(
                     # "name": "storage4",
                     "efficiency": 1,
                     "enabled": None,
-                    "group": "PSP_open",
+                    "group": "psp_open",
                     "initialLevel": 0.5,
                     "initialLevelOptim": True,
                     "injectionNominalCapacity": 567,
@@ -817,25 +817,25 @@ def test_lifecycle__nominal(
             assert res.status_code == 200, res.json()
             expected = {
                 "fr / siemens": {
-                    "group": "Battery",
+                    "group": "battery",
                     "injectionNominalCapacity": 1550,
                     "reservoirCapacity": 1500,
                     "withdrawalNominalCapacity": 1550,
                 },
                 "fr / tesla": {
-                    "group": "Battery",
+                    "group": "battery",
                     "injectionNominalCapacity": 1200,
                     "reservoirCapacity": 1200,
                     "withdrawalNominalCapacity": 1200,
                 },
                 "it / storage3": {
-                    "group": "Pondage",
+                    "group": "pondage",
                     "injectionNominalCapacity": 1234,
                     "reservoirCapacity": 1357,
                     "withdrawalNominalCapacity": 1020,
                 },
                 "it / storage4": {
-                    "group": "PSP_open",
+                    "group": "psp_open",
                     "injectionNominalCapacity": 567,
                     "reservoirCapacity": 500,
                     "withdrawalNominalCapacity": 456,
@@ -859,7 +859,7 @@ def test_lifecycle__nominal(
         )
         assert res.status_code == 200, res.json()
         cluster_id = res.json()["id"]
-        assert cluster_id == "Cluster 1"
+        assert cluster_id == "cluster 1"
 
         # Create Binding Constraints
         res = client.post(
@@ -945,7 +945,7 @@ def test_lifecycle__nominal(
 
         if study_version >= 870:
             expected_binding["binding constraint 1"]["group"] = "default"
-            expected_binding["binding constraint 2"]["group"] = "My BC Group"
+            expected_binding["binding constraint 2"]["group"] = "my bc group"
 
         assert actual == expected_binding
 
diff --git a/tests/integration/study_data_blueprint/test_thermal.py b/tests/integration/study_data_blueprint/test_thermal.py
index 6328606247..97ceda384b 100644
--- a/tests/integration/study_data_blueprint/test_thermal.py
+++ b/tests/integration/study_data_blueprint/test_thermal.py
@@ -49,7 +49,7 @@
 from starlette.testclient import TestClient
 
 from antarest.core.utils.string import to_camel_case
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.thermal import ThermalProperties
 from tests.integration.utils import wait_task_completion
 
@@ -63,7 +63,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "01_solar",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -87,7 +87,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "02_wind_on",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -111,7 +111,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "03_wind_off",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -135,7 +135,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "04_res",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -159,7 +159,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "05_nuclear",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -183,7 +183,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "06_coal",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -207,7 +207,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "07_gas",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -231,7 +231,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "08_non-res",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -255,7 +255,7 @@
         "enabled": True,
         "fixedCost": 0.0,
         "genTs": "use global",
-        "group": "Other 1",
+        "group": "other 1",
         "id": "09_hydro_pump",
         "lawForced": "uniform",
         "lawPlanned": "uniform",
@@ -374,12 +374,14 @@ def test_lifecycle(self, client: TestClient, user_access_token: str, internal_st
         )
         assert res.status_code == 200, res.json()
         fr_gas_conventional_id = res.json()["id"]
-        assert fr_gas_conventional_id == transform_name_to_id(fr_gas_conventional, lower=False)
+        assert fr_gas_conventional_id == transform_name_to_id(fr_gas_conventional)
         # noinspection SpellCheckingInspection
         fr_gas_conventional_cfg = {
             **fr_gas_conventional_props,
             "id": fr_gas_conventional_id,
             **{p: pollutants_values for p in pollutants_names},
+            "name": fr_gas_conventional_props["name"].lower(),
+            "group": fr_gas_conventional_props["group"].lower(),
         }
         fr_gas_conventional_cfg = {
             **fr_gas_conventional_cfg,
@@ -426,17 +428,18 @@ def test_lifecycle(self, client: TestClient, user_access_token: str, internal_st
         assert res.json() == EXISTING_CLUSTERS + [fr_gas_conventional_cfg]
 
         # updating properties
+        name = "FR_Gas conventional old 1"
         res = client.patch(
             f"/v1/studies/{internal_study_id}/areas/{area_id}/clusters/thermal/{fr_gas_conventional_id}",
             json={
-                "name": "FR_Gas conventional old 1",
+                "name": name,
                 "nominalCapacity": 32.1,
             },
         )
         assert res.status_code == 200, res.json()
         fr_gas_conventional_cfg = {
             **fr_gas_conventional_cfg,
-            "name": "FR_Gas conventional old 1",
+            "name": name.lower(),
             "nominalCapacity": 32.1,
         }
         assert res.json() == fr_gas_conventional_cfg
@@ -509,8 +512,8 @@ def test_lifecycle(self, client: TestClient, user_access_token: str, internal_st
         assert res.status_code in {200, 201}, res.json()
         # asserts the config is the same
         duplicated_config = dict(fr_gas_conventional_cfg)
-        duplicated_config["name"] = new_name
-        duplicated_id = transform_name_to_id(new_name, lower=False)
+        duplicated_config["name"] = new_name.lower()
+        duplicated_id = transform_name_to_id(new_name)
         duplicated_config["id"] = duplicated_id
         # takes the update into account
         if version >= 860:
@@ -626,7 +629,7 @@ def test_lifecycle(self, client: TestClient, user_access_token: str, internal_st
         )
         assert res.status_code == 403, res.json()
         description = res.json()["description"]
-        assert all([elm in description for elm in [fr_gas_conventional, "binding constraint"]])
+        assert all([elm in description for elm in [fr_gas_conventional.lower(), "binding constraint"]])
         assert res.json()["exception"] == "ReferencedObjectDeletionNotAllowed"
 
         # delete the binding constraint
@@ -667,7 +670,7 @@ def test_lifecycle(self, client: TestClient, user_access_token: str, internal_st
         assert res.status_code == 200, res.json()
         deleted_clusters = [other_cluster_id1, other_cluster_id2, fr_gas_conventional_id]
         for cluster in res.json():
-            assert transform_name_to_id(cluster["name"], lower=False) not in deleted_clusters
+            assert transform_name_to_id(cluster["name"]) not in deleted_clusters
 
         # ===========================
         #  THERMAL CLUSTER ERRORS
@@ -756,7 +759,7 @@ def test_lifecycle(self, client: TestClient, user_access_token: str, internal_st
         assert res.status_code == 200, res.json()
         obj = res.json()
         # If a group is not found, return the default group ('OTHER1' by default).
-        assert obj["group"] == "Other 1"
+        assert obj["group"] == "other 1"
 
         # Check PATCH with the wrong `area_id`
         res = client.patch(
@@ -836,7 +839,7 @@ def test_lifecycle(self, client: TestClient, user_access_token: str, internal_st
         assert res.status_code == 409, res.json()
         obj = res.json()
         description = obj["description"]
-        assert new_name.upper() in description
+        assert new_name.lower() in description
         assert obj["exception"] == "DuplicateThermalCluster"
 
     @pytest.fixture(name="base_study_id")
@@ -918,14 +921,14 @@ def test_variant_lifecycle(self, client: TestClient, user_access_token: str, var
         )
         assert res.status_code in {200, 201}, res.json()
         cluster_cfg = res.json()
-        assert cluster_cfg["name"] == new_name
+        assert cluster_cfg["name"] == new_name.lower()
         new_id = cluster_cfg["id"]
 
         # Check that the duplicate has the right properties
         res = client.get(f"/v1/studies/{variant_id}/areas/{area_id}/clusters/thermal/{new_id}")
         assert res.status_code == 200, res.json()
         cluster_cfg = res.json()
-        assert cluster_cfg["group"] == "Nuclear"
+        assert cluster_cfg["group"] == "nuclear"
         assert cluster_cfg["unitCount"] == 13
         assert cluster_cfg["nominalCapacity"] == 42500
         assert cluster_cfg["marginalCost"] == 0.2
diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py
index 37f34f5273..27cb8cf78a 100644
--- a/tests/integration/test_integration.py
+++ b/tests/integration/test_integration.py
@@ -532,19 +532,19 @@ def test_area_management(client: TestClient, admin_access_token: str) -> None:
                 {
                     "code-oi": None,
                     "enabled": True,
-                    "group": None,
+                    "group": "other 1",
                     "id": "cluster 1",
-                    "marginal-cost": None,
-                    "market-bid-cost": None,
-                    "min-down-time": None,
-                    "min-stable-power": None,
-                    "min-up-time": None,
+                    "marginal-cost": 0.0,
+                    "market-bid-cost": 0.0,
+                    "min-down-time": 1,
+                    "min-stable-power": 0.0,
+                    "min-up-time": 1,
                     "name": "cluster 1",
-                    "nominalcapacity": 0,
-                    "spinning": None,
-                    "spread-cost": None,
+                    "nominalcapacity": 0.0,
+                    "spinning": 0.0,
+                    "spread-cost": 0.0,
                     "type": None,
-                    "unitcount": 0,
+                    "unitcount": 1,
                 }
             ],
             "type": "AREA",
@@ -558,19 +558,19 @@ def test_area_management(client: TestClient, admin_access_token: str) -> None:
                 {
                     "code-oi": None,
                     "enabled": True,
-                    "group": None,
+                    "group": "other 1",
                     "id": "cluster 2",
-                    "marginal-cost": None,
-                    "market-bid-cost": None,
-                    "min-down-time": None,
-                    "min-stable-power": None,
-                    "min-up-time": None,
+                    "marginal-cost": 0.0,
+                    "market-bid-cost": 0.0,
+                    "min-down-time": 1,
+                    "min-stable-power": 0.0,
+                    "min-up-time": 1,
                     "name": "cluster 2",
                     "nominalcapacity": 2.5,
-                    "spinning": None,
-                    "spread-cost": None,
+                    "spinning": 0.0,
+                    "spread-cost": 0.0,
                     "type": None,
-                    "unitcount": 0,
+                    "unitcount": 1,
                 }
             ],
             "type": "AREA",
@@ -1336,7 +1336,7 @@ def test_area_management(client: TestClient, admin_access_token: str) -> None:
     )
     expected = {
         "enabled": False,
-        "group": "Other RES 1",  # Default group used when not specified.
+        "group": "other res 1",  # Default group used when not specified.
         "id": "cluster renewable 1",
         "name": "cluster renewable 1 renamed",
         "nominalCapacity": 3.0,
@@ -1398,6 +1398,7 @@ def test_area_management(client: TestClient, admin_access_token: str) -> None:
         f"/v1/studies/{study_id}/areas/area 1/clusters/thermal/cluster 1/form",
     )
     assert res.status_code == 200, res.json()
+    obj["group"] = obj["group"].lower()
     assert res.json() == {"id": "cluster 1", **obj}
 
     # Links
@@ -1470,19 +1471,19 @@ def test_area_management(client: TestClient, admin_access_token: str) -> None:
                 {
                     "code-oi": None,
                     "enabled": True,
-                    "group": None,
+                    "group": "other 1",
                     "id": "cluster 2",
-                    "marginal-cost": None,
-                    "market-bid-cost": None,
-                    "min-down-time": None,
-                    "min-stable-power": None,
-                    "min-up-time": None,
+                    "marginal-cost": 0.0,
+                    "market-bid-cost": 0.0,
+                    "min-down-time": 1,
+                    "min-stable-power": 0.0,
+                    "min-up-time": 1,
                     "name": "cluster 2",
                     "nominalcapacity": 2.5,
-                    "spinning": None,
-                    "spread-cost": None,
+                    "spinning": 0.0,
+                    "spread-cost": 0.0,
                     "type": None,
-                    "unitcount": 0,
+                    "unitcount": 1,
                 }
             ],
             "type": "AREA",
diff --git a/tests/integration/test_integration_token_end_to_end.py b/tests/integration/test_integration_token_end_to_end.py
index 6bfefe0d3b..01b92788d4 100644
--- a/tests/integration/test_integration_token_end_to_end.py
+++ b/tests/integration/test_integration_token_end_to_end.py
@@ -96,7 +96,7 @@ def test_nominal_case_of_an_api_user(client: TestClient, admin_access_token: str
                 "cluster_name": "mycluster",
                 "parameters": {
                     "group": "Gas",
-                    "unitCount": 1,
+                    "unitcount": 1,
                     "marginal_cost": 50,
                 },
             },
@@ -116,15 +116,15 @@ def test_nominal_case_of_an_api_user(client: TestClient, admin_access_token: str
                 "parameters": {
                     "group": "Gas",
                     "marginal-cost": 98,
-                    "unitCount": 1,
-                    "nominalCapacity": 250,
-                    "minStablePower": 0.0,
-                    "minUpTime": 2,
-                    "minDownTime": 2,
+                    "unitcount": 1,
+                    "nominalcapacity": 250,
+                    "min-stable-power": 0.0,
+                    "min-up-time": 2,
+                    "min-down-time": 2,
                     "spinning": 5,
-                    "spreadCost": 0.0,
-                    "startupCost": 2500,
-                    "marketBidCost": 85,
+                    "spread-cost": 0.0,
+                    "startup-cost": 2500,
+                    "market-bid-cost": 85,
                     "co2": 0.3,
                 },
             },
diff --git a/tests/integration/variant_blueprint/test_renewable_cluster.py b/tests/integration/variant_blueprint/test_renewable_cluster.py
index 18e6af0c56..74fc2c18f7 100644
--- a/tests/integration/variant_blueprint/test_renewable_cluster.py
+++ b/tests/integration/variant_blueprint/test_renewable_cluster.py
@@ -17,7 +17,7 @@
 from starlette.testclient import TestClient
 
 from antarest.core.tasks.model import TaskStatus
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from tests.integration.utils import wait_task_completion
 
 
@@ -76,7 +76,7 @@ def test_lifecycle(
         area_fr_id = transform_name_to_id("FR")
 
         cluster_fr1 = "Oleron"
-        cluster_fr1_id = transform_name_to_id(cluster_fr1, lower=False)
+        cluster_fr1_id = transform_name_to_id(cluster_fr1)
         args = {
             "area_id": area_fr_id,
             "cluster_name": cluster_fr1_id,
@@ -95,7 +95,7 @@ def test_lifecycle(
         res.raise_for_status()
 
         cluster_fr2 = "La_Rochelle"
-        cluster_fr2_id = transform_name_to_id(cluster_fr2, lower=False)
+        cluster_fr2_id = transform_name_to_id(cluster_fr2)
         args = {
             "area_id": area_fr_id,
             "cluster_name": cluster_fr2_id,
@@ -124,9 +124,9 @@ def test_lifecycle(
         properties = res.json()
         expected = {
             "enabled": True,
-            "group": "Wind Offshore",
-            "id": "Oleron",
-            "name": cluster_fr1,
+            "group": "wind offshore",
+            "id": "oleron",
+            "name": cluster_fr1.lower(),
             "nominalCapacity": 2500.0,
             "tsInterpretation": "power-generation",
             "unitCount": 1,
@@ -141,9 +141,9 @@ def test_lifecycle(
         properties = res.json()
         expected = {
             "enabled": False,
-            "group": "Solar PV",
-            "id": "La_Rochelle",
-            "name": cluster_fr2,
+            "group": "solar pv",
+            "id": "la_rochelle",
+            "name": cluster_fr2.lower(),
             "nominalCapacity": 3500.0,
             "tsInterpretation": "power-generation",
             "unitCount": 4,
@@ -201,10 +201,10 @@ def test_lifecycle(
         area_it_id = transform_name_to_id("IT")
 
         cluster_it1 = "Oléron"
-        cluster_it1_id = transform_name_to_id(cluster_it1, lower=False)
+        cluster_it1_id = transform_name_to_id(cluster_it1)
         args = {
             "area_id": area_it_id,
-            "cluster_name": cluster_it1_id,
+            "cluster_name": cluster_it1,
             "parameters": {
                 "group": "wind offshore",
                 "name": cluster_it1,
@@ -228,9 +228,9 @@ def test_lifecycle(
         properties = res.json()
         expected = {
             "enabled": True,
-            "group": "Wind Offshore",
-            "id": "Ol ron",
-            "name": cluster_it1,
+            "group": "wind offshore",
+            "id": "ol ron",
+            "name": cluster_it1.lower(),
             "nominalCapacity": 1000.0,
             "tsInterpretation": "production-factor",
             "unitCount": 1,
@@ -274,9 +274,11 @@ def test_lifecycle(
                 "list": {
                     cluster_fr1_id: {
                         "group": "wind offshore",
-                        "name": cluster_fr1,
+                        "name": cluster_fr1.lower(),
                         "nominalcapacity": 2500,
                         "ts-interpretation": "power-generation",
+                        "unitcount": 1,
+                        "enabled": True,
                     },
                 }
             },
@@ -284,10 +286,11 @@ def test_lifecycle(
                 "list": {
                     cluster_it1_id: {
                         "group": "wind offshore",
-                        "name": cluster_it1,
+                        "name": cluster_it1.lower(),
                         "nominalcapacity": 1000,
                         "ts-interpretation": "production-factor",
                         "unitcount": 1,
+                        "enabled": True,
                     }
                 }
             },
@@ -317,10 +320,11 @@ def test_lifecycle(
                 "list": {
                     cluster_it1_id: {
                         "group": "wind offshore",
-                        "name": cluster_it1,
+                        "name": cluster_it1.lower(),
                         "nominalcapacity": 1000,
                         "ts-interpretation": "production-factor",
                         "unitcount": 1,
+                        "enabled": True,
                     }
                 }
             },
diff --git a/tests/integration/variant_blueprint/test_st_storage.py b/tests/integration/variant_blueprint/test_st_storage.py
index b4092f0acb..7d48aa2c94 100644
--- a/tests/integration/variant_blueprint/test_st_storage.py
+++ b/tests/integration/variant_blueprint/test_st_storage.py
@@ -18,7 +18,7 @@
 from starlette.testclient import TestClient
 
 from antarest.core.tasks.model import TaskStatus
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from tests.integration.utils import wait_task_completion
 
 
diff --git a/tests/integration/variant_blueprint/test_thermal_cluster.py b/tests/integration/variant_blueprint/test_thermal_cluster.py
index 7e5ce92677..ef20d9d3ab 100644
--- a/tests/integration/variant_blueprint/test_thermal_cluster.py
+++ b/tests/integration/variant_blueprint/test_thermal_cluster.py
@@ -20,7 +20,7 @@
 from starlette.testclient import TestClient
 
 from antarest.core.tasks.model import TaskDTO, TaskStatus
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 
 
 def _create_thermal_params(cluster_name: str) -> t.Mapping[str, t.Any]:
@@ -97,7 +97,7 @@ def test_cascade_update(
                 "action": "create_cluster",
                 "args": {
                     "area_id": area_id,
-                    "cluster_name": transform_name_to_id(cluster_name, lower=False),
+                    "cluster_name": transform_name_to_id(cluster_name),
                     "parameters": _create_thermal_params(cluster_name),
                     "prepro": np.random.rand(8760, 6).tolist(),
                     "modulation": np.random.rand(8760, 4).tolist(),
diff --git a/tests/storage/business/test_study_version_upgrader.py b/tests/storage/business/test_study_version_upgrader.py
index 39ce1da653..4d248539f2 100644
--- a/tests/storage/business/test_study_version_upgrader.py
+++ b/tests/storage/business/test_study_version_upgrader.py
@@ -25,7 +25,7 @@
 
 from antarest.core.exceptions import UnsupportedStudyVersion
 from antarest.study.storage.rawstudy.ini_reader import IniReader
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.root.settings.generaldata import DUPLICATE_KEYS
 from antarest.study.storage.study_upgrader import (
     InvalidUpgrade,
diff --git a/tests/storage/repository/filesystem/config/test_utils.py b/tests/storage/repository/filesystem/config/test_utils.py
index cf470df38f..de31252956 100644
--- a/tests/storage/repository/filesystem/config/test_utils.py
+++ b/tests/storage/repository/filesystem/config/test_utils.py
@@ -14,7 +14,7 @@
 
 import pytest
 
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 
 VALID_CHARS = "azAZ09_-(),&"
 
@@ -29,8 +29,7 @@ def test_transform_name_to_id__nominal_case(name, expected):
 
 @pytest.mark.parametrize("name", VALID_CHARS)
 def test_transform_name_to_id__valid_chars(name):
-    assert transform_name_to_id(name, lower=True) == name.lower()
-    assert transform_name_to_id(name, lower=False) == name
+    assert transform_name_to_id(name) == name.lower()
 
 
 @pytest.mark.parametrize("name", sorted(set(string.punctuation) - set(VALID_CHARS)))
diff --git a/tests/study/business/areas/test_st_storage_management.py b/tests/study/business/areas/test_st_storage_management.py
index 56a42d88a0..7826113112 100644
--- a/tests/study/business/areas/test_st_storage_management.py
+++ b/tests/study/business/areas/test_st_storage_management.py
@@ -158,7 +158,7 @@ def test_get_all_storages__nominal_case(
                     "id": "storage1",
                     "enabled": None,
                     "group": STStorageGroup.BATTERY,
-                    "name": "Storage1",
+                    "name": "storage1",
                     "injectionNominalCapacity": 1500.0,
                     "withdrawalNominalCapacity": 1500.0,
                     "reservoirCapacity": 20000.0,
@@ -170,7 +170,7 @@ def test_get_all_storages__nominal_case(
                     "id": "storage2",
                     "enabled": None,
                     "group": STStorageGroup.PSP_CLOSED,
-                    "name": "Storage2",
+                    "name": "storage2",
                     "injectionNominalCapacity": 2000.0,
                     "withdrawalNominalCapacity": 1500.0,
                     "reservoirCapacity": 20000.0,
@@ -182,7 +182,7 @@ def test_get_all_storages__nominal_case(
                     "id": "storage3",
                     "enabled": None,
                     "group": STStorageGroup.PSP_CLOSED,
-                    "name": "Storage3",
+                    "name": "storage3",
                     "injectionNominalCapacity": 1500.0,
                     "withdrawalNominalCapacity": 1500.0,
                     "reservoirCapacity": 21000.0,
@@ -264,7 +264,7 @@ def test_get_st_storages__nominal_case(
                 "initialLevel": 0.5,
                 "initialLevelOptim": True,
                 "injectionNominalCapacity": 1500.0,
-                "name": "Storage1",
+                "name": "storage1",
                 "reservoirCapacity": 20000.0,
                 "withdrawalNominalCapacity": 1500.0,
                 "enabled": None,
@@ -276,7 +276,7 @@ def test_get_st_storages__nominal_case(
                 "initialLevel": 0.5,
                 "initialLevelOptim": False,
                 "injectionNominalCapacity": 2000.0,
-                "name": "Storage2",
+                "name": "storage2",
                 "reservoirCapacity": 20000.0,
                 "withdrawalNominalCapacity": 1500.0,
                 "enabled": None,
@@ -288,7 +288,7 @@ def test_get_st_storages__nominal_case(
                 "initialLevel": 1,
                 "initialLevelOptim": False,
                 "injectionNominalCapacity": 1500.0,
-                "name": "Storage3",
+                "name": "storage3",
                 "reservoirCapacity": 21000.0,
                 "withdrawalNominalCapacity": 1500.0,
                 "enabled": None,
@@ -375,7 +375,7 @@ def test_get_st_storage__nominal_case(
             "initialLevel": 0.5,
             "initialLevelOptim": True,
             "injectionNominalCapacity": 1500.0,
-            "name": "Storage1",
+            "name": "storage1",
             "reservoirCapacity": 20000.0,
             "withdrawalNominalCapacity": 1500.0,
             "enabled": None,
diff --git a/tests/study/business/areas/test_thermal_management.py b/tests/study/business/areas/test_thermal_management.py
index 6bb2e34d7e..a0a053599d 100644
--- a/tests/study/business/areas/test_thermal_management.py
+++ b/tests/study/business/areas/test_thermal_management.py
@@ -373,7 +373,7 @@ def test_create_cluster__study_legacy(
                 "fixedCost": 0.0,
                 "genTs": LocalTSGenerationBehavior.USE_GLOBAL,
                 "group": ThermalClusterGroup.NUCLEAR,
-                "id": "New Cluster",
+                "id": "new cluster",
                 "lawForced": LawOption.UNIFORM,
                 "lawPlanned": LawOption.UNIFORM,
                 "marginalCost": 0.0,
@@ -382,7 +382,7 @@ def test_create_cluster__study_legacy(
                 "minStablePower": 0.0,
                 "minUpTime": 15,
                 "mustRun": False,
-                "name": "New Cluster",
+                "name": "new cluster",
                 "nh3": None,
                 "nmvoc": None,
                 "nominalCapacity": 1000.0,
@@ -430,7 +430,7 @@ def test_update_cluster(
             expected = {
                 "id": "2 avail and must 1",
                 "group": ThermalClusterGroup.GAS,
-                "name": "New name",
+                "name": "new name",
                 "enabled": False,
                 "unitCount": 100,
                 "nominalCapacity": 2000.0,
diff --git a/tests/study/storage/rawstudy/test_raw_study_service.py b/tests/study/storage/rawstudy/test_raw_study_service.py
index a138da1735..4a0f4ca5c2 100644
--- a/tests/study/storage/rawstudy/test_raw_study_service.py
+++ b/tests/study/storage/rawstudy/test_raw_study_service.py
@@ -25,7 +25,7 @@
 from antarest.study.business.utils import execute_or_add_commands
 from antarest.study.model import RawStudy, StudyAdditionalData
 from antarest.study.storage.patch_service import PatchService
-from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import STStorageConfig, STStorageGroup
+from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import STStorageGroup
 from antarest.study.storage.rawstudy.raw_study_service import RawStudyService
 from antarest.study.storage.storage_service import StudyStorageService
 from antarest.study.storage.variantstudy.business.matrix_constants_generator import GeneratorMatrixConstants
@@ -131,16 +131,15 @@ def test_export_study_flat(
         create_st_storage = CreateSTStorage(
             command_context=command_context,
             area_id="fr",
-            parameters=STStorageConfig(
-                id="",  # will be calculated ;-)
-                name="Storage1",
-                group=STStorageGroup.BATTERY,
-                injection_nominal_capacity=1500,
-                withdrawal_nominal_capacity=1500,
-                reservoir_capacity=20000,
-                efficiency=0.94,
-                initial_level_optim=True,
-            ),
+            parameters={
+                "name": "Storage1",
+                "group": STStorageGroup.BATTERY,
+                "injection_nominal_capacity": 1500,
+                "withdrawal_nominal_capacity": 1500,
+                "reservoir_capacity": 20000,
+                "efficiency": 0.94,
+                "initial_level_optim": True,
+            },
             pmax_injection=pmax_injection.tolist(),
             inflows=inflows.tolist(),
             study_version=raw_study.version,
diff --git a/tests/study/storage/variantstudy/test_snapshot_generator.py b/tests/study/storage/variantstudy/test_snapshot_generator.py
index 70a05c391a..c2280d2b46 100644
--- a/tests/study/storage/variantstudy/test_snapshot_generator.py
+++ b/tests/study/storage/variantstudy/test_snapshot_generator.py
@@ -10,7 +10,6 @@
 #
 # This file is part of the Antares project.
 
-import configparser
 import datetime
 import json
 import logging
@@ -33,6 +32,7 @@
 from antarest.core.utils.fastapi_sqlalchemy import db
 from antarest.login.model import Group, Role, User
 from antarest.study.model import RawStudy, Study, StudyAdditionalData
+from antarest.study.storage.rawstudy.ini_reader import IniReader
 from antarest.study.storage.rawstudy.raw_study_service import RawStudyService
 from antarest.study.storage.variantstudy.model.dbmodel import CommandBlock, VariantStudy, VariantStudySnapshot
 from antarest.study.storage.variantstudy.model.model import CommandDTO
@@ -920,18 +920,46 @@ def test_generate__nominal_case(
         assert snapshot_dir.exists()
         assert (snapshot_dir / "study.antares").exists()
         assert (snapshot_dir / "input/areas/list.txt").read_text().splitlines(keepends=False) == ["North", "South"]
-        config = configparser.RawConfigParser()
-        config.read(snapshot_dir / "input/links/north/properties.ini")
-        assert config.sections() == ["south"]
-        assert config["south"], "The 'south' section must exist in the 'properties.ini' file."
-        config = configparser.RawConfigParser()
-        config.read(snapshot_dir / "input/thermal/clusters/south/list.ini")
-        assert config.sections() == ["gas_cluster"]
-        assert config["gas_cluster"] == {  # type: ignore
-            "group": "Gas",
-            "unitcount": "1",
-            "nominalcapacity": "500",
+        reader = IniReader()
+        properties = reader.read(snapshot_dir / "input/links/north/properties.ini")
+        assert list(properties.keys()) == ["south"]
+        reader = IniReader()
+        cluster_props = reader.read(snapshot_dir / "input/thermal/clusters/south/list.ini")
+        assert list(cluster_props.keys()) == ["gas_cluster"]
+        assert cluster_props["gas_cluster"] == {
+            "co2": 0.0,
+            "enabled": True,
+            "fixed-cost": 0.0,
+            "gen-ts": "use global",
+            "group": "gas",
+            "law.forced": "uniform",
+            "law.planned": "uniform",
+            "marginal-cost": 0.0,
+            "market-bid-cost": 0.0,
+            "min-down-time": 1,
+            "min-stable-power": 0.0,
+            "min-up-time": 1,
+            "must-run": False,
             "name": "gas_cluster",
+            "nh3": 0.0,
+            "nmvoc": 0.0,
+            "nominalcapacity": 500.0,
+            "nox": 0.0,
+            "op1": 0.0,
+            "op2": 0.0,
+            "op3": 0.0,
+            "op4": 0.0,
+            "op5": 0.0,
+            "pm10": 0.0,
+            "pm2_5": 0.0,
+            "pm5": 0.0,
+            "so2": 0.0,
+            "spinning": 0.0,
+            "spread-cost": 0.0,
+            "startup-cost": 0.0,
+            "unitcount": 1,
+            "volatility.forced": 0.0,
+            "volatility.planned": 0.0,
         }
 
         # Check: the matrices are not denormalized (we should have links to matrices).
diff --git a/tests/study/storage/variantstudy/test_variant_study_service.py b/tests/study/storage/variantstudy/test_variant_study_service.py
index dc6b4a47d3..ba0cb93277 100644
--- a/tests/study/storage/variantstudy/test_variant_study_service.py
+++ b/tests/study/storage/variantstudy/test_variant_study_service.py
@@ -12,7 +12,6 @@
 
 import datetime
 import re
-import typing
 from pathlib import Path
 from unittest.mock import Mock
 
@@ -30,7 +29,7 @@
 from antarest.study.business.utils import execute_or_add_commands
 from antarest.study.model import RawStudy, StudyAdditionalData
 from antarest.study.storage.patch_service import PatchService
-from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import STStorageConfig, STStorageGroup
+from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import STStorageGroup
 from antarest.study.storage.rawstudy.raw_study_service import RawStudyService
 from antarest.study.storage.storage_service import StudyStorageService
 from antarest.study.storage.variantstudy.business.matrix_constants_generator import GeneratorMatrixConstants
@@ -197,16 +196,15 @@ def test_generate_task(
         create_st_storage = CreateSTStorage(
             command_context=command_context,
             area_id="fr",
-            parameters=STStorageConfig(
-                id="",  # will be calculated ;-)
-                name="Storage1",
-                group=STStorageGroup.BATTERY,
-                injection_nominal_capacity=1500,
-                withdrawal_nominal_capacity=1500,
-                reservoir_capacity=20000,
-                efficiency=0.94,
-                initial_level_optim=True,
-            ),
+            parameters={
+                "name": "Storage1",
+                "group": STStorageGroup.BATTERY,
+                "injection_nominal_capacity": 1500,
+                "withdrawal_nominal_capacity": 1500,
+                "reservoir_capacity": 20000,
+                "efficiency": 0.94,
+                "initial_level_optim": True,
+            },
             pmax_injection=pmax_injection.tolist(),
             inflows=inflows.tolist(),
             study_version=study_version,
diff --git a/tests/variantstudy/model/command/test_create_area.py b/tests/variantstudy/model/command/test_create_area.py
index 87f8d1044c..08b3e7c451 100644
--- a/tests/variantstudy/model/command/test_create_area.py
+++ b/tests/variantstudy/model/command/test_create_area.py
@@ -18,7 +18,8 @@
 
 from antarest.study.model import STUDY_VERSION_8_8
 from antarest.study.storage.rawstudy.ini_reader import IniReader
-from antarest.study.storage.rawstudy.model.filesystem.config.model import EnrModelling, transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.model import EnrModelling
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.command_reverter import CommandReverter
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
diff --git a/tests/variantstudy/model/command/test_create_cluster.py b/tests/variantstudy/model/command/test_create_cluster.py
index 77c4d10f90..b6a03874f5 100644
--- a/tests/variantstudy/model/command/test_create_cluster.py
+++ b/tests/variantstudy/model/command/test_create_cluster.py
@@ -19,7 +19,8 @@
 from pydantic import ValidationError
 
 from antarest.study.model import STUDY_VERSION_8_8
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.thermal import Thermal870Properties
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.command_reverter import CommandReverter
 from antarest.study.storage.variantstudy.model.command.common import CommandName
@@ -57,13 +58,15 @@ def test_init(self, command_context: CommandContext):
         prepro_id = command_context.matrix_service.create(prepro)
         modulation_id = command_context.matrix_service.create(modulation)
         assert cl.area_id == "foo"
-        assert cl.cluster_name == "Cluster1"
-        assert cl.parameters == {"group": "Nuclear", "nominalcapacity": 2400, "unitcount": 2}
+        assert cl.cluster_name == "cluster1"
+        assert cl.parameters.group == "nuclear"
+        assert cl.parameters.nominal_capacity == 2400
+        assert cl.parameters.unit_count == 2
         assert cl.prepro == f"matrix://{prepro_id}"
         assert cl.modulation == f"matrix://{modulation_id}"
 
     def test_validate_cluster_name(self, command_context: CommandContext):
-        with pytest.raises(ValidationError, match="cluster_name"):
+        with pytest.raises(ValidationError, match="name"):
             CreateCluster(
                 area_id="fr",
                 cluster_name="%",
@@ -95,16 +98,16 @@ def test_validate_modulation(self, command_context: CommandContext):
     def test_apply(self, empty_study: FileStudy, command_context: CommandContext):
         study_path = empty_study.config.study_path
         area_name = "DE"
-        area_id = transform_name_to_id(area_name, lower=True)
+        area_id = transform_name_to_id(area_name)
         cluster_name = "Cluster-1"
-        cluster_id = transform_name_to_id(cluster_name, lower=True)
+        cluster_id = transform_name_to_id(cluster_name)
 
         CreateArea(area_name=area_name, command_context=command_context, study_version=STUDY_VERSION_8_8).apply(
             empty_study
         )
 
         parameters = {
-            "group": "Other",
+            "group": "nuclear",
             "unitcount": "1",
             "nominalcapacity": "1000000",
             "marginal-cost": "30",
@@ -113,6 +116,7 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext):
 
         prepro = GEN.random((365, 6)).tolist()
         modulation = GEN.random((8760, 4)).tolist()
+
         command = CreateCluster(
             area_id=area_id,
             cluster_name=cluster_name,
@@ -133,12 +137,13 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext):
 
         clusters = configparser.ConfigParser()
         clusters.read(study_path / "input" / "thermal" / "clusters" / area_id / "list.ini")
-        assert str(clusters[cluster_name]["name"]) == cluster_name
-        assert str(clusters[cluster_name]["group"]) == parameters["group"]
-        assert int(clusters[cluster_name]["unitcount"]) == int(parameters["unitcount"])
-        assert float(clusters[cluster_name]["nominalcapacity"]) == float(parameters["nominalcapacity"])
-        assert float(clusters[cluster_name]["marginal-cost"]) == float(parameters["marginal-cost"])
-        assert float(clusters[cluster_name]["market-bid-cost"]) == float(parameters["market-bid-cost"])
+        section = clusters[cluster_name.lower()]
+        assert str(section["name"]) == cluster_name.lower()
+        assert str(section["group"]) == parameters["group"]
+        assert int(section["unitcount"]) == int(parameters["unitcount"])
+        assert float(section["nominalcapacity"]) == float(parameters["nominalcapacity"])
+        assert float(section["marginal-cost"]) == float(parameters["marginal-cost"])
+        assert float(section["market-bid-cost"]) == float(parameters["market-bid-cost"])
 
         assert (study_path / "input" / "thermal" / "prepro" / area_id / cluster_id / "data.txt.link").exists()
         assert (study_path / "input" / "thermal" / "prepro" / area_id / cluster_id / "modulation.txt.link").exists()
@@ -178,10 +183,11 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext):
     def test_to_dto(self, command_context: CommandContext):
         prepro = GEN.random((365, 6)).tolist()
         modulation = GEN.random((8760, 4)).tolist()
+        parameters = {"group": "Nuclear", "unitcount": 2, "nominalcapacity": 2400}
         command = CreateCluster(
             area_id="foo",
             cluster_name="Cluster1",
-            parameters={"group": "Nuclear", "unitcount": 2, "nominalcapacity": 2400},
+            parameters=parameters,
             command_context=command_context,
             prepro=prepro,
             modulation=modulation,
@@ -194,8 +200,10 @@ def test_to_dto(self, command_context: CommandContext):
             "action": "create_cluster",
             "args": {
                 "area_id": "foo",
-                "cluster_name": "Cluster1",
-                "parameters": {"group": "Nuclear", "nominalcapacity": 2400, "unitcount": 2},
+                "cluster_name": "cluster1",
+                "parameters": Thermal870Properties.model_validate({"name": "cluster1", **parameters}).model_dump(
+                    mode="json", by_alias=True
+                ),
                 "prepro": prepro_id,
                 "modulation": modulation_id,
             },
@@ -309,7 +317,9 @@ def test_create_diff(command_context: CommandContext):
         ),
         UpdateConfig(
             target="input/thermal/clusters/foo/list/foo",
-            data={"nominalcapacity": "2400"},
+            data=Thermal870Properties.model_validate({"name": "foo", "nominalcapacity": "2400"}).model_dump(
+                mode="json", by_alias=True
+            ),
             command_context=command_context,
             study_version=STUDY_VERSION_8_8,
         ),
diff --git a/tests/variantstudy/model/command/test_create_link.py b/tests/variantstudy/model/command/test_create_link.py
index bd4bac60ef..611c2918e1 100644
--- a/tests/variantstudy/model/command/test_create_link.py
+++ b/tests/variantstudy/model/command/test_create_link.py
@@ -21,7 +21,7 @@
 from antarest.study.business.link_management import LinkInternal
 from antarest.study.model import STUDY_VERSION_8_8
 from antarest.study.storage.rawstudy.ini_reader import IniReader
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.command_reverter import CommandReverter
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
diff --git a/tests/variantstudy/model/command/test_create_renewables_cluster.py b/tests/variantstudy/model/command/test_create_renewables_cluster.py
index c23cb83f4f..aa4eeff60e 100644
--- a/tests/variantstudy/model/command/test_create_renewables_cluster.py
+++ b/tests/variantstudy/model/command/test_create_renewables_cluster.py
@@ -18,7 +18,9 @@
 from pydantic import ValidationError
 
 from antarest.study.model import STUDY_VERSION_8_1, STUDY_VERSION_8_8
-from antarest.study.storage.rawstudy.model.filesystem.config.model import EnrModelling, transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.model import EnrModelling
+from antarest.study.storage.rawstudy.model.filesystem.config.renewable import RenewableProperties
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.command_reverter import CommandReverter
 from antarest.study.storage.variantstudy.model.command.common import CommandName
@@ -32,10 +34,11 @@
 class TestCreateRenewablesCluster:
     # noinspection SpellCheckingInspection
     def test_init(self, command_context: CommandContext) -> None:
+        parameters = {"group": "Solar Thermal", "unitcount": 2, "nominalcapacity": 2400}
         cl = CreateRenewablesCluster(
             area_id="foo",
             cluster_name="Cluster1",
-            parameters={"group": "Solar Thermal", "unitcount": 2, "nominalcapacity": 2400},
+            parameters=parameters,
             command_context=command_context,
             study_version=STUDY_VERSION_8_8,
         )
@@ -47,11 +50,13 @@ def test_init(self, command_context: CommandContext) -> None:
 
         # Check the command data
         assert cl.area_id == "foo"
-        assert cl.cluster_name == "Cluster1"
-        assert cl.parameters == {"group": "Solar Thermal", "nominalcapacity": 2400, "unitcount": 2}
+        assert cl.cluster_name == "cluster1"
+        assert cl.parameters.model_dump(by_alias=True) == RenewableProperties.model_validate(
+            {"name": "cluster1", **parameters}
+        ).model_dump(by_alias=True)
 
     def test_validate_cluster_name(self, command_context: CommandContext) -> None:
-        with pytest.raises(ValidationError, match="cluster_name"):
+        with pytest.raises(ValidationError, match="name"):
             CreateRenewablesCluster(
                 area_id="fr",
                 cluster_name="%",
@@ -66,7 +71,7 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext) ->
         empty_study.config.version = study_version
         study_path = empty_study.config.study_path
         area_name = "DE"
-        area_id = transform_name_to_id(area_name, lower=True)
+        area_id = transform_name_to_id(area_name)
         cluster_name = "Cluster-1"
 
         CreateArea(area_name=area_name, command_context=command_context, study_version=study_version).apply(empty_study)
@@ -94,8 +99,8 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext) ->
 
         clusters = configparser.ConfigParser()
         clusters.read(study_path / "input" / "renewables" / "clusters" / area_id / "list.ini")
-        assert str(clusters[cluster_name]["name"]) == cluster_name
-        assert str(clusters[cluster_name]["ts-interpretation"]) == parameters["ts-interpretation"]
+        assert str(clusters[cluster_name.lower()]["name"]) == cluster_name.lower()
+        assert str(clusters[cluster_name.lower()]["ts-interpretation"]) == parameters["ts-interpretation"]
 
         output = CreateRenewablesCluster(
             area_id=area_id,
@@ -137,10 +142,11 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext) ->
 
     # noinspection SpellCheckingInspection
     def test_to_dto(self, command_context: CommandContext) -> None:
+        parameters = {"group": "Solar Thermal", "unitcount": 2, "nominalcapacity": 2400}
         command = CreateRenewablesCluster(
             area_id="foo",
             cluster_name="Cluster1",
-            parameters={"group": "Solar Thermal", "unitcount": 2, "nominalcapacity": 2400},
+            parameters=parameters,
             command_context=command_context,
             study_version=STUDY_VERSION_8_8,
         )
@@ -149,8 +155,10 @@ def test_to_dto(self, command_context: CommandContext) -> None:
             "action": "create_renewables_cluster",  # "renewables" with a final "s".
             "args": {
                 "area_id": "foo",
-                "cluster_name": "Cluster1",
-                "parameters": {"group": "Solar Thermal", "nominalcapacity": 2400, "unitcount": 2},
+                "cluster_name": "cluster1",
+                "parameters": RenewableProperties.model_validate({"name": "cluster1", **parameters}).model_dump(
+                    by_alias=True
+                ),
             },
             "id": None,
             "version": 1,
@@ -221,17 +229,20 @@ def test_create_diff(command_context: CommandContext) -> None:
         command_context=command_context,
         study_version=STUDY_VERSION_8_8,
     )
+    parameters = {"nominal_capacity": 1.2}
     other_match = CreateRenewablesCluster(
         area_id="foo",
         cluster_name="foo",
-        parameters={"a": "b"},
+        parameters=parameters,
         command_context=command_context,
         study_version=STUDY_VERSION_8_8,
     )
     assert base.create_diff(other_match) == [
         UpdateConfig(
             target="input/renewables/clusters/foo/list/foo",
-            data={"a": "b"},
+            data=RenewableProperties.model_validate({"name": "foo", **parameters}).model_dump(
+                mode="json", by_alias=True
+            ),
             command_context=command_context,
             study_version=STUDY_VERSION_8_8,
         ),
diff --git a/tests/variantstudy/model/command/test_create_st_storage.py b/tests/variantstudy/model/command/test_create_st_storage.py
index 81093faec8..a0b13410f2 100644
--- a/tests/variantstudy/model/command/test_create_st_storage.py
+++ b/tests/variantstudy/model/command/test_create_st_storage.py
@@ -9,16 +9,19 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-
+import copy
 import re
 
 import numpy as np
 import pytest
 from pydantic import ValidationError
 
-from antarest.study.model import STUDY_VERSION_8_8
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
-from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import STStorageConfig
+from antarest.study.model import STUDY_VERSION_8_6, STUDY_VERSION_8_8
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.st_storage import (
+    STStorage880Properties,
+    STStorageProperties,
+)
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.study_upgrader import StudyUpgrader
 from antarest.study.storage.variantstudy.business.utils import strip_matrix_protocol
@@ -83,7 +86,7 @@ def test_init(self, command_context: CommandContext):
         cmd = CreateSTStorage(
             command_context=command_context,
             area_id="area_fr",
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             pmax_injection=pmax_injection.tolist(),  # type: ignore
             inflows=inflows.tolist(),  # type: ignore
             study_version=STUDY_VERSION_8_8,
@@ -96,7 +99,7 @@ def test_init(self, command_context: CommandContext):
         assert cmd.command_context == command_context
         assert cmd.area_id == "area_fr"
         expected_parameters = {k: str(v) for k, v in PARAMETERS.items()}
-        assert cmd.parameters == STStorageConfig(**expected_parameters)
+        assert cmd.parameters == STStorage880Properties(**expected_parameters)
 
         # check the matrices links
 
@@ -114,23 +117,15 @@ def test_init__invalid_storage_name(self, recent_study: FileStudy, command_conte
             CreateSTStorage(
                 command_context=command_context,
                 area_id="dummy",
-                parameters=STStorageConfig(**parameters),
+                parameters=parameters,
                 study_version=STUDY_VERSION_8_8,
             )
         # We get 2 errors because the `storage_name` is duplicated in the `parameters`:
         assert ctx.value.error_count() == 1
         raised_error = ctx.value.errors()[0]
-        assert raised_error["type"] == "value_error"
-        assert raised_error["msg"] == "Value error, Invalid name '?%$$'."
-        assert raised_error["input"] == {
-            "efficiency": 0.94,
-            "group": "Battery",
-            "initialleveloptim": True,
-            "injectionnominalcapacity": 1500,
-            "name": "?%$$",
-            "reservoircapacity": 20000,
-            "withdrawalnominalcapacity": 1500,
-        }
+        assert raised_error["type"] == "string_pattern_mismatch"
+        assert raised_error["msg"] == "String should match pattern '[a-zA-Z0-9_(),& -]+'"
+        assert raised_error["input"] == "?%$$"
 
     def test_init__invalid_matrix_values(self, command_context: CommandContext):
         array = GEN.random((8760, 1))
@@ -139,7 +134,7 @@ def test_init__invalid_matrix_values(self, command_context: CommandContext):
             CreateSTStorage(
                 command_context=command_context,
                 area_id="area_fr",
-                parameters=STStorageConfig(**PARAMETERS),
+                parameters=PARAMETERS,
                 pmax_injection=array.tolist(),  # type: ignore
                 study_version=STUDY_VERSION_8_8,
             )
@@ -156,7 +151,7 @@ def test_init__invalid_matrix_shape(self, command_context: CommandContext):
             CreateSTStorage(
                 command_context=command_context,
                 area_id="area_fr",
-                parameters=STStorageConfig(**PARAMETERS),
+                parameters=PARAMETERS,
                 pmax_injection=array.tolist(),  # type: ignore
                 study_version=STUDY_VERSION_8_8,
             )
@@ -173,7 +168,7 @@ def test_init__invalid_nan_value(self, command_context: CommandContext):
             CreateSTStorage(
                 command_context=command_context,
                 area_id="area_fr",
-                parameters=STStorageConfig(**PARAMETERS),
+                parameters=PARAMETERS,
                 pmax_injection=array.tolist(),  # type: ignore
                 study_version=STUDY_VERSION_8_8,
             )
@@ -188,7 +183,7 @@ def test_init__invalid_matrix_type(self, command_context: CommandContext):
             CreateSTStorage(
                 command_context=command_context,
                 area_id="area_fr",
-                parameters=STStorageConfig(**PARAMETERS),
+                parameters=PARAMETERS,
                 pmax_injection=[1, 2, 3],
                 study_version=STUDY_VERSION_8_8,
             )
@@ -198,24 +193,14 @@ def test_init__invalid_matrix_type(self, command_context: CommandContext):
         assert raised_error["msg"] == "Value error, Invalid matrix shape (3,), expected (8760, 1)"
         assert "pmax_injection" in raised_error["input"]
 
-    def test_apply_config__invalid_version(self, empty_study: FileStudy, command_context: CommandContext):
-        # Given an old study in version 720
-        # When we apply the config to add a new ST Storage
-        create_st_storage = CreateSTStorage(
-            command_context=command_context,
-            area_id="foo",
-            parameters=STStorageConfig(**PARAMETERS),
-            study_version=empty_study.config.version,
-        )
-        command_output = create_st_storage.apply_config(empty_study.config)
-
-        # Then, the output should be an error
-        assert command_output.status is False
-        assert re.search(
-            rf"Invalid.*version {empty_study.config.version}",
-            command_output.message,
-            flags=re.IGNORECASE,
-        )
+    def test_instantiate_with_invalid_version(self, empty_study: FileStudy, command_context: CommandContext):
+        with pytest.raises(ValidationError):
+            CreateSTStorage(
+                command_context=command_context,
+                area_id="foo",
+                parameters=PARAMETERS,
+                study_version=empty_study.config.version,
+            )
 
     def test_apply_config__missing_area(self, recent_study: FileStudy, command_context: CommandContext):
         # Given a study without "unknown area" area
@@ -223,7 +208,7 @@ def test_apply_config__missing_area(self, recent_study: FileStudy, command_conte
         create_st_storage = CreateSTStorage(
             command_context=command_context,
             area_id="unknown area",  # bad ID
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             study_version=recent_study.config.version,
         )
         command_output = create_st_storage.apply_config(recent_study.config)
@@ -247,7 +232,7 @@ def test_apply_config__duplicate_storage(self, recent_study: FileStudy, command_
         create_st_storage = CreateSTStorage(
             command_context=command_context,
             area_id=transform_name_to_id(create_area.area_name),
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             study_version=recent_study.config.version,
         )
         command_output = create_st_storage.apply_config(recent_study.config)
@@ -258,7 +243,7 @@ def test_apply_config__duplicate_storage(self, recent_study: FileStudy, command_
         create_st_storage = CreateSTStorage(
             command_context=command_context,
             area_id=transform_name_to_id(create_area.area_name),
-            parameters=STStorageConfig(**parameters),
+            parameters=parameters,
             study_version=recent_study.config.version,
         )
         command_output = create_st_storage.apply_config(recent_study.config)
@@ -282,7 +267,7 @@ def test_apply_config__nominal_case(self, recent_study: FileStudy, command_conte
         create_st_storage = CreateSTStorage(
             command_context=command_context,
             area_id=transform_name_to_id(create_area.area_name),
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             study_version=recent_study.config.version,
         )
         command_output = create_st_storage.apply_config(recent_study.config)
@@ -309,7 +294,7 @@ def test_apply__nominal_case(self, recent_study: FileStudy, command_context: Com
         cmd = CreateSTStorage(
             command_context=command_context,
             area_id=transform_name_to_id(create_area.area_name),
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             pmax_injection=pmax_injection.tolist(),  # type: ignore
             inflows=inflows.tolist(),  # type: ignore
             study_version=recent_study.config.version,
@@ -322,11 +307,11 @@ def test_apply__nominal_case(self, recent_study: FileStudy, command_context: Com
         expected = {
             "storage1": {
                 "efficiency": 0.94,
-                "group": "Battery",
+                "group": "battery",
                 "initiallevel": 0.5,
                 "initialleveloptim": True,
                 "injectionnominalcapacity": 1500,
-                "name": "Storage1",
+                "name": "storage1",
                 "reservoircapacity": 20000,
                 "withdrawalnominalcapacity": 1500,
             }
@@ -350,29 +335,12 @@ def test_apply__nominal_case(self, recent_study: FileStudy, command_context: Com
         }
         assert config == expected
 
-    def test_apply__invalid_apply_config(self, empty_study: FileStudy, command_context: CommandContext):
-        # First, prepare a new Area
-        create_area = CreateArea(
-            area_name="Area FR", command_context=command_context, study_version=empty_study.config.version
-        )
-        create_area.apply(empty_study)
-
-        # Then, apply the command to create a new ST Storage
-        cmd = CreateSTStorage(
-            command_context=command_context,
-            area_id=transform_name_to_id(create_area.area_name),
-            parameters=STStorageConfig(**PARAMETERS),
-            study_version=empty_study.config.version,
-        )
-        command_output = cmd.apply(empty_study)
-        assert not command_output.status  # invalid study (too old)
-
     # noinspection SpellCheckingInspection
     def test_to_dto(self, command_context: CommandContext):
         cmd = CreateSTStorage(
             command_context=command_context,
             area_id="area_fr",
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             study_version=STUDY_VERSION_8_8,
         )
 
@@ -381,6 +349,10 @@ def test_to_dto(self, command_context: CommandContext):
         expected_parameters = PARAMETERS.copy()
         # `initiallevel` = 0.5 (the default value) because `initialleveloptim` is True
         expected_parameters["initiallevel"] = 0.5
+        expected_parameters["name"] = expected_parameters["name"].lower()
+        expected_parameters["group"] = expected_parameters["group"].lower()
+        # as we're using study version 8.8, we have the parameter `enabled`
+        expected_parameters["enabled"] = True
         constants = command_context.generator_matrix_constants
 
         assert actual == CommandDTO(
@@ -401,7 +373,7 @@ def test_match_signature(self, command_context: CommandContext):
         cmd = CreateSTStorage(
             command_context=command_context,
             area_id="area_fr",
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             study_version=STUDY_VERSION_8_8,
         )
         assert cmd.match_signature() == "create_st_storage%area_fr%storage1"
@@ -417,16 +389,16 @@ def test_match(
         cmd1 = CreateSTStorage(
             command_context=command_context,
             area_id="area_fr",
-            parameters=STStorageConfig(**PARAMETERS),
-            study_version=STUDY_VERSION_8_8,
+            parameters=PARAMETERS,
+            study_version=STUDY_VERSION_8_6,
         )
         cmd2 = CreateSTStorage(
             command_context=command_context,
             area_id=area_id,
-            parameters=STStorageConfig(**parameters),
-            study_version=STUDY_VERSION_8_8,
+            parameters=parameters,
+            study_version=STUDY_VERSION_8_6,
         )
-        light_equal = area_id == cmd1.area_id and parameters["name"] == cmd1.storage_name
+        light_equal = area_id == cmd1.area_id and parameters["name"].lower() == cmd1.storage_name
         assert cmd1.match(cmd2, equal=False) == light_equal
         deep_equal = area_id == cmd1.area_id and parameters == PARAMETERS
         assert cmd1.match(cmd2, equal=True) == deep_equal
@@ -435,7 +407,7 @@ def test_match__unknown_type(self, command_context: CommandContext):
         cmd1 = CreateSTStorage(
             command_context=command_context,
             area_id="area_fr",
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             study_version=STUDY_VERSION_8_8,
         )
         # Always `False` when compared to another object type
@@ -446,38 +418,41 @@ def test_create_diff__not_equals(self, command_context: CommandContext):
         cmd = CreateSTStorage(
             command_context=command_context,
             area_id="area_fr",
-            parameters=STStorageConfig(**PARAMETERS),
-            study_version=STUDY_VERSION_8_8,
+            parameters=PARAMETERS,
+            study_version=STUDY_VERSION_8_6,
         )
         upper_rule_curve = GEN.random((8760, 1))
         inflows = GEN.uniform(0, 1000, size=(8760, 1))
         other = CreateSTStorage(
             command_context=command_context,
             area_id=cmd.area_id,
-            parameters=STStorageConfig(**OTHER_PARAMETERS),
+            parameters=OTHER_PARAMETERS,
             upper_rule_curve=upper_rule_curve.tolist(),  # type: ignore
             inflows=inflows.tolist(),  # type: ignore
-            study_version=STUDY_VERSION_8_8,
+            study_version=STUDY_VERSION_8_6,
         )
         actual = cmd.create_diff(other)
+        expected_params = copy.deepcopy(OTHER_PARAMETERS)
+        expected_params["name"] = expected_params["name"].lower()
+        expected_params["group"] = expected_params["group"].lower()
         expected = [
             ReplaceMatrix(
                 command_context=command_context,
                 target="input/st-storage/series/area_fr/storage1/upper_rule_curve",
                 matrix=strip_matrix_protocol(other.upper_rule_curve),
-                study_version=STUDY_VERSION_8_8,
+                study_version=STUDY_VERSION_8_6,
             ),
             ReplaceMatrix(
                 command_context=command_context,
                 target="input/st-storage/series/area_fr/storage1/inflows",
                 matrix=strip_matrix_protocol(other.inflows),
-                study_version=STUDY_VERSION_8_8,
+                study_version=STUDY_VERSION_8_6,
             ),
             UpdateConfig(
                 command_context=command_context,
                 target="input/st-storage/clusters/area_fr/list/storage1",
-                data=OTHER_PARAMETERS,
-                study_version=STUDY_VERSION_8_8,
+                data=expected_params,
+                study_version=STUDY_VERSION_8_6,
             ),
         ]
         assert actual == expected
@@ -486,7 +461,7 @@ def test_create_diff__equals(self, command_context: CommandContext):
         cmd = CreateSTStorage(
             command_context=command_context,
             area_id="area_fr",
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             study_version=STUDY_VERSION_8_8,
         )
         actual = cmd.create_diff(cmd)
@@ -496,7 +471,7 @@ def test_get_inner_matrices(self, command_context: CommandContext):
         cmd = CreateSTStorage(
             command_context=command_context,
             area_id="area_fr",
-            parameters=STStorageConfig(**PARAMETERS),
+            parameters=PARAMETERS,
             study_version=STUDY_VERSION_8_8,
         )
         actual = cmd.get_inner_matrices()
diff --git a/tests/variantstudy/model/command/test_manage_binding_constraints.py b/tests/variantstudy/model/command/test_manage_binding_constraints.py
index 1f3cb55971..fe3c3c697e 100644
--- a/tests/variantstudy/model/command/test_manage_binding_constraints.py
+++ b/tests/variantstudy/model/command/test_manage_binding_constraints.py
@@ -21,7 +21,7 @@
     BindingConstraintFrequency,
     BindingConstraintOperator,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.command_extractor import CommandExtractor
 from antarest.study.storage.variantstudy.business.command_reverter import CommandReverter
diff --git a/tests/variantstudy/model/command/test_manage_district.py b/tests/variantstudy/model/command/test_manage_district.py
index 532ec35c19..d67b2f8be7 100644
--- a/tests/variantstudy/model/command/test_manage_district.py
+++ b/tests/variantstudy/model/command/test_manage_district.py
@@ -13,8 +13,8 @@
 
 from antarest.study.model import STUDY_VERSION_8_8
 from antarest.study.storage.rawstudy.ini_reader import IniReader
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.files import build
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.command_reverter import CommandReverter
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
diff --git a/tests/variantstudy/model/command/test_remove_area.py b/tests/variantstudy/model/command/test_remove_area.py
index b3de1c3342..7e016f88cd 100644
--- a/tests/variantstudy/model/command/test_remove_area.py
+++ b/tests/variantstudy/model/command/test_remove_area.py
@@ -18,7 +18,7 @@
     BindingConstraintFrequency,
     BindingConstraintOperator,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
 from antarest.study.storage.variantstudy.model.command.create_binding_constraint import CreateBindingConstraint
diff --git a/tests/variantstudy/model/command/test_remove_cluster.py b/tests/variantstudy/model/command/test_remove_cluster.py
index bf8db68e03..6cb8cf2be2 100644
--- a/tests/variantstudy/model/command/test_remove_cluster.py
+++ b/tests/variantstudy/model/command/test_remove_cluster.py
@@ -19,7 +19,7 @@
     BindingConstraintFrequency,
     BindingConstraintOperator,
 )
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
 from antarest.study.storage.variantstudy.model.command.create_binding_constraint import CreateBindingConstraint
@@ -37,7 +37,7 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext) ->
         area_name = "Area_name"
         area_id = transform_name_to_id(area_name)
         cluster_name = "Cluster Name"
-        cluster_id = transform_name_to_id(cluster_name, lower=False)
+        cluster_id = transform_name_to_id(cluster_name)
 
         study_version = empty_study.config.version
 
@@ -57,10 +57,10 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext) ->
             cluster_name=cluster_name,
             parameters={
                 "group": "group",
-                "unitcount": "unitcount",
-                "nominalcapacity": "nominalcapacity",
-                "marginal-cost": "marginal-cost",
-                "market-bid-cost": "market-bid-cost",
+                "unitcount": 4,
+                "nominalcapacity": 1.2,
+                "marginal-cost": 1.2,
+                "market-bid-cost": 1.2,
             },
             command_context=command_context,
             prepro=[[0]],
diff --git a/tests/variantstudy/model/command/test_remove_link.py b/tests/variantstudy/model/command/test_remove_link.py
index 305d2f976f..4032c32384 100644
--- a/tests/variantstudy/model/command/test_remove_link.py
+++ b/tests/variantstudy/model/command/test_remove_link.py
@@ -22,8 +22,8 @@
 from pydantic import ValidationError
 
 from antarest.study.model import STUDY_VERSION_8_8
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.config.files import build
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.rawstudy.model.filesystem.root.filestudytree import FileStudyTree
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
@@ -98,7 +98,7 @@ def test_apply(self, tmpdir: Path, command_context: CommandContext, version: int
         study_version = empty_study.config.version
 
         # Create some areas
-        areas = {transform_name_to_id(area, lower=True): area for area in ["Area_X", "Area_Y", "Area_Z"]}
+        areas = {transform_name_to_id(area): area for area in ["Area_X", "Area_Y", "Area_Z"]}
         for area in areas.values():
             output = CreateArea(area_name=area, command_context=command_context, study_version=study_version).apply(
                 empty_study
diff --git a/tests/variantstudy/model/command/test_remove_renewables_cluster.py b/tests/variantstudy/model/command/test_remove_renewables_cluster.py
index a03308e5b3..26a4daade1 100644
--- a/tests/variantstudy/model/command/test_remove_renewables_cluster.py
+++ b/tests/variantstudy/model/command/test_remove_renewables_cluster.py
@@ -13,7 +13,8 @@
 from checksumdir import dirhash
 
 from antarest.study.model import STUDY_VERSION_8_8
-from antarest.study.storage.rawstudy.model.filesystem.config.model import EnrModelling, transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.model import EnrModelling
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
 from antarest.study.storage.variantstudy.model.command.create_renewables_cluster import CreateRenewablesCluster
@@ -32,7 +33,7 @@ def test_apply(self, empty_study: FileStudy, command_context: CommandContext) ->
         area_name = "Area_name"
         area_id = transform_name_to_id(area_name)
         cluster_name = "Cluster Name"
-        cluster_id = transform_name_to_id(cluster_name, lower=False)
+        cluster_id = transform_name_to_id(cluster_name)
 
         output = CreateArea(area_name=area_name, command_context=command_context, study_version=study_version).apply(
             empty_study
diff --git a/tests/variantstudy/model/command/test_remove_st_storage.py b/tests/variantstudy/model/command/test_remove_st_storage.py
index e58db6db55..63b3d76c3b 100644
--- a/tests/variantstudy/model/command/test_remove_st_storage.py
+++ b/tests/variantstudy/model/command/test_remove_st_storage.py
@@ -16,7 +16,7 @@
 from pydantic import ValidationError
 
 from antarest.study.model import STUDY_VERSION_8_8
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.study_upgrader import StudyUpgrader
 from antarest.study.storage.variantstudy.model.command.common import CommandName
@@ -72,7 +72,7 @@ def test_init(self, command_context: CommandContext):
         assert cmd.area_id == "area_fr"
         assert cmd.storage_id == "storage_1"
 
-    def test_init__invalid_storage_id(self, recent_study: FileStudy, command_context: CommandContext):
+    def test_init__invalid_storage_id(self, command_context: CommandContext):
         # When we apply the config for a new ST Storage with a bad name
         with pytest.raises(ValidationError) as ctx:
             RemoveSTStorage(
@@ -81,16 +81,11 @@ def test_init__invalid_storage_id(self, recent_study: FileStudy, command_context
                 storage_id="?%$$",  # bad name
                 study_version=STUDY_VERSION_8_8,
             )
-        assert ctx.value.errors() == [
-            {
-                "ctx": {"pattern": "[a-z0-9_(),& -]+"},
-                "input": "?%$$",
-                "loc": ("storage_id",),
-                "msg": "String should match pattern '[a-z0-9_(),& -]+'",
-                "type": "string_pattern_mismatch",
-                "url": "https://errors.pydantic.dev/2.8/v/string_pattern_mismatch",
-            }
-        ]
+        assert len(ctx.value.errors()) == 1
+        error = ctx.value.errors()[0]
+        assert error["type"] == "string_pattern_mismatch"
+        assert error["loc"] == ("storage_id",)
+        assert error["msg"] == "String should match pattern '[a-z0-9_(),& -]+'"
 
     def test_apply_config__invalid_version(self, empty_study: FileStudy, command_context: CommandContext):
         # Given an old study in version 720
diff --git a/tests/variantstudy/model/command/test_replace_matrix.py b/tests/variantstudy/model/command/test_replace_matrix.py
index 95c21eac94..5e38031b40 100644
--- a/tests/variantstudy/model/command/test_replace_matrix.py
+++ b/tests/variantstudy/model/command/test_replace_matrix.py
@@ -15,7 +15,7 @@
 import numpy as np
 
 from antarest.study.model import STUDY_VERSION_8_8
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.command_reverter import CommandReverter
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
diff --git a/tests/variantstudy/model/command/test_update_config.py b/tests/variantstudy/model/command/test_update_config.py
index ceaff693c2..b4bd739b63 100644
--- a/tests/variantstudy/model/command/test_update_config.py
+++ b/tests/variantstudy/model/command/test_update_config.py
@@ -18,7 +18,7 @@
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.study.model import STUDY_VERSION_8_8
 from antarest.study.storage.rawstudy.ini_reader import IniReader
-from antarest.study.storage.rawstudy.model.filesystem.config.model import transform_name_to_id
+from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.business.command_reverter import CommandReverter
 from antarest.study.storage.variantstudy.model.command.create_area import CreateArea
diff --git a/tests/variantstudy/test_command_factory.py b/tests/variantstudy/test_command_factory.py
index e031d07e1e..7efdddd4e5 100644
--- a/tests/variantstudy/test_command_factory.py
+++ b/tests/variantstudy/test_command_factory.py
@@ -19,7 +19,7 @@
 import pytest
 
 from antarest.matrixstore.service import MatrixService
-from antarest.study.model import STUDY_VERSION_8_8
+from antarest.study.model import STUDY_VERSION_8_2, STUDY_VERSION_8_6, STUDY_VERSION_8_8
 from antarest.study.storage.patch_service import PatchService
 from antarest.study.storage.variantstudy.business.matrix_constants_generator import GeneratorMatrixConstants
 from antarest.study.storage.variantstudy.command_factory import CommandFactory
@@ -156,26 +156,6 @@
         study_version=STUDY_VERSION_8_8,
     ),
     CommandDTO(action=CommandName.REMOVE_BINDING_CONSTRAINT.value, args={"id": "id"}, study_version=STUDY_VERSION_8_8),
-    CommandDTO(
-        action=CommandName.REMOVE_BINDING_CONSTRAINT.value, args=[{"id": "id"}], study_version=STUDY_VERSION_8_8
-    ),
-    CommandDTO(
-        action=CommandName.CREATE_THERMAL_CLUSTER.value,
-        args={
-            "area_id": "area_name",
-            "cluster_name": "cluster_name",
-            "parameters": {
-                "group": "group",
-                "unitcount": "unitcount",
-                "nominalcapacity": "nominalcapacity",
-                "marginal-cost": "marginal-cost",
-                "market-bid-cost": "market-bid-cost",
-            },
-            "prepro": "prepro",
-            "modulation": "modulation",
-        },
-        study_version=STUDY_VERSION_8_8,
-    ),
     CommandDTO(
         action=CommandName.CREATE_THERMAL_CLUSTER.value,
         args=[
@@ -183,17 +163,33 @@
                 "area_id": "area_name",
                 "cluster_name": "cluster_name",
                 "parameters": {
-                    "group": "group",
-                    "unitcount": "unitcount",
-                    "nominalcapacity": "nominalcapacity",
-                    "marginal-cost": "marginal-cost",
-                    "market-bid-cost": "market-bid-cost",
+                    "co2": 0.0,
+                    "enabled": True,
+                    "fixed-cost": 0.0,
+                    "gen-ts": "use global",
+                    "group": "other 1",
+                    "law.forced": "uniform",
+                    "law.planned": "uniform",
+                    "marginal-cost": 2.0,
+                    "market-bid-cost": 2.0,
+                    "min-down-time": 1,
+                    "min-stable-power": 0.0,
+                    "min-up-time": 1,
+                    "must-run": False,
+                    "name": "cluster_name",
+                    "nominalcapacity": 2.0,
+                    "spinning": 0.0,
+                    "spread-cost": 0.0,
+                    "startup-cost": 0.0,
+                    "unitcount": 2,
+                    "volatility.forced": 0.0,
+                    "volatility.planned": 0.0,
                 },
                 "prepro": "prepro",
                 "modulation": "modulation",
             }
         ],
-        study_version=STUDY_VERSION_8_8,
+        study_version=STUDY_VERSION_8_2,
     ),
     CommandDTO(
         action=CommandName.REMOVE_THERMAL_CLUSTER.value,
@@ -211,26 +207,16 @@
             "area_id": "area_name",
             "cluster_name": "cluster_name",
             "parameters": {
+                "enabled": True,
+                "group": "other res 1",
                 "name": "name",
+                "nominalcapacity": 0.0,
                 "ts-interpretation": "power-generation",
+                "unitcount": 1,
             },
         },
         study_version=STUDY_VERSION_8_8,
     ),
-    CommandDTO(
-        action=CommandName.CREATE_RENEWABLES_CLUSTER.value,
-        args=[
-            {
-                "area_id": "area_name",
-                "cluster_name": "cluster_name",
-                "parameters": {
-                    "name": "name",
-                    "ts-interpretation": "power-generation",
-                },
-            }
-        ],
-        study_version=STUDY_VERSION_8_8,
-    ),
     CommandDTO(
         action=CommandName.REMOVE_RENEWABLES_CLUSTER.value,
         args={"area_id": "area_name", "cluster_id": "cluster_name"},
@@ -314,8 +300,8 @@
         args={
             "area_id": "area 1",
             "parameters": {
-                "name": "Storage 1",
-                "group": "Battery",
+                "name": "storage 1",
+                "group": "battery",
                 "injectionnominalcapacity": 0,
                 "withdrawalnominalcapacity": 0,
                 "reservoircapacity": 0,
@@ -329,7 +315,7 @@
             "upper_rule_curve": "matrix://8ce614c8-c687-41af-8b24-df8a49cc52af",
             "inflows": "matrix://df9b25e1-e3f7-4a57-8182-0ff9791439e5",
         },
-        study_version=STUDY_VERSION_8_8,
+        study_version=STUDY_VERSION_8_6,
     ),
     CommandDTO(
         action=CommandName.CREATE_ST_STORAGE.value,
@@ -338,11 +324,11 @@
                 "area_id": "area 1",
                 "parameters": {
                     "efficiency": 1,
-                    "group": "Battery",
+                    "group": "battery",
                     "initiallevel": 0,
                     "initialleveloptim": False,
                     "injectionnominalcapacity": 0,
-                    "name": "Storage 1",
+                    "name": "storage 1",
                     "reservoircapacity": 0,
                     "withdrawalnominalcapacity": 0,
                 },
@@ -356,11 +342,11 @@
                 "area_id": "area 1",
                 "parameters": {
                     "efficiency": 0.94,
-                    "group": "Battery",
+                    "group": "battery",
                     "initiallevel": 0,
                     "initialleveloptim": False,
                     "injectionnominalcapacity": 0,
-                    "name": "Storage 2",
+                    "name": "storage 2",
                     "reservoircapacity": 0,
                     "withdrawalnominalcapacity": 0,
                 },
@@ -371,7 +357,7 @@
                 "inflows": "matrix://e8923768-9bdd-40c2-a6ea-2da2523be727",
             },
         ],
-        study_version=STUDY_VERSION_8_8,
+        study_version=STUDY_VERSION_8_6,
     ),
     CommandDTO(
         action=CommandName.REMOVE_ST_STORAGE.value,

From 93884de3810444e2e30ad57d4c1efb74dbfa1830 Mon Sep 17 00:00:00 2001
From: maugde <167874615+maugde@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:10:23 +0100
Subject: [PATCH 03/31] feat(commands): add creation timestamp and user name
 inside commands (#2252)

---
 ...dd_user_name_and_updated_at_to_commands.py |  36 +++++
 .../storage/variantstudy/model/dbmodel.py     |   6 +
 .../study/storage/variantstudy/model/model.py |  14 +-
 .../variantstudy/variant_study_service.py     |  39 +++++-
 .../test_hydro_inflow_structure.py            |   3 +-
 .../study_data_blueprint/test_st_storage.py   |   6 +
 .../test_integration_token_end_to_end.py      |  16 +++
 .../variantstudy/model/test_dbmodel.py        |   7 +-
 .../test_variant_study_service.py             |   2 +-
 .../model/command/test_create_cluster.py      |   2 +
 .../command/test_create_renewables_cluster.py |   2 +
 .../variantstudy/model/test_variant_model.py  | 131 +++++++++++++++++-
 12 files changed, 251 insertions(+), 13 deletions(-)
 create mode 100644 alembic/versions/bae9c99bc42d_add_user_name_and_updated_at_to_commands.py

diff --git a/alembic/versions/bae9c99bc42d_add_user_name_and_updated_at_to_commands.py b/alembic/versions/bae9c99bc42d_add_user_name_and_updated_at_to_commands.py
new file mode 100644
index 0000000000..cd91acb203
--- /dev/null
+++ b/alembic/versions/bae9c99bc42d_add_user_name_and_updated_at_to_commands.py
@@ -0,0 +1,36 @@
+"""add_user_name_and_updated_at_to_commands
+
+Revision ID: bae9c99bc42d
+Revises: 00a9ceb38842
+Create Date: 2024-11-29 09:13:04.292874
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'bae9c99bc42d'
+down_revision = '00a9ceb38842'
+branch_labels = None
+depends_on = None
+
+USER_ID_FKEY = 'commandblock_user_id_fk'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('commandblock', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('user_id', sa.Integer(), nullable=True))
+        batch_op.add_column(sa.Column('updated_at', sa.DateTime(), nullable=True))
+        batch_op.create_foreign_key(USER_ID_FKEY, 'identities', ['user_id'], ['id'], ondelete='SET NULL')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('commandblock', schema=None) as batch_op:
+        batch_op.drop_constraint(USER_ID_FKEY, type_='foreignkey')
+        batch_op.drop_column('updated_at')
+        batch_op.drop_column('user_id')
+    # ### end Alembic commands ###
diff --git a/antarest/study/storage/variantstudy/model/dbmodel.py b/antarest/study/storage/variantstudy/model/dbmodel.py
index f09231cc86..180b7105ef 100644
--- a/antarest/study/storage/variantstudy/model/dbmodel.py
+++ b/antarest/study/storage/variantstudy/model/dbmodel.py
@@ -66,6 +66,8 @@ class CommandBlock(Base):  # type: ignore
     version: int = Column(Integer)
     args: str = Column(String())
     study_version: str = Column(String(36))
+    user_id: int = Column(Integer, ForeignKey("identities.id", ondelete="SET NULL"), nullable=True)
+    updated_at: datetime.datetime = Column(DateTime, nullable=True)
 
     def to_dto(self) -> CommandDTO:
         # Database may lack a version number, defaulting to 1 if so.
@@ -76,6 +78,8 @@ def to_dto(self) -> CommandDTO:
             args=from_json(self.args),
             version=version,
             study_version=self.study_version,
+            user_id=self.user_id,
+            updated_at=self.updated_at,
         )
 
     def __str__(self) -> str:
@@ -87,6 +91,8 @@ def __str__(self) -> str:
             f" version={self.version!r},"
             f" args={self.args!r})"
             f" study_version={self.study_version!r}"
+            f" user_id={self.user_id!r}"
+            f" updated_at={self.updated_at!r}"
         )
 
 
diff --git a/antarest/study/storage/variantstudy/model/model.py b/antarest/study/storage/variantstudy/model/model.py
index a303e39020..0d0c308581 100644
--- a/antarest/study/storage/variantstudy/model/model.py
+++ b/antarest/study/storage/variantstudy/model/model.py
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-
+import datetime
 import typing as t
 import uuid
 
@@ -73,6 +73,8 @@ class CommandDTOAPI(AntaresBaseModel):
     action: str
     args: t.Union[t.MutableSequence[JSON], JSON]
     version: int = 1
+    user_name: t.Optional[str] = None
+    updated_at: t.Optional[datetime.datetime] = None
 
 
 class CommandDTO(AntaresBaseModel):
@@ -85,6 +87,8 @@ class CommandDTO(AntaresBaseModel):
         args: The arguments for the command action.
         version: The version of the command.
         study_version: The version of the study associated to the command.
+        user_id: id of the author of the command.
+        updated_at: The time the command was last updated.
     """
 
     id: t.Optional[str] = None
@@ -92,9 +96,13 @@ class CommandDTO(AntaresBaseModel):
     args: t.Union[t.MutableSequence[JSON], JSON]
     version: int = 1
     study_version: StudyVersionStr
+    user_id: t.Optional[int] = None
+    updated_at: t.Optional[datetime.datetime] = None
 
-    def to_api(self) -> CommandDTOAPI:
-        return CommandDTOAPI.model_validate(self.model_dump(mode="json", exclude={"study_version"}))
+    def to_api(self, user_name: t.Optional[str] = None) -> CommandDTOAPI:
+        data = self.model_dump(mode="json", exclude={"study_version", "user_id"})
+        data["user_name"] = user_name
+        return CommandDTOAPI.model_validate(data)
 
 
 class CommandResultDTO(AntaresBaseModel):
diff --git a/antarest/study/storage/variantstudy/variant_study_service.py b/antarest/study/storage/variantstudy/variant_study_service.py
index ea57a82d60..a57b7f1b2f 100644
--- a/antarest/study/storage/variantstudy/variant_study_service.py
+++ b/antarest/study/storage/variantstudy/variant_study_service.py
@@ -41,7 +41,7 @@
 from antarest.core.filetransfer.model import FileDownloadTaskDTO
 from antarest.core.interfaces.cache import ICache
 from antarest.core.interfaces.eventbus import Event, EventChannelDirectory, EventType, IEventBus
-from antarest.core.jwt import DEFAULT_ADMIN_USER
+from antarest.core.jwt import DEFAULT_ADMIN_USER, JWTUser
 from antarest.core.model import JSON, PermissionInfo, PublicMode, StudyPermissionType
 from antarest.core.requests import RequestParameters, UserHasNotPermissionError
 from antarest.core.serialization import to_json_string
@@ -49,6 +49,7 @@
 from antarest.core.tasks.service import DEFAULT_AWAIT_MAX_TIMEOUT, ITaskNotifier, ITaskService, NoopNotifier
 from antarest.core.utils.fastapi_sqlalchemy import db
 from antarest.core.utils.utils import assert_this, suppress_exception
+from antarest.login.model import Identity
 from antarest.matrixstore.service import MatrixService
 from antarest.study.model import RawStudy, Study, StudyAdditionalData, StudyMetadataDTO, StudySimResultDTO
 from antarest.study.repository import AccessPermissions, StudyFilter
@@ -106,6 +107,17 @@ def __init__(
         self.command_factory = command_factory
         self.generator = VariantCommandGenerator(self.study_factory)
 
+    @staticmethod
+    def _get_user_name_from_id(user_id: int) -> str:
+        """
+        Utility method that retrieves a user's name based on their id.
+        Args:
+            user_id: user id (user must exist)
+        Returns: String representing the user's name
+        """
+        user_obj: Identity = db.session.query(Identity).get(user_id)
+        return user_obj.name  # type: ignore  # `name` attribute is always a string
+
     def get_command(self, study_id: str, command_id: str, params: RequestParameters) -> CommandDTOAPI:
         """
         Get command lists
@@ -118,8 +130,10 @@ def get_command(self, study_id: str, command_id: str, params: RequestParameters)
         study = self._get_variant_study(study_id, params)
 
         try:
-            index = [command.id for command in study.commands].index(command_id)  # Maybe add Try catch for this
-            return t.cast(CommandDTOAPI, study.commands[index].to_dto().to_api())
+            index = [command.id for command in study.commands].index(command_id)
+            command: CommandBlock = study.commands[index]
+            user_name = self._get_user_name_from_id(command.user_id) if command.user_id else None
+            return command.to_dto().to_api(user_name)
         except ValueError:
             raise CommandNotFoundError(f"Command with id {command_id} not found") from None
 
@@ -132,7 +146,16 @@ def get_commands(self, study_id: str, params: RequestParameters) -> t.List[Comma
         Returns: List of commands
         """
         study = self._get_variant_study(study_id, params)
-        return [command.to_dto().to_api() for command in study.commands]
+
+        id_to_name: t.Dict[int, str] = {}
+        command_list = []
+
+        for command in study.commands:
+            if command.user_id and command.user_id not in id_to_name.keys():
+                user_name: str = self._get_user_name_from_id(command.user_id)
+                id_to_name[command.user_id] = user_name
+            command_list.append(command.to_dto().to_api(id_to_name.get(command.user_id)))
+        return command_list
 
     def convert_commands(
         self, study_id: str, api_commands: t.List[CommandDTOAPI], params: RequestParameters
@@ -201,6 +224,7 @@ def append_commands(
         command_objs = self._check_commands_validity(study_id, commands)
         validated_commands = transform_command_to_dto(command_objs, commands)
         first_index = len(study.commands)
+
         # noinspection PyArgumentList
         new_commands = [
             CommandBlock(
@@ -209,6 +233,9 @@ def append_commands(
                 index=(first_index + i),
                 version=command.version,
                 study_version=str(command.study_version),
+                # params.user cannot be None, since previous checks were successful
+                user_id=params.user.id,  # type: ignore
+                updated_at=datetime.utcnow(),
             )
             for i, command in enumerate(validated_commands)
         ]
@@ -249,6 +276,8 @@ def replace_commands(
                 index=i,
                 version=command.version,
                 study_version=str(command.study_version),
+                user_id=params.user.id,  # type: ignore
+                updated_at=datetime.utcnow(),
             )
             for i, command in enumerate(validated_commands)
         ]
@@ -893,6 +922,8 @@ def copy(
                 index=command.index,
                 version=command.version,
                 study_version=str(command.study_version),
+                user_id=command.user_id,
+                updated_at=command.updated_at,
             )
             for command in src_meta.commands
         ]
diff --git a/tests/integration/study_data_blueprint/test_hydro_inflow_structure.py b/tests/integration/study_data_blueprint/test_hydro_inflow_structure.py
index ec1327093d..79965cc81e 100644
--- a/tests/integration/study_data_blueprint/test_hydro_inflow_structure.py
+++ b/tests/integration/study_data_blueprint/test_hydro_inflow_structure.py
@@ -9,7 +9,6 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-
 from http import HTTPStatus
 from unittest.mock import ANY
 
@@ -137,6 +136,8 @@ def test_get_inflow_structure(
                 "data": {"intermonthly-correlation": 0.9},
             },
             "version": 1,
+            "updated_at": ANY,
+            "user_name": ANY,
         }
         assert actual[1] == expected
 
diff --git a/tests/integration/study_data_blueprint/test_st_storage.py b/tests/integration/study_data_blueprint/test_st_storage.py
index 2780e098cf..ae5a25dacd 100644
--- a/tests/integration/study_data_blueprint/test_st_storage.py
+++ b/tests/integration/study_data_blueprint/test_st_storage.py
@@ -669,6 +669,8 @@ def test__default_values(
                 "inflows": ANY,
             },
             "version": 1,
+            "updated_at": ANY,
+            "user_name": ANY,
         }
         assert actual == expected
 
@@ -693,6 +695,8 @@ def test__default_values(
                 "target": "input/st-storage/clusters/fr/list/siemens battery/initiallevel",
             },
             "version": 1,
+            "updated_at": ANY,
+            "user_name": ANY,
         }
         assert actual == expected
 
@@ -723,6 +727,8 @@ def test__default_values(
                 },
             ],
             "version": 1,
+            "updated_at": ANY,
+            "user_name": ANY,
         }
         assert actual == expected
 
diff --git a/tests/integration/test_integration_token_end_to_end.py b/tests/integration/test_integration_token_end_to_end.py
index 01b92788d4..5b78d0ac58 100644
--- a/tests/integration/test_integration_token_end_to_end.py
+++ b/tests/integration/test_integration_token_end_to_end.py
@@ -10,6 +10,7 @@
 #
 # This file is part of the Antares project.
 
+import datetime
 import io
 import typing as t
 from unittest.mock import ANY
@@ -173,6 +174,21 @@ def test_nominal_case_of_an_api_user(client: TestClient, admin_access_token: str
     res = client.post(f"/v1/studies/{variant_id}/commands", headers=bot_headers, json=commands)
     assert res.status_code == 200
 
+    # Check if the author's name and date of update are retrieved with commands created by a bot
+    commands_res = client.get(f"/v1/studies/{variant_id}/commands", headers=bot_headers)
+
+    for command in commands_res.json():
+        # FIXME: Some commands, such as those that modify study configurations, are run by admin user
+        # Thus the `user_name` for such type of command will be the admin's name
+        # Here we detect those commands by their `action` and their `target` values
+        if command["action"] == "update_playlist" or (
+            command["action"] == "update_config" and "settings/generaldata" in command["args"]["target"]
+        ):
+            assert command["user_name"] == "admin"
+        else:
+            assert command["user_name"] == "admin_bot"
+        assert command["updated_at"]
+
     # generate variant before running a simulation
     res = client.put(f"/v1/studies/{variant_id}/generate", headers=bot_headers)
     assert res.status_code == 200
diff --git a/tests/study/storage/variantstudy/model/test_dbmodel.py b/tests/study/storage/variantstudy/model/test_dbmodel.py
index e89ea48355..529c9f04b3 100644
--- a/tests/study/storage/variantstudy/model/test_dbmodel.py
+++ b/tests/study/storage/variantstudy/model/test_dbmodel.py
@@ -127,7 +127,7 @@ def test_init__with_command(self, db_session: Session, variant_study_id: str) ->
 
 
 class TestCommandBlock:
-    def test_init(self, db_session: Session, variant_study_id: str) -> None:
+    def test_init(self, db_session: Session, variant_study_id: str, user_id: int) -> None:
         """
         Check the creation of an instance of CommandBlock
         """
@@ -136,6 +136,7 @@ def test_init(self, db_session: Session, variant_study_id: str) -> None:
         command = "dummy command"
         version = 42
         args = '{"foo": "bar"}'
+        updated_at = datetime.datetime.utcnow()
 
         with db_session:
             block = CommandBlock(
@@ -146,6 +147,8 @@ def test_init(self, db_session: Session, variant_study_id: str) -> None:
                 version=version,
                 args=args,
                 study_version="860",
+                updated_at=updated_at,
+                user_id=user_id,
             )
             db_session.add(block)
             db_session.commit()
@@ -172,6 +175,8 @@ def test_init(self, db_session: Session, variant_study_id: str) -> None:
             "args": json.loads(args),
             "version": 42,
             "study_version": StudyVersion.parse("860"),
+            "updated_at": updated_at,
+            "user_id": user_id,
         }
 
 
diff --git a/tests/study/storage/variantstudy/test_variant_study_service.py b/tests/study/storage/variantstudy/test_variant_study_service.py
index ba0cb93277..6375dcc546 100644
--- a/tests/study/storage/variantstudy/test_variant_study_service.py
+++ b/tests/study/storage/variantstudy/test_variant_study_service.py
@@ -134,7 +134,7 @@ def test_generate_task(
     ) -> None:
         ## Prepare database objects
         # noinspection PyArgumentList
-        user = User(id=0, name="admin")
+        user = User(id=1, name="admin")
         db.session.add(user)
         db.session.commit()
 
diff --git a/tests/variantstudy/model/command/test_create_cluster.py b/tests/variantstudy/model/command/test_create_cluster.py
index b6a03874f5..adf9f221f6 100644
--- a/tests/variantstudy/model/command/test_create_cluster.py
+++ b/tests/variantstudy/model/command/test_create_cluster.py
@@ -210,6 +210,8 @@ def test_to_dto(self, command_context: CommandContext):
             "id": None,
             "version": 1,
             "study_version": STUDY_VERSION_8_8,
+            "user_id": None,
+            "updated_at": None,
         }
 
 
diff --git a/tests/variantstudy/model/command/test_create_renewables_cluster.py b/tests/variantstudy/model/command/test_create_renewables_cluster.py
index aa4eeff60e..78b73e0208 100644
--- a/tests/variantstudy/model/command/test_create_renewables_cluster.py
+++ b/tests/variantstudy/model/command/test_create_renewables_cluster.py
@@ -163,6 +163,8 @@ def test_to_dto(self, command_context: CommandContext) -> None:
             "id": None,
             "version": 1,
             "study_version": STUDY_VERSION_8_8,
+            "updated_at": None,
+            "user_id": None,
         }
 
 
diff --git a/tests/variantstudy/model/test_variant_model.py b/tests/variantstudy/model/test_variant_model.py
index 2fd8a47881..e2b607a30e 100644
--- a/tests/variantstudy/model/test_variant_model.py
+++ b/tests/variantstudy/model/test_variant_model.py
@@ -11,13 +11,17 @@
 # This file is part of the Antares project.
 
 import datetime
+import typing as t
 import uuid
 from pathlib import Path
+from unittest.mock import patch
 
 import pytest
 from antares.study.version import StudyVersion
+from sqlalchemy import event
 
 from antarest.core.jwt import JWTGroup, JWTUser
+from antarest.core.model import PublicMode
 from antarest.core.requests import RequestParameters
 from antarest.core.roles import RoleType
 from antarest.core.utils.fastapi_sqlalchemy import db
@@ -59,7 +63,11 @@ def root_study_id_fixture(
         raw_study_service: RawStudyService,
         variant_study_service: VariantStudyService,
         jwt_user: JWTUser,
+        request: t.Any,
     ) -> str:
+        # Get public mode argument
+        public_mode = request.param
+
         # Prepare a RAW study in the temporary folder
         study_dir = tmp_path / "my-study"
         root_study_id = str(uuid.uuid4())
@@ -72,6 +80,7 @@ def root_study_id_fixture(
             updated_at=datetime.datetime.utcnow(),
             additional_data=StudyAdditionalData(author="john.doe"),
             owner_id=jwt_user.id,
+            public_mode=PublicMode.EDIT if public_mode else PublicMode.NONE,
         )
         root_study = raw_study_service.create(root_study)
         with db():
@@ -79,6 +88,7 @@ def root_study_id_fixture(
             variant_study_service.repository.save(root_study)
         return root_study_id
 
+    @pytest.mark.parametrize("root_study_id", [False], indirect=True)
     @with_db_context
     def test_commands_service(
         self,
@@ -89,10 +99,9 @@ def test_commands_service(
     ) -> None:
         # Initialize the default matrix constants
         generator_matrix_constants.init_constant_matrices()
-
         params = RequestParameters(user=jwt_user)
 
-        # Create un new variant
+        # Create a new variant
         variant_study = variant_study_service.create_variant_study(root_study_id, "my-variant", params=params)
         study_version = StudyVersion.parse(variant_study.version)
         saved_id = variant_study.id
@@ -101,7 +110,7 @@ def test_commands_service(
         assert study.id == saved_id
         assert study.parent_id == root_study_id
 
-        # Append command
+        # Append commands one at the time
         command_count = 0
         command_1 = CommandDTO(action="create_area", args={"area_name": "Yes"}, study_version=study_version)
         variant_study_service.append_command(saved_id, command_1, params=params)
@@ -190,3 +199,119 @@ def test_commands_service(
             ],
         }
         assert study.snapshot.id == study.id
+
+    @pytest.mark.parametrize("root_study_id", [True], indirect=True)
+    @with_db_context
+    def test_command_several_authors(
+        self,
+        jwt_user: JWTUser,
+        variant_study_service: VariantStudyService,
+        root_study_id: str,
+    ):
+        """
+        Test two different users that are authors on two different commands of the same variant
+        Set up:
+            Retrieve the user that will be the owner of the study and variant
+            Create a second user
+            Create a study and a variant study
+            Each user creates a command
+
+        Tests:
+            Test whether the commands have the `user_name` and `updated_at` attributes
+            Test authors of the commands
+        """
+        # Get the owner request parameters
+        owner_params = RequestParameters(user=jwt_user)
+
+        # create another user that has the write privilege
+        user2 = User(id=3, name="jane.doe", type="users")
+        db.session.add(user2)
+        db.session.commit()
+
+        user2_params = RequestParameters(
+            user=JWTUser(
+                id=user2.id,
+                impersonator=user2.id,
+                type="users",
+                groups=[JWTGroup(id="writers", name="writers", role=RoleType.WRITER)],
+            )
+        )
+
+        # Generate a variant on a study that allow other user to edit it
+        variant_study = variant_study_service.create_variant_study(root_study_id, "new variant", params=owner_params)
+        study_version = StudyVersion.parse(variant_study.version)
+        variant_id = variant_study.id
+
+        # Create two new commands on the existing variant
+        command_6 = CommandDTO(action="update_comments", args={"comments": "new comment"}, study_version=study_version)
+        command_7 = CommandDTO(
+            action="update_comments", args={"comments": "another new comment"}, study_version=study_version
+        )
+
+        variant_study_service.append_command(variant_id, command_6, params=owner_params)
+        variant_study_service.append_command(variant_id, command_7, params=user2_params)
+
+        # Make sure there are commands generated by both users
+        commands = variant_study_service.get_commands(variant_id, params=owner_params)
+        assert len(commands) == 2
+
+        # Make sure their `user_name` and `updated_at` attributes are not None
+        for command in commands:
+            assert command.user_name and command.updated_at
+
+        # Make sure commands has not the same author
+        assert commands[0] != commands[1]
+        assert commands[0].user_name == "john.doe"
+        assert commands[1].user_name == "jane.doe"
+
+    @pytest.mark.parametrize("root_study_id", [False], indirect=True)
+    @with_db_context
+    def test_command_same_author(
+        self,
+        jwt_user: JWTUser,
+        variant_study_service: VariantStudyService,
+        root_study_id: str,
+    ):
+        """
+        Test the case of multiple commands was created by the same user.
+        Set up:
+            Initialize a counter of queries to database
+            Define a watcher on the orm queries to database that updates the counter
+            Create a user
+            Create a variant study
+            Make the user generates five commands on the newly created variant
+        Test:
+            Each time a command is retrieved, the database must be accessed only if
+            the author of the currently retrieved command is not already known during
+            the process
+        """
+        nb_queries = 0  # Store number of orm queries to database
+
+        # Watch orm events and update `nb_queries`
+        @event.listens_for(db.session, "do_orm_execute")
+        def check_orm_operations(orm_execute_state):
+            if orm_execute_state.is_select:
+                nonlocal nb_queries
+                nb_queries += 1
+
+        owner_params = RequestParameters(user=jwt_user)
+
+        # Generate a variant on a study that allow other user to edit it
+        variant_study = variant_study_service.create_variant_study(root_study_id, "new_variant", params=owner_params)
+
+        commands = []
+
+        # Create two new commands on the existing variant
+        for index in range(5):
+            commands.append(
+                CommandDTO(
+                    action="update_comments",
+                    args={"comments": f"new comment {index}"},
+                    study_version=StudyVersion.parse(variant_study.version),
+                )
+            )
+        variant_study_service.append_commands(variant_study.id, commands, params=owner_params)
+
+        nb_queries_before = nb_queries  # store initial state
+        variant_study_service.get_commands(variant_study.id, params=owner_params)  # execute database query
+        assert nb_queries_before + 1 == nb_queries  # compare with initial state to make sure database was queried once

From 53667c058ce1f693ad0271308bfe6645e925d1b0 Mon Sep 17 00:00:00 2001
From: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
Date: Fri, 6 Dec 2024 17:35:46 +0100
Subject: [PATCH 04/31] fix(tasks): frozen tasks with pgpool (#2264)

This work aims at fixing issues encountered with load balanced pgpool,
where a commit is not always instantly visible in another session (when
read from replica).

Fixes are:
- restore a workaround which consists in re-trying the read until success
- ensure exceptions occurring in the task execution thread are
  ALL caught

Also removing a technical debt:
- remove optional session from task job repo which was just used in tests.
  It did not work with code which uses both the repo and also the session
  from the singleton db.session.

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
---
 antarest/core/tasks/repository.py |  15 +----
 antarest/core/tasks/service.py    | 105 +++++++++++++++++-------------
 antarest/core/utils/utils.py      |   2 +-
 tests/core/test_tasks.py          |  46 ++++++-------
 4 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/antarest/core/tasks/repository.py b/antarest/core/tasks/repository.py
index 0a2028db33..74c9e84b78 100644
--- a/antarest/core/tasks/repository.py
+++ b/antarest/core/tasks/repository.py
@@ -27,15 +27,6 @@ class TaskJobRepository:
     Database connector to manage Tasks/Jobs entities.
     """
 
-    def __init__(self, session: t.Optional[Session] = None):
-        """
-        Initialize the repository.
-
-        Args:
-            session: Optional SQLAlchemy session to be used.
-        """
-        self._session = session
-
     @property
     def session(self) -> Session:
         """
@@ -44,11 +35,7 @@ def session(self) -> Session:
         Returns:
             SQLAlchemy session.
         """
-        if self._session is None:
-            # Get or create the session from a context variable (thread local variable)
-            return db.session
-        # Get the user-defined session
-        return self._session
+        return db.session
 
     def save(self, task: TaskJob) -> TaskJob:
         session = self.session
diff --git a/antarest/core/tasks/service.py b/antarest/core/tasks/service.py
index f992e227c6..a97a2fedf5 100644
--- a/antarest/core/tasks/service.py
+++ b/antarest/core/tasks/service.py
@@ -38,6 +38,7 @@
 )
 from antarest.core.tasks.repository import TaskJobRepository
 from antarest.core.utils.fastapi_sqlalchemy import db
+from antarest.core.utils.utils import retry
 from antarest.worker.worker import WorkerTaskCommand, WorkerTaskResult
 
 logger = logging.getLogger(__name__)
@@ -390,35 +391,41 @@ def _run_task(
         task_id: str,
         custom_event_messages: t.Optional[CustomTaskEventMessages] = None,
     ) -> None:
-        # attention: this function is executed in a thread, not in the main process
-        with db():
-            task = db.session.query(TaskJob).get(task_id)
-            task_type = task.type
-            study_id = task.ref_id
+        # We need to catch all exceptions so that the calling thread is guaranteed
+        # to not die
+        try:
+            # attention: this function is executed in a thread, not in the main process
+            with db():
+                # Important to keep this retry for now,
+                # in case commit is not visible (read from replica ...)
+                task = retry(lambda: self.repo.get_or_raise(task_id))
+                task_type = task.type
+                study_id = task.ref_id
 
-        self.event_bus.push(
-            Event(
-                type=EventType.TASK_RUNNING,
-                payload=TaskEventPayload(
-                    id=task_id,
-                    message=custom_event_messages.running
-                    if custom_event_messages is not None
-                    else f"Task {task_id} is running",
-                    type=task_type,
-                    study_id=study_id,
-                ).model_dump(),
-                permissions=PermissionInfo(public_mode=PublicMode.READ),
-                channel=EventChannelDirectory.TASK + task_id,
+            self.event_bus.push(
+                Event(
+                    type=EventType.TASK_RUNNING,
+                    payload=TaskEventPayload(
+                        id=task_id,
+                        message=custom_event_messages.running
+                        if custom_event_messages is not None
+                        else f"Task {task_id} is running",
+                        type=task_type,
+                        study_id=study_id,
+                    ).model_dump(),
+                    permissions=PermissionInfo(public_mode=PublicMode.READ),
+                    channel=EventChannelDirectory.TASK + task_id,
+                )
             )
-        )
 
-        logger.info(f"Starting task {task_id}")
-        with db():
-            db.session.query(TaskJob).filter(TaskJob.id == task_id).update({TaskJob.status: TaskStatus.RUNNING.value})
-            db.session.commit()
-        logger.info(f"Task {task_id} set to RUNNING")
+            logger.info(f"Starting task {task_id}")
+            with db():
+                db.session.query(TaskJob).filter(TaskJob.id == task_id).update(
+                    {TaskJob.status: TaskStatus.RUNNING.value}
+                )
+                db.session.commit()
+            logger.info(f"Task {task_id} set to RUNNING")
 
-        try:
             with db():
                 # We must use the DB session attached to the current thread
                 result = callback(TaskLogAndProgressRecorder(task_id, db.session, self.event_bus))
@@ -463,29 +470,35 @@ def _run_task(
             err_msg = f"Task {task_id} failed: Unhandled exception {exc}"
             logger.error(err_msg, exc_info=exc)
 
-            with db():
-                result_msg = f"{err_msg}\nSee the logs for detailed information and the error traceback."
-                db.session.query(TaskJob).filter(TaskJob.id == task_id).update(
-                    {
-                        TaskJob.status: TaskStatus.FAILED.value,
-                        TaskJob.result_msg: result_msg,
-                        TaskJob.result_status: False,
-                        TaskJob.completion_date: datetime.datetime.utcnow(),
-                    }
+            try:
+                with db():
+                    result_msg = f"{err_msg}\nSee the logs for detailed information and the error traceback."
+                    db.session.query(TaskJob).filter(TaskJob.id == task_id).update(
+                        {
+                            TaskJob.status: TaskStatus.FAILED.value,
+                            TaskJob.result_msg: result_msg,
+                            TaskJob.result_status: False,
+                            TaskJob.completion_date: datetime.datetime.utcnow(),
+                        }
+                    )
+                    db.session.commit()
+
+                message = err_msg if custom_event_messages is None else custom_event_messages.end
+                self.event_bus.push(
+                    Event(
+                        type=EventType.TASK_FAILED,
+                        payload=TaskEventPayload(
+                            id=task_id, message=message, type=task_type, study_id=study_id
+                        ).model_dump(),
+                        permissions=PermissionInfo(public_mode=PublicMode.READ),
+                        channel=EventChannelDirectory.TASK + task_id,
+                    )
                 )
-                db.session.commit()
-
-            message = err_msg if custom_event_messages is None else custom_event_messages.end
-            self.event_bus.push(
-                Event(
-                    type=EventType.TASK_FAILED,
-                    payload=TaskEventPayload(
-                        id=task_id, message=message, type=task_type, study_id=study_id
-                    ).model_dump(),
-                    permissions=PermissionInfo(public_mode=PublicMode.READ),
-                    channel=EventChannelDirectory.TASK + task_id,
+            except Exception as inner_exc:
+                logger.error(
+                    f"An exception occurred while handling execution error of task {task_id}: {inner_exc}",
+                    exc_info=inner_exc,
                 )
-            )
 
     def get_task_progress(self, task_id: str, params: RequestParameters) -> t.Optional[int]:
         task = self.repo.get_or_raise(task_id)
diff --git a/antarest/core/utils/utils.py b/antarest/core/utils/utils.py
index c748420549..2940db582a 100644
--- a/antarest/core/utils/utils.py
+++ b/antarest/core/utils/utils.py
@@ -105,7 +105,7 @@ def retry(func: t.Callable[[], T], attempts: int = 10, interval: float = 0.5) ->
             attempt += 1
             return func()
         except Exception as e:
-            logger.info(f"💤 Sleeping {interval} second(s)...")
+            logger.info(f"💤 Sleeping {interval} second(s) before retry...", exc_info=e)
             time.sleep(interval)
             caught_exception = e
     raise caught_exception or ShouldNotHappenException()
diff --git a/tests/core/test_tasks.py b/tests/core/test_tasks.py
index 139db56691..5a8b490047 100644
--- a/tests/core/test_tasks.py
+++ b/tests/core/test_tasks.py
@@ -204,21 +204,22 @@ def _execute_task(self, task_info: WorkerTaskCommand) -> TaskResult:
         return TaskResult(success=True, message="")
 
 
-def test_repository(db_session: Session) -> None:
+@with_db_context
+def test_repository() -> None:
     # Prepare two users in the database
     user1_id = 9
-    db_session.add(User(id=user1_id, name="John"))
+    db.session.add(User(id=user1_id, name="John"))
     user2_id = 10
-    db_session.add(User(id=user2_id, name="Jane"))
-    db_session.commit()
+    db.session.add(User(id=user2_id, name="Jane"))
+    db.session.commit()
 
     # Create a RawStudy in the database
     study_id = "e34fe4d5-5964-4ef2-9baf-fad66dadc512"
-    db_session.add(RawStudy(id=study_id, name="foo", version="860"))
-    db_session.commit()
+    db.session.add(RawStudy(id=study_id, name="foo", version="860"))
+    db.session.commit()
 
     # Create a TaskJobService
-    task_job_repo = TaskJobRepository(db_session)
+    task_job_repo = TaskJobRepository()
 
     new_task = TaskJob(name="foo", owner_id=user1_id, type=TaskType.COPY)
 
@@ -282,10 +283,10 @@ def test_repository(db_session: Session) -> None:
     assert len(new_task.logs) == 2
     assert new_task.logs[0].message == "hello"
 
-    assert len(db_session.query(TaskJobLog).where(TaskJobLog.task_id == new_task.id).all()) == 2
+    assert len(db.session.query(TaskJobLog).where(TaskJobLog.task_id == new_task.id).all()) == 2
 
     task_job_repo.delete(new_task.id)
-    assert len(db_session.query(TaskJobLog).where(TaskJobLog.task_id == new_task.id).all()) == 0
+    assert len(db.session.query(TaskJobLog).where(TaskJobLog.task_id == new_task.id).all()) == 0
     assert task_job_repo.get(new_task.id) is None
 
 
@@ -390,21 +391,22 @@ def test_cancel_orphan_tasks(
             assert (datetime.datetime.utcnow() - updated_task_job.completion_date).seconds <= max_diff_seconds
 
 
-def test_get_progress(db_session: Session, admin_user: JWTUser, core_config: Config, event_bus: IEventBus) -> None:
+@with_db_context
+def test_get_progress(admin_user: JWTUser, core_config: Config, event_bus: IEventBus) -> None:
     # Prepare two users in the database
     user1_id = 9
-    db_session.add(User(id=user1_id, name="John"))
+    db.session.add(User(id=user1_id, name="John"))
     user2_id = 10
-    db_session.add(User(id=user2_id, name="Jane"))
-    db_session.commit()
+    db.session.add(User(id=user2_id, name="Jane"))
+    db.session.commit()
 
     # Create a RawStudy in the database
     study_id = "e34fe4d5-5964-4ef2-9baf-fad66dadc512"
-    db_session.add(RawStudy(id=study_id, name="foo", version="860"))
-    db_session.commit()
+    db.session.add(RawStudy(id=study_id, name="foo", version="860"))
+    db.session.commit()
 
     # Create a TaskJobService
-    task_job_repo = TaskJobRepository(db_session)
+    task_job_repo = TaskJobRepository()
 
     # User 1 launches a ts generation
     first_task = TaskJob(
@@ -451,12 +453,12 @@ def test_get_progress(db_session: Session, admin_user: JWTUser, core_config: Con
         service.get_task_progress(wrong_id, RequestParameters(user))
 
 
+@with_db_context
 def test_ts_generation_task(
     tmp_path: Path,
     core_config: Config,
     admin_user: JWTUser,
     raw_study_service: RawStudyService,
-    db_session: Session,
 ) -> None:
     # =======================
     #  SET UP
@@ -465,7 +467,7 @@ def test_ts_generation_task(
     event_bus = DummyEventBusService()
 
     # Create a TaskJobService and add tasks
-    task_job_repo = TaskJobRepository(db_session)
+    task_job_repo = TaskJobRepository()
 
     # Create a TaskJobService
     task_job_service = TaskJobService(config=core_config, repository=task_job_repo, event_bus=event_bus)
@@ -474,8 +476,8 @@ def test_ts_generation_task(
     raw_study_path = tmp_path / "study"
 
     regular_user = User(id=99, name="regular")
-    db_session.add(regular_user)
-    db_session.commit()
+    db.session.add(regular_user)
+    db.session.commit()
 
     raw_study = RawStudy(
         id="my_raw_study",
@@ -490,8 +492,8 @@ def test_ts_generation_task(
         path=str(raw_study_path),
     )
     study_metadata_repository = StudyMetadataRepository(Mock(), None)
-    db_session.add(raw_study)
-    db_session.commit()
+    db.session.add(raw_study)
+    db.session.commit()
 
     # Set up the Raw Study
     raw_study_service.create(raw_study)

From 1e6966420d97720ee6dbbab868dfe90906f0b8b8 Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Wed, 11 Dec 2024 12:46:46 +0100
Subject: [PATCH 05/31] chore: bump version to 2.18.2

---
 antarest/__init__.py     | 4 ++--
 docs/CHANGELOG.md        | 4 ++++
 pyproject.toml           | 2 +-
 sonar-project.properties | 2 +-
 webapp/package-lock.json | 4 ++--
 webapp/package.json      | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/antarest/__init__.py b/antarest/__init__.py
index ed494cf4c5..8fd62ea94a 100644
--- a/antarest/__init__.py
+++ b/antarest/__init__.py
@@ -19,9 +19,9 @@
 
 # Standard project metadata
 
-__version__ = "2.18.1"
+__version__ = "2.18.2"
 __author__ = "RTE, Antares Web Team"
-__date__ = "2024-12-02"
+__date__ = "2024-12-11"
 # noinspection SpellCheckingInspection
 __credits__ = "(c) Réseau de Transport de l’Électricité (RTE)"
 
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 2a35203f73..187aaa031f 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Antares Web Changelog
 =====================
 
+v2.18.2 (2024-12-11)
+--------------------
+
+
 v2.18.1 (2024-12-02)
 --------------------
 
diff --git a/pyproject.toml b/pyproject.toml
index 00613c0cc4..bc4332d38f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools"]
 
 [project]
 name = "AntaREST"
-version = "2.18.1"
+version = "2.18.2"
 authors = [{name="RTE, Antares Web Team", email="andrea.sgattoni@rte-france.com" }]
 description="Antares Server"
 readme = {file = "README.md", content-type = "text/markdown"}
diff --git a/sonar-project.properties b/sonar-project.properties
index 92b73ee890..704e6924d8 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,5 +6,5 @@ sonar.exclusions=antarest/gui.py,antarest/main.py
 sonar.python.coverage.reportPaths=coverage.xml
 sonar.python.version=3.11
 sonar.javascript.lcov.reportPaths=webapp/coverage/lcov.info
-sonar.projectVersion=2.18.1
+sonar.projectVersion=2.18.2
 sonar.coverage.exclusions=antarest/gui.py,antarest/main.py,antarest/singleton_services.py,antarest/worker/archive_worker_service.py,webapp/**/*,,antarest/fastapi_jwt_auth/**
\ No newline at end of file
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 3ed8e546ee..2222e73412 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "antares-web",
-  "version": "2.18.1",
+  "version": "2.18.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "antares-web",
-      "version": "2.18.1",
+      "version": "2.18.2",
       "dependencies": {
         "@emotion/react": "11.13.3",
         "@emotion/styled": "11.13.0",
diff --git a/webapp/package.json b/webapp/package.json
index 1abf973a65..e63d40860e 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antares-web",
-  "version": "2.18.1",
+  "version": "2.18.2",
   "private": true,
   "type": "module",
   "scripts": {

From 80f1b9e004478afc80152e8c74f020569117bacb Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Wed, 11 Dec 2024 12:48:51 +0100
Subject: [PATCH 06/31] chore: update changelog for 2.18.2 release

---
 docs/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 187aaa031f..a8c6b3cf13 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,6 +4,13 @@ Antares Web Changelog
 v2.18.2 (2024-12-11)
 --------------------
 
+## What's Changed
+
+### Bug Fixes
+
+* **tasks**: frozen tasks with pgpool [`2264`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/2264)
+
+**Full Changelog**: https://github.com/AntaresSimulatorTeam/AntaREST/compare/v2.18.1...v2.18.2
 
 v2.18.1 (2024-12-02)
 --------------------

From a951ca17fa3b850ceb4c57e8fa62e3703d346e66 Mon Sep 17 00:00:00 2001
From: Hatim Dinia <33469289+hdinia@users.noreply.github.com>
Date: Fri, 13 Dec 2024 08:43:33 +0100
Subject: [PATCH 07/31] fix(ui-bc): use `matrixindex` timesteps for row display
 (#2262)

---
 webapp/src/components/common/Matrix/hooks/useMatrix/index.ts | 4 ++++
 webapp/src/components/common/Matrix/index.tsx                | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/src/components/common/Matrix/hooks/useMatrix/index.ts b/webapp/src/components/common/Matrix/hooks/useMatrix/index.ts
index 286b732405..6558e764e8 100644
--- a/webapp/src/components/common/Matrix/hooks/useMatrix/index.ts
+++ b/webapp/src/components/common/Matrix/hooks/useMatrix/index.ts
@@ -320,5 +320,9 @@ export function useMatrix(
     canUndo: canUndoChanges,
     canRedo,
     reload: fetchMatrix,
+    // Use the matrix index 'steps' field to determine the number of rows
+    // This ensures consistent row display (8760 for hourly, 365 for daily/weekly)
+    // rather than using data.length which can vary for Binding Constraints (8784/366)
+    rowCount: index?.steps,
   };
 }
diff --git a/webapp/src/components/common/Matrix/index.tsx b/webapp/src/components/common/Matrix/index.tsx
index 1316d2d7f2..4bb07202dd 100644
--- a/webapp/src/components/common/Matrix/index.tsx
+++ b/webapp/src/components/common/Matrix/index.tsx
@@ -83,6 +83,7 @@ function Matrix({
     canUndo,
     canRedo,
     reload,
+    rowCount,
   } = useMatrix(
     study.id,
     url,
@@ -136,7 +137,7 @@ function Matrix({
           data={data}
           aggregates={aggregates}
           columns={columns}
-          rows={data.length}
+          rows={rowCount ?? data.length}
           rowHeaders={customRowHeaders}
           dateTime={dateTime}
           onCellEdit={handleCellEdit}

From 25420972990c704d42cae2fa6afffeac26592a41 Mon Sep 17 00:00:00 2001
From: Hatim Dinia <33469289+hdinia@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:18:33 +0100
Subject: [PATCH 08/31] feat(ui-cmd): add command details on variants commands
 panel (#2265)

---
 webapp/src/common/types.ts                    |  3 +
 .../CommandListItem/CommandDetails.tsx        | 83 +++++++++++++++++++
 .../CommandListItem/index.tsx                 |  9 +-
 .../CommandListItem/style.ts                  |  9 +-
 .../DraggableCommands/CommandListView.tsx     |  6 +-
 .../Commands/Edition/commandTypes.ts          | 22 ++++-
 .../Singlestudy/Commands/Edition/index.tsx    | 24 +++---
 .../App/Singlestudy/Commands/Edition/style.ts | 16 ++--
 .../App/Singlestudy/Commands/Edition/utils.ts |  6 +-
 9 files changed, 141 insertions(+), 37 deletions(-)
 create mode 100644 webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/CommandDetails.tsx

diff --git a/webapp/src/common/types.ts b/webapp/src/common/types.ts
index 0674b5031a..ece13fa1ea 100644
--- a/webapp/src/common/types.ts
+++ b/webapp/src/common/types.ts
@@ -306,6 +306,9 @@ export interface CommandDTO {
   id?: string;
   action: string;
   args: object;
+  version?: number;
+  user_name?: string;
+  updated_at?: string;
 }
 
 export type Components = Record<string, () => React.ReactNode>;
diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/CommandDetails.tsx b/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/CommandDetails.tsx
new file mode 100644
index 0000000000..a3b73ce62b
--- /dev/null
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/CommandDetails.tsx
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2024, RTE (https://www.rte-france.com)
+ *
+ * See AUTHORS.txt
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This file is part of the Antares project.
+ */
+
+import { Fragment } from "react";
+import { Box, Typography, Divider, Tooltip } from "@mui/material";
+import { CommandItem } from "../../commandTypes";
+import { PersonOutlineOutlined, UpdateOutlined } from "@mui/icons-material";
+import { format, formatDistanceToNow, parseISO } from "date-fns";
+import { enUS, fr } from "date-fns/locale";
+import { useTranslation } from "react-i18next";
+import { getCurrentLanguage } from "@/utils/i18nUtils";
+
+interface Props {
+  item: CommandItem;
+}
+
+const formatDate = (dateStr: string) => {
+  const utcDate = parseISO(dateStr + "Z");
+  return format(utcDate, "dd/MM/yyyy HH:mm");
+};
+
+const formatDateWithLocale = (dateStr: string) => {
+  const date = parseISO(dateStr);
+  const lang = getCurrentLanguage();
+  const locale = lang.startsWith("fr") ? fr : enUS;
+
+  return formatDistanceToNow(date, {
+    addSuffix: true,
+    locale,
+  });
+};
+
+function CommandDetails({ item }: Props) {
+  const [t] = useTranslation();
+  const details = [
+    {
+      icon: <PersonOutlineOutlined sx={{ fontSize: 20 }} />,
+      text: item.user || t("global.unknown"),
+    },
+    {
+      icon: <UpdateOutlined sx={{ fontSize: 20 }} />,
+      text: item.updatedAt ? formatDate(item.updatedAt) : t("global.unknown"),
+      tooltip: item.updatedAt
+        ? formatDateWithLocale(item.updatedAt)
+        : t("global.unknown"),
+    },
+  ];
+
+  return (
+    <Box sx={{ display: "flex" }}>
+      {details.map((detail, index) => (
+        <Fragment key={index}>
+          {index > 0 && (
+            <Divider orientation="vertical" flexItem sx={{ mx: 1 }} />
+          )}
+          <Box sx={{ display: "flex", alignItems: "center", gap: "4px" }}>
+            {detail.icon}
+            {detail.tooltip ? (
+              <Tooltip title={detail.tooltip}>
+                <Typography sx={{ fontSize: "12px" }}>{detail.text}</Typography>
+              </Tooltip>
+            ) : (
+              <Typography sx={{ fontSize: "12px" }}>{detail.text}</Typography>
+            )}
+          </Box>
+        </Fragment>
+      ))}
+    </Box>
+  );
+}
+
+export default CommandDetails;
diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/index.tsx b/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/index.tsx
index c53d7b7ef1..c8b3bf92d9 100644
--- a/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/index.tsx
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/index.tsx
@@ -43,6 +43,7 @@ import {
   StyledDeleteIcon,
 } from "./style";
 import CommandMatrixViewer from "./CommandMatrixViewer";
+import CommandDetails from "./CommandDetails";
 
 export const Item = styled(Box)(({ theme }) => ({
   boxSizing: "border-box",
@@ -51,9 +52,6 @@ export const Item = styled(Box)(({ theme }) => ({
   justifyContent: "space-between",
   alignItems: "flex-start",
   width: "100%",
-  height: "auto",
-  userSelect: "none",
-  maxWidth: "800px",
 }));
 
 interface StyleType {
@@ -189,9 +187,8 @@ function CommandListItem({
             onClick={() => onExpanded(index, !(expandedIndex === index))}
           >
             <Info>
-              <Typography style={{ fontSize: "0.9em", color: "text.primary" }}>
-                {item.action}
-              </Typography>
+              <Typography sx={{ px: 0.5, mb: 0.5 }}>{item.action}</Typography>
+              <CommandDetails item={item} />
             </Info>
           </AccordionSummary>
           <AccordionDetails sx={{ ...detailsStyle }}>
diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/style.ts b/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/style.ts
index e0d056e66c..ea27e92815 100644
--- a/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/style.ts
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListItem/style.ts
@@ -22,6 +22,8 @@ export const ItemContainer = styled(Box, {
   display: "flex",
   justifyContent: "center",
   zIndex: onTopVisible ? 10000 : 9999,
+  width: "100%",
+  boxSizing: "border-box",
 }));
 
 export const DraggableAccorderon = styled(Accordion, {
@@ -30,6 +32,9 @@ export const DraggableAccorderon = styled(Accordion, {
   flex: 1,
   boxSizing: "border-box",
   backgroundColor: PAPER_BACKGROUND_NO_TRANSPARENCY,
+  maxWidth: "800px",
+  width: "100%",
+  margin: "0 auto",
   ...(isDragging
     ? {
         borderColor: theme.palette.secondary.main,
@@ -43,9 +48,9 @@ export const DraggableAccorderon = styled(Accordion, {
 export const StyledDeleteIcon = styled(DeleteIcon)(({ theme }) => ({
   flex: "0 0 24px",
   color: theme.palette.error.light,
-  marginLeft: theme.spacing(1),
-  marginRight: theme.spacing(1),
+  margin: theme.spacing(0, 2),
   cursor: "pointer",
+  alignSelf: "center",
   "&:hover": {
     color: theme.palette.error.main,
   },
diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListView.tsx b/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListView.tsx
index 5ba09ec873..37dc79fb06 100644
--- a/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListView.tsx
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/DraggableCommands/CommandListView.tsx
@@ -129,9 +129,9 @@ function CommandListView({
       >
         {(provided) => (
           <FixedSizeList
-            height={500}
+            height={1000}
             itemCount={items.length}
-            itemSize={68}
+            itemSize={80}
             width={300}
             outerRef={provided.innerRef}
             ref={listRef}
@@ -149,7 +149,7 @@ function CommandListView({
             }}
             style={{
               width: "100%",
-              height: "90%",
+              height: "100%",
             }}
           >
             {Row}
diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/commandTypes.ts b/webapp/src/components/App/Singlestudy/Commands/Edition/commandTypes.ts
index 76d63180d0..e43f205696 100644
--- a/webapp/src/components/App/Singlestudy/Commands/Edition/commandTypes.ts
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/commandTypes.ts
@@ -14,12 +14,32 @@
 
 import { CommandResultDTO } from "../../../../../common/types";
 
+interface AntaresConfig {
+  version: string;
+  caption: string;
+  created: number;
+  lastsave: number;
+  author: string;
+}
+
+interface CommandArgsData {
+  antares: AntaresConfig;
+}
+
+export interface CommandArgsDTO {
+  data: CommandArgsData;
+  target: string;
+}
+
 export interface CommandItem {
   id?: string;
   action: string;
   updated: boolean;
-  args: object;
+  args: CommandArgsDTO | object;
   results?: CommandResultDTO;
+  version?: number;
+  user?: string;
+  updatedAt?: string;
 }
 
 export interface JsonCommandItem {
diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/index.tsx b/webapp/src/components/App/Singlestudy/Commands/Edition/index.tsx
index e8cafa7d4e..2ef264dc63 100644
--- a/webapp/src/components/App/Singlestudy/Commands/Edition/index.tsx
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/index.tsx
@@ -23,7 +23,7 @@ import BoltIcon from "@mui/icons-material/Bolt";
 import debug from "debug";
 import { AxiosError } from "axios";
 import HelpIcon from "@mui/icons-material/Help";
-import { Box, Button, Tooltip, Typography } from "@mui/material";
+import { Box, Button, Skeleton, Tooltip, Typography } from "@mui/material";
 import { useMountedState } from "react-use";
 import { CommandItem, JsonCommandItem } from "./commandTypes";
 import CommandListView from "./DraggableCommands/CommandListView";
@@ -50,7 +50,6 @@ import { CommandResultDTO } from "../../../../../common/types";
 import CommandImportButton from "./DraggableCommands/CommandImportButton";
 import { getTask } from "../../../../../services/api/tasks";
 import { Body, EditHeader, Header, headerIconStyle, Root } from "./style";
-import SimpleLoader from "../../../../common/loaders/SimpleLoader";
 import useEnqueueErrorSnackbar from "../../../../../hooks/useEnqueueErrorSnackbar";
 import {
   addWsEventListener,
@@ -500,7 +499,7 @@ function EditionView(props: Props) {
           </Typography>
         </Header>
       )}
-      {loaded && commands.length > 0 ? (
+      {commands.length > 0 ? (
         <Body>
           <CommandListView
             items={commands}
@@ -516,18 +515,15 @@ function EditionView(props: Props) {
             onExpanded={onExpanded}
           />
         </Body>
-      ) : (
-        loaded && (
-          <Body sx={{ alignItems: "left" }}>
-            <Box height="85%">
-              <EmptyView title="variants.error.noCommands" />
-            </Box>
-          </Body>
-        )
-      )}
-      {!loaded && (
+      ) : !loaded ? (
         <Body>
-          <SimpleLoader color="" />
+          <Skeleton sx={{ width: 1, height: "80vh", transform: "none" }} />
+        </Body>
+      ) : (
+        <Body sx={{ alignItems: "left" }}>
+          <Box height="85%">
+            <EmptyView title="variants.error.noCommands" />
+          </Box>
         </Body>
       )}
       {openClearCommandsDialog && (
diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/style.ts b/webapp/src/components/App/Singlestudy/Commands/Edition/style.ts
index 50163125c0..0702c1cb23 100644
--- a/webapp/src/components/App/Singlestudy/Commands/Edition/style.ts
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/style.ts
@@ -14,18 +14,18 @@
 
 import { Box, styled } from "@mui/material";
 
-export const Root = styled(Box)(({ theme }) => ({
-  flex: 1,
+export const Root = styled(Box)(() => ({
+  width: "100%",
   height: "98%",
   display: "flex",
   flexFlow: "column nowrap",
   justifyContent: "flex-start",
   alignItems: "center",
-  overflowY: "hidden",
+  overflowY: "auto",
 }));
 
-export const Header = styled(Box)(({ theme }) => ({
-  width: "90%",
+export const Header = styled(Box)(() => ({
+  width: "95%",
   height: "80px",
   display: "flex",
   flexFlow: "row nowrap",
@@ -33,7 +33,7 @@ export const Header = styled(Box)(({ theme }) => ({
   alignItems: "center",
 }));
 
-export const EditHeader = styled(Box)(({ theme }) => ({
+export const EditHeader = styled(Box)(() => ({
   flex: 1,
   display: "flex",
   flexFlow: "row nowrap",
@@ -43,10 +43,8 @@ export const EditHeader = styled(Box)(({ theme }) => ({
 
 export const Body = styled(Box)(({ theme }) => ({
   width: "100%",
-  maxHeight: "90%",
-  minHeight: "90%",
+  height: "100%",
   display: "flex",
-  flexFlow: "column nowrap",
   justifyContent: "flex-start",
   alignItems: "center",
   overflow: "auto",
diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/utils.ts b/webapp/src/components/App/Singlestudy/Commands/Edition/utils.ts
index e86abf59c0..bcb4a3ed47 100644
--- a/webapp/src/components/App/Singlestudy/Commands/Edition/utils.ts
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/utils.ts
@@ -49,13 +49,15 @@ export const reorder = <T>(
 export const fromCommandDTOToCommandItem = (
   commands: CommandDTO[],
 ): CommandItem[] => {
-  const dtoItems: CommandItem[] = commands.map((elm) => ({
+  return commands.map((elm) => ({
     id: elm?.id,
     action: elm.action,
     args: elm.args,
     updated: false,
+    version: elm.version,
+    user: elm.user_name,
+    updatedAt: elm.updated_at,
   }));
-  return dtoItems;
 };
 
 export const fromCommandDTOToJsonCommand = (

From 3dd23884ec338a37c9061453d0f6fc11369c92ca Mon Sep 17 00:00:00 2001
From: hatim dinia <diniahatim@gmail.com>
Date: Mon, 2 Dec 2024 15:52:05 +0100
Subject: [PATCH 09/31] feat(ui-debug): add unsupported files handling

---
 webapp/public/locales/en/main.json            |  1 +
 webapp/public/locales/fr/main.json            |  1 +
 .../Singlestudy/explore/Debug/Data/Image.tsx  | 34 ---------
 .../Singlestudy/explore/Debug/Data/Matrix.tsx |  2 +-
 .../explore/Debug/Data/Unsupported.tsx        | 75 +++++++++++++++++++
 .../Singlestudy/explore/Debug/Data/index.tsx  | 20 ++---
 .../App/Singlestudy/explore/Debug/utils.ts    | 35 +++++++--
 7 files changed, 115 insertions(+), 53 deletions(-)
 delete mode 100644 webapp/src/components/App/Singlestudy/explore/Debug/Data/Image.tsx
 create mode 100644 webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx

diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json
index 952091b0d4..d6bbea522e 100644
--- a/webapp/public/locales/en/main.json
+++ b/webapp/public/locales/en/main.json
@@ -252,6 +252,7 @@
   "study.bindingconstraints": "Binding Constraints",
   "study.debug": "Debug",
   "study.debug.file.image": "Image file",
+  "study.debug.file.unsupported": "Unsupported file type",
   "study.debug.file.deleteConfirm.title": "Delete File?",
   "study.debug.file.deleteConfirm.message": "Are you sure you want to delete the file?",
   "study.debug.folder.empty": "Folder is empty",
diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json
index 81ffca6679..9ddb68910e 100644
--- a/webapp/public/locales/fr/main.json
+++ b/webapp/public/locales/fr/main.json
@@ -253,6 +253,7 @@
   "study.debug": "Debug",
   "study.debug.file.image": "Fichier image",
   "study.debug.folder.empty": "Le dossier est vide",
+  "study.debug.file.unsupported": "Type de fichier non supporté",
   "study.debug.file.deleteConfirm.title": "Supprimer le fichier ?",
   "study.debug.file.deleteConfirm.message": "Êtes-vous sûr de vouloir supprimer le fichier ?",
   "study.debug.folder.upload.replaceFileConfirm.title": "Remplacer le fichier ?",
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Image.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Image.tsx
deleted file mode 100644
index 23aa34e993..0000000000
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Image.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (c) 2024, RTE (https://www.rte-france.com)
- *
- * See AUTHORS.txt
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This file is part of the Antares project.
- */
-
-import { useTranslation } from "react-i18next";
-import EmptyView from "../../../../../common/page/SimpleContent";
-import ImageIcon from "@mui/icons-material/Image";
-import { Filename, Flex, Menubar } from "./styles";
-import type { DataCompProps } from "../utils";
-
-function Image({ filename }: DataCompProps) {
-  const { t } = useTranslation();
-
-  return (
-    <Flex>
-      <Menubar>
-        <Filename>{filename}</Filename>
-      </Menubar>
-      <EmptyView icon={ImageIcon} title={t("study.debug.file.image")} />
-    </Flex>
-  );
-}
-
-export default Image;
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Matrix.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Matrix.tsx
index a140fe71e8..26a211251d 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Matrix.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Matrix.tsx
@@ -15,7 +15,7 @@
 import Matrix from "../../../../../common/Matrix";
 import type { DataCompProps } from "../utils";
 
-function DebugMatrix({ studyId, filename, filePath, canEdit }: DataCompProps) {
+function DebugMatrix({ filename, filePath, canEdit }: DataCompProps) {
   return <Matrix title={filename} url={filePath} canImport={!canEdit} />;
 }
 
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
new file mode 100644
index 0000000000..59c4f48950
--- /dev/null
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2024, RTE (https://www.rte-france.com)
+ *
+ * See AUTHORS.txt
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This file is part of the Antares project.
+ */
+
+import { useTranslation } from "react-i18next";
+import EmptyView from "../../../../../common/page/SimpleContent";
+import BlockIcon from "@mui/icons-material/Block";
+import { Filename, Flex, Menubar } from "./styles";
+import type { DataCompProps } from "../utils";
+import DownloadButton from "@/components/common/buttons/DownloadButton";
+import UploadFileButton from "@/components/common/buttons/UploadFileButton";
+import usePromiseWithSnackbarError from "@/hooks/usePromiseWithSnackbarError";
+import { getStudyData } from "@/services/api/study";
+import { downloadFile } from "@/utils/fileUtils";
+
+function Unsupported({ studyId, filePath, filename }: DataCompProps) {
+  const { t } = useTranslation();
+
+  const res = usePromiseWithSnackbarError(
+    () => getStudyData<string>(studyId, filePath),
+    {
+      errorMessage: t("studies.error.retrieveData"),
+      deps: [studyId, filePath],
+    },
+  );
+
+  ////////////////////////////////////////////////////////////////
+  // Event Handlers
+  ////////////////////////////////////////////////////////////////
+
+  const handleDownload = () => {
+    if (res.data) {
+      downloadFile(
+        res.data,
+        filename.endsWith(".txt") ? filename : `${filename}.txt`,
+      );
+    }
+  };
+
+  const handleUploadSuccessful = () => {
+    res.reload();
+  };
+
+  ////////////////////////////////////////////////////////////////
+  // JSX
+  ////////////////////////////////////////////////////////////////
+
+  return (
+    <Flex>
+      <Menubar>
+        <Filename>{filename}</Filename>
+        <UploadFileButton
+          studyId={studyId}
+          path={filePath}
+          accept={{ "text/plain": [".txt"] }}
+          onUploadSuccessful={handleUploadSuccessful}
+        />
+        <DownloadButton onClick={handleDownload} />
+      </Menubar>
+      <EmptyView icon={BlockIcon} title={t("study.debug.file.unsupported")} />
+    </Flex>
+  );
+}
+
+export default Unsupported;
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/index.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/index.tsx
index f387b7ef9c..de7e0ca24e 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/index.tsx
@@ -12,15 +12,16 @@
  * This file is part of the Antares project.
  */
 
+import { ComponentType } from "react";
 import Text from "./Text";
-import Image from "./Image";
-import Json from "./Json";
+import Unsupported from "./Unsupported";
 import Matrix from "./Matrix";
 import Folder from "./Folder";
 import { canEditFile, type FileInfo, type FileType } from "../utils";
 import type { DataCompProps } from "../utils";
 import ViewWrapper from "../../../../../common/page/ViewWrapper";
 import type { StudyMetadata } from "../../../../../../common/types";
+import Json from "./Json";
 
 interface Props extends FileInfo {
   study: StudyMetadata;
@@ -28,28 +29,23 @@ interface Props extends FileInfo {
   reloadTreeData: () => void;
 }
 
-type DataComponent = React.ComponentType<DataCompProps>;
-
-const componentByFileType: Record<FileType, DataComponent> = {
+const componentByFileType: Record<FileType, ComponentType<DataCompProps>> = {
   matrix: Matrix,
   json: Json,
   text: Text,
-  image: Image,
+  unsupported: Unsupported,
   folder: Folder,
 } as const;
 
-function Data(props: Props) {
-  const { study, setSelectedFile, reloadTreeData, ...fileInfo } = props;
-  const { fileType, filePath } = fileInfo;
-  const canEdit = canEditFile(study, filePath);
-  const DataViewer = componentByFileType[fileType];
+function Data({ study, setSelectedFile, reloadTreeData, ...fileInfo }: Props) {
+  const DataViewer = componentByFileType[fileInfo.fileType];
 
   return (
     <ViewWrapper>
       <DataViewer
         {...fileInfo}
         studyId={study.id}
-        canEdit={canEdit}
+        canEdit={canEditFile(study, fileInfo.filePath)}
         setSelectedFile={setSelectedFile}
         reloadTreeData={reloadTreeData}
       />
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts b/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
index b1d8653f07..d192aad6d9 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
@@ -14,7 +14,7 @@
 
 import DataObjectIcon from "@mui/icons-material/DataObject";
 import TextSnippetIcon from "@mui/icons-material/TextSnippet";
-import ImageIcon from "@mui/icons-material/Image";
+import BlockIcon from "@mui/icons-material/Block";
 import FolderIcon from "@mui/icons-material/Folder";
 import DatasetIcon from "@mui/icons-material/Dataset";
 import { SvgIconComponent } from "@mui/icons-material";
@@ -33,7 +33,7 @@ export interface TreeFolder {
 
 export type TreeData = TreeFolder | TreeFile;
 
-export type FileType = "json" | "matrix" | "text" | "image" | "folder";
+export type FileType = "json" | "matrix" | "text" | "folder" | "unsupported";
 
 export interface FileInfo {
   fileType: FileType;
@@ -58,8 +58,8 @@ const iconByFileType: Record<FileType, SvgIconComponent> = {
   matrix: DatasetIcon,
   json: DataObjectIcon,
   text: TextSnippetIcon,
-  image: ImageIcon,
   folder: FolderIcon,
+  unsupported: BlockIcon,
 } as const;
 
 /**
@@ -83,21 +83,44 @@ export function isFolder(treeData: TreeData): treeData is TreeFolder {
  * @returns The corresponding file type.
  */
 export function getFileType(treeData: TreeData): FileType {
+  if (isFolder(treeData)) {
+    return "folder";
+  }
+
   if (typeof treeData === "string") {
+    // Handle matrix files
     if (
       treeData.startsWith("matrix://") ||
       treeData.startsWith("matrixfile://")
     ) {
       return "matrix";
     }
+
+    // Handle files displayed as JSON by the API even though they are .ini files in the filesystem.
+    // The json:// prefix or .json extension indicates the content should be viewed as JSON.
     if (treeData.startsWith("json://") || treeData.endsWith(".json")) {
       return "json";
     }
-    if (treeData.startsWith("file://") && treeData.endsWith(".ico")) {
-      return "image";
+
+    // Handle regular files with file:// prefix
+    // All files except matrices and json-formatted content use this prefix
+    // We filter to only allow extensions that can be properly displayed (.txt, .log, .csv, .tsv, .ini)
+    // Other extensions (like .RDS or .xlsx) are marked as unsupported since they can't be shown in the UI
+    if (treeData.startsWith("file://")) {
+      const supportedTextExtensions = [".txt", ".log", ".csv", ".tsv", ".ini"];
+
+      // Check if the file ends with any of the supported extensions
+      if (supportedTextExtensions.some((ext) => treeData.endsWith(ext))) {
+        return "text";
+      }
+
+      // Any other extension with file:// prefix is unsupported
+      return "unsupported";
     }
   }
-  return isFolder(treeData) ? "folder" : "text";
+
+  // Default to text for any other string content
+  return "text";
 }
 
 ////////////////////////////////////////////////////////////////

From aa373d5f0fb326d8621613853191fca897f33a41 Mon Sep 17 00:00:00 2001
From: hatim dinia <diniahatim@gmail.com>
Date: Mon, 2 Dec 2024 15:52:28 +0100
Subject: [PATCH 10/31] fix(ui-debug): prevent empty text files display

---
 webapp/public/locales/en/main.json            |  1 -
 webapp/public/locales/fr/main.json            |  1 -
 .../Singlestudy/explore/Debug/Data/Text.tsx   | 53 +++++++++++++------
 .../explore/Debug/Data/Unsupported.tsx        |  6 +--
 .../App/Singlestudy/explore/Debug/utils.ts    | 42 ++++++---------
 5 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json
index d6bbea522e..df948d3920 100644
--- a/webapp/public/locales/en/main.json
+++ b/webapp/public/locales/en/main.json
@@ -251,7 +251,6 @@
   "study.district": "District",
   "study.bindingconstraints": "Binding Constraints",
   "study.debug": "Debug",
-  "study.debug.file.image": "Image file",
   "study.debug.file.unsupported": "Unsupported file type",
   "study.debug.file.deleteConfirm.title": "Delete File?",
   "study.debug.file.deleteConfirm.message": "Are you sure you want to delete the file?",
diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json
index 9ddb68910e..3dacacb6e0 100644
--- a/webapp/public/locales/fr/main.json
+++ b/webapp/public/locales/fr/main.json
@@ -251,7 +251,6 @@
   "study.district": "District",
   "study.bindingconstraints": "Contraintes Couplantes",
   "study.debug": "Debug",
-  "study.debug.file.image": "Fichier image",
   "study.debug.folder.empty": "Le dossier est vide",
   "study.debug.file.unsupported": "Type de fichier non supporté",
   "study.debug.file.deleteConfirm.title": "Supprimer le fichier ?",
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
index 7380186bc3..f2ac0a31e1 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
@@ -31,6 +31,8 @@ import DownloadButton from "../../../../../common/buttons/DownloadButton";
 import { downloadFile } from "../../../../../../utils/fileUtils";
 import { Filename, Flex, Menubar } from "./styles";
 import UploadFileButton from "../../../../../common/buttons/UploadFileButton";
+import EmptyView from "@/components/common/page/SimpleContent";
+import GridOffIcon from "@mui/icons-material/GridOff";
 
 SyntaxHighlighter.registerLanguage("xml", xml);
 SyntaxHighlighter.registerLanguage("plaintext", plaintext);
@@ -42,6 +44,16 @@ const logsRegex = /^(\[[^\]]*\]){3}/;
 // Ex: "EXP : 0"
 const propertiesRegex = /^[^:]+ : [^:]+/;
 
+function isEmptyContent(text: string | string[]): boolean {
+  if (Array.isArray(text)) {
+    return (
+      !text || text.every((line) => typeof line === "string" && !line.trim())
+    );
+  }
+
+  return typeof text !== "string" || !text.trim();
+}
+
 function getSyntaxProps(data: string | string[]): SyntaxHighlighterProps {
   const isArray = Array.isArray(data);
   const text = isArray ? data.join("\n") : data;
@@ -111,24 +123,31 @@ function Text({ studyId, filePath, filename, canEdit }: DataCompProps) {
                 onUploadSuccessful={handleUploadSuccessful}
               />
             )}
-            <DownloadButton onClick={handleDownload} />
-          </Menubar>
-          <Box sx={{ overflow: "auto" }}>
-            <SyntaxHighlighter
-              style={atomOneDark}
-              lineNumberStyle={{
-                opacity: 0.5,
-                paddingRight: theme.spacing(3),
-              }}
-              customStyle={{
-                margin: 0,
-                padding: theme.spacing(2),
-                borderRadius: theme.shape.borderRadius,
-                fontSize: theme.typography.body2.fontSize,
-              }}
-              {...getSyntaxProps(text)}
+            <DownloadButton
+              onClick={handleDownload}
+              disabled={isEmptyContent(text)}
             />
-          </Box>
+          </Menubar>
+          {isEmptyContent(text) ? (
+            <EmptyView icon={GridOffIcon} title={t("study.results.noData")} />
+          ) : (
+            <Box sx={{ overflow: "auto" }}>
+              <SyntaxHighlighter
+                style={atomOneDark}
+                lineNumberStyle={{
+                  opacity: 0.5,
+                  paddingRight: theme.spacing(3),
+                }}
+                customStyle={{
+                  margin: 0,
+                  padding: theme.spacing(2),
+                  borderRadius: theme.shape.borderRadius,
+                  fontSize: theme.typography.body2.fontSize,
+                }}
+                {...getSyntaxProps(text)}
+              />
+            </Box>
+          )}
         </Flex>
       )}
     />
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
index 59c4f48950..163235ba6f 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
@@ -40,10 +40,7 @@ function Unsupported({ studyId, filePath, filename }: DataCompProps) {
 
   const handleDownload = () => {
     if (res.data) {
-      downloadFile(
-        res.data,
-        filename.endsWith(".txt") ? filename : `${filename}.txt`,
-      );
+      downloadFile(res.data, filename);
     }
   };
 
@@ -62,7 +59,6 @@ function Unsupported({ studyId, filePath, filename }: DataCompProps) {
         <UploadFileButton
           studyId={studyId}
           path={filePath}
-          accept={{ "text/plain": [".txt"] }}
           onUploadSuccessful={handleUploadSuccessful}
         />
         <DownloadButton onClick={handleDownload} />
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts b/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
index d192aad6d9..f0e9c428b8 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
@@ -50,9 +50,17 @@ export interface DataCompProps extends FileInfo {
 }
 
 ////////////////////////////////////////////////////////////////
-// File Info
+// Utils
 ////////////////////////////////////////////////////////////////
 
+const URL_SCHEMES = {
+  MATRIX: ["matrix://", "matrixfile://"],
+  JSON: "json://",
+  FILE: "file://",
+} as const;
+
+const SUPPORTED_EXTENSIONS = [".txt", ".log", ".csv", ".tsv", ".ini"] as const;
+
 // Maps file types to their corresponding icon components.
 const iconByFileType: Record<FileType, SvgIconComponent> = {
   matrix: DatasetIcon,
@@ -88,17 +96,11 @@ export function getFileType(treeData: TreeData): FileType {
   }
 
   if (typeof treeData === "string") {
-    // Handle matrix files
-    if (
-      treeData.startsWith("matrix://") ||
-      treeData.startsWith("matrixfile://")
-    ) {
+    if (URL_SCHEMES.MATRIX.some((scheme) => treeData.startsWith(scheme))) {
       return "matrix";
     }
 
-    // Handle files displayed as JSON by the API even though they are .ini files in the filesystem.
-    // The json:// prefix or .json extension indicates the content should be viewed as JSON.
-    if (treeData.startsWith("json://") || treeData.endsWith(".json")) {
+    if (treeData.startsWith(URL_SCHEMES.JSON)) {
       return "json";
     }
 
@@ -106,27 +108,17 @@ export function getFileType(treeData: TreeData): FileType {
     // All files except matrices and json-formatted content use this prefix
     // We filter to only allow extensions that can be properly displayed (.txt, .log, .csv, .tsv, .ini)
     // Other extensions (like .RDS or .xlsx) are marked as unsupported since they can't be shown in the UI
-    if (treeData.startsWith("file://")) {
-      const supportedTextExtensions = [".txt", ".log", ".csv", ".tsv", ".ini"];
-
-      // Check if the file ends with any of the supported extensions
-      if (supportedTextExtensions.some((ext) => treeData.endsWith(ext))) {
-        return "text";
-      }
-
-      // Any other extension with file:// prefix is unsupported
-      return "unsupported";
+    if (
+      treeData.startsWith(URL_SCHEMES.FILE) &&
+      SUPPORTED_EXTENSIONS.some((ext) => treeData.endsWith(ext))
+    ) {
+      return "text";
     }
   }
 
-  // Default to text for any other string content
-  return "text";
+  return "unsupported";
 }
 
-////////////////////////////////////////////////////////////////
-// Rights
-////////////////////////////////////////////////////////////////
-
 /**
  * Checks if a study's file can be edited.
  *

From 2c7eeac5d9fda9aefad0d502ba068979257efba1 Mon Sep 17 00:00:00 2001
From: hatim dinia <diniahatim@gmail.com>
Date: Wed, 11 Dec 2024 15:32:07 +0100
Subject: [PATCH 11/31] feat(ui-debug): display output matrices as raw text

---
 .../Singlestudy/explore/Debug/Data/Text.tsx   |  44 ++---
 .../explore/Debug/Data/Unsupported.tsx        |  14 +-
 .../Singlestudy/explore/Debug/Data/index.tsx  |  10 +-
 .../App/Singlestudy/explore/Debug/utils.ts    | 168 ++++++++++++++++--
 4 files changed, 198 insertions(+), 38 deletions(-)

diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
index f2ac0a31e1..1f7a7f4909 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
@@ -26,7 +26,7 @@ import plaintext from "react-syntax-highlighter/dist/esm/languages/hljs/plaintex
 import ini from "react-syntax-highlighter/dist/esm/languages/hljs/ini";
 import properties from "react-syntax-highlighter/dist/esm/languages/hljs/properties";
 import { atomOneDark } from "react-syntax-highlighter/dist/esm/styles/hljs";
-import type { DataCompProps } from "../utils";
+import { isEmptyContent, parseContent, type DataCompProps } from "../utils";
 import DownloadButton from "../../../../../common/buttons/DownloadButton";
 import { downloadFile } from "../../../../../../utils/fileUtils";
 import { Filename, Flex, Menubar } from "./styles";
@@ -44,16 +44,6 @@ const logsRegex = /^(\[[^\]]*\]){3}/;
 // Ex: "EXP : 0"
 const propertiesRegex = /^[^:]+ : [^:]+/;
 
-function isEmptyContent(text: string | string[]): boolean {
-  if (Array.isArray(text)) {
-    return (
-      !text || text.every((line) => typeof line === "string" && !line.trim())
-    );
-  }
-
-  return typeof text !== "string" || !text.trim();
-}
-
 function getSyntaxProps(data: string | string[]): SyntaxHighlighterProps {
   const isArray = Array.isArray(data);
   const text = isArray ? data.join("\n") : data;
@@ -75,15 +65,24 @@ function getSyntaxProps(data: string | string[]): SyntaxHighlighterProps {
   };
 }
 
-function Text({ studyId, filePath, filename, canEdit }: DataCompProps) {
+function Text({
+  studyId,
+  filePath,
+  filename,
+  fileType,
+  canEdit,
+}: DataCompProps) {
   const { t } = useTranslation();
   const theme = useTheme();
 
   const res = usePromiseWithSnackbarError(
-    () => getStudyData<string>(studyId, filePath),
+    () =>
+      getStudyData<string>(studyId, filePath).then((text) =>
+        parseContent(text, { filePath, fileType }),
+      ),
     {
       errorMessage: t("studies.error.retrieveData"),
-      deps: [studyId, filePath],
+      deps: [studyId, filePath, fileType],
     },
   );
 
@@ -123,15 +122,19 @@ function Text({ studyId, filePath, filename, canEdit }: DataCompProps) {
                 onUploadSuccessful={handleUploadSuccessful}
               />
             )}
-            <DownloadButton
-              onClick={handleDownload}
-              disabled={isEmptyContent(text)}
-            />
+            <DownloadButton onClick={handleDownload} />
           </Menubar>
-          {isEmptyContent(text) ? (
+          {isEmptyContent(text) ? ( // TODO remove when files become editable
             <EmptyView icon={GridOffIcon} title={t("study.results.noData")} />
           ) : (
-            <Box sx={{ overflow: "auto" }}>
+            <Box
+              sx={{
+                overflow: "auto",
+                height: 1,
+                display: "flex",
+                flexDirection: "column",
+              }}
+            >
               <SyntaxHighlighter
                 style={atomOneDark}
                 lineNumberStyle={{
@@ -143,6 +146,7 @@ function Text({ studyId, filePath, filename, canEdit }: DataCompProps) {
                   padding: theme.spacing(2),
                   borderRadius: theme.shape.borderRadius,
                   fontSize: theme.typography.body2.fontSize,
+                  flex: 1,
                 }}
                 {...getSyntaxProps(text)}
               />
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
index 163235ba6f..e4bcfccc5c 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
@@ -23,7 +23,7 @@ import usePromiseWithSnackbarError from "@/hooks/usePromiseWithSnackbarError";
 import { getStudyData } from "@/services/api/study";
 import { downloadFile } from "@/utils/fileUtils";
 
-function Unsupported({ studyId, filePath, filename }: DataCompProps) {
+function Unsupported({ studyId, filePath, filename, canEdit }: DataCompProps) {
   const { t } = useTranslation();
 
   const res = usePromiseWithSnackbarError(
@@ -56,11 +56,13 @@ function Unsupported({ studyId, filePath, filename }: DataCompProps) {
     <Flex>
       <Menubar>
         <Filename>{filename}</Filename>
-        <UploadFileButton
-          studyId={studyId}
-          path={filePath}
-          onUploadSuccessful={handleUploadSuccessful}
-        />
+        {canEdit && (
+          <UploadFileButton
+            studyId={studyId}
+            path={filePath}
+            onUploadSuccessful={handleUploadSuccessful}
+          />
+        )}
         <DownloadButton onClick={handleDownload} />
       </Menubar>
       <EmptyView icon={BlockIcon} title={t("study.debug.file.unsupported")} />
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/index.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/index.tsx
index de7e0ca24e..9d09c246a5 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/index.tsx
@@ -17,7 +17,12 @@ import Text from "./Text";
 import Unsupported from "./Unsupported";
 import Matrix from "./Matrix";
 import Folder from "./Folder";
-import { canEditFile, type FileInfo, type FileType } from "../utils";
+import {
+  canEditFile,
+  getEffectiveFileType,
+  type FileInfo,
+  type FileType,
+} from "../utils";
 import type { DataCompProps } from "../utils";
 import ViewWrapper from "../../../../../common/page/ViewWrapper";
 import type { StudyMetadata } from "../../../../../../common/types";
@@ -38,7 +43,8 @@ const componentByFileType: Record<FileType, ComponentType<DataCompProps>> = {
 } as const;
 
 function Data({ study, setSelectedFile, reloadTreeData, ...fileInfo }: Props) {
-  const DataViewer = componentByFileType[fileInfo.fileType];
+  const fileType = getEffectiveFileType(fileInfo.filePath, fileInfo.fileType);
+  const DataViewer = componentByFileType[fileType];
 
   return (
     <ViewWrapper>
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts b/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
index f0e9c428b8..d546a1e4dc 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/utils.ts
@@ -20,6 +20,7 @@ import DatasetIcon from "@mui/icons-material/Dataset";
 import { SvgIconComponent } from "@mui/icons-material";
 import * as RA from "ramda-adjunct";
 import type { StudyMetadata } from "../../../../../common/types";
+import { MatrixDataDTO } from "@/components/common/Matrix/shared/types";
 
 ////////////////////////////////////////////////////////////////
 // Types
@@ -49,8 +50,13 @@ export interface DataCompProps extends FileInfo {
   reloadTreeData: () => void;
 }
 
+interface ContentParsingOptions {
+  filePath: string;
+  fileType: string;
+}
+
 ////////////////////////////////////////////////////////////////
-// Utils
+// Constants
 ////////////////////////////////////////////////////////////////
 
 const URL_SCHEMES = {
@@ -59,7 +65,14 @@ const URL_SCHEMES = {
   FILE: "file://",
 } as const;
 
-const SUPPORTED_EXTENSIONS = [".txt", ".log", ".csv", ".tsv", ".ini"] as const;
+const SUPPORTED_EXTENSIONS = [
+  ".txt",
+  ".log",
+  ".csv",
+  ".tsv",
+  ".ini",
+  ".yml",
+] as const;
 
 // Maps file types to their corresponding icon components.
 const iconByFileType: Record<FileType, SvgIconComponent> = {
@@ -70,6 +83,10 @@ const iconByFileType: Record<FileType, SvgIconComponent> = {
   unsupported: BlockIcon,
 } as const;
 
+////////////////////////////////////////////////////////////////
+// Functions
+////////////////////////////////////////////////////////////////
+
 /**
  * Gets the icon component for a given file type.
  *
@@ -108,15 +125,15 @@ export function getFileType(treeData: TreeData): FileType {
     // All files except matrices and json-formatted content use this prefix
     // We filter to only allow extensions that can be properly displayed (.txt, .log, .csv, .tsv, .ini)
     // Other extensions (like .RDS or .xlsx) are marked as unsupported since they can't be shown in the UI
-    if (
-      treeData.startsWith(URL_SCHEMES.FILE) &&
-      SUPPORTED_EXTENSIONS.some((ext) => treeData.endsWith(ext))
-    ) {
-      return "text";
-    }
+    return treeData.startsWith(URL_SCHEMES.FILE) &&
+      SUPPORTED_EXTENSIONS.some((ext) =>
+        treeData.toLowerCase().endsWith(ext.toLowerCase()),
+      )
+      ? "text"
+      : "unsupported";
   }
 
-  return "unsupported";
+  return "text";
 }
 
 /**
@@ -130,7 +147,138 @@ export function canEditFile(study: StudyMetadata, filePath: string): boolean {
   return (
     !study.archived &&
     (filePath === "user" || filePath.startsWith("user/")) &&
-    // To remove when Xpansion tool configuration will be moved to "input/expansion" directory
+    // TODO: remove when Xpansion tool configuration will be moved to "input/expansion" directory
     !(filePath === "user/expansion" || filePath.startsWith("user/expansion/"))
   );
 }
+
+/**
+ * Checks if a file path is within the output folder
+ *
+ * @param path - The file path to check
+ * @returns Whether the path is in the output folder
+ */
+export function isInOutputFolder(path: string): boolean {
+  return path.startsWith("output/");
+}
+
+/**
+ * Determines if .txt files content is empty
+ *
+ * @param text - Content of .txt to check
+ * @returns boolean indicating if content is effectively empty
+ */
+export function isEmptyContent(text: string | string[]): boolean {
+  if (Array.isArray(text)) {
+    return (
+      !text || text.every((line) => typeof line === "string" && !line.trim())
+    );
+  }
+
+  return typeof text === "string" && !text.trim();
+}
+
+/**
+ * !Temporary workaround for matrix data display in output folders.
+ *
+ * Context:
+ * In output folders, matrix data can be returned by the API in two different formats:
+ * 1. As an unparsed JSON string containing the matrix data
+ * 2. As an already parsed MatrixDataDTO object
+ *
+ * This inconsistency exists because the API's matrix parsing behavior differs between
+ * output folders and other locations. Additionally, there's a UI requirement to display
+ * matrices from output folders as raw text rather than formatted tables.
+ *
+ * The workaround consists of three functions:
+ * 1. getEffectiveFileType: Forces matrix files in output folders to use text display
+ * 2. parseResponse: Handles the dual format nature of the API response
+ * 3. parseContent: Orchestrates the parsing logic based on file location and type
+ *
+ * TODO: This temporary solution will be removed once:
+ * - The API provides consistent matrix parsing across all folders
+ * - UI requirements for matrix display are finalized
+ */
+
+/**
+ * Forces matrix files in output folders to be displayed as text
+ * This is necessary because matrices in output folders need to be shown
+ * in their raw format rather than as formatted tables
+ *
+ * @param filePath - Path to the file being displayed
+ * @param originalType - Original file type as determined by the system
+ * @returns Modified file type (forces 'text' for matrices in output folders)
+ */
+export function getEffectiveFileType(
+  filePath: string,
+  originalType: FileType,
+): FileType {
+  if (isInOutputFolder(filePath) && originalType === "matrix") {
+    return "text";
+  }
+
+  return originalType;
+}
+
+/**
+ * Formats a 2D number array into a string representation
+ *
+ * @param matrix - 2D array of numbers to format
+ * @returns String representation of the matrix
+ */
+function formatMatrixToString(matrix: number[][]): string {
+  return matrix
+    .map((row) => row.map((val) => val.toString()).join("\t"))
+    .join("\n");
+}
+
+/**
+ * Handles parsing of matrix data from the API, dealing with both
+ * string and pre-parsed object formats
+ *
+ * @param res - API response containing matrix data (either MatrixDataDTO or string)
+ * @returns Extracted matrix data as a string
+ */
+function parseResponse(res: string | MatrixDataDTO): string {
+  if (typeof res === "object") {
+    // Handle case where API has already parsed the JSON into MatrixDataDTO
+    return formatMatrixToString(res.data);
+  }
+
+  try {
+    // Handle case where API returns unparsed JSON string
+    // Replace special numeric values with their string representations
+    const sanitizedJson = res
+      .replace(/NaN/g, '"NaN"')
+      .replace(/Infinity/g, '"Infinity"');
+
+    const parsed = JSON.parse(sanitizedJson);
+    return formatMatrixToString(parsed.data);
+  } catch (e) {
+    // If JSON parsing fails, assume it's plain text
+    return res;
+  }
+}
+
+/**
+ * Main content parsing function that orchestrates the matrix display workaround
+ *
+ * @param content - Raw content from the API (either string or parsed object)
+ * @param options - Configuration options including file path and type
+ * @returns Processed content ready for display
+ */
+export function parseContent(
+  content: string,
+  options: ContentParsingOptions,
+): string {
+  const { filePath, fileType } = options;
+
+  if (isInOutputFolder(filePath) && fileType === "matrix") {
+    // Apply special handling for matrices in output folders
+    return parseResponse(content);
+  }
+
+  return content || "";
+}
+
+// !End of Matrix Display Workaround

From d51e88c1a0f20b95e959b1d67e401d9f3fb11192 Mon Sep 17 00:00:00 2001
From: mabw-rte <41002227+mabw-rte@users.noreply.github.com>
Date: Fri, 13 Dec 2024 17:10:18 +0100
Subject: [PATCH 12/31] feat(aggregation-apis): rename aggregation cols (#2250)

---
 .../study/business/aggregator_management.py   |    46 +-
 .../details-STstorage-annual.txt              |     8 +
 .../expected_result_sts.csv                   |     2 +
 .../test-02-all.result.tsv                    |    20 +-
 .../test-02.result.tsv                        |  9398 +++---
 .../test-07.result.tsv                        | 25058 ++++++++--------
 .../test-08-all.result.tsv                    |    38 +-
 .../test_aggregate_raw_data.py                |   135 +-
 8 files changed, 17372 insertions(+), 17333 deletions(-)
 create mode 100644 tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/details-STstorage-annual.txt
 create mode 100644 tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/expected_result_sts.csv

diff --git a/antarest/study/business/aggregator_management.py b/antarest/study/business/aggregator_management.py
index cf7f59ab81..da2bdf846f 100644
--- a/antarest/study/business/aggregator_management.py
+++ b/antarest/study/business/aggregator_management.py
@@ -41,8 +41,20 @@
 """Index in path parts starting from the Monte Carlo year to determine the Monte Carlo year."""
 AREA_OR_LINK_INDEX__IND, AREA_OR_LINK_INDEX__ALL = 2, 1
 """Indexes in path parts starting from the output root `economy//mc-(ind/all)` to determine the area/link name."""
-PRODUCTION_COLUMN_NAME = "production"
+PRODUCTION_COLUMN_NAME_GENERAL = "production"
+PRODUCTION_COLUMN_NAME_ST = "levels"
 PRODUCTION_COLUMN_REGEX = "mwh"
+RENAME_MAPPING = {
+    "NP Cost - Euro": "NP Cost",
+    "NODU": "NODU",
+    "P-injection - MW": "P.injection",
+    "P-withdrawal - MW": "P.withdrawal",
+    "CashFlow - Euro": "CashFlow",
+}
+"""
+Dictionary to rename columns in a table.
+keys are the regexes to fetch for columns to rename, values are the new column names.
+"""
 CLUSTER_ID_COMPONENT = 0
 ACTUAL_COLUMN_COMPONENT = 1
 DUMMY_COMPONENT = 2
@@ -104,8 +116,9 @@ def _columns_ordering(df_cols: t.List[str], column_name: str, is_details: bool,
     return new_column_order
 
 
-def _infer_production_column(cols: t.Sequence[str]) -> t.Optional[str]:
-    return next((c for c in cols if PRODUCTION_COLUMN_REGEX in c.lower().strip()), None)
+def _infer_column_from_regex(cols: t.Sequence[str], col_regex: str) -> t.Optional[str]:
+    stripped_lower_col_regex = col_regex.lower().strip()
+    return next((c for c in cols if stripped_lower_col_regex in c.lower().strip()), None)
 
 
 def _infer_time_id(df: pd.DataFrame, is_details: bool) -> t.List[int]:
@@ -309,16 +322,31 @@ def _process_df(self, file_path: Path, is_details: bool) -> pd.DataFrame:
                 new_obj[CLUSTER_ID_COL] += [cluster_id for _ in range(df_len)]
                 new_obj[TIME_ID_COL] += list(range(1, df_len + 1))
 
+            # rename the columns
+            renamed_cols = []
             # check if there is a production column to rename it to `PRODUCTION_COLUMN_NAME`
-            prod_col = _infer_production_column(actual_cols)
-            if prod_col is not None:
-                new_obj[PRODUCTION_COLUMN_NAME] = new_obj.pop(prod_col)
+            prod_col = _infer_column_from_regex(actual_cols, PRODUCTION_COLUMN_REGEX)
+            if prod_col:
+                prod_col_name = (
+                    PRODUCTION_COLUMN_NAME_ST
+                    if (
+                        self.query_file == MCIndAreasQueryFile.DETAILS_ST_STORAGE
+                        or self.query_file == MCAllAreasQueryFile.DETAILS_ST_STORAGE
+                    )
+                    else PRODUCTION_COLUMN_NAME_GENERAL
+                )
+                new_obj[prod_col_name] = new_obj.pop(prod_col)
                 actual_cols.remove(prod_col)
+                renamed_cols.append(prod_col_name)
+            for col_regex, new_col_name in RENAME_MAPPING.items():
+                col_name = _infer_column_from_regex(actual_cols, col_regex)
+                if col_name:
+                    new_obj[new_col_name] = new_obj.pop(col_name)
+                    actual_cols.remove(col_name)
+                    renamed_cols.append(new_col_name)
 
             # reorganize the data frame
-            # first the production column if it exists
-            add_prod = [PRODUCTION_COLUMN_NAME] if prod_col is not None else []
-            columns_order = [CLUSTER_ID_COL, TIME_ID_COL] + add_prod + list(actual_cols)
+            columns_order = [CLUSTER_ID_COL, TIME_ID_COL] + renamed_cols + list(actual_cols)
             df = pd.DataFrame(new_obj).reindex(columns=columns_order).sort_values(by=[TIME_ID_COL, CLUSTER_ID_COL])
             df.index = pd.Index(list(range(1, len(df) + 1)))
 
diff --git a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/details-STstorage-annual.txt b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/details-STstorage-annual.txt
new file mode 100644
index 0000000000..89ae122d47
--- /dev/null
+++ b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/details-STstorage-annual.txt
@@ -0,0 +1,8 @@
+area_1	area	sts	annual
+	VARIABLES	BEGIN	END
+	4	1	1
+
+area_1	annual	storage_1	storage_1	storage_1	storage_1
+		P-injection - MW	P-withdrawal - MW	Levels - MWh	CashFlow - Euro
+		EXP	EXP	EXP	EXP
+	Annual	0	0	0	0
diff --git a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/expected_result_sts.csv b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/expected_result_sts.csv
new file mode 100644
index 0000000000..522a83355a
--- /dev/null
+++ b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/expected_result_sts.csv
@@ -0,0 +1,2 @@
+area,cluster,timeId,levels,P.injection,P.withdrawal,CashFlow
+de,storage_1,1,0.000000,0.000000,0.000000,0.000000
diff --git a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-02-all.result.tsv b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-02-all.result.tsv
index c0fdcaf9ce..e1c32d55fa 100644
--- a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-02-all.result.tsv
+++ b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-02-all.result.tsv
@@ -1,10 +1,10 @@
-area	cluster	timeId	production	NODU	NP Cost - Euro
-de	01_solar	1	315000.0	167.0	0.0
-de	02_wind_on	1	275000.0	147.0	0.0
-de	03_wind_off	1	235000.0	127.0	0.0
-de	04_res	1	195000.0	107.0	0.0
-de	05_nuclear	1	155000.0	87.0	0.0
-de	06_coal	1	115000.0	67.0	0.0
-de	07_gas	1	75000.0	47.0	0.0
-de	08_non-res	1	35000.0	27.0	0.0
-de	09_hydro_pump	1	2800.0	7.0	0.0
+area	cluster	timeId	production	NP Cost	NODU
+de	01_solar	1	315000.0	0.0	167.0
+de	02_wind_on	1	275000.0	0.0	147.0
+de	03_wind_off	1	235000.0	0.0	127.0
+de	04_res	1	195000.0	0.0	107.0
+de	05_nuclear	1	155000.0	0.0	87.0
+de	06_coal	1	115000.0	0.0	67.0
+de	07_gas	1	75000.0	0.0	47.0
+de	08_non-res	1	35000.0	0.0	27.0
+de	09_hydro_pump	1	2800.0	0.0	7.0
diff --git a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-02.result.tsv b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-02.result.tsv
index 3ae4e16777..f10a5ebc0e 100644
--- a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-02.result.tsv
+++ b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-02.result.tsv
@@ -1,4 +1,4 @@
-area	cluster	mcYear	timeId	production	NODU	NP Cost - Euro
+area	cluster	mcYear	timeId	production	NP Cost	NODU
 de	01_solar	1	1	0.0	0.0	0.0
 de	02_wind_on	1	1	0.0	0.0	0.0
 de	03_wind_off	1	1	0.0	0.0	0.0
@@ -8,7 +8,7 @@ de	06_coal	1	1	0.0	0.0	0.0
 de	07_gas	1	1	0.0	0.0	0.0
 de	08_non-res	1	1	0.0	0.0	0.0
 de	09_hydro_pump	1	1	0.0	0.0	0.0
-de	01_solar	1	2	100.0	1.0	0.0
+de	01_solar	1	2	100.0	0.0	1.0
 de	02_wind_on	1	2	0.0	0.0	0.0
 de	03_wind_off	1	2	0.0	0.0	0.0
 de	04_res	1	2	0.0	0.0	0.0
@@ -17,7 +17,7 @@ de	06_coal	1	2	0.0	0.0	0.0
 de	07_gas	1	2	0.0	0.0	0.0
 de	08_non-res	1	2	0.0	0.0	0.0
 de	09_hydro_pump	1	2	0.0	0.0	0.0
-de	01_solar	1	3	200.0	1.0	0.0
+de	01_solar	1	3	200.0	0.0	1.0
 de	02_wind_on	1	3	0.0	0.0	0.0
 de	03_wind_off	1	3	0.0	0.0	0.0
 de	04_res	1	3	0.0	0.0	0.0
@@ -26,7 +26,7 @@ de	06_coal	1	3	0.0	0.0	0.0
 de	07_gas	1	3	0.0	0.0	0.0
 de	08_non-res	1	3	0.0	0.0	0.0
 de	09_hydro_pump	1	3	0.0	0.0	0.0
-de	01_solar	1	4	300.0	1.0	0.0
+de	01_solar	1	4	300.0	0.0	1.0
 de	02_wind_on	1	4	0.0	0.0	0.0
 de	03_wind_off	1	4	0.0	0.0	0.0
 de	04_res	1	4	0.0	0.0	0.0
@@ -35,7 +35,7 @@ de	06_coal	1	4	0.0	0.0	0.0
 de	07_gas	1	4	0.0	0.0	0.0
 de	08_non-res	1	4	0.0	0.0	0.0
 de	09_hydro_pump	1	4	0.0	0.0	0.0
-de	01_solar	1	5	400.0	1.0	0.0
+de	01_solar	1	5	400.0	0.0	1.0
 de	02_wind_on	1	5	0.0	0.0	0.0
 de	03_wind_off	1	5	0.0	0.0	0.0
 de	04_res	1	5	0.0	0.0	0.0
@@ -44,7 +44,7 @@ de	06_coal	1	5	0.0	0.0	0.0
 de	07_gas	1	5	0.0	0.0	0.0
 de	08_non-res	1	5	0.0	0.0	0.0
 de	09_hydro_pump	1	5	0.0	0.0	0.0
-de	01_solar	1	6	500.0	1.0	0.0
+de	01_solar	1	6	500.0	0.0	1.0
 de	02_wind_on	1	6	0.0	0.0	0.0
 de	03_wind_off	1	6	0.0	0.0	0.0
 de	04_res	1	6	0.0	0.0	0.0
@@ -53,7 +53,7 @@ de	06_coal	1	6	0.0	0.0	0.0
 de	07_gas	1	6	0.0	0.0	0.0
 de	08_non-res	1	6	0.0	0.0	0.0
 de	09_hydro_pump	1	6	0.0	0.0	0.0
-de	01_solar	1	7	600.0	1.0	0.0
+de	01_solar	1	7	600.0	0.0	1.0
 de	02_wind_on	1	7	0.0	0.0	0.0
 de	03_wind_off	1	7	0.0	0.0	0.0
 de	04_res	1	7	0.0	0.0	0.0
@@ -62,7 +62,7 @@ de	06_coal	1	7	0.0	0.0	0.0
 de	07_gas	1	7	0.0	0.0	0.0
 de	08_non-res	1	7	0.0	0.0	0.0
 de	09_hydro_pump	1	7	0.0	0.0	0.0
-de	01_solar	1	8	700.0	1.0	0.0
+de	01_solar	1	8	700.0	0.0	1.0
 de	02_wind_on	1	8	0.0	0.0	0.0
 de	03_wind_off	1	8	0.0	0.0	0.0
 de	04_res	1	8	0.0	0.0	0.0
@@ -71,7 +71,7 @@ de	06_coal	1	8	0.0	0.0	0.0
 de	07_gas	1	8	0.0	0.0	0.0
 de	08_non-res	1	8	0.0	0.0	0.0
 de	09_hydro_pump	1	8	0.0	0.0	0.0
-de	01_solar	1	9	800.0	1.0	0.0
+de	01_solar	1	9	800.0	0.0	1.0
 de	02_wind_on	1	9	0.0	0.0	0.0
 de	03_wind_off	1	9	0.0	0.0	0.0
 de	04_res	1	9	0.0	0.0	0.0
@@ -80,7 +80,7 @@ de	06_coal	1	9	0.0	0.0	0.0
 de	07_gas	1	9	0.0	0.0	0.0
 de	08_non-res	1	9	0.0	0.0	0.0
 de	09_hydro_pump	1	9	0.0	0.0	0.0
-de	01_solar	1	10	900.0	1.0	0.0
+de	01_solar	1	10	900.0	0.0	1.0
 de	02_wind_on	1	10	0.0	0.0	0.0
 de	03_wind_off	1	10	0.0	0.0	0.0
 de	04_res	1	10	0.0	0.0	0.0
@@ -89,7 +89,7 @@ de	06_coal	1	10	0.0	0.0	0.0
 de	07_gas	1	10	0.0	0.0	0.0
 de	08_non-res	1	10	0.0	0.0	0.0
 de	09_hydro_pump	1	10	0.0	0.0	0.0
-de	01_solar	1	11	1000.0	1.0	0.0
+de	01_solar	1	11	1000.0	0.0	1.0
 de	02_wind_on	1	11	0.0	0.0	0.0
 de	03_wind_off	1	11	0.0	0.0	0.0
 de	04_res	1	11	0.0	0.0	0.0
@@ -98,7 +98,7 @@ de	06_coal	1	11	0.0	0.0	0.0
 de	07_gas	1	11	0.0	0.0	0.0
 de	08_non-res	1	11	0.0	0.0	0.0
 de	09_hydro_pump	1	11	0.0	0.0	0.0
-de	01_solar	1	12	1100.0	1.0	0.0
+de	01_solar	1	12	1100.0	0.0	1.0
 de	02_wind_on	1	12	0.0	0.0	0.0
 de	03_wind_off	1	12	0.0	0.0	0.0
 de	04_res	1	12	0.0	0.0	0.0
@@ -107,7 +107,7 @@ de	06_coal	1	12	0.0	0.0	0.0
 de	07_gas	1	12	0.0	0.0	0.0
 de	08_non-res	1	12	0.0	0.0	0.0
 de	09_hydro_pump	1	12	0.0	0.0	0.0
-de	01_solar	1	13	1200.0	1.0	0.0
+de	01_solar	1	13	1200.0	0.0	1.0
 de	02_wind_on	1	13	0.0	0.0	0.0
 de	03_wind_off	1	13	0.0	0.0	0.0
 de	04_res	1	13	0.0	0.0	0.0
@@ -116,7 +116,7 @@ de	06_coal	1	13	0.0	0.0	0.0
 de	07_gas	1	13	0.0	0.0	0.0
 de	08_non-res	1	13	0.0	0.0	0.0
 de	09_hydro_pump	1	13	0.0	0.0	0.0
-de	01_solar	1	14	1300.0	1.0	0.0
+de	01_solar	1	14	1300.0	0.0	1.0
 de	02_wind_on	1	14	0.0	0.0	0.0
 de	03_wind_off	1	14	0.0	0.0	0.0
 de	04_res	1	14	0.0	0.0	0.0
@@ -125,7 +125,7 @@ de	06_coal	1	14	0.0	0.0	0.0
 de	07_gas	1	14	0.0	0.0	0.0
 de	08_non-res	1	14	0.0	0.0	0.0
 de	09_hydro_pump	1	14	0.0	0.0	0.0
-de	01_solar	1	15	1400.0	1.0	0.0
+de	01_solar	1	15	1400.0	0.0	1.0
 de	02_wind_on	1	15	0.0	0.0	0.0
 de	03_wind_off	1	15	0.0	0.0	0.0
 de	04_res	1	15	0.0	0.0	0.0
@@ -134,7 +134,7 @@ de	06_coal	1	15	0.0	0.0	0.0
 de	07_gas	1	15	0.0	0.0	0.0
 de	08_non-res	1	15	0.0	0.0	0.0
 de	09_hydro_pump	1	15	0.0	0.0	0.0
-de	01_solar	1	16	1500.0	1.0	0.0
+de	01_solar	1	16	1500.0	0.0	1.0
 de	02_wind_on	1	16	0.0	0.0	0.0
 de	03_wind_off	1	16	0.0	0.0	0.0
 de	04_res	1	16	0.0	0.0	0.0
@@ -143,7 +143,7 @@ de	06_coal	1	16	0.0	0.0	0.0
 de	07_gas	1	16	0.0	0.0	0.0
 de	08_non-res	1	16	0.0	0.0	0.0
 de	09_hydro_pump	1	16	0.0	0.0	0.0
-de	01_solar	1	17	1600.0	1.0	0.0
+de	01_solar	1	17	1600.0	0.0	1.0
 de	02_wind_on	1	17	0.0	0.0	0.0
 de	03_wind_off	1	17	0.0	0.0	0.0
 de	04_res	1	17	0.0	0.0	0.0
@@ -152,7 +152,7 @@ de	06_coal	1	17	0.0	0.0	0.0
 de	07_gas	1	17	0.0	0.0	0.0
 de	08_non-res	1	17	0.0	0.0	0.0
 de	09_hydro_pump	1	17	0.0	0.0	0.0
-de	01_solar	1	18	1700.0	1.0	0.0
+de	01_solar	1	18	1700.0	0.0	1.0
 de	02_wind_on	1	18	0.0	0.0	0.0
 de	03_wind_off	1	18	0.0	0.0	0.0
 de	04_res	1	18	0.0	0.0	0.0
@@ -161,7 +161,7 @@ de	06_coal	1	18	0.0	0.0	0.0
 de	07_gas	1	18	0.0	0.0	0.0
 de	08_non-res	1	18	0.0	0.0	0.0
 de	09_hydro_pump	1	18	0.0	0.0	0.0
-de	01_solar	1	19	1800.0	1.0	0.0
+de	01_solar	1	19	1800.0	0.0	1.0
 de	02_wind_on	1	19	0.0	0.0	0.0
 de	03_wind_off	1	19	0.0	0.0	0.0
 de	04_res	1	19	0.0	0.0	0.0
@@ -170,7 +170,7 @@ de	06_coal	1	19	0.0	0.0	0.0
 de	07_gas	1	19	0.0	0.0	0.0
 de	08_non-res	1	19	0.0	0.0	0.0
 de	09_hydro_pump	1	19	0.0	0.0	0.0
-de	01_solar	1	20	1900.0	1.0	0.0
+de	01_solar	1	20	1900.0	0.0	1.0
 de	02_wind_on	1	20	0.0	0.0	0.0
 de	03_wind_off	1	20	0.0	0.0	0.0
 de	04_res	1	20	0.0	0.0	0.0
@@ -179,7 +179,7 @@ de	06_coal	1	20	0.0	0.0	0.0
 de	07_gas	1	20	0.0	0.0	0.0
 de	08_non-res	1	20	0.0	0.0	0.0
 de	09_hydro_pump	1	20	0.0	0.0	0.0
-de	01_solar	1	21	2000.0	1.0	0.0
+de	01_solar	1	21	2000.0	0.0	1.0
 de	02_wind_on	1	21	0.0	0.0	0.0
 de	03_wind_off	1	21	0.0	0.0	0.0
 de	04_res	1	21	0.0	0.0	0.0
@@ -188,8 +188,8 @@ de	06_coal	1	21	0.0	0.0	0.0
 de	07_gas	1	21	0.0	0.0	0.0
 de	08_non-res	1	21	0.0	0.0	0.0
 de	09_hydro_pump	1	21	0.0	0.0	0.0
-de	01_solar	1	22	2000.0	1.0	0.0
-de	02_wind_on	1	22	100.0	1.0	0.0
+de	01_solar	1	22	2000.0	0.0	1.0
+de	02_wind_on	1	22	100.0	0.0	1.0
 de	03_wind_off	1	22	0.0	0.0	0.0
 de	04_res	1	22	0.0	0.0	0.0
 de	05_nuclear	1	22	0.0	0.0	0.0
@@ -197,8 +197,8 @@ de	06_coal	1	22	0.0	0.0	0.0
 de	07_gas	1	22	0.0	0.0	0.0
 de	08_non-res	1	22	0.0	0.0	0.0
 de	09_hydro_pump	1	22	0.0	0.0	0.0
-de	01_solar	1	23	2000.0	1.0	0.0
-de	02_wind_on	1	23	200.0	1.0	0.0
+de	01_solar	1	23	2000.0	0.0	1.0
+de	02_wind_on	1	23	200.0	0.0	1.0
 de	03_wind_off	1	23	0.0	0.0	0.0
 de	04_res	1	23	0.0	0.0	0.0
 de	05_nuclear	1	23	0.0	0.0	0.0
@@ -206,8 +206,8 @@ de	06_coal	1	23	0.0	0.0	0.0
 de	07_gas	1	23	0.0	0.0	0.0
 de	08_non-res	1	23	0.0	0.0	0.0
 de	09_hydro_pump	1	23	0.0	0.0	0.0
-de	01_solar	1	24	2000.0	1.0	0.0
-de	02_wind_on	1	24	300.0	1.0	0.0
+de	01_solar	1	24	2000.0	0.0	1.0
+de	02_wind_on	1	24	300.0	0.0	1.0
 de	03_wind_off	1	24	0.0	0.0	0.0
 de	04_res	1	24	0.0	0.0	0.0
 de	05_nuclear	1	24	0.0	0.0	0.0
@@ -215,8 +215,8 @@ de	06_coal	1	24	0.0	0.0	0.0
 de	07_gas	1	24	0.0	0.0	0.0
 de	08_non-res	1	24	0.0	0.0	0.0
 de	09_hydro_pump	1	24	0.0	0.0	0.0
-de	01_solar	1	25	2000.0	1.0	0.0
-de	02_wind_on	1	25	400.0	1.0	0.0
+de	01_solar	1	25	2000.0	0.0	1.0
+de	02_wind_on	1	25	400.0	0.0	1.0
 de	03_wind_off	1	25	0.0	0.0	0.0
 de	04_res	1	25	0.0	0.0	0.0
 de	05_nuclear	1	25	0.0	0.0	0.0
@@ -224,8 +224,8 @@ de	06_coal	1	25	0.0	0.0	0.0
 de	07_gas	1	25	0.0	0.0	0.0
 de	08_non-res	1	25	0.0	0.0	0.0
 de	09_hydro_pump	1	25	0.0	0.0	0.0
-de	01_solar	1	26	2000.0	1.0	0.0
-de	02_wind_on	1	26	500.0	1.0	0.0
+de	01_solar	1	26	2000.0	0.0	1.0
+de	02_wind_on	1	26	500.0	0.0	1.0
 de	03_wind_off	1	26	0.0	0.0	0.0
 de	04_res	1	26	0.0	0.0	0.0
 de	05_nuclear	1	26	0.0	0.0	0.0
@@ -233,8 +233,8 @@ de	06_coal	1	26	0.0	0.0	0.0
 de	07_gas	1	26	0.0	0.0	0.0
 de	08_non-res	1	26	0.0	0.0	0.0
 de	09_hydro_pump	1	26	0.0	0.0	0.0
-de	01_solar	1	27	2000.0	1.0	0.0
-de	02_wind_on	1	27	600.0	1.0	0.0
+de	01_solar	1	27	2000.0	0.0	1.0
+de	02_wind_on	1	27	600.0	0.0	1.0
 de	03_wind_off	1	27	0.0	0.0	0.0
 de	04_res	1	27	0.0	0.0	0.0
 de	05_nuclear	1	27	0.0	0.0	0.0
@@ -242,8 +242,8 @@ de	06_coal	1	27	0.0	0.0	0.0
 de	07_gas	1	27	0.0	0.0	0.0
 de	08_non-res	1	27	0.0	0.0	0.0
 de	09_hydro_pump	1	27	0.0	0.0	0.0
-de	01_solar	1	28	2000.0	1.0	0.0
-de	02_wind_on	1	28	700.0	1.0	0.0
+de	01_solar	1	28	2000.0	0.0	1.0
+de	02_wind_on	1	28	700.0	0.0	1.0
 de	03_wind_off	1	28	0.0	0.0	0.0
 de	04_res	1	28	0.0	0.0	0.0
 de	05_nuclear	1	28	0.0	0.0	0.0
@@ -251,8 +251,8 @@ de	06_coal	1	28	0.0	0.0	0.0
 de	07_gas	1	28	0.0	0.0	0.0
 de	08_non-res	1	28	0.0	0.0	0.0
 de	09_hydro_pump	1	28	0.0	0.0	0.0
-de	01_solar	1	29	2000.0	1.0	0.0
-de	02_wind_on	1	29	800.0	1.0	0.0
+de	01_solar	1	29	2000.0	0.0	1.0
+de	02_wind_on	1	29	800.0	0.0	1.0
 de	03_wind_off	1	29	0.0	0.0	0.0
 de	04_res	1	29	0.0	0.0	0.0
 de	05_nuclear	1	29	0.0	0.0	0.0
@@ -260,8 +260,8 @@ de	06_coal	1	29	0.0	0.0	0.0
 de	07_gas	1	29	0.0	0.0	0.0
 de	08_non-res	1	29	0.0	0.0	0.0
 de	09_hydro_pump	1	29	0.0	0.0	0.0
-de	01_solar	1	30	2000.0	1.0	0.0
-de	02_wind_on	1	30	900.0	1.0	0.0
+de	01_solar	1	30	2000.0	0.0	1.0
+de	02_wind_on	1	30	900.0	0.0	1.0
 de	03_wind_off	1	30	0.0	0.0	0.0
 de	04_res	1	30	0.0	0.0	0.0
 de	05_nuclear	1	30	0.0	0.0	0.0
@@ -269,8 +269,8 @@ de	06_coal	1	30	0.0	0.0	0.0
 de	07_gas	1	30	0.0	0.0	0.0
 de	08_non-res	1	30	0.0	0.0	0.0
 de	09_hydro_pump	1	30	0.0	0.0	0.0
-de	01_solar	1	31	2000.0	1.0	0.0
-de	02_wind_on	1	31	1000.0	1.0	0.0
+de	01_solar	1	31	2000.0	0.0	1.0
+de	02_wind_on	1	31	1000.0	0.0	1.0
 de	03_wind_off	1	31	0.0	0.0	0.0
 de	04_res	1	31	0.0	0.0	0.0
 de	05_nuclear	1	31	0.0	0.0	0.0
@@ -278,8 +278,8 @@ de	06_coal	1	31	0.0	0.0	0.0
 de	07_gas	1	31	0.0	0.0	0.0
 de	08_non-res	1	31	0.0	0.0	0.0
 de	09_hydro_pump	1	31	0.0	0.0	0.0
-de	01_solar	1	32	2000.0	1.0	0.0
-de	02_wind_on	1	32	1100.0	1.0	0.0
+de	01_solar	1	32	2000.0	0.0	1.0
+de	02_wind_on	1	32	1100.0	0.0	1.0
 de	03_wind_off	1	32	0.0	0.0	0.0
 de	04_res	1	32	0.0	0.0	0.0
 de	05_nuclear	1	32	0.0	0.0	0.0
@@ -287,8 +287,8 @@ de	06_coal	1	32	0.0	0.0	0.0
 de	07_gas	1	32	0.0	0.0	0.0
 de	08_non-res	1	32	0.0	0.0	0.0
 de	09_hydro_pump	1	32	0.0	0.0	0.0
-de	01_solar	1	33	2000.0	1.0	0.0
-de	02_wind_on	1	33	1200.0	1.0	0.0
+de	01_solar	1	33	2000.0	0.0	1.0
+de	02_wind_on	1	33	1200.0	0.0	1.0
 de	03_wind_off	1	33	0.0	0.0	0.0
 de	04_res	1	33	0.0	0.0	0.0
 de	05_nuclear	1	33	0.0	0.0	0.0
@@ -296,8 +296,8 @@ de	06_coal	1	33	0.0	0.0	0.0
 de	07_gas	1	33	0.0	0.0	0.0
 de	08_non-res	1	33	0.0	0.0	0.0
 de	09_hydro_pump	1	33	0.0	0.0	0.0
-de	01_solar	1	34	2000.0	1.0	0.0
-de	02_wind_on	1	34	1300.0	1.0	0.0
+de	01_solar	1	34	2000.0	0.0	1.0
+de	02_wind_on	1	34	1300.0	0.0	1.0
 de	03_wind_off	1	34	0.0	0.0	0.0
 de	04_res	1	34	0.0	0.0	0.0
 de	05_nuclear	1	34	0.0	0.0	0.0
@@ -305,8 +305,8 @@ de	06_coal	1	34	0.0	0.0	0.0
 de	07_gas	1	34	0.0	0.0	0.0
 de	08_non-res	1	34	0.0	0.0	0.0
 de	09_hydro_pump	1	34	0.0	0.0	0.0
-de	01_solar	1	35	2000.0	1.0	0.0
-de	02_wind_on	1	35	1400.0	1.0	0.0
+de	01_solar	1	35	2000.0	0.0	1.0
+de	02_wind_on	1	35	1400.0	0.0	1.0
 de	03_wind_off	1	35	0.0	0.0	0.0
 de	04_res	1	35	0.0	0.0	0.0
 de	05_nuclear	1	35	0.0	0.0	0.0
@@ -314,8 +314,8 @@ de	06_coal	1	35	0.0	0.0	0.0
 de	07_gas	1	35	0.0	0.0	0.0
 de	08_non-res	1	35	0.0	0.0	0.0
 de	09_hydro_pump	1	35	0.0	0.0	0.0
-de	01_solar	1	36	2000.0	1.0	0.0
-de	02_wind_on	1	36	1500.0	1.0	0.0
+de	01_solar	1	36	2000.0	0.0	1.0
+de	02_wind_on	1	36	1500.0	0.0	1.0
 de	03_wind_off	1	36	0.0	0.0	0.0
 de	04_res	1	36	0.0	0.0	0.0
 de	05_nuclear	1	36	0.0	0.0	0.0
@@ -323,8 +323,8 @@ de	06_coal	1	36	0.0	0.0	0.0
 de	07_gas	1	36	0.0	0.0	0.0
 de	08_non-res	1	36	0.0	0.0	0.0
 de	09_hydro_pump	1	36	0.0	0.0	0.0
-de	01_solar	1	37	2000.0	1.0	0.0
-de	02_wind_on	1	37	1600.0	1.0	0.0
+de	01_solar	1	37	2000.0	0.0	1.0
+de	02_wind_on	1	37	1600.0	0.0	1.0
 de	03_wind_off	1	37	0.0	0.0	0.0
 de	04_res	1	37	0.0	0.0	0.0
 de	05_nuclear	1	37	0.0	0.0	0.0
@@ -332,8 +332,8 @@ de	06_coal	1	37	0.0	0.0	0.0
 de	07_gas	1	37	0.0	0.0	0.0
 de	08_non-res	1	37	0.0	0.0	0.0
 de	09_hydro_pump	1	37	0.0	0.0	0.0
-de	01_solar	1	38	2000.0	1.0	0.0
-de	02_wind_on	1	38	1700.0	1.0	0.0
+de	01_solar	1	38	2000.0	0.0	1.0
+de	02_wind_on	1	38	1700.0	0.0	1.0
 de	03_wind_off	1	38	0.0	0.0	0.0
 de	04_res	1	38	0.0	0.0	0.0
 de	05_nuclear	1	38	0.0	0.0	0.0
@@ -341,8 +341,8 @@ de	06_coal	1	38	0.0	0.0	0.0
 de	07_gas	1	38	0.0	0.0	0.0
 de	08_non-res	1	38	0.0	0.0	0.0
 de	09_hydro_pump	1	38	0.0	0.0	0.0
-de	01_solar	1	39	2000.0	1.0	0.0
-de	02_wind_on	1	39	1800.0	1.0	0.0
+de	01_solar	1	39	2000.0	0.0	1.0
+de	02_wind_on	1	39	1800.0	0.0	1.0
 de	03_wind_off	1	39	0.0	0.0	0.0
 de	04_res	1	39	0.0	0.0	0.0
 de	05_nuclear	1	39	0.0	0.0	0.0
@@ -350,8 +350,8 @@ de	06_coal	1	39	0.0	0.0	0.0
 de	07_gas	1	39	0.0	0.0	0.0
 de	08_non-res	1	39	0.0	0.0	0.0
 de	09_hydro_pump	1	39	0.0	0.0	0.0
-de	01_solar	1	40	2000.0	1.0	0.0
-de	02_wind_on	1	40	1900.0	1.0	0.0
+de	01_solar	1	40	2000.0	0.0	1.0
+de	02_wind_on	1	40	1900.0	0.0	1.0
 de	03_wind_off	1	40	0.0	0.0	0.0
 de	04_res	1	40	0.0	0.0	0.0
 de	05_nuclear	1	40	0.0	0.0	0.0
@@ -359,8 +359,8 @@ de	06_coal	1	40	0.0	0.0	0.0
 de	07_gas	1	40	0.0	0.0	0.0
 de	08_non-res	1	40	0.0	0.0	0.0
 de	09_hydro_pump	1	40	0.0	0.0	0.0
-de	01_solar	1	41	2000.0	1.0	0.0
-de	02_wind_on	1	41	2000.0	1.0	0.0
+de	01_solar	1	41	2000.0	0.0	1.0
+de	02_wind_on	1	41	2000.0	0.0	1.0
 de	03_wind_off	1	41	0.0	0.0	0.0
 de	04_res	1	41	0.0	0.0	0.0
 de	05_nuclear	1	41	0.0	0.0	0.0
@@ -368,1149 +368,1149 @@ de	06_coal	1	41	0.0	0.0	0.0
 de	07_gas	1	41	0.0	0.0	0.0
 de	08_non-res	1	41	0.0	0.0	0.0
 de	09_hydro_pump	1	41	0.0	0.0	0.0
-de	01_solar	1	42	2000.0	1.0	0.0
-de	02_wind_on	1	42	2000.0	1.0	0.0
-de	03_wind_off	1	42	100.0	1.0	0.0
+de	01_solar	1	42	2000.0	0.0	1.0
+de	02_wind_on	1	42	2000.0	0.0	1.0
+de	03_wind_off	1	42	100.0	0.0	1.0
 de	04_res	1	42	0.0	0.0	0.0
 de	05_nuclear	1	42	0.0	0.0	0.0
 de	06_coal	1	42	0.0	0.0	0.0
 de	07_gas	1	42	0.0	0.0	0.0
 de	08_non-res	1	42	0.0	0.0	0.0
 de	09_hydro_pump	1	42	0.0	0.0	0.0
-de	01_solar	1	43	2000.0	1.0	0.0
-de	02_wind_on	1	43	2000.0	1.0	0.0
-de	03_wind_off	1	43	200.0	1.0	0.0
+de	01_solar	1	43	2000.0	0.0	1.0
+de	02_wind_on	1	43	2000.0	0.0	1.0
+de	03_wind_off	1	43	200.0	0.0	1.0
 de	04_res	1	43	0.0	0.0	0.0
 de	05_nuclear	1	43	0.0	0.0	0.0
 de	06_coal	1	43	0.0	0.0	0.0
 de	07_gas	1	43	0.0	0.0	0.0
 de	08_non-res	1	43	0.0	0.0	0.0
 de	09_hydro_pump	1	43	0.0	0.0	0.0
-de	01_solar	1	44	2000.0	1.0	0.0
-de	02_wind_on	1	44	2000.0	1.0	0.0
-de	03_wind_off	1	44	300.0	1.0	0.0
+de	01_solar	1	44	2000.0	0.0	1.0
+de	02_wind_on	1	44	2000.0	0.0	1.0
+de	03_wind_off	1	44	300.0	0.0	1.0
 de	04_res	1	44	0.0	0.0	0.0
 de	05_nuclear	1	44	0.0	0.0	0.0
 de	06_coal	1	44	0.0	0.0	0.0
 de	07_gas	1	44	0.0	0.0	0.0
 de	08_non-res	1	44	0.0	0.0	0.0
 de	09_hydro_pump	1	44	0.0	0.0	0.0
-de	01_solar	1	45	2000.0	1.0	0.0
-de	02_wind_on	1	45	2000.0	1.0	0.0
-de	03_wind_off	1	45	400.0	1.0	0.0
+de	01_solar	1	45	2000.0	0.0	1.0
+de	02_wind_on	1	45	2000.0	0.0	1.0
+de	03_wind_off	1	45	400.0	0.0	1.0
 de	04_res	1	45	0.0	0.0	0.0
 de	05_nuclear	1	45	0.0	0.0	0.0
 de	06_coal	1	45	0.0	0.0	0.0
 de	07_gas	1	45	0.0	0.0	0.0
 de	08_non-res	1	45	0.0	0.0	0.0
 de	09_hydro_pump	1	45	0.0	0.0	0.0
-de	01_solar	1	46	2000.0	1.0	0.0
-de	02_wind_on	1	46	2000.0	1.0	0.0
-de	03_wind_off	1	46	500.0	1.0	0.0
+de	01_solar	1	46	2000.0	0.0	1.0
+de	02_wind_on	1	46	2000.0	0.0	1.0
+de	03_wind_off	1	46	500.0	0.0	1.0
 de	04_res	1	46	0.0	0.0	0.0
 de	05_nuclear	1	46	0.0	0.0	0.0
 de	06_coal	1	46	0.0	0.0	0.0
 de	07_gas	1	46	0.0	0.0	0.0
 de	08_non-res	1	46	0.0	0.0	0.0
 de	09_hydro_pump	1	46	0.0	0.0	0.0
-de	01_solar	1	47	2000.0	1.0	0.0
-de	02_wind_on	1	47	2000.0	1.0	0.0
-de	03_wind_off	1	47	600.0	1.0	0.0
+de	01_solar	1	47	2000.0	0.0	1.0
+de	02_wind_on	1	47	2000.0	0.0	1.0
+de	03_wind_off	1	47	600.0	0.0	1.0
 de	04_res	1	47	0.0	0.0	0.0
 de	05_nuclear	1	47	0.0	0.0	0.0
 de	06_coal	1	47	0.0	0.0	0.0
 de	07_gas	1	47	0.0	0.0	0.0
 de	08_non-res	1	47	0.0	0.0	0.0
 de	09_hydro_pump	1	47	0.0	0.0	0.0
-de	01_solar	1	48	2000.0	1.0	0.0
-de	02_wind_on	1	48	2000.0	1.0	0.0
-de	03_wind_off	1	48	700.0	1.0	0.0
+de	01_solar	1	48	2000.0	0.0	1.0
+de	02_wind_on	1	48	2000.0	0.0	1.0
+de	03_wind_off	1	48	700.0	0.0	1.0
 de	04_res	1	48	0.0	0.0	0.0
 de	05_nuclear	1	48	0.0	0.0	0.0
 de	06_coal	1	48	0.0	0.0	0.0
 de	07_gas	1	48	0.0	0.0	0.0
 de	08_non-res	1	48	0.0	0.0	0.0
 de	09_hydro_pump	1	48	0.0	0.0	0.0
-de	01_solar	1	49	2000.0	1.0	0.0
-de	02_wind_on	1	49	2000.0	1.0	0.0
-de	03_wind_off	1	49	800.0	1.0	0.0
+de	01_solar	1	49	2000.0	0.0	1.0
+de	02_wind_on	1	49	2000.0	0.0	1.0
+de	03_wind_off	1	49	800.0	0.0	1.0
 de	04_res	1	49	0.0	0.0	0.0
 de	05_nuclear	1	49	0.0	0.0	0.0
 de	06_coal	1	49	0.0	0.0	0.0
 de	07_gas	1	49	0.0	0.0	0.0
 de	08_non-res	1	49	0.0	0.0	0.0
 de	09_hydro_pump	1	49	0.0	0.0	0.0
-de	01_solar	1	50	2000.0	1.0	0.0
-de	02_wind_on	1	50	2000.0	1.0	0.0
-de	03_wind_off	1	50	900.0	1.0	0.0
+de	01_solar	1	50	2000.0	0.0	1.0
+de	02_wind_on	1	50	2000.0	0.0	1.0
+de	03_wind_off	1	50	900.0	0.0	1.0
 de	04_res	1	50	0.0	0.0	0.0
 de	05_nuclear	1	50	0.0	0.0	0.0
 de	06_coal	1	50	0.0	0.0	0.0
 de	07_gas	1	50	0.0	0.0	0.0
 de	08_non-res	1	50	0.0	0.0	0.0
 de	09_hydro_pump	1	50	0.0	0.0	0.0
-de	01_solar	1	51	2000.0	1.0	0.0
-de	02_wind_on	1	51	2000.0	1.0	0.0
-de	03_wind_off	1	51	1000.0	1.0	0.0
+de	01_solar	1	51	2000.0	0.0	1.0
+de	02_wind_on	1	51	2000.0	0.0	1.0
+de	03_wind_off	1	51	1000.0	0.0	1.0
 de	04_res	1	51	0.0	0.0	0.0
 de	05_nuclear	1	51	0.0	0.0	0.0
 de	06_coal	1	51	0.0	0.0	0.0
 de	07_gas	1	51	0.0	0.0	0.0
 de	08_non-res	1	51	0.0	0.0	0.0
 de	09_hydro_pump	1	51	0.0	0.0	0.0
-de	01_solar	1	52	2000.0	1.0	0.0
-de	02_wind_on	1	52	2000.0	1.0	0.0
-de	03_wind_off	1	52	1100.0	1.0	0.0
+de	01_solar	1	52	2000.0	0.0	1.0
+de	02_wind_on	1	52	2000.0	0.0	1.0
+de	03_wind_off	1	52	1100.0	0.0	1.0
 de	04_res	1	52	0.0	0.0	0.0
 de	05_nuclear	1	52	0.0	0.0	0.0
 de	06_coal	1	52	0.0	0.0	0.0
 de	07_gas	1	52	0.0	0.0	0.0
 de	08_non-res	1	52	0.0	0.0	0.0
 de	09_hydro_pump	1	52	0.0	0.0	0.0
-de	01_solar	1	53	2000.0	1.0	0.0
-de	02_wind_on	1	53	2000.0	1.0	0.0
-de	03_wind_off	1	53	1200.0	1.0	0.0
+de	01_solar	1	53	2000.0	0.0	1.0
+de	02_wind_on	1	53	2000.0	0.0	1.0
+de	03_wind_off	1	53	1200.0	0.0	1.0
 de	04_res	1	53	0.0	0.0	0.0
 de	05_nuclear	1	53	0.0	0.0	0.0
 de	06_coal	1	53	0.0	0.0	0.0
 de	07_gas	1	53	0.0	0.0	0.0
 de	08_non-res	1	53	0.0	0.0	0.0
 de	09_hydro_pump	1	53	0.0	0.0	0.0
-de	01_solar	1	54	2000.0	1.0	0.0
-de	02_wind_on	1	54	2000.0	1.0	0.0
-de	03_wind_off	1	54	1300.0	1.0	0.0
+de	01_solar	1	54	2000.0	0.0	1.0
+de	02_wind_on	1	54	2000.0	0.0	1.0
+de	03_wind_off	1	54	1300.0	0.0	1.0
 de	04_res	1	54	0.0	0.0	0.0
 de	05_nuclear	1	54	0.0	0.0	0.0
 de	06_coal	1	54	0.0	0.0	0.0
 de	07_gas	1	54	0.0	0.0	0.0
 de	08_non-res	1	54	0.0	0.0	0.0
 de	09_hydro_pump	1	54	0.0	0.0	0.0
-de	01_solar	1	55	2000.0	1.0	0.0
-de	02_wind_on	1	55	2000.0	1.0	0.0
-de	03_wind_off	1	55	1400.0	1.0	0.0
+de	01_solar	1	55	2000.0	0.0	1.0
+de	02_wind_on	1	55	2000.0	0.0	1.0
+de	03_wind_off	1	55	1400.0	0.0	1.0
 de	04_res	1	55	0.0	0.0	0.0
 de	05_nuclear	1	55	0.0	0.0	0.0
 de	06_coal	1	55	0.0	0.0	0.0
 de	07_gas	1	55	0.0	0.0	0.0
 de	08_non-res	1	55	0.0	0.0	0.0
 de	09_hydro_pump	1	55	0.0	0.0	0.0
-de	01_solar	1	56	2000.0	1.0	0.0
-de	02_wind_on	1	56	2000.0	1.0	0.0
-de	03_wind_off	1	56	1500.0	1.0	0.0
+de	01_solar	1	56	2000.0	0.0	1.0
+de	02_wind_on	1	56	2000.0	0.0	1.0
+de	03_wind_off	1	56	1500.0	0.0	1.0
 de	04_res	1	56	0.0	0.0	0.0
 de	05_nuclear	1	56	0.0	0.0	0.0
 de	06_coal	1	56	0.0	0.0	0.0
 de	07_gas	1	56	0.0	0.0	0.0
 de	08_non-res	1	56	0.0	0.0	0.0
 de	09_hydro_pump	1	56	0.0	0.0	0.0
-de	01_solar	1	57	2000.0	1.0	0.0
-de	02_wind_on	1	57	2000.0	1.0	0.0
-de	03_wind_off	1	57	1600.0	1.0	0.0
+de	01_solar	1	57	2000.0	0.0	1.0
+de	02_wind_on	1	57	2000.0	0.0	1.0
+de	03_wind_off	1	57	1600.0	0.0	1.0
 de	04_res	1	57	0.0	0.0	0.0
 de	05_nuclear	1	57	0.0	0.0	0.0
 de	06_coal	1	57	0.0	0.0	0.0
 de	07_gas	1	57	0.0	0.0	0.0
 de	08_non-res	1	57	0.0	0.0	0.0
 de	09_hydro_pump	1	57	0.0	0.0	0.0
-de	01_solar	1	58	2000.0	1.0	0.0
-de	02_wind_on	1	58	2000.0	1.0	0.0
-de	03_wind_off	1	58	1700.0	1.0	0.0
+de	01_solar	1	58	2000.0	0.0	1.0
+de	02_wind_on	1	58	2000.0	0.0	1.0
+de	03_wind_off	1	58	1700.0	0.0	1.0
 de	04_res	1	58	0.0	0.0	0.0
 de	05_nuclear	1	58	0.0	0.0	0.0
 de	06_coal	1	58	0.0	0.0	0.0
 de	07_gas	1	58	0.0	0.0	0.0
 de	08_non-res	1	58	0.0	0.0	0.0
 de	09_hydro_pump	1	58	0.0	0.0	0.0
-de	01_solar	1	59	2000.0	1.0	0.0
-de	02_wind_on	1	59	2000.0	1.0	0.0
-de	03_wind_off	1	59	1800.0	1.0	0.0
+de	01_solar	1	59	2000.0	0.0	1.0
+de	02_wind_on	1	59	2000.0	0.0	1.0
+de	03_wind_off	1	59	1800.0	0.0	1.0
 de	04_res	1	59	0.0	0.0	0.0
 de	05_nuclear	1	59	0.0	0.0	0.0
 de	06_coal	1	59	0.0	0.0	0.0
 de	07_gas	1	59	0.0	0.0	0.0
 de	08_non-res	1	59	0.0	0.0	0.0
 de	09_hydro_pump	1	59	0.0	0.0	0.0
-de	01_solar	1	60	2000.0	1.0	0.0
-de	02_wind_on	1	60	2000.0	1.0	0.0
-de	03_wind_off	1	60	1900.0	1.0	0.0
+de	01_solar	1	60	2000.0	0.0	1.0
+de	02_wind_on	1	60	2000.0	0.0	1.0
+de	03_wind_off	1	60	1900.0	0.0	1.0
 de	04_res	1	60	0.0	0.0	0.0
 de	05_nuclear	1	60	0.0	0.0	0.0
 de	06_coal	1	60	0.0	0.0	0.0
 de	07_gas	1	60	0.0	0.0	0.0
 de	08_non-res	1	60	0.0	0.0	0.0
 de	09_hydro_pump	1	60	0.0	0.0	0.0
-de	01_solar	1	61	2000.0	1.0	0.0
-de	02_wind_on	1	61	2000.0	1.0	0.0
-de	03_wind_off	1	61	2000.0	1.0	0.0
+de	01_solar	1	61	2000.0	0.0	1.0
+de	02_wind_on	1	61	2000.0	0.0	1.0
+de	03_wind_off	1	61	2000.0	0.0	1.0
 de	04_res	1	61	0.0	0.0	0.0
 de	05_nuclear	1	61	0.0	0.0	0.0
 de	06_coal	1	61	0.0	0.0	0.0
 de	07_gas	1	61	0.0	0.0	0.0
 de	08_non-res	1	61	0.0	0.0	0.0
 de	09_hydro_pump	1	61	0.0	0.0	0.0
-de	01_solar	1	62	2000.0	1.0	0.0
-de	02_wind_on	1	62	2000.0	1.0	0.0
-de	03_wind_off	1	62	2000.0	1.0	0.0
-de	04_res	1	62	100.0	1.0	0.0
+de	01_solar	1	62	2000.0	0.0	1.0
+de	02_wind_on	1	62	2000.0	0.0	1.0
+de	03_wind_off	1	62	2000.0	0.0	1.0
+de	04_res	1	62	100.0	0.0	1.0
 de	05_nuclear	1	62	0.0	0.0	0.0
 de	06_coal	1	62	0.0	0.0	0.0
 de	07_gas	1	62	0.0	0.0	0.0
 de	08_non-res	1	62	0.0	0.0	0.0
 de	09_hydro_pump	1	62	0.0	0.0	0.0
-de	01_solar	1	63	2000.0	1.0	0.0
-de	02_wind_on	1	63	2000.0	1.0	0.0
-de	03_wind_off	1	63	2000.0	1.0	0.0
-de	04_res	1	63	200.0	1.0	0.0
+de	01_solar	1	63	2000.0	0.0	1.0
+de	02_wind_on	1	63	2000.0	0.0	1.0
+de	03_wind_off	1	63	2000.0	0.0	1.0
+de	04_res	1	63	200.0	0.0	1.0
 de	05_nuclear	1	63	0.0	0.0	0.0
 de	06_coal	1	63	0.0	0.0	0.0
 de	07_gas	1	63	0.0	0.0	0.0
 de	08_non-res	1	63	0.0	0.0	0.0
 de	09_hydro_pump	1	63	0.0	0.0	0.0
-de	01_solar	1	64	2000.0	1.0	0.0
-de	02_wind_on	1	64	2000.0	1.0	0.0
-de	03_wind_off	1	64	2000.0	1.0	0.0
-de	04_res	1	64	300.0	1.0	0.0
+de	01_solar	1	64	2000.0	0.0	1.0
+de	02_wind_on	1	64	2000.0	0.0	1.0
+de	03_wind_off	1	64	2000.0	0.0	1.0
+de	04_res	1	64	300.0	0.0	1.0
 de	05_nuclear	1	64	0.0	0.0	0.0
 de	06_coal	1	64	0.0	0.0	0.0
 de	07_gas	1	64	0.0	0.0	0.0
 de	08_non-res	1	64	0.0	0.0	0.0
 de	09_hydro_pump	1	64	0.0	0.0	0.0
-de	01_solar	1	65	2000.0	1.0	0.0
-de	02_wind_on	1	65	2000.0	1.0	0.0
-de	03_wind_off	1	65	2000.0	1.0	0.0
-de	04_res	1	65	400.0	1.0	0.0
+de	01_solar	1	65	2000.0	0.0	1.0
+de	02_wind_on	1	65	2000.0	0.0	1.0
+de	03_wind_off	1	65	2000.0	0.0	1.0
+de	04_res	1	65	400.0	0.0	1.0
 de	05_nuclear	1	65	0.0	0.0	0.0
 de	06_coal	1	65	0.0	0.0	0.0
 de	07_gas	1	65	0.0	0.0	0.0
 de	08_non-res	1	65	0.0	0.0	0.0
 de	09_hydro_pump	1	65	0.0	0.0	0.0
-de	01_solar	1	66	2000.0	1.0	0.0
-de	02_wind_on	1	66	2000.0	1.0	0.0
-de	03_wind_off	1	66	2000.0	1.0	0.0
-de	04_res	1	66	500.0	1.0	0.0
+de	01_solar	1	66	2000.0	0.0	1.0
+de	02_wind_on	1	66	2000.0	0.0	1.0
+de	03_wind_off	1	66	2000.0	0.0	1.0
+de	04_res	1	66	500.0	0.0	1.0
 de	05_nuclear	1	66	0.0	0.0	0.0
 de	06_coal	1	66	0.0	0.0	0.0
 de	07_gas	1	66	0.0	0.0	0.0
 de	08_non-res	1	66	0.0	0.0	0.0
 de	09_hydro_pump	1	66	0.0	0.0	0.0
-de	01_solar	1	67	2000.0	1.0	0.0
-de	02_wind_on	1	67	2000.0	1.0	0.0
-de	03_wind_off	1	67	2000.0	1.0	0.0
-de	04_res	1	67	600.0	1.0	0.0
+de	01_solar	1	67	2000.0	0.0	1.0
+de	02_wind_on	1	67	2000.0	0.0	1.0
+de	03_wind_off	1	67	2000.0	0.0	1.0
+de	04_res	1	67	600.0	0.0	1.0
 de	05_nuclear	1	67	0.0	0.0	0.0
 de	06_coal	1	67	0.0	0.0	0.0
 de	07_gas	1	67	0.0	0.0	0.0
 de	08_non-res	1	67	0.0	0.0	0.0
 de	09_hydro_pump	1	67	0.0	0.0	0.0
-de	01_solar	1	68	2000.0	1.0	0.0
-de	02_wind_on	1	68	2000.0	1.0	0.0
-de	03_wind_off	1	68	2000.0	1.0	0.0
-de	04_res	1	68	700.0	1.0	0.0
+de	01_solar	1	68	2000.0	0.0	1.0
+de	02_wind_on	1	68	2000.0	0.0	1.0
+de	03_wind_off	1	68	2000.0	0.0	1.0
+de	04_res	1	68	700.0	0.0	1.0
 de	05_nuclear	1	68	0.0	0.0	0.0
 de	06_coal	1	68	0.0	0.0	0.0
 de	07_gas	1	68	0.0	0.0	0.0
 de	08_non-res	1	68	0.0	0.0	0.0
 de	09_hydro_pump	1	68	0.0	0.0	0.0
-de	01_solar	1	69	2000.0	1.0	0.0
-de	02_wind_on	1	69	2000.0	1.0	0.0
-de	03_wind_off	1	69	2000.0	1.0	0.0
-de	04_res	1	69	800.0	1.0	0.0
+de	01_solar	1	69	2000.0	0.0	1.0
+de	02_wind_on	1	69	2000.0	0.0	1.0
+de	03_wind_off	1	69	2000.0	0.0	1.0
+de	04_res	1	69	800.0	0.0	1.0
 de	05_nuclear	1	69	0.0	0.0	0.0
 de	06_coal	1	69	0.0	0.0	0.0
 de	07_gas	1	69	0.0	0.0	0.0
 de	08_non-res	1	69	0.0	0.0	0.0
 de	09_hydro_pump	1	69	0.0	0.0	0.0
-de	01_solar	1	70	2000.0	1.0	0.0
-de	02_wind_on	1	70	2000.0	1.0	0.0
-de	03_wind_off	1	70	2000.0	1.0	0.0
-de	04_res	1	70	900.0	1.0	0.0
+de	01_solar	1	70	2000.0	0.0	1.0
+de	02_wind_on	1	70	2000.0	0.0	1.0
+de	03_wind_off	1	70	2000.0	0.0	1.0
+de	04_res	1	70	900.0	0.0	1.0
 de	05_nuclear	1	70	0.0	0.0	0.0
 de	06_coal	1	70	0.0	0.0	0.0
 de	07_gas	1	70	0.0	0.0	0.0
 de	08_non-res	1	70	0.0	0.0	0.0
 de	09_hydro_pump	1	70	0.0	0.0	0.0
-de	01_solar	1	71	2000.0	1.0	0.0
-de	02_wind_on	1	71	2000.0	1.0	0.0
-de	03_wind_off	1	71	2000.0	1.0	0.0
-de	04_res	1	71	1000.0	1.0	0.0
+de	01_solar	1	71	2000.0	0.0	1.0
+de	02_wind_on	1	71	2000.0	0.0	1.0
+de	03_wind_off	1	71	2000.0	0.0	1.0
+de	04_res	1	71	1000.0	0.0	1.0
 de	05_nuclear	1	71	0.0	0.0	0.0
 de	06_coal	1	71	0.0	0.0	0.0
 de	07_gas	1	71	0.0	0.0	0.0
 de	08_non-res	1	71	0.0	0.0	0.0
 de	09_hydro_pump	1	71	0.0	0.0	0.0
-de	01_solar	1	72	2000.0	1.0	0.0
-de	02_wind_on	1	72	2000.0	1.0	0.0
-de	03_wind_off	1	72	2000.0	1.0	0.0
-de	04_res	1	72	1100.0	1.0	0.0
+de	01_solar	1	72	2000.0	0.0	1.0
+de	02_wind_on	1	72	2000.0	0.0	1.0
+de	03_wind_off	1	72	2000.0	0.0	1.0
+de	04_res	1	72	1100.0	0.0	1.0
 de	05_nuclear	1	72	0.0	0.0	0.0
 de	06_coal	1	72	0.0	0.0	0.0
 de	07_gas	1	72	0.0	0.0	0.0
 de	08_non-res	1	72	0.0	0.0	0.0
 de	09_hydro_pump	1	72	0.0	0.0	0.0
-de	01_solar	1	73	2000.0	1.0	0.0
-de	02_wind_on	1	73	2000.0	1.0	0.0
-de	03_wind_off	1	73	2000.0	1.0	0.0
-de	04_res	1	73	1200.0	1.0	0.0
+de	01_solar	1	73	2000.0	0.0	1.0
+de	02_wind_on	1	73	2000.0	0.0	1.0
+de	03_wind_off	1	73	2000.0	0.0	1.0
+de	04_res	1	73	1200.0	0.0	1.0
 de	05_nuclear	1	73	0.0	0.0	0.0
 de	06_coal	1	73	0.0	0.0	0.0
 de	07_gas	1	73	0.0	0.0	0.0
 de	08_non-res	1	73	0.0	0.0	0.0
 de	09_hydro_pump	1	73	0.0	0.0	0.0
-de	01_solar	1	74	2000.0	1.0	0.0
-de	02_wind_on	1	74	2000.0	1.0	0.0
-de	03_wind_off	1	74	2000.0	1.0	0.0
-de	04_res	1	74	1300.0	1.0	0.0
+de	01_solar	1	74	2000.0	0.0	1.0
+de	02_wind_on	1	74	2000.0	0.0	1.0
+de	03_wind_off	1	74	2000.0	0.0	1.0
+de	04_res	1	74	1300.0	0.0	1.0
 de	05_nuclear	1	74	0.0	0.0	0.0
 de	06_coal	1	74	0.0	0.0	0.0
 de	07_gas	1	74	0.0	0.0	0.0
 de	08_non-res	1	74	0.0	0.0	0.0
 de	09_hydro_pump	1	74	0.0	0.0	0.0
-de	01_solar	1	75	2000.0	1.0	0.0
-de	02_wind_on	1	75	2000.0	1.0	0.0
-de	03_wind_off	1	75	2000.0	1.0	0.0
-de	04_res	1	75	1400.0	1.0	0.0
+de	01_solar	1	75	2000.0	0.0	1.0
+de	02_wind_on	1	75	2000.0	0.0	1.0
+de	03_wind_off	1	75	2000.0	0.0	1.0
+de	04_res	1	75	1400.0	0.0	1.0
 de	05_nuclear	1	75	0.0	0.0	0.0
 de	06_coal	1	75	0.0	0.0	0.0
 de	07_gas	1	75	0.0	0.0	0.0
 de	08_non-res	1	75	0.0	0.0	0.0
 de	09_hydro_pump	1	75	0.0	0.0	0.0
-de	01_solar	1	76	2000.0	1.0	0.0
-de	02_wind_on	1	76	2000.0	1.0	0.0
-de	03_wind_off	1	76	2000.0	1.0	0.0
-de	04_res	1	76	1500.0	1.0	0.0
+de	01_solar	1	76	2000.0	0.0	1.0
+de	02_wind_on	1	76	2000.0	0.0	1.0
+de	03_wind_off	1	76	2000.0	0.0	1.0
+de	04_res	1	76	1500.0	0.0	1.0
 de	05_nuclear	1	76	0.0	0.0	0.0
 de	06_coal	1	76	0.0	0.0	0.0
 de	07_gas	1	76	0.0	0.0	0.0
 de	08_non-res	1	76	0.0	0.0	0.0
 de	09_hydro_pump	1	76	0.0	0.0	0.0
-de	01_solar	1	77	2000.0	1.0	0.0
-de	02_wind_on	1	77	2000.0	1.0	0.0
-de	03_wind_off	1	77	2000.0	1.0	0.0
-de	04_res	1	77	1600.0	1.0	0.0
+de	01_solar	1	77	2000.0	0.0	1.0
+de	02_wind_on	1	77	2000.0	0.0	1.0
+de	03_wind_off	1	77	2000.0	0.0	1.0
+de	04_res	1	77	1600.0	0.0	1.0
 de	05_nuclear	1	77	0.0	0.0	0.0
 de	06_coal	1	77	0.0	0.0	0.0
 de	07_gas	1	77	0.0	0.0	0.0
 de	08_non-res	1	77	0.0	0.0	0.0
 de	09_hydro_pump	1	77	0.0	0.0	0.0
-de	01_solar	1	78	2000.0	1.0	0.0
-de	02_wind_on	1	78	2000.0	1.0	0.0
-de	03_wind_off	1	78	2000.0	1.0	0.0
-de	04_res	1	78	1700.0	1.0	0.0
+de	01_solar	1	78	2000.0	0.0	1.0
+de	02_wind_on	1	78	2000.0	0.0	1.0
+de	03_wind_off	1	78	2000.0	0.0	1.0
+de	04_res	1	78	1700.0	0.0	1.0
 de	05_nuclear	1	78	0.0	0.0	0.0
 de	06_coal	1	78	0.0	0.0	0.0
 de	07_gas	1	78	0.0	0.0	0.0
 de	08_non-res	1	78	0.0	0.0	0.0
 de	09_hydro_pump	1	78	0.0	0.0	0.0
-de	01_solar	1	79	2000.0	1.0	0.0
-de	02_wind_on	1	79	2000.0	1.0	0.0
-de	03_wind_off	1	79	2000.0	1.0	0.0
-de	04_res	1	79	1800.0	1.0	0.0
+de	01_solar	1	79	2000.0	0.0	1.0
+de	02_wind_on	1	79	2000.0	0.0	1.0
+de	03_wind_off	1	79	2000.0	0.0	1.0
+de	04_res	1	79	1800.0	0.0	1.0
 de	05_nuclear	1	79	0.0	0.0	0.0
 de	06_coal	1	79	0.0	0.0	0.0
 de	07_gas	1	79	0.0	0.0	0.0
 de	08_non-res	1	79	0.0	0.0	0.0
 de	09_hydro_pump	1	79	0.0	0.0	0.0
-de	01_solar	1	80	2000.0	1.0	0.0
-de	02_wind_on	1	80	2000.0	1.0	0.0
-de	03_wind_off	1	80	2000.0	1.0	0.0
-de	04_res	1	80	1900.0	1.0	0.0
+de	01_solar	1	80	2000.0	0.0	1.0
+de	02_wind_on	1	80	2000.0	0.0	1.0
+de	03_wind_off	1	80	2000.0	0.0	1.0
+de	04_res	1	80	1900.0	0.0	1.0
 de	05_nuclear	1	80	0.0	0.0	0.0
 de	06_coal	1	80	0.0	0.0	0.0
 de	07_gas	1	80	0.0	0.0	0.0
 de	08_non-res	1	80	0.0	0.0	0.0
 de	09_hydro_pump	1	80	0.0	0.0	0.0
-de	01_solar	1	81	2000.0	1.0	0.0
-de	02_wind_on	1	81	2000.0	1.0	0.0
-de	03_wind_off	1	81	2000.0	1.0	0.0
-de	04_res	1	81	2000.0	1.0	0.0
+de	01_solar	1	81	2000.0	0.0	1.0
+de	02_wind_on	1	81	2000.0	0.0	1.0
+de	03_wind_off	1	81	2000.0	0.0	1.0
+de	04_res	1	81	2000.0	0.0	1.0
 de	05_nuclear	1	81	0.0	0.0	0.0
 de	06_coal	1	81	0.0	0.0	0.0
 de	07_gas	1	81	0.0	0.0	0.0
 de	08_non-res	1	81	0.0	0.0	0.0
 de	09_hydro_pump	1	81	0.0	0.0	0.0
-de	01_solar	1	82	2000.0	1.0	0.0
-de	02_wind_on	1	82	2000.0	1.0	0.0
-de	03_wind_off	1	82	2000.0	1.0	0.0
-de	04_res	1	82	2000.0	1.0	0.0
-de	05_nuclear	1	82	100.0	1.0	0.0
+de	01_solar	1	82	2000.0	0.0	1.0
+de	02_wind_on	1	82	2000.0	0.0	1.0
+de	03_wind_off	1	82	2000.0	0.0	1.0
+de	04_res	1	82	2000.0	0.0	1.0
+de	05_nuclear	1	82	100.0	0.0	1.0
 de	06_coal	1	82	0.0	0.0	0.0
 de	07_gas	1	82	0.0	0.0	0.0
 de	08_non-res	1	82	0.0	0.0	0.0
 de	09_hydro_pump	1	82	0.0	0.0	0.0
-de	01_solar	1	83	2000.0	1.0	0.0
-de	02_wind_on	1	83	2000.0	1.0	0.0
-de	03_wind_off	1	83	2000.0	1.0	0.0
-de	04_res	1	83	2000.0	1.0	0.0
-de	05_nuclear	1	83	200.0	1.0	0.0
+de	01_solar	1	83	2000.0	0.0	1.0
+de	02_wind_on	1	83	2000.0	0.0	1.0
+de	03_wind_off	1	83	2000.0	0.0	1.0
+de	04_res	1	83	2000.0	0.0	1.0
+de	05_nuclear	1	83	200.0	0.0	1.0
 de	06_coal	1	83	0.0	0.0	0.0
 de	07_gas	1	83	0.0	0.0	0.0
 de	08_non-res	1	83	0.0	0.0	0.0
 de	09_hydro_pump	1	83	0.0	0.0	0.0
-de	01_solar	1	84	2000.0	1.0	0.0
-de	02_wind_on	1	84	2000.0	1.0	0.0
-de	03_wind_off	1	84	2000.0	1.0	0.0
-de	04_res	1	84	2000.0	1.0	0.0
-de	05_nuclear	1	84	300.0	1.0	0.0
+de	01_solar	1	84	2000.0	0.0	1.0
+de	02_wind_on	1	84	2000.0	0.0	1.0
+de	03_wind_off	1	84	2000.0	0.0	1.0
+de	04_res	1	84	2000.0	0.0	1.0
+de	05_nuclear	1	84	300.0	0.0	1.0
 de	06_coal	1	84	0.0	0.0	0.0
 de	07_gas	1	84	0.0	0.0	0.0
 de	08_non-res	1	84	0.0	0.0	0.0
 de	09_hydro_pump	1	84	0.0	0.0	0.0
-de	01_solar	1	85	2000.0	1.0	0.0
-de	02_wind_on	1	85	2000.0	1.0	0.0
-de	03_wind_off	1	85	2000.0	1.0	0.0
-de	04_res	1	85	2000.0	1.0	0.0
-de	05_nuclear	1	85	400.0	1.0	0.0
+de	01_solar	1	85	2000.0	0.0	1.0
+de	02_wind_on	1	85	2000.0	0.0	1.0
+de	03_wind_off	1	85	2000.0	0.0	1.0
+de	04_res	1	85	2000.0	0.0	1.0
+de	05_nuclear	1	85	400.0	0.0	1.0
 de	06_coal	1	85	0.0	0.0	0.0
 de	07_gas	1	85	0.0	0.0	0.0
 de	08_non-res	1	85	0.0	0.0	0.0
 de	09_hydro_pump	1	85	0.0	0.0	0.0
-de	01_solar	1	86	2000.0	1.0	0.0
-de	02_wind_on	1	86	2000.0	1.0	0.0
-de	03_wind_off	1	86	2000.0	1.0	0.0
-de	04_res	1	86	2000.0	1.0	0.0
-de	05_nuclear	1	86	500.0	1.0	0.0
+de	01_solar	1	86	2000.0	0.0	1.0
+de	02_wind_on	1	86	2000.0	0.0	1.0
+de	03_wind_off	1	86	2000.0	0.0	1.0
+de	04_res	1	86	2000.0	0.0	1.0
+de	05_nuclear	1	86	500.0	0.0	1.0
 de	06_coal	1	86	0.0	0.0	0.0
 de	07_gas	1	86	0.0	0.0	0.0
 de	08_non-res	1	86	0.0	0.0	0.0
 de	09_hydro_pump	1	86	0.0	0.0	0.0
-de	01_solar	1	87	2000.0	1.0	0.0
-de	02_wind_on	1	87	2000.0	1.0	0.0
-de	03_wind_off	1	87	2000.0	1.0	0.0
-de	04_res	1	87	2000.0	1.0	0.0
-de	05_nuclear	1	87	600.0	1.0	0.0
+de	01_solar	1	87	2000.0	0.0	1.0
+de	02_wind_on	1	87	2000.0	0.0	1.0
+de	03_wind_off	1	87	2000.0	0.0	1.0
+de	04_res	1	87	2000.0	0.0	1.0
+de	05_nuclear	1	87	600.0	0.0	1.0
 de	06_coal	1	87	0.0	0.0	0.0
 de	07_gas	1	87	0.0	0.0	0.0
 de	08_non-res	1	87	0.0	0.0	0.0
 de	09_hydro_pump	1	87	0.0	0.0	0.0
-de	01_solar	1	88	2000.0	1.0	0.0
-de	02_wind_on	1	88	2000.0	1.0	0.0
-de	03_wind_off	1	88	2000.0	1.0	0.0
-de	04_res	1	88	2000.0	1.0	0.0
-de	05_nuclear	1	88	700.0	1.0	0.0
+de	01_solar	1	88	2000.0	0.0	1.0
+de	02_wind_on	1	88	2000.0	0.0	1.0
+de	03_wind_off	1	88	2000.0	0.0	1.0
+de	04_res	1	88	2000.0	0.0	1.0
+de	05_nuclear	1	88	700.0	0.0	1.0
 de	06_coal	1	88	0.0	0.0	0.0
 de	07_gas	1	88	0.0	0.0	0.0
 de	08_non-res	1	88	0.0	0.0	0.0
 de	09_hydro_pump	1	88	0.0	0.0	0.0
-de	01_solar	1	89	2000.0	1.0	0.0
-de	02_wind_on	1	89	2000.0	1.0	0.0
-de	03_wind_off	1	89	2000.0	1.0	0.0
-de	04_res	1	89	2000.0	1.0	0.0
-de	05_nuclear	1	89	800.0	1.0	0.0
+de	01_solar	1	89	2000.0	0.0	1.0
+de	02_wind_on	1	89	2000.0	0.0	1.0
+de	03_wind_off	1	89	2000.0	0.0	1.0
+de	04_res	1	89	2000.0	0.0	1.0
+de	05_nuclear	1	89	800.0	0.0	1.0
 de	06_coal	1	89	0.0	0.0	0.0
 de	07_gas	1	89	0.0	0.0	0.0
 de	08_non-res	1	89	0.0	0.0	0.0
 de	09_hydro_pump	1	89	0.0	0.0	0.0
-de	01_solar	1	90	2000.0	1.0	0.0
-de	02_wind_on	1	90	2000.0	1.0	0.0
-de	03_wind_off	1	90	2000.0	1.0	0.0
-de	04_res	1	90	2000.0	1.0	0.0
-de	05_nuclear	1	90	900.0	1.0	0.0
+de	01_solar	1	90	2000.0	0.0	1.0
+de	02_wind_on	1	90	2000.0	0.0	1.0
+de	03_wind_off	1	90	2000.0	0.0	1.0
+de	04_res	1	90	2000.0	0.0	1.0
+de	05_nuclear	1	90	900.0	0.0	1.0
 de	06_coal	1	90	0.0	0.0	0.0
 de	07_gas	1	90	0.0	0.0	0.0
 de	08_non-res	1	90	0.0	0.0	0.0
 de	09_hydro_pump	1	90	0.0	0.0	0.0
-de	01_solar	1	91	2000.0	1.0	0.0
-de	02_wind_on	1	91	2000.0	1.0	0.0
-de	03_wind_off	1	91	2000.0	1.0	0.0
-de	04_res	1	91	2000.0	1.0	0.0
-de	05_nuclear	1	91	1000.0	1.0	0.0
+de	01_solar	1	91	2000.0	0.0	1.0
+de	02_wind_on	1	91	2000.0	0.0	1.0
+de	03_wind_off	1	91	2000.0	0.0	1.0
+de	04_res	1	91	2000.0	0.0	1.0
+de	05_nuclear	1	91	1000.0	0.0	1.0
 de	06_coal	1	91	0.0	0.0	0.0
 de	07_gas	1	91	0.0	0.0	0.0
 de	08_non-res	1	91	0.0	0.0	0.0
 de	09_hydro_pump	1	91	0.0	0.0	0.0
-de	01_solar	1	92	2000.0	1.0	0.0
-de	02_wind_on	1	92	2000.0	1.0	0.0
-de	03_wind_off	1	92	2000.0	1.0	0.0
-de	04_res	1	92	2000.0	1.0	0.0
-de	05_nuclear	1	92	1100.0	1.0	0.0
+de	01_solar	1	92	2000.0	0.0	1.0
+de	02_wind_on	1	92	2000.0	0.0	1.0
+de	03_wind_off	1	92	2000.0	0.0	1.0
+de	04_res	1	92	2000.0	0.0	1.0
+de	05_nuclear	1	92	1100.0	0.0	1.0
 de	06_coal	1	92	0.0	0.0	0.0
 de	07_gas	1	92	0.0	0.0	0.0
 de	08_non-res	1	92	0.0	0.0	0.0
 de	09_hydro_pump	1	92	0.0	0.0	0.0
-de	01_solar	1	93	2000.0	1.0	0.0
-de	02_wind_on	1	93	2000.0	1.0	0.0
-de	03_wind_off	1	93	2000.0	1.0	0.0
-de	04_res	1	93	2000.0	1.0	0.0
-de	05_nuclear	1	93	1200.0	1.0	0.0
+de	01_solar	1	93	2000.0	0.0	1.0
+de	02_wind_on	1	93	2000.0	0.0	1.0
+de	03_wind_off	1	93	2000.0	0.0	1.0
+de	04_res	1	93	2000.0	0.0	1.0
+de	05_nuclear	1	93	1200.0	0.0	1.0
 de	06_coal	1	93	0.0	0.0	0.0
 de	07_gas	1	93	0.0	0.0	0.0
 de	08_non-res	1	93	0.0	0.0	0.0
 de	09_hydro_pump	1	93	0.0	0.0	0.0
-de	01_solar	1	94	2000.0	1.0	0.0
-de	02_wind_on	1	94	2000.0	1.0	0.0
-de	03_wind_off	1	94	2000.0	1.0	0.0
-de	04_res	1	94	2000.0	1.0	0.0
-de	05_nuclear	1	94	1300.0	1.0	0.0
+de	01_solar	1	94	2000.0	0.0	1.0
+de	02_wind_on	1	94	2000.0	0.0	1.0
+de	03_wind_off	1	94	2000.0	0.0	1.0
+de	04_res	1	94	2000.0	0.0	1.0
+de	05_nuclear	1	94	1300.0	0.0	1.0
 de	06_coal	1	94	0.0	0.0	0.0
 de	07_gas	1	94	0.0	0.0	0.0
 de	08_non-res	1	94	0.0	0.0	0.0
 de	09_hydro_pump	1	94	0.0	0.0	0.0
-de	01_solar	1	95	2000.0	1.0	0.0
-de	02_wind_on	1	95	2000.0	1.0	0.0
-de	03_wind_off	1	95	2000.0	1.0	0.0
-de	04_res	1	95	2000.0	1.0	0.0
-de	05_nuclear	1	95	1400.0	1.0	0.0
+de	01_solar	1	95	2000.0	0.0	1.0
+de	02_wind_on	1	95	2000.0	0.0	1.0
+de	03_wind_off	1	95	2000.0	0.0	1.0
+de	04_res	1	95	2000.0	0.0	1.0
+de	05_nuclear	1	95	1400.0	0.0	1.0
 de	06_coal	1	95	0.0	0.0	0.0
 de	07_gas	1	95	0.0	0.0	0.0
 de	08_non-res	1	95	0.0	0.0	0.0
 de	09_hydro_pump	1	95	0.0	0.0	0.0
-de	01_solar	1	96	2000.0	1.0	0.0
-de	02_wind_on	1	96	2000.0	1.0	0.0
-de	03_wind_off	1	96	2000.0	1.0	0.0
-de	04_res	1	96	2000.0	1.0	0.0
-de	05_nuclear	1	96	1500.0	1.0	0.0
+de	01_solar	1	96	2000.0	0.0	1.0
+de	02_wind_on	1	96	2000.0	0.0	1.0
+de	03_wind_off	1	96	2000.0	0.0	1.0
+de	04_res	1	96	2000.0	0.0	1.0
+de	05_nuclear	1	96	1500.0	0.0	1.0
 de	06_coal	1	96	0.0	0.0	0.0
 de	07_gas	1	96	0.0	0.0	0.0
 de	08_non-res	1	96	0.0	0.0	0.0
 de	09_hydro_pump	1	96	0.0	0.0	0.0
-de	01_solar	1	97	2000.0	1.0	0.0
-de	02_wind_on	1	97	2000.0	1.0	0.0
-de	03_wind_off	1	97	2000.0	1.0	0.0
-de	04_res	1	97	2000.0	1.0	0.0
-de	05_nuclear	1	97	1600.0	1.0	0.0
+de	01_solar	1	97	2000.0	0.0	1.0
+de	02_wind_on	1	97	2000.0	0.0	1.0
+de	03_wind_off	1	97	2000.0	0.0	1.0
+de	04_res	1	97	2000.0	0.0	1.0
+de	05_nuclear	1	97	1600.0	0.0	1.0
 de	06_coal	1	97	0.0	0.0	0.0
 de	07_gas	1	97	0.0	0.0	0.0
 de	08_non-res	1	97	0.0	0.0	0.0
 de	09_hydro_pump	1	97	0.0	0.0	0.0
-de	01_solar	1	98	2000.0	1.0	0.0
-de	02_wind_on	1	98	2000.0	1.0	0.0
-de	03_wind_off	1	98	2000.0	1.0	0.0
-de	04_res	1	98	2000.0	1.0	0.0
-de	05_nuclear	1	98	1700.0	1.0	0.0
+de	01_solar	1	98	2000.0	0.0	1.0
+de	02_wind_on	1	98	2000.0	0.0	1.0
+de	03_wind_off	1	98	2000.0	0.0	1.0
+de	04_res	1	98	2000.0	0.0	1.0
+de	05_nuclear	1	98	1700.0	0.0	1.0
 de	06_coal	1	98	0.0	0.0	0.0
 de	07_gas	1	98	0.0	0.0	0.0
 de	08_non-res	1	98	0.0	0.0	0.0
 de	09_hydro_pump	1	98	0.0	0.0	0.0
-de	01_solar	1	99	2000.0	1.0	0.0
-de	02_wind_on	1	99	2000.0	1.0	0.0
-de	03_wind_off	1	99	2000.0	1.0	0.0
-de	04_res	1	99	2000.0	1.0	0.0
-de	05_nuclear	1	99	1800.0	1.0	0.0
+de	01_solar	1	99	2000.0	0.0	1.0
+de	02_wind_on	1	99	2000.0	0.0	1.0
+de	03_wind_off	1	99	2000.0	0.0	1.0
+de	04_res	1	99	2000.0	0.0	1.0
+de	05_nuclear	1	99	1800.0	0.0	1.0
 de	06_coal	1	99	0.0	0.0	0.0
 de	07_gas	1	99	0.0	0.0	0.0
 de	08_non-res	1	99	0.0	0.0	0.0
 de	09_hydro_pump	1	99	0.0	0.0	0.0
-de	01_solar	1	100	2000.0	1.0	0.0
-de	02_wind_on	1	100	2000.0	1.0	0.0
-de	03_wind_off	1	100	2000.0	1.0	0.0
-de	04_res	1	100	2000.0	1.0	0.0
-de	05_nuclear	1	100	1900.0	1.0	0.0
+de	01_solar	1	100	2000.0	0.0	1.0
+de	02_wind_on	1	100	2000.0	0.0	1.0
+de	03_wind_off	1	100	2000.0	0.0	1.0
+de	04_res	1	100	2000.0	0.0	1.0
+de	05_nuclear	1	100	1900.0	0.0	1.0
 de	06_coal	1	100	0.0	0.0	0.0
 de	07_gas	1	100	0.0	0.0	0.0
 de	08_non-res	1	100	0.0	0.0	0.0
 de	09_hydro_pump	1	100	0.0	0.0	0.0
-de	01_solar	1	101	2000.0	1.0	0.0
-de	02_wind_on	1	101	2000.0	1.0	0.0
-de	03_wind_off	1	101	2000.0	1.0	0.0
-de	04_res	1	101	2000.0	1.0	0.0
-de	05_nuclear	1	101	2000.0	1.0	0.0
+de	01_solar	1	101	2000.0	0.0	1.0
+de	02_wind_on	1	101	2000.0	0.0	1.0
+de	03_wind_off	1	101	2000.0	0.0	1.0
+de	04_res	1	101	2000.0	0.0	1.0
+de	05_nuclear	1	101	2000.0	0.0	1.0
 de	06_coal	1	101	0.0	0.0	0.0
 de	07_gas	1	101	0.0	0.0	0.0
 de	08_non-res	1	101	0.0	0.0	0.0
 de	09_hydro_pump	1	101	0.0	0.0	0.0
-de	01_solar	1	102	2000.0	1.0	0.0
-de	02_wind_on	1	102	2000.0	1.0	0.0
-de	03_wind_off	1	102	2000.0	1.0	0.0
-de	04_res	1	102	2000.0	1.0	0.0
-de	05_nuclear	1	102	2000.0	1.0	0.0
-de	06_coal	1	102	100.0	1.0	0.0
+de	01_solar	1	102	2000.0	0.0	1.0
+de	02_wind_on	1	102	2000.0	0.0	1.0
+de	03_wind_off	1	102	2000.0	0.0	1.0
+de	04_res	1	102	2000.0	0.0	1.0
+de	05_nuclear	1	102	2000.0	0.0	1.0
+de	06_coal	1	102	100.0	0.0	1.0
 de	07_gas	1	102	0.0	0.0	0.0
 de	08_non-res	1	102	0.0	0.0	0.0
 de	09_hydro_pump	1	102	0.0	0.0	0.0
-de	01_solar	1	103	2000.0	1.0	0.0
-de	02_wind_on	1	103	2000.0	1.0	0.0
-de	03_wind_off	1	103	2000.0	1.0	0.0
-de	04_res	1	103	2000.0	1.0	0.0
-de	05_nuclear	1	103	2000.0	1.0	0.0
-de	06_coal	1	103	200.0	1.0	0.0
+de	01_solar	1	103	2000.0	0.0	1.0
+de	02_wind_on	1	103	2000.0	0.0	1.0
+de	03_wind_off	1	103	2000.0	0.0	1.0
+de	04_res	1	103	2000.0	0.0	1.0
+de	05_nuclear	1	103	2000.0	0.0	1.0
+de	06_coal	1	103	200.0	0.0	1.0
 de	07_gas	1	103	0.0	0.0	0.0
 de	08_non-res	1	103	0.0	0.0	0.0
 de	09_hydro_pump	1	103	0.0	0.0	0.0
-de	01_solar	1	104	2000.0	1.0	0.0
-de	02_wind_on	1	104	2000.0	1.0	0.0
-de	03_wind_off	1	104	2000.0	1.0	0.0
-de	04_res	1	104	2000.0	1.0	0.0
-de	05_nuclear	1	104	2000.0	1.0	0.0
-de	06_coal	1	104	300.0	1.0	0.0
+de	01_solar	1	104	2000.0	0.0	1.0
+de	02_wind_on	1	104	2000.0	0.0	1.0
+de	03_wind_off	1	104	2000.0	0.0	1.0
+de	04_res	1	104	2000.0	0.0	1.0
+de	05_nuclear	1	104	2000.0	0.0	1.0
+de	06_coal	1	104	300.0	0.0	1.0
 de	07_gas	1	104	0.0	0.0	0.0
 de	08_non-res	1	104	0.0	0.0	0.0
 de	09_hydro_pump	1	104	0.0	0.0	0.0
-de	01_solar	1	105	2000.0	1.0	0.0
-de	02_wind_on	1	105	2000.0	1.0	0.0
-de	03_wind_off	1	105	2000.0	1.0	0.0
-de	04_res	1	105	2000.0	1.0	0.0
-de	05_nuclear	1	105	2000.0	1.0	0.0
-de	06_coal	1	105	400.0	1.0	0.0
+de	01_solar	1	105	2000.0	0.0	1.0
+de	02_wind_on	1	105	2000.0	0.0	1.0
+de	03_wind_off	1	105	2000.0	0.0	1.0
+de	04_res	1	105	2000.0	0.0	1.0
+de	05_nuclear	1	105	2000.0	0.0	1.0
+de	06_coal	1	105	400.0	0.0	1.0
 de	07_gas	1	105	0.0	0.0	0.0
 de	08_non-res	1	105	0.0	0.0	0.0
 de	09_hydro_pump	1	105	0.0	0.0	0.0
-de	01_solar	1	106	2000.0	1.0	0.0
-de	02_wind_on	1	106	2000.0	1.0	0.0
-de	03_wind_off	1	106	2000.0	1.0	0.0
-de	04_res	1	106	2000.0	1.0	0.0
-de	05_nuclear	1	106	2000.0	1.0	0.0
-de	06_coal	1	106	500.0	1.0	0.0
+de	01_solar	1	106	2000.0	0.0	1.0
+de	02_wind_on	1	106	2000.0	0.0	1.0
+de	03_wind_off	1	106	2000.0	0.0	1.0
+de	04_res	1	106	2000.0	0.0	1.0
+de	05_nuclear	1	106	2000.0	0.0	1.0
+de	06_coal	1	106	500.0	0.0	1.0
 de	07_gas	1	106	0.0	0.0	0.0
 de	08_non-res	1	106	0.0	0.0	0.0
 de	09_hydro_pump	1	106	0.0	0.0	0.0
-de	01_solar	1	107	2000.0	1.0	0.0
-de	02_wind_on	1	107	2000.0	1.0	0.0
-de	03_wind_off	1	107	2000.0	1.0	0.0
-de	04_res	1	107	2000.0	1.0	0.0
-de	05_nuclear	1	107	2000.0	1.0	0.0
-de	06_coal	1	107	600.0	1.0	0.0
+de	01_solar	1	107	2000.0	0.0	1.0
+de	02_wind_on	1	107	2000.0	0.0	1.0
+de	03_wind_off	1	107	2000.0	0.0	1.0
+de	04_res	1	107	2000.0	0.0	1.0
+de	05_nuclear	1	107	2000.0	0.0	1.0
+de	06_coal	1	107	600.0	0.0	1.0
 de	07_gas	1	107	0.0	0.0	0.0
 de	08_non-res	1	107	0.0	0.0	0.0
 de	09_hydro_pump	1	107	0.0	0.0	0.0
-de	01_solar	1	108	2000.0	1.0	0.0
-de	02_wind_on	1	108	2000.0	1.0	0.0
-de	03_wind_off	1	108	2000.0	1.0	0.0
-de	04_res	1	108	2000.0	1.0	0.0
-de	05_nuclear	1	108	2000.0	1.0	0.0
-de	06_coal	1	108	700.0	1.0	0.0
+de	01_solar	1	108	2000.0	0.0	1.0
+de	02_wind_on	1	108	2000.0	0.0	1.0
+de	03_wind_off	1	108	2000.0	0.0	1.0
+de	04_res	1	108	2000.0	0.0	1.0
+de	05_nuclear	1	108	2000.0	0.0	1.0
+de	06_coal	1	108	700.0	0.0	1.0
 de	07_gas	1	108	0.0	0.0	0.0
 de	08_non-res	1	108	0.0	0.0	0.0
 de	09_hydro_pump	1	108	0.0	0.0	0.0
-de	01_solar	1	109	2000.0	1.0	0.0
-de	02_wind_on	1	109	2000.0	1.0	0.0
-de	03_wind_off	1	109	2000.0	1.0	0.0
-de	04_res	1	109	2000.0	1.0	0.0
-de	05_nuclear	1	109	2000.0	1.0	0.0
-de	06_coal	1	109	800.0	1.0	0.0
+de	01_solar	1	109	2000.0	0.0	1.0
+de	02_wind_on	1	109	2000.0	0.0	1.0
+de	03_wind_off	1	109	2000.0	0.0	1.0
+de	04_res	1	109	2000.0	0.0	1.0
+de	05_nuclear	1	109	2000.0	0.0	1.0
+de	06_coal	1	109	800.0	0.0	1.0
 de	07_gas	1	109	0.0	0.0	0.0
 de	08_non-res	1	109	0.0	0.0	0.0
 de	09_hydro_pump	1	109	0.0	0.0	0.0
-de	01_solar	1	110	2000.0	1.0	0.0
-de	02_wind_on	1	110	2000.0	1.0	0.0
-de	03_wind_off	1	110	2000.0	1.0	0.0
-de	04_res	1	110	2000.0	1.0	0.0
-de	05_nuclear	1	110	2000.0	1.0	0.0
-de	06_coal	1	110	900.0	1.0	0.0
+de	01_solar	1	110	2000.0	0.0	1.0
+de	02_wind_on	1	110	2000.0	0.0	1.0
+de	03_wind_off	1	110	2000.0	0.0	1.0
+de	04_res	1	110	2000.0	0.0	1.0
+de	05_nuclear	1	110	2000.0	0.0	1.0
+de	06_coal	1	110	900.0	0.0	1.0
 de	07_gas	1	110	0.0	0.0	0.0
 de	08_non-res	1	110	0.0	0.0	0.0
 de	09_hydro_pump	1	110	0.0	0.0	0.0
-de	01_solar	1	111	2000.0	1.0	0.0
-de	02_wind_on	1	111	2000.0	1.0	0.0
-de	03_wind_off	1	111	2000.0	1.0	0.0
-de	04_res	1	111	2000.0	1.0	0.0
-de	05_nuclear	1	111	2000.0	1.0	0.0
-de	06_coal	1	111	1000.0	1.0	0.0
+de	01_solar	1	111	2000.0	0.0	1.0
+de	02_wind_on	1	111	2000.0	0.0	1.0
+de	03_wind_off	1	111	2000.0	0.0	1.0
+de	04_res	1	111	2000.0	0.0	1.0
+de	05_nuclear	1	111	2000.0	0.0	1.0
+de	06_coal	1	111	1000.0	0.0	1.0
 de	07_gas	1	111	0.0	0.0	0.0
 de	08_non-res	1	111	0.0	0.0	0.0
 de	09_hydro_pump	1	111	0.0	0.0	0.0
-de	01_solar	1	112	2000.0	1.0	0.0
-de	02_wind_on	1	112	2000.0	1.0	0.0
-de	03_wind_off	1	112	2000.0	1.0	0.0
-de	04_res	1	112	2000.0	1.0	0.0
-de	05_nuclear	1	112	2000.0	1.0	0.0
-de	06_coal	1	112	1100.0	1.0	0.0
+de	01_solar	1	112	2000.0	0.0	1.0
+de	02_wind_on	1	112	2000.0	0.0	1.0
+de	03_wind_off	1	112	2000.0	0.0	1.0
+de	04_res	1	112	2000.0	0.0	1.0
+de	05_nuclear	1	112	2000.0	0.0	1.0
+de	06_coal	1	112	1100.0	0.0	1.0
 de	07_gas	1	112	0.0	0.0	0.0
 de	08_non-res	1	112	0.0	0.0	0.0
 de	09_hydro_pump	1	112	0.0	0.0	0.0
-de	01_solar	1	113	2000.0	1.0	0.0
-de	02_wind_on	1	113	2000.0	1.0	0.0
-de	03_wind_off	1	113	2000.0	1.0	0.0
-de	04_res	1	113	2000.0	1.0	0.0
-de	05_nuclear	1	113	2000.0	1.0	0.0
-de	06_coal	1	113	1200.0	1.0	0.0
+de	01_solar	1	113	2000.0	0.0	1.0
+de	02_wind_on	1	113	2000.0	0.0	1.0
+de	03_wind_off	1	113	2000.0	0.0	1.0
+de	04_res	1	113	2000.0	0.0	1.0
+de	05_nuclear	1	113	2000.0	0.0	1.0
+de	06_coal	1	113	1200.0	0.0	1.0
 de	07_gas	1	113	0.0	0.0	0.0
 de	08_non-res	1	113	0.0	0.0	0.0
 de	09_hydro_pump	1	113	0.0	0.0	0.0
-de	01_solar	1	114	2000.0	1.0	0.0
-de	02_wind_on	1	114	2000.0	1.0	0.0
-de	03_wind_off	1	114	2000.0	1.0	0.0
-de	04_res	1	114	2000.0	1.0	0.0
-de	05_nuclear	1	114	2000.0	1.0	0.0
-de	06_coal	1	114	1300.0	1.0	0.0
+de	01_solar	1	114	2000.0	0.0	1.0
+de	02_wind_on	1	114	2000.0	0.0	1.0
+de	03_wind_off	1	114	2000.0	0.0	1.0
+de	04_res	1	114	2000.0	0.0	1.0
+de	05_nuclear	1	114	2000.0	0.0	1.0
+de	06_coal	1	114	1300.0	0.0	1.0
 de	07_gas	1	114	0.0	0.0	0.0
 de	08_non-res	1	114	0.0	0.0	0.0
 de	09_hydro_pump	1	114	0.0	0.0	0.0
-de	01_solar	1	115	2000.0	1.0	0.0
-de	02_wind_on	1	115	2000.0	1.0	0.0
-de	03_wind_off	1	115	2000.0	1.0	0.0
-de	04_res	1	115	2000.0	1.0	0.0
-de	05_nuclear	1	115	2000.0	1.0	0.0
-de	06_coal	1	115	1400.0	1.0	0.0
+de	01_solar	1	115	2000.0	0.0	1.0
+de	02_wind_on	1	115	2000.0	0.0	1.0
+de	03_wind_off	1	115	2000.0	0.0	1.0
+de	04_res	1	115	2000.0	0.0	1.0
+de	05_nuclear	1	115	2000.0	0.0	1.0
+de	06_coal	1	115	1400.0	0.0	1.0
 de	07_gas	1	115	0.0	0.0	0.0
 de	08_non-res	1	115	0.0	0.0	0.0
 de	09_hydro_pump	1	115	0.0	0.0	0.0
-de	01_solar	1	116	2000.0	1.0	0.0
-de	02_wind_on	1	116	2000.0	1.0	0.0
-de	03_wind_off	1	116	2000.0	1.0	0.0
-de	04_res	1	116	2000.0	1.0	0.0
-de	05_nuclear	1	116	2000.0	1.0	0.0
-de	06_coal	1	116	1500.0	1.0	0.0
+de	01_solar	1	116	2000.0	0.0	1.0
+de	02_wind_on	1	116	2000.0	0.0	1.0
+de	03_wind_off	1	116	2000.0	0.0	1.0
+de	04_res	1	116	2000.0	0.0	1.0
+de	05_nuclear	1	116	2000.0	0.0	1.0
+de	06_coal	1	116	1500.0	0.0	1.0
 de	07_gas	1	116	0.0	0.0	0.0
 de	08_non-res	1	116	0.0	0.0	0.0
 de	09_hydro_pump	1	116	0.0	0.0	0.0
-de	01_solar	1	117	2000.0	1.0	0.0
-de	02_wind_on	1	117	2000.0	1.0	0.0
-de	03_wind_off	1	117	2000.0	1.0	0.0
-de	04_res	1	117	2000.0	1.0	0.0
-de	05_nuclear	1	117	2000.0	1.0	0.0
-de	06_coal	1	117	1600.0	1.0	0.0
+de	01_solar	1	117	2000.0	0.0	1.0
+de	02_wind_on	1	117	2000.0	0.0	1.0
+de	03_wind_off	1	117	2000.0	0.0	1.0
+de	04_res	1	117	2000.0	0.0	1.0
+de	05_nuclear	1	117	2000.0	0.0	1.0
+de	06_coal	1	117	1600.0	0.0	1.0
 de	07_gas	1	117	0.0	0.0	0.0
 de	08_non-res	1	117	0.0	0.0	0.0
 de	09_hydro_pump	1	117	0.0	0.0	0.0
-de	01_solar	1	118	2000.0	1.0	0.0
-de	02_wind_on	1	118	2000.0	1.0	0.0
-de	03_wind_off	1	118	2000.0	1.0	0.0
-de	04_res	1	118	2000.0	1.0	0.0
-de	05_nuclear	1	118	2000.0	1.0	0.0
-de	06_coal	1	118	1700.0	1.0	0.0
+de	01_solar	1	118	2000.0	0.0	1.0
+de	02_wind_on	1	118	2000.0	0.0	1.0
+de	03_wind_off	1	118	2000.0	0.0	1.0
+de	04_res	1	118	2000.0	0.0	1.0
+de	05_nuclear	1	118	2000.0	0.0	1.0
+de	06_coal	1	118	1700.0	0.0	1.0
 de	07_gas	1	118	0.0	0.0	0.0
 de	08_non-res	1	118	0.0	0.0	0.0
 de	09_hydro_pump	1	118	0.0	0.0	0.0
-de	01_solar	1	119	2000.0	1.0	0.0
-de	02_wind_on	1	119	2000.0	1.0	0.0
-de	03_wind_off	1	119	2000.0	1.0	0.0
-de	04_res	1	119	2000.0	1.0	0.0
-de	05_nuclear	1	119	2000.0	1.0	0.0
-de	06_coal	1	119	1800.0	1.0	0.0
+de	01_solar	1	119	2000.0	0.0	1.0
+de	02_wind_on	1	119	2000.0	0.0	1.0
+de	03_wind_off	1	119	2000.0	0.0	1.0
+de	04_res	1	119	2000.0	0.0	1.0
+de	05_nuclear	1	119	2000.0	0.0	1.0
+de	06_coal	1	119	1800.0	0.0	1.0
 de	07_gas	1	119	0.0	0.0	0.0
 de	08_non-res	1	119	0.0	0.0	0.0
 de	09_hydro_pump	1	119	0.0	0.0	0.0
-de	01_solar	1	120	2000.0	1.0	0.0
-de	02_wind_on	1	120	2000.0	1.0	0.0
-de	03_wind_off	1	120	2000.0	1.0	0.0
-de	04_res	1	120	2000.0	1.0	0.0
-de	05_nuclear	1	120	2000.0	1.0	0.0
-de	06_coal	1	120	1900.0	1.0	0.0
+de	01_solar	1	120	2000.0	0.0	1.0
+de	02_wind_on	1	120	2000.0	0.0	1.0
+de	03_wind_off	1	120	2000.0	0.0	1.0
+de	04_res	1	120	2000.0	0.0	1.0
+de	05_nuclear	1	120	2000.0	0.0	1.0
+de	06_coal	1	120	1900.0	0.0	1.0
 de	07_gas	1	120	0.0	0.0	0.0
 de	08_non-res	1	120	0.0	0.0	0.0
 de	09_hydro_pump	1	120	0.0	0.0	0.0
-de	01_solar	1	121	2000.0	1.0	0.0
-de	02_wind_on	1	121	2000.0	1.0	0.0
-de	03_wind_off	1	121	2000.0	1.0	0.0
-de	04_res	1	121	2000.0	1.0	0.0
-de	05_nuclear	1	121	2000.0	1.0	0.0
-de	06_coal	1	121	2000.0	1.0	0.0
+de	01_solar	1	121	2000.0	0.0	1.0
+de	02_wind_on	1	121	2000.0	0.0	1.0
+de	03_wind_off	1	121	2000.0	0.0	1.0
+de	04_res	1	121	2000.0	0.0	1.0
+de	05_nuclear	1	121	2000.0	0.0	1.0
+de	06_coal	1	121	2000.0	0.0	1.0
 de	07_gas	1	121	0.0	0.0	0.0
 de	08_non-res	1	121	0.0	0.0	0.0
 de	09_hydro_pump	1	121	0.0	0.0	0.0
-de	01_solar	1	122	2000.0	1.0	0.0
-de	02_wind_on	1	122	2000.0	1.0	0.0
-de	03_wind_off	1	122	2000.0	1.0	0.0
-de	04_res	1	122	2000.0	1.0	0.0
-de	05_nuclear	1	122	2000.0	1.0	0.0
-de	06_coal	1	122	2000.0	1.0	0.0
-de	07_gas	1	122	100.0	1.0	0.0
+de	01_solar	1	122	2000.0	0.0	1.0
+de	02_wind_on	1	122	2000.0	0.0	1.0
+de	03_wind_off	1	122	2000.0	0.0	1.0
+de	04_res	1	122	2000.0	0.0	1.0
+de	05_nuclear	1	122	2000.0	0.0	1.0
+de	06_coal	1	122	2000.0	0.0	1.0
+de	07_gas	1	122	100.0	0.0	1.0
 de	08_non-res	1	122	0.0	0.0	0.0
 de	09_hydro_pump	1	122	0.0	0.0	0.0
-de	01_solar	1	123	2000.0	1.0	0.0
-de	02_wind_on	1	123	2000.0	1.0	0.0
-de	03_wind_off	1	123	2000.0	1.0	0.0
-de	04_res	1	123	2000.0	1.0	0.0
-de	05_nuclear	1	123	2000.0	1.0	0.0
-de	06_coal	1	123	2000.0	1.0	0.0
-de	07_gas	1	123	200.0	1.0	0.0
+de	01_solar	1	123	2000.0	0.0	1.0
+de	02_wind_on	1	123	2000.0	0.0	1.0
+de	03_wind_off	1	123	2000.0	0.0	1.0
+de	04_res	1	123	2000.0	0.0	1.0
+de	05_nuclear	1	123	2000.0	0.0	1.0
+de	06_coal	1	123	2000.0	0.0	1.0
+de	07_gas	1	123	200.0	0.0	1.0
 de	08_non-res	1	123	0.0	0.0	0.0
 de	09_hydro_pump	1	123	0.0	0.0	0.0
-de	01_solar	1	124	2000.0	1.0	0.0
-de	02_wind_on	1	124	2000.0	1.0	0.0
-de	03_wind_off	1	124	2000.0	1.0	0.0
-de	04_res	1	124	2000.0	1.0	0.0
-de	05_nuclear	1	124	2000.0	1.0	0.0
-de	06_coal	1	124	2000.0	1.0	0.0
-de	07_gas	1	124	300.0	1.0	0.0
+de	01_solar	1	124	2000.0	0.0	1.0
+de	02_wind_on	1	124	2000.0	0.0	1.0
+de	03_wind_off	1	124	2000.0	0.0	1.0
+de	04_res	1	124	2000.0	0.0	1.0
+de	05_nuclear	1	124	2000.0	0.0	1.0
+de	06_coal	1	124	2000.0	0.0	1.0
+de	07_gas	1	124	300.0	0.0	1.0
 de	08_non-res	1	124	0.0	0.0	0.0
 de	09_hydro_pump	1	124	0.0	0.0	0.0
-de	01_solar	1	125	2000.0	1.0	0.0
-de	02_wind_on	1	125	2000.0	1.0	0.0
-de	03_wind_off	1	125	2000.0	1.0	0.0
-de	04_res	1	125	2000.0	1.0	0.0
-de	05_nuclear	1	125	2000.0	1.0	0.0
-de	06_coal	1	125	2000.0	1.0	0.0
-de	07_gas	1	125	400.0	1.0	0.0
+de	01_solar	1	125	2000.0	0.0	1.0
+de	02_wind_on	1	125	2000.0	0.0	1.0
+de	03_wind_off	1	125	2000.0	0.0	1.0
+de	04_res	1	125	2000.0	0.0	1.0
+de	05_nuclear	1	125	2000.0	0.0	1.0
+de	06_coal	1	125	2000.0	0.0	1.0
+de	07_gas	1	125	400.0	0.0	1.0
 de	08_non-res	1	125	0.0	0.0	0.0
 de	09_hydro_pump	1	125	0.0	0.0	0.0
-de	01_solar	1	126	2000.0	1.0	0.0
-de	02_wind_on	1	126	2000.0	1.0	0.0
-de	03_wind_off	1	126	2000.0	1.0	0.0
-de	04_res	1	126	2000.0	1.0	0.0
-de	05_nuclear	1	126	2000.0	1.0	0.0
-de	06_coal	1	126	2000.0	1.0	0.0
-de	07_gas	1	126	500.0	1.0	0.0
+de	01_solar	1	126	2000.0	0.0	1.0
+de	02_wind_on	1	126	2000.0	0.0	1.0
+de	03_wind_off	1	126	2000.0	0.0	1.0
+de	04_res	1	126	2000.0	0.0	1.0
+de	05_nuclear	1	126	2000.0	0.0	1.0
+de	06_coal	1	126	2000.0	0.0	1.0
+de	07_gas	1	126	500.0	0.0	1.0
 de	08_non-res	1	126	0.0	0.0	0.0
 de	09_hydro_pump	1	126	0.0	0.0	0.0
-de	01_solar	1	127	2000.0	1.0	0.0
-de	02_wind_on	1	127	2000.0	1.0	0.0
-de	03_wind_off	1	127	2000.0	1.0	0.0
-de	04_res	1	127	2000.0	1.0	0.0
-de	05_nuclear	1	127	2000.0	1.0	0.0
-de	06_coal	1	127	2000.0	1.0	0.0
-de	07_gas	1	127	600.0	1.0	0.0
+de	01_solar	1	127	2000.0	0.0	1.0
+de	02_wind_on	1	127	2000.0	0.0	1.0
+de	03_wind_off	1	127	2000.0	0.0	1.0
+de	04_res	1	127	2000.0	0.0	1.0
+de	05_nuclear	1	127	2000.0	0.0	1.0
+de	06_coal	1	127	2000.0	0.0	1.0
+de	07_gas	1	127	600.0	0.0	1.0
 de	08_non-res	1	127	0.0	0.0	0.0
 de	09_hydro_pump	1	127	0.0	0.0	0.0
-de	01_solar	1	128	2000.0	1.0	0.0
-de	02_wind_on	1	128	2000.0	1.0	0.0
-de	03_wind_off	1	128	2000.0	1.0	0.0
-de	04_res	1	128	2000.0	1.0	0.0
-de	05_nuclear	1	128	2000.0	1.0	0.0
-de	06_coal	1	128	2000.0	1.0	0.0
-de	07_gas	1	128	700.0	1.0	0.0
+de	01_solar	1	128	2000.0	0.0	1.0
+de	02_wind_on	1	128	2000.0	0.0	1.0
+de	03_wind_off	1	128	2000.0	0.0	1.0
+de	04_res	1	128	2000.0	0.0	1.0
+de	05_nuclear	1	128	2000.0	0.0	1.0
+de	06_coal	1	128	2000.0	0.0	1.0
+de	07_gas	1	128	700.0	0.0	1.0
 de	08_non-res	1	128	0.0	0.0	0.0
 de	09_hydro_pump	1	128	0.0	0.0	0.0
-de	01_solar	1	129	2000.0	1.0	0.0
-de	02_wind_on	1	129	2000.0	1.0	0.0
-de	03_wind_off	1	129	2000.0	1.0	0.0
-de	04_res	1	129	2000.0	1.0	0.0
-de	05_nuclear	1	129	2000.0	1.0	0.0
-de	06_coal	1	129	2000.0	1.0	0.0
-de	07_gas	1	129	800.0	1.0	0.0
+de	01_solar	1	129	2000.0	0.0	1.0
+de	02_wind_on	1	129	2000.0	0.0	1.0
+de	03_wind_off	1	129	2000.0	0.0	1.0
+de	04_res	1	129	2000.0	0.0	1.0
+de	05_nuclear	1	129	2000.0	0.0	1.0
+de	06_coal	1	129	2000.0	0.0	1.0
+de	07_gas	1	129	800.0	0.0	1.0
 de	08_non-res	1	129	0.0	0.0	0.0
 de	09_hydro_pump	1	129	0.0	0.0	0.0
-de	01_solar	1	130	2000.0	1.0	0.0
-de	02_wind_on	1	130	2000.0	1.0	0.0
-de	03_wind_off	1	130	2000.0	1.0	0.0
-de	04_res	1	130	2000.0	1.0	0.0
-de	05_nuclear	1	130	2000.0	1.0	0.0
-de	06_coal	1	130	2000.0	1.0	0.0
-de	07_gas	1	130	900.0	1.0	0.0
+de	01_solar	1	130	2000.0	0.0	1.0
+de	02_wind_on	1	130	2000.0	0.0	1.0
+de	03_wind_off	1	130	2000.0	0.0	1.0
+de	04_res	1	130	2000.0	0.0	1.0
+de	05_nuclear	1	130	2000.0	0.0	1.0
+de	06_coal	1	130	2000.0	0.0	1.0
+de	07_gas	1	130	900.0	0.0	1.0
 de	08_non-res	1	130	0.0	0.0	0.0
 de	09_hydro_pump	1	130	0.0	0.0	0.0
-de	01_solar	1	131	2000.0	1.0	0.0
-de	02_wind_on	1	131	2000.0	1.0	0.0
-de	03_wind_off	1	131	2000.0	1.0	0.0
-de	04_res	1	131	2000.0	1.0	0.0
-de	05_nuclear	1	131	2000.0	1.0	0.0
-de	06_coal	1	131	2000.0	1.0	0.0
-de	07_gas	1	131	1000.0	1.0	0.0
+de	01_solar	1	131	2000.0	0.0	1.0
+de	02_wind_on	1	131	2000.0	0.0	1.0
+de	03_wind_off	1	131	2000.0	0.0	1.0
+de	04_res	1	131	2000.0	0.0	1.0
+de	05_nuclear	1	131	2000.0	0.0	1.0
+de	06_coal	1	131	2000.0	0.0	1.0
+de	07_gas	1	131	1000.0	0.0	1.0
 de	08_non-res	1	131	0.0	0.0	0.0
 de	09_hydro_pump	1	131	0.0	0.0	0.0
-de	01_solar	1	132	2000.0	1.0	0.0
-de	02_wind_on	1	132	2000.0	1.0	0.0
-de	03_wind_off	1	132	2000.0	1.0	0.0
-de	04_res	1	132	2000.0	1.0	0.0
-de	05_nuclear	1	132	2000.0	1.0	0.0
-de	06_coal	1	132	2000.0	1.0	0.0
-de	07_gas	1	132	1100.0	1.0	0.0
+de	01_solar	1	132	2000.0	0.0	1.0
+de	02_wind_on	1	132	2000.0	0.0	1.0
+de	03_wind_off	1	132	2000.0	0.0	1.0
+de	04_res	1	132	2000.0	0.0	1.0
+de	05_nuclear	1	132	2000.0	0.0	1.0
+de	06_coal	1	132	2000.0	0.0	1.0
+de	07_gas	1	132	1100.0	0.0	1.0
 de	08_non-res	1	132	0.0	0.0	0.0
 de	09_hydro_pump	1	132	0.0	0.0	0.0
-de	01_solar	1	133	2000.0	1.0	0.0
-de	02_wind_on	1	133	2000.0	1.0	0.0
-de	03_wind_off	1	133	2000.0	1.0	0.0
-de	04_res	1	133	2000.0	1.0	0.0
-de	05_nuclear	1	133	2000.0	1.0	0.0
-de	06_coal	1	133	2000.0	1.0	0.0
-de	07_gas	1	133	1200.0	1.0	0.0
+de	01_solar	1	133	2000.0	0.0	1.0
+de	02_wind_on	1	133	2000.0	0.0	1.0
+de	03_wind_off	1	133	2000.0	0.0	1.0
+de	04_res	1	133	2000.0	0.0	1.0
+de	05_nuclear	1	133	2000.0	0.0	1.0
+de	06_coal	1	133	2000.0	0.0	1.0
+de	07_gas	1	133	1200.0	0.0	1.0
 de	08_non-res	1	133	0.0	0.0	0.0
 de	09_hydro_pump	1	133	0.0	0.0	0.0
-de	01_solar	1	134	2000.0	1.0	0.0
-de	02_wind_on	1	134	2000.0	1.0	0.0
-de	03_wind_off	1	134	2000.0	1.0	0.0
-de	04_res	1	134	2000.0	1.0	0.0
-de	05_nuclear	1	134	2000.0	1.0	0.0
-de	06_coal	1	134	2000.0	1.0	0.0
-de	07_gas	1	134	1300.0	1.0	0.0
+de	01_solar	1	134	2000.0	0.0	1.0
+de	02_wind_on	1	134	2000.0	0.0	1.0
+de	03_wind_off	1	134	2000.0	0.0	1.0
+de	04_res	1	134	2000.0	0.0	1.0
+de	05_nuclear	1	134	2000.0	0.0	1.0
+de	06_coal	1	134	2000.0	0.0	1.0
+de	07_gas	1	134	1300.0	0.0	1.0
 de	08_non-res	1	134	0.0	0.0	0.0
 de	09_hydro_pump	1	134	0.0	0.0	0.0
-de	01_solar	1	135	2000.0	1.0	0.0
-de	02_wind_on	1	135	2000.0	1.0	0.0
-de	03_wind_off	1	135	2000.0	1.0	0.0
-de	04_res	1	135	2000.0	1.0	0.0
-de	05_nuclear	1	135	2000.0	1.0	0.0
-de	06_coal	1	135	2000.0	1.0	0.0
-de	07_gas	1	135	1400.0	1.0	0.0
+de	01_solar	1	135	2000.0	0.0	1.0
+de	02_wind_on	1	135	2000.0	0.0	1.0
+de	03_wind_off	1	135	2000.0	0.0	1.0
+de	04_res	1	135	2000.0	0.0	1.0
+de	05_nuclear	1	135	2000.0	0.0	1.0
+de	06_coal	1	135	2000.0	0.0	1.0
+de	07_gas	1	135	1400.0	0.0	1.0
 de	08_non-res	1	135	0.0	0.0	0.0
 de	09_hydro_pump	1	135	0.0	0.0	0.0
-de	01_solar	1	136	2000.0	1.0	0.0
-de	02_wind_on	1	136	2000.0	1.0	0.0
-de	03_wind_off	1	136	2000.0	1.0	0.0
-de	04_res	1	136	2000.0	1.0	0.0
-de	05_nuclear	1	136	2000.0	1.0	0.0
-de	06_coal	1	136	2000.0	1.0	0.0
-de	07_gas	1	136	1500.0	1.0	0.0
+de	01_solar	1	136	2000.0	0.0	1.0
+de	02_wind_on	1	136	2000.0	0.0	1.0
+de	03_wind_off	1	136	2000.0	0.0	1.0
+de	04_res	1	136	2000.0	0.0	1.0
+de	05_nuclear	1	136	2000.0	0.0	1.0
+de	06_coal	1	136	2000.0	0.0	1.0
+de	07_gas	1	136	1500.0	0.0	1.0
 de	08_non-res	1	136	0.0	0.0	0.0
 de	09_hydro_pump	1	136	0.0	0.0	0.0
-de	01_solar	1	137	2000.0	1.0	0.0
-de	02_wind_on	1	137	2000.0	1.0	0.0
-de	03_wind_off	1	137	2000.0	1.0	0.0
-de	04_res	1	137	2000.0	1.0	0.0
-de	05_nuclear	1	137	2000.0	1.0	0.0
-de	06_coal	1	137	2000.0	1.0	0.0
-de	07_gas	1	137	1600.0	1.0	0.0
+de	01_solar	1	137	2000.0	0.0	1.0
+de	02_wind_on	1	137	2000.0	0.0	1.0
+de	03_wind_off	1	137	2000.0	0.0	1.0
+de	04_res	1	137	2000.0	0.0	1.0
+de	05_nuclear	1	137	2000.0	0.0	1.0
+de	06_coal	1	137	2000.0	0.0	1.0
+de	07_gas	1	137	1600.0	0.0	1.0
 de	08_non-res	1	137	0.0	0.0	0.0
 de	09_hydro_pump	1	137	0.0	0.0	0.0
-de	01_solar	1	138	2000.0	1.0	0.0
-de	02_wind_on	1	138	2000.0	1.0	0.0
-de	03_wind_off	1	138	2000.0	1.0	0.0
-de	04_res	1	138	2000.0	1.0	0.0
-de	05_nuclear	1	138	2000.0	1.0	0.0
-de	06_coal	1	138	2000.0	1.0	0.0
-de	07_gas	1	138	1700.0	1.0	0.0
+de	01_solar	1	138	2000.0	0.0	1.0
+de	02_wind_on	1	138	2000.0	0.0	1.0
+de	03_wind_off	1	138	2000.0	0.0	1.0
+de	04_res	1	138	2000.0	0.0	1.0
+de	05_nuclear	1	138	2000.0	0.0	1.0
+de	06_coal	1	138	2000.0	0.0	1.0
+de	07_gas	1	138	1700.0	0.0	1.0
 de	08_non-res	1	138	0.0	0.0	0.0
 de	09_hydro_pump	1	138	0.0	0.0	0.0
-de	01_solar	1	139	2000.0	1.0	0.0
-de	02_wind_on	1	139	2000.0	1.0	0.0
-de	03_wind_off	1	139	2000.0	1.0	0.0
-de	04_res	1	139	2000.0	1.0	0.0
-de	05_nuclear	1	139	2000.0	1.0	0.0
-de	06_coal	1	139	2000.0	1.0	0.0
-de	07_gas	1	139	1800.0	1.0	0.0
+de	01_solar	1	139	2000.0	0.0	1.0
+de	02_wind_on	1	139	2000.0	0.0	1.0
+de	03_wind_off	1	139	2000.0	0.0	1.0
+de	04_res	1	139	2000.0	0.0	1.0
+de	05_nuclear	1	139	2000.0	0.0	1.0
+de	06_coal	1	139	2000.0	0.0	1.0
+de	07_gas	1	139	1800.0	0.0	1.0
 de	08_non-res	1	139	0.0	0.0	0.0
 de	09_hydro_pump	1	139	0.0	0.0	0.0
-de	01_solar	1	140	2000.0	1.0	0.0
-de	02_wind_on	1	140	2000.0	1.0	0.0
-de	03_wind_off	1	140	2000.0	1.0	0.0
-de	04_res	1	140	2000.0	1.0	0.0
-de	05_nuclear	1	140	2000.0	1.0	0.0
-de	06_coal	1	140	2000.0	1.0	0.0
-de	07_gas	1	140	1900.0	1.0	0.0
+de	01_solar	1	140	2000.0	0.0	1.0
+de	02_wind_on	1	140	2000.0	0.0	1.0
+de	03_wind_off	1	140	2000.0	0.0	1.0
+de	04_res	1	140	2000.0	0.0	1.0
+de	05_nuclear	1	140	2000.0	0.0	1.0
+de	06_coal	1	140	2000.0	0.0	1.0
+de	07_gas	1	140	1900.0	0.0	1.0
 de	08_non-res	1	140	0.0	0.0	0.0
 de	09_hydro_pump	1	140	0.0	0.0	0.0
-de	01_solar	1	141	2000.0	1.0	0.0
-de	02_wind_on	1	141	2000.0	1.0	0.0
-de	03_wind_off	1	141	2000.0	1.0	0.0
-de	04_res	1	141	2000.0	1.0	0.0
-de	05_nuclear	1	141	2000.0	1.0	0.0
-de	06_coal	1	141	2000.0	1.0	0.0
-de	07_gas	1	141	2000.0	1.0	0.0
+de	01_solar	1	141	2000.0	0.0	1.0
+de	02_wind_on	1	141	2000.0	0.0	1.0
+de	03_wind_off	1	141	2000.0	0.0	1.0
+de	04_res	1	141	2000.0	0.0	1.0
+de	05_nuclear	1	141	2000.0	0.0	1.0
+de	06_coal	1	141	2000.0	0.0	1.0
+de	07_gas	1	141	2000.0	0.0	1.0
 de	08_non-res	1	141	0.0	0.0	0.0
 de	09_hydro_pump	1	141	0.0	0.0	0.0
-de	01_solar	1	142	2000.0	1.0	0.0
-de	02_wind_on	1	142	2000.0	1.0	0.0
-de	03_wind_off	1	142	2000.0	1.0	0.0
-de	04_res	1	142	2000.0	1.0	0.0
-de	05_nuclear	1	142	2000.0	1.0	0.0
-de	06_coal	1	142	2000.0	1.0	0.0
-de	07_gas	1	142	2000.0	1.0	0.0
-de	08_non-res	1	142	100.0	1.0	0.0
+de	01_solar	1	142	2000.0	0.0	1.0
+de	02_wind_on	1	142	2000.0	0.0	1.0
+de	03_wind_off	1	142	2000.0	0.0	1.0
+de	04_res	1	142	2000.0	0.0	1.0
+de	05_nuclear	1	142	2000.0	0.0	1.0
+de	06_coal	1	142	2000.0	0.0	1.0
+de	07_gas	1	142	2000.0	0.0	1.0
+de	08_non-res	1	142	100.0	0.0	1.0
 de	09_hydro_pump	1	142	0.0	0.0	0.0
-de	01_solar	1	143	2000.0	1.0	0.0
-de	02_wind_on	1	143	2000.0	1.0	0.0
-de	03_wind_off	1	143	2000.0	1.0	0.0
-de	04_res	1	143	2000.0	1.0	0.0
-de	05_nuclear	1	143	2000.0	1.0	0.0
-de	06_coal	1	143	2000.0	1.0	0.0
-de	07_gas	1	143	2000.0	1.0	0.0
-de	08_non-res	1	143	200.0	1.0	0.0
+de	01_solar	1	143	2000.0	0.0	1.0
+de	02_wind_on	1	143	2000.0	0.0	1.0
+de	03_wind_off	1	143	2000.0	0.0	1.0
+de	04_res	1	143	2000.0	0.0	1.0
+de	05_nuclear	1	143	2000.0	0.0	1.0
+de	06_coal	1	143	2000.0	0.0	1.0
+de	07_gas	1	143	2000.0	0.0	1.0
+de	08_non-res	1	143	200.0	0.0	1.0
 de	09_hydro_pump	1	143	0.0	0.0	0.0
-de	01_solar	1	144	2000.0	1.0	0.0
-de	02_wind_on	1	144	2000.0	1.0	0.0
-de	03_wind_off	1	144	2000.0	1.0	0.0
-de	04_res	1	144	2000.0	1.0	0.0
-de	05_nuclear	1	144	2000.0	1.0	0.0
-de	06_coal	1	144	2000.0	1.0	0.0
-de	07_gas	1	144	2000.0	1.0	0.0
-de	08_non-res	1	144	300.0	1.0	0.0
+de	01_solar	1	144	2000.0	0.0	1.0
+de	02_wind_on	1	144	2000.0	0.0	1.0
+de	03_wind_off	1	144	2000.0	0.0	1.0
+de	04_res	1	144	2000.0	0.0	1.0
+de	05_nuclear	1	144	2000.0	0.0	1.0
+de	06_coal	1	144	2000.0	0.0	1.0
+de	07_gas	1	144	2000.0	0.0	1.0
+de	08_non-res	1	144	300.0	0.0	1.0
 de	09_hydro_pump	1	144	0.0	0.0	0.0
-de	01_solar	1	145	2000.0	1.0	0.0
-de	02_wind_on	1	145	2000.0	1.0	0.0
-de	03_wind_off	1	145	2000.0	1.0	0.0
-de	04_res	1	145	2000.0	1.0	0.0
-de	05_nuclear	1	145	2000.0	1.0	0.0
-de	06_coal	1	145	2000.0	1.0	0.0
-de	07_gas	1	145	2000.0	1.0	0.0
-de	08_non-res	1	145	400.0	1.0	0.0
+de	01_solar	1	145	2000.0	0.0	1.0
+de	02_wind_on	1	145	2000.0	0.0	1.0
+de	03_wind_off	1	145	2000.0	0.0	1.0
+de	04_res	1	145	2000.0	0.0	1.0
+de	05_nuclear	1	145	2000.0	0.0	1.0
+de	06_coal	1	145	2000.0	0.0	1.0
+de	07_gas	1	145	2000.0	0.0	1.0
+de	08_non-res	1	145	400.0	0.0	1.0
 de	09_hydro_pump	1	145	0.0	0.0	0.0
-de	01_solar	1	146	2000.0	1.0	0.0
-de	02_wind_on	1	146	2000.0	1.0	0.0
-de	03_wind_off	1	146	2000.0	1.0	0.0
-de	04_res	1	146	2000.0	1.0	0.0
-de	05_nuclear	1	146	2000.0	1.0	0.0
-de	06_coal	1	146	2000.0	1.0	0.0
-de	07_gas	1	146	2000.0	1.0	0.0
-de	08_non-res	1	146	500.0	1.0	0.0
+de	01_solar	1	146	2000.0	0.0	1.0
+de	02_wind_on	1	146	2000.0	0.0	1.0
+de	03_wind_off	1	146	2000.0	0.0	1.0
+de	04_res	1	146	2000.0	0.0	1.0
+de	05_nuclear	1	146	2000.0	0.0	1.0
+de	06_coal	1	146	2000.0	0.0	1.0
+de	07_gas	1	146	2000.0	0.0	1.0
+de	08_non-res	1	146	500.0	0.0	1.0
 de	09_hydro_pump	1	146	0.0	0.0	0.0
-de	01_solar	1	147	2000.0	1.0	0.0
-de	02_wind_on	1	147	2000.0	1.0	0.0
-de	03_wind_off	1	147	2000.0	1.0	0.0
-de	04_res	1	147	2000.0	1.0	0.0
-de	05_nuclear	1	147	2000.0	1.0	0.0
-de	06_coal	1	147	2000.0	1.0	0.0
-de	07_gas	1	147	2000.0	1.0	0.0
-de	08_non-res	1	147	600.0	1.0	0.0
+de	01_solar	1	147	2000.0	0.0	1.0
+de	02_wind_on	1	147	2000.0	0.0	1.0
+de	03_wind_off	1	147	2000.0	0.0	1.0
+de	04_res	1	147	2000.0	0.0	1.0
+de	05_nuclear	1	147	2000.0	0.0	1.0
+de	06_coal	1	147	2000.0	0.0	1.0
+de	07_gas	1	147	2000.0	0.0	1.0
+de	08_non-res	1	147	600.0	0.0	1.0
 de	09_hydro_pump	1	147	0.0	0.0	0.0
-de	01_solar	1	148	2000.0	1.0	0.0
-de	02_wind_on	1	148	2000.0	1.0	0.0
-de	03_wind_off	1	148	2000.0	1.0	0.0
-de	04_res	1	148	2000.0	1.0	0.0
-de	05_nuclear	1	148	2000.0	1.0	0.0
-de	06_coal	1	148	2000.0	1.0	0.0
-de	07_gas	1	148	2000.0	1.0	0.0
-de	08_non-res	1	148	700.0	1.0	0.0
+de	01_solar	1	148	2000.0	0.0	1.0
+de	02_wind_on	1	148	2000.0	0.0	1.0
+de	03_wind_off	1	148	2000.0	0.0	1.0
+de	04_res	1	148	2000.0	0.0	1.0
+de	05_nuclear	1	148	2000.0	0.0	1.0
+de	06_coal	1	148	2000.0	0.0	1.0
+de	07_gas	1	148	2000.0	0.0	1.0
+de	08_non-res	1	148	700.0	0.0	1.0
 de	09_hydro_pump	1	148	0.0	0.0	0.0
-de	01_solar	1	149	2000.0	1.0	0.0
-de	02_wind_on	1	149	2000.0	1.0	0.0
-de	03_wind_off	1	149	2000.0	1.0	0.0
-de	04_res	1	149	2000.0	1.0	0.0
-de	05_nuclear	1	149	2000.0	1.0	0.0
-de	06_coal	1	149	2000.0	1.0	0.0
-de	07_gas	1	149	2000.0	1.0	0.0
-de	08_non-res	1	149	800.0	1.0	0.0
+de	01_solar	1	149	2000.0	0.0	1.0
+de	02_wind_on	1	149	2000.0	0.0	1.0
+de	03_wind_off	1	149	2000.0	0.0	1.0
+de	04_res	1	149	2000.0	0.0	1.0
+de	05_nuclear	1	149	2000.0	0.0	1.0
+de	06_coal	1	149	2000.0	0.0	1.0
+de	07_gas	1	149	2000.0	0.0	1.0
+de	08_non-res	1	149	800.0	0.0	1.0
 de	09_hydro_pump	1	149	0.0	0.0	0.0
-de	01_solar	1	150	2000.0	1.0	0.0
-de	02_wind_on	1	150	2000.0	1.0	0.0
-de	03_wind_off	1	150	2000.0	1.0	0.0
-de	04_res	1	150	2000.0	1.0	0.0
-de	05_nuclear	1	150	2000.0	1.0	0.0
-de	06_coal	1	150	2000.0	1.0	0.0
-de	07_gas	1	150	2000.0	1.0	0.0
-de	08_non-res	1	150	900.0	1.0	0.0
+de	01_solar	1	150	2000.0	0.0	1.0
+de	02_wind_on	1	150	2000.0	0.0	1.0
+de	03_wind_off	1	150	2000.0	0.0	1.0
+de	04_res	1	150	2000.0	0.0	1.0
+de	05_nuclear	1	150	2000.0	0.0	1.0
+de	06_coal	1	150	2000.0	0.0	1.0
+de	07_gas	1	150	2000.0	0.0	1.0
+de	08_non-res	1	150	900.0	0.0	1.0
 de	09_hydro_pump	1	150	0.0	0.0	0.0
-de	01_solar	1	151	2000.0	1.0	0.0
-de	02_wind_on	1	151	2000.0	1.0	0.0
-de	03_wind_off	1	151	2000.0	1.0	0.0
-de	04_res	1	151	2000.0	1.0	0.0
-de	05_nuclear	1	151	2000.0	1.0	0.0
-de	06_coal	1	151	2000.0	1.0	0.0
-de	07_gas	1	151	2000.0	1.0	0.0
-de	08_non-res	1	151	1000.0	1.0	0.0
+de	01_solar	1	151	2000.0	0.0	1.0
+de	02_wind_on	1	151	2000.0	0.0	1.0
+de	03_wind_off	1	151	2000.0	0.0	1.0
+de	04_res	1	151	2000.0	0.0	1.0
+de	05_nuclear	1	151	2000.0	0.0	1.0
+de	06_coal	1	151	2000.0	0.0	1.0
+de	07_gas	1	151	2000.0	0.0	1.0
+de	08_non-res	1	151	1000.0	0.0	1.0
 de	09_hydro_pump	1	151	0.0	0.0	0.0
-de	01_solar	1	152	2000.0	1.0	0.0
-de	02_wind_on	1	152	2000.0	1.0	0.0
-de	03_wind_off	1	152	2000.0	1.0	0.0
-de	04_res	1	152	2000.0	1.0	0.0
-de	05_nuclear	1	152	2000.0	1.0	0.0
-de	06_coal	1	152	2000.0	1.0	0.0
-de	07_gas	1	152	2000.0	1.0	0.0
-de	08_non-res	1	152	1100.0	1.0	0.0
+de	01_solar	1	152	2000.0	0.0	1.0
+de	02_wind_on	1	152	2000.0	0.0	1.0
+de	03_wind_off	1	152	2000.0	0.0	1.0
+de	04_res	1	152	2000.0	0.0	1.0
+de	05_nuclear	1	152	2000.0	0.0	1.0
+de	06_coal	1	152	2000.0	0.0	1.0
+de	07_gas	1	152	2000.0	0.0	1.0
+de	08_non-res	1	152	1100.0	0.0	1.0
 de	09_hydro_pump	1	152	0.0	0.0	0.0
-de	01_solar	1	153	2000.0	1.0	0.0
-de	02_wind_on	1	153	2000.0	1.0	0.0
-de	03_wind_off	1	153	2000.0	1.0	0.0
-de	04_res	1	153	2000.0	1.0	0.0
-de	05_nuclear	1	153	2000.0	1.0	0.0
-de	06_coal	1	153	2000.0	1.0	0.0
-de	07_gas	1	153	2000.0	1.0	0.0
-de	08_non-res	1	153	1200.0	1.0	0.0
+de	01_solar	1	153	2000.0	0.0	1.0
+de	02_wind_on	1	153	2000.0	0.0	1.0
+de	03_wind_off	1	153	2000.0	0.0	1.0
+de	04_res	1	153	2000.0	0.0	1.0
+de	05_nuclear	1	153	2000.0	0.0	1.0
+de	06_coal	1	153	2000.0	0.0	1.0
+de	07_gas	1	153	2000.0	0.0	1.0
+de	08_non-res	1	153	1200.0	0.0	1.0
 de	09_hydro_pump	1	153	0.0	0.0	0.0
-de	01_solar	1	154	2000.0	1.0	0.0
-de	02_wind_on	1	154	2000.0	1.0	0.0
-de	03_wind_off	1	154	2000.0	1.0	0.0
-de	04_res	1	154	2000.0	1.0	0.0
-de	05_nuclear	1	154	2000.0	1.0	0.0
-de	06_coal	1	154	2000.0	1.0	0.0
-de	07_gas	1	154	2000.0	1.0	0.0
-de	08_non-res	1	154	1300.0	1.0	0.0
+de	01_solar	1	154	2000.0	0.0	1.0
+de	02_wind_on	1	154	2000.0	0.0	1.0
+de	03_wind_off	1	154	2000.0	0.0	1.0
+de	04_res	1	154	2000.0	0.0	1.0
+de	05_nuclear	1	154	2000.0	0.0	1.0
+de	06_coal	1	154	2000.0	0.0	1.0
+de	07_gas	1	154	2000.0	0.0	1.0
+de	08_non-res	1	154	1300.0	0.0	1.0
 de	09_hydro_pump	1	154	0.0	0.0	0.0
-de	01_solar	1	155	2000.0	1.0	0.0
-de	02_wind_on	1	155	2000.0	1.0	0.0
-de	03_wind_off	1	155	2000.0	1.0	0.0
-de	04_res	1	155	2000.0	1.0	0.0
-de	05_nuclear	1	155	2000.0	1.0	0.0
-de	06_coal	1	155	2000.0	1.0	0.0
-de	07_gas	1	155	2000.0	1.0	0.0
-de	08_non-res	1	155	1400.0	1.0	0.0
+de	01_solar	1	155	2000.0	0.0	1.0
+de	02_wind_on	1	155	2000.0	0.0	1.0
+de	03_wind_off	1	155	2000.0	0.0	1.0
+de	04_res	1	155	2000.0	0.0	1.0
+de	05_nuclear	1	155	2000.0	0.0	1.0
+de	06_coal	1	155	2000.0	0.0	1.0
+de	07_gas	1	155	2000.0	0.0	1.0
+de	08_non-res	1	155	1400.0	0.0	1.0
 de	09_hydro_pump	1	155	0.0	0.0	0.0
-de	01_solar	1	156	2000.0	1.0	0.0
-de	02_wind_on	1	156	2000.0	1.0	0.0
-de	03_wind_off	1	156	2000.0	1.0	0.0
-de	04_res	1	156	2000.0	1.0	0.0
-de	05_nuclear	1	156	2000.0	1.0	0.0
-de	06_coal	1	156	2000.0	1.0	0.0
-de	07_gas	1	156	2000.0	1.0	0.0
-de	08_non-res	1	156	1500.0	1.0	0.0
+de	01_solar	1	156	2000.0	0.0	1.0
+de	02_wind_on	1	156	2000.0	0.0	1.0
+de	03_wind_off	1	156	2000.0	0.0	1.0
+de	04_res	1	156	2000.0	0.0	1.0
+de	05_nuclear	1	156	2000.0	0.0	1.0
+de	06_coal	1	156	2000.0	0.0	1.0
+de	07_gas	1	156	2000.0	0.0	1.0
+de	08_non-res	1	156	1500.0	0.0	1.0
 de	09_hydro_pump	1	156	0.0	0.0	0.0
-de	01_solar	1	157	2000.0	1.0	0.0
-de	02_wind_on	1	157	2000.0	1.0	0.0
-de	03_wind_off	1	157	2000.0	1.0	0.0
-de	04_res	1	157	2000.0	1.0	0.0
-de	05_nuclear	1	157	2000.0	1.0	0.0
-de	06_coal	1	157	2000.0	1.0	0.0
-de	07_gas	1	157	2000.0	1.0	0.0
-de	08_non-res	1	157	1600.0	1.0	0.0
+de	01_solar	1	157	2000.0	0.0	1.0
+de	02_wind_on	1	157	2000.0	0.0	1.0
+de	03_wind_off	1	157	2000.0	0.0	1.0
+de	04_res	1	157	2000.0	0.0	1.0
+de	05_nuclear	1	157	2000.0	0.0	1.0
+de	06_coal	1	157	2000.0	0.0	1.0
+de	07_gas	1	157	2000.0	0.0	1.0
+de	08_non-res	1	157	1600.0	0.0	1.0
 de	09_hydro_pump	1	157	0.0	0.0	0.0
-de	01_solar	1	158	2000.0	1.0	0.0
-de	02_wind_on	1	158	2000.0	1.0	0.0
-de	03_wind_off	1	158	2000.0	1.0	0.0
-de	04_res	1	158	2000.0	1.0	0.0
-de	05_nuclear	1	158	2000.0	1.0	0.0
-de	06_coal	1	158	2000.0	1.0	0.0
-de	07_gas	1	158	2000.0	1.0	0.0
-de	08_non-res	1	158	1700.0	1.0	0.0
+de	01_solar	1	158	2000.0	0.0	1.0
+de	02_wind_on	1	158	2000.0	0.0	1.0
+de	03_wind_off	1	158	2000.0	0.0	1.0
+de	04_res	1	158	2000.0	0.0	1.0
+de	05_nuclear	1	158	2000.0	0.0	1.0
+de	06_coal	1	158	2000.0	0.0	1.0
+de	07_gas	1	158	2000.0	0.0	1.0
+de	08_non-res	1	158	1700.0	0.0	1.0
 de	09_hydro_pump	1	158	0.0	0.0	0.0
-de	01_solar	1	159	2000.0	1.0	0.0
-de	02_wind_on	1	159	2000.0	1.0	0.0
-de	03_wind_off	1	159	2000.0	1.0	0.0
-de	04_res	1	159	2000.0	1.0	0.0
-de	05_nuclear	1	159	2000.0	1.0	0.0
-de	06_coal	1	159	2000.0	1.0	0.0
-de	07_gas	1	159	2000.0	1.0	0.0
-de	08_non-res	1	159	1800.0	1.0	0.0
+de	01_solar	1	159	2000.0	0.0	1.0
+de	02_wind_on	1	159	2000.0	0.0	1.0
+de	03_wind_off	1	159	2000.0	0.0	1.0
+de	04_res	1	159	2000.0	0.0	1.0
+de	05_nuclear	1	159	2000.0	0.0	1.0
+de	06_coal	1	159	2000.0	0.0	1.0
+de	07_gas	1	159	2000.0	0.0	1.0
+de	08_non-res	1	159	1800.0	0.0	1.0
 de	09_hydro_pump	1	159	0.0	0.0	0.0
-de	01_solar	1	160	2000.0	1.0	0.0
-de	02_wind_on	1	160	2000.0	1.0	0.0
-de	03_wind_off	1	160	2000.0	1.0	0.0
-de	04_res	1	160	2000.0	1.0	0.0
-de	05_nuclear	1	160	2000.0	1.0	0.0
-de	06_coal	1	160	2000.0	1.0	0.0
-de	07_gas	1	160	2000.0	1.0	0.0
-de	08_non-res	1	160	1900.0	1.0	0.0
+de	01_solar	1	160	2000.0	0.0	1.0
+de	02_wind_on	1	160	2000.0	0.0	1.0
+de	03_wind_off	1	160	2000.0	0.0	1.0
+de	04_res	1	160	2000.0	0.0	1.0
+de	05_nuclear	1	160	2000.0	0.0	1.0
+de	06_coal	1	160	2000.0	0.0	1.0
+de	07_gas	1	160	2000.0	0.0	1.0
+de	08_non-res	1	160	1900.0	0.0	1.0
 de	09_hydro_pump	1	160	0.0	0.0	0.0
-de	01_solar	1	161	2000.0	1.0	0.0
-de	02_wind_on	1	161	2000.0	1.0	0.0
-de	03_wind_off	1	161	2000.0	1.0	0.0
-de	04_res	1	161	2000.0	1.0	0.0
-de	05_nuclear	1	161	2000.0	1.0	0.0
-de	06_coal	1	161	2000.0	1.0	0.0
-de	07_gas	1	161	2000.0	1.0	0.0
-de	08_non-res	1	161	2000.0	1.0	0.0
+de	01_solar	1	161	2000.0	0.0	1.0
+de	02_wind_on	1	161	2000.0	0.0	1.0
+de	03_wind_off	1	161	2000.0	0.0	1.0
+de	04_res	1	161	2000.0	0.0	1.0
+de	05_nuclear	1	161	2000.0	0.0	1.0
+de	06_coal	1	161	2000.0	0.0	1.0
+de	07_gas	1	161	2000.0	0.0	1.0
+de	08_non-res	1	161	2000.0	0.0	1.0
 de	09_hydro_pump	1	161	0.0	0.0	0.0
-de	01_solar	1	162	2000.0	1.0	0.0
-de	02_wind_on	1	162	2000.0	1.0	0.0
-de	03_wind_off	1	162	2000.0	1.0	0.0
-de	04_res	1	162	2000.0	1.0	0.0
-de	05_nuclear	1	162	2000.0	1.0	0.0
-de	06_coal	1	162	2000.0	1.0	0.0
-de	07_gas	1	162	2000.0	1.0	0.0
-de	08_non-res	1	162	2000.0	1.0	0.0
-de	09_hydro_pump	1	162	100.0	1.0	0.0
-de	01_solar	1	163	2000.0	1.0	0.0
-de	02_wind_on	1	163	2000.0	1.0	0.0
-de	03_wind_off	1	163	2000.0	1.0	0.0
-de	04_res	1	163	2000.0	1.0	0.0
-de	05_nuclear	1	163	2000.0	1.0	0.0
-de	06_coal	1	163	2000.0	1.0	0.0
-de	07_gas	1	163	2000.0	1.0	0.0
-de	08_non-res	1	163	2000.0	1.0	0.0
-de	09_hydro_pump	1	163	200.0	1.0	0.0
-de	01_solar	1	164	2000.0	1.0	0.0
-de	02_wind_on	1	164	2000.0	1.0	0.0
-de	03_wind_off	1	164	2000.0	1.0	0.0
-de	04_res	1	164	2000.0	1.0	0.0
-de	05_nuclear	1	164	2000.0	1.0	0.0
-de	06_coal	1	164	2000.0	1.0	0.0
-de	07_gas	1	164	2000.0	1.0	0.0
-de	08_non-res	1	164	2000.0	1.0	0.0
-de	09_hydro_pump	1	164	300.0	1.0	0.0
-de	01_solar	1	165	2000.0	1.0	0.0
-de	02_wind_on	1	165	2000.0	1.0	0.0
-de	03_wind_off	1	165	2000.0	1.0	0.0
-de	04_res	1	165	2000.0	1.0	0.0
-de	05_nuclear	1	165	2000.0	1.0	0.0
-de	06_coal	1	165	2000.0	1.0	0.0
-de	07_gas	1	165	2000.0	1.0	0.0
-de	08_non-res	1	165	2000.0	1.0	0.0
-de	09_hydro_pump	1	165	400.0	1.0	0.0
-de	01_solar	1	166	2000.0	1.0	0.0
-de	02_wind_on	1	166	2000.0	1.0	0.0
-de	03_wind_off	1	166	2000.0	1.0	0.0
-de	04_res	1	166	2000.0	1.0	0.0
-de	05_nuclear	1	166	2000.0	1.0	0.0
-de	06_coal	1	166	2000.0	1.0	0.0
-de	07_gas	1	166	2000.0	1.0	0.0
-de	08_non-res	1	166	2000.0	1.0	0.0
-de	09_hydro_pump	1	166	500.0	1.0	0.0
-de	01_solar	1	167	2000.0	1.0	0.0
-de	02_wind_on	1	167	2000.0	1.0	0.0
-de	03_wind_off	1	167	2000.0	1.0	0.0
-de	04_res	1	167	2000.0	1.0	0.0
-de	05_nuclear	1	167	2000.0	1.0	0.0
-de	06_coal	1	167	2000.0	1.0	0.0
-de	07_gas	1	167	2000.0	1.0	0.0
-de	08_non-res	1	167	2000.0	1.0	0.0
-de	09_hydro_pump	1	167	600.0	1.0	0.0
-de	01_solar	1	168	2000.0	1.0	0.0
-de	02_wind_on	1	168	2000.0	1.0	0.0
-de	03_wind_off	1	168	2000.0	1.0	0.0
-de	04_res	1	168	2000.0	1.0	0.0
-de	05_nuclear	1	168	2000.0	1.0	0.0
-de	06_coal	1	168	2000.0	1.0	0.0
-de	07_gas	1	168	2000.0	1.0	0.0
-de	08_non-res	1	168	2000.0	1.0	0.0
-de	09_hydro_pump	1	168	700.0	1.0	0.0
+de	01_solar	1	162	2000.0	0.0	1.0
+de	02_wind_on	1	162	2000.0	0.0	1.0
+de	03_wind_off	1	162	2000.0	0.0	1.0
+de	04_res	1	162	2000.0	0.0	1.0
+de	05_nuclear	1	162	2000.0	0.0	1.0
+de	06_coal	1	162	2000.0	0.0	1.0
+de	07_gas	1	162	2000.0	0.0	1.0
+de	08_non-res	1	162	2000.0	0.0	1.0
+de	09_hydro_pump	1	162	100.0	0.0	1.0
+de	01_solar	1	163	2000.0	0.0	1.0
+de	02_wind_on	1	163	2000.0	0.0	1.0
+de	03_wind_off	1	163	2000.0	0.0	1.0
+de	04_res	1	163	2000.0	0.0	1.0
+de	05_nuclear	1	163	2000.0	0.0	1.0
+de	06_coal	1	163	2000.0	0.0	1.0
+de	07_gas	1	163	2000.0	0.0	1.0
+de	08_non-res	1	163	2000.0	0.0	1.0
+de	09_hydro_pump	1	163	200.0	0.0	1.0
+de	01_solar	1	164	2000.0	0.0	1.0
+de	02_wind_on	1	164	2000.0	0.0	1.0
+de	03_wind_off	1	164	2000.0	0.0	1.0
+de	04_res	1	164	2000.0	0.0	1.0
+de	05_nuclear	1	164	2000.0	0.0	1.0
+de	06_coal	1	164	2000.0	0.0	1.0
+de	07_gas	1	164	2000.0	0.0	1.0
+de	08_non-res	1	164	2000.0	0.0	1.0
+de	09_hydro_pump	1	164	300.0	0.0	1.0
+de	01_solar	1	165	2000.0	0.0	1.0
+de	02_wind_on	1	165	2000.0	0.0	1.0
+de	03_wind_off	1	165	2000.0	0.0	1.0
+de	04_res	1	165	2000.0	0.0	1.0
+de	05_nuclear	1	165	2000.0	0.0	1.0
+de	06_coal	1	165	2000.0	0.0	1.0
+de	07_gas	1	165	2000.0	0.0	1.0
+de	08_non-res	1	165	2000.0	0.0	1.0
+de	09_hydro_pump	1	165	400.0	0.0	1.0
+de	01_solar	1	166	2000.0	0.0	1.0
+de	02_wind_on	1	166	2000.0	0.0	1.0
+de	03_wind_off	1	166	2000.0	0.0	1.0
+de	04_res	1	166	2000.0	0.0	1.0
+de	05_nuclear	1	166	2000.0	0.0	1.0
+de	06_coal	1	166	2000.0	0.0	1.0
+de	07_gas	1	166	2000.0	0.0	1.0
+de	08_non-res	1	166	2000.0	0.0	1.0
+de	09_hydro_pump	1	166	500.0	0.0	1.0
+de	01_solar	1	167	2000.0	0.0	1.0
+de	02_wind_on	1	167	2000.0	0.0	1.0
+de	03_wind_off	1	167	2000.0	0.0	1.0
+de	04_res	1	167	2000.0	0.0	1.0
+de	05_nuclear	1	167	2000.0	0.0	1.0
+de	06_coal	1	167	2000.0	0.0	1.0
+de	07_gas	1	167	2000.0	0.0	1.0
+de	08_non-res	1	167	2000.0	0.0	1.0
+de	09_hydro_pump	1	167	600.0	0.0	1.0
+de	01_solar	1	168	2000.0	0.0	1.0
+de	02_wind_on	1	168	2000.0	0.0	1.0
+de	03_wind_off	1	168	2000.0	0.0	1.0
+de	04_res	1	168	2000.0	0.0	1.0
+de	05_nuclear	1	168	2000.0	0.0	1.0
+de	06_coal	1	168	2000.0	0.0	1.0
+de	07_gas	1	168	2000.0	0.0	1.0
+de	08_non-res	1	168	2000.0	0.0	1.0
+de	09_hydro_pump	1	168	700.0	0.0	1.0
 de	01_solar	1	169	0.0	0.0	0.0
 de	02_wind_on	1	169	0.0	0.0	0.0
 de	03_wind_off	1	169	0.0	0.0	0.0
@@ -1520,7 +1520,7 @@ de	06_coal	1	169	0.0	0.0	0.0
 de	07_gas	1	169	0.0	0.0	0.0
 de	08_non-res	1	169	0.0	0.0	0.0
 de	09_hydro_pump	1	169	0.0	0.0	0.0
-de	01_solar	1	170	100.0	1.0	0.0
+de	01_solar	1	170	100.0	0.0	1.0
 de	02_wind_on	1	170	0.0	0.0	0.0
 de	03_wind_off	1	170	0.0	0.0	0.0
 de	04_res	1	170	0.0	0.0	0.0
@@ -1529,7 +1529,7 @@ de	06_coal	1	170	0.0	0.0	0.0
 de	07_gas	1	170	0.0	0.0	0.0
 de	08_non-res	1	170	0.0	0.0	0.0
 de	09_hydro_pump	1	170	0.0	0.0	0.0
-de	01_solar	1	171	200.0	1.0	0.0
+de	01_solar	1	171	200.0	0.0	1.0
 de	02_wind_on	1	171	0.0	0.0	0.0
 de	03_wind_off	1	171	0.0	0.0	0.0
 de	04_res	1	171	0.0	0.0	0.0
@@ -1538,7 +1538,7 @@ de	06_coal	1	171	0.0	0.0	0.0
 de	07_gas	1	171	0.0	0.0	0.0
 de	08_non-res	1	171	0.0	0.0	0.0
 de	09_hydro_pump	1	171	0.0	0.0	0.0
-de	01_solar	1	172	300.0	1.0	0.0
+de	01_solar	1	172	300.0	0.0	1.0
 de	02_wind_on	1	172	0.0	0.0	0.0
 de	03_wind_off	1	172	0.0	0.0	0.0
 de	04_res	1	172	0.0	0.0	0.0
@@ -1547,7 +1547,7 @@ de	06_coal	1	172	0.0	0.0	0.0
 de	07_gas	1	172	0.0	0.0	0.0
 de	08_non-res	1	172	0.0	0.0	0.0
 de	09_hydro_pump	1	172	0.0	0.0	0.0
-de	01_solar	1	173	400.0	1.0	0.0
+de	01_solar	1	173	400.0	0.0	1.0
 de	02_wind_on	1	173	0.0	0.0	0.0
 de	03_wind_off	1	173	0.0	0.0	0.0
 de	04_res	1	173	0.0	0.0	0.0
@@ -1556,7 +1556,7 @@ de	06_coal	1	173	0.0	0.0	0.0
 de	07_gas	1	173	0.0	0.0	0.0
 de	08_non-res	1	173	0.0	0.0	0.0
 de	09_hydro_pump	1	173	0.0	0.0	0.0
-de	01_solar	1	174	500.0	1.0	0.0
+de	01_solar	1	174	500.0	0.0	1.0
 de	02_wind_on	1	174	0.0	0.0	0.0
 de	03_wind_off	1	174	0.0	0.0	0.0
 de	04_res	1	174	0.0	0.0	0.0
@@ -1565,7 +1565,7 @@ de	06_coal	1	174	0.0	0.0	0.0
 de	07_gas	1	174	0.0	0.0	0.0
 de	08_non-res	1	174	0.0	0.0	0.0
 de	09_hydro_pump	1	174	0.0	0.0	0.0
-de	01_solar	1	175	600.0	1.0	0.0
+de	01_solar	1	175	600.0	0.0	1.0
 de	02_wind_on	1	175	0.0	0.0	0.0
 de	03_wind_off	1	175	0.0	0.0	0.0
 de	04_res	1	175	0.0	0.0	0.0
@@ -1574,7 +1574,7 @@ de	06_coal	1	175	0.0	0.0	0.0
 de	07_gas	1	175	0.0	0.0	0.0
 de	08_non-res	1	175	0.0	0.0	0.0
 de	09_hydro_pump	1	175	0.0	0.0	0.0
-de	01_solar	1	176	700.0	1.0	0.0
+de	01_solar	1	176	700.0	0.0	1.0
 de	02_wind_on	1	176	0.0	0.0	0.0
 de	03_wind_off	1	176	0.0	0.0	0.0
 de	04_res	1	176	0.0	0.0	0.0
@@ -1583,7 +1583,7 @@ de	06_coal	1	176	0.0	0.0	0.0
 de	07_gas	1	176	0.0	0.0	0.0
 de	08_non-res	1	176	0.0	0.0	0.0
 de	09_hydro_pump	1	176	0.0	0.0	0.0
-de	01_solar	1	177	800.0	1.0	0.0
+de	01_solar	1	177	800.0	0.0	1.0
 de	02_wind_on	1	177	0.0	0.0	0.0
 de	03_wind_off	1	177	0.0	0.0	0.0
 de	04_res	1	177	0.0	0.0	0.0
@@ -1592,7 +1592,7 @@ de	06_coal	1	177	0.0	0.0	0.0
 de	07_gas	1	177	0.0	0.0	0.0
 de	08_non-res	1	177	0.0	0.0	0.0
 de	09_hydro_pump	1	177	0.0	0.0	0.0
-de	01_solar	1	178	900.0	1.0	0.0
+de	01_solar	1	178	900.0	0.0	1.0
 de	02_wind_on	1	178	0.0	0.0	0.0
 de	03_wind_off	1	178	0.0	0.0	0.0
 de	04_res	1	178	0.0	0.0	0.0
@@ -1601,7 +1601,7 @@ de	06_coal	1	178	0.0	0.0	0.0
 de	07_gas	1	178	0.0	0.0	0.0
 de	08_non-res	1	178	0.0	0.0	0.0
 de	09_hydro_pump	1	178	0.0	0.0	0.0
-de	01_solar	1	179	1000.0	1.0	0.0
+de	01_solar	1	179	1000.0	0.0	1.0
 de	02_wind_on	1	179	0.0	0.0	0.0
 de	03_wind_off	1	179	0.0	0.0	0.0
 de	04_res	1	179	0.0	0.0	0.0
@@ -1610,7 +1610,7 @@ de	06_coal	1	179	0.0	0.0	0.0
 de	07_gas	1	179	0.0	0.0	0.0
 de	08_non-res	1	179	0.0	0.0	0.0
 de	09_hydro_pump	1	179	0.0	0.0	0.0
-de	01_solar	1	180	1100.0	1.0	0.0
+de	01_solar	1	180	1100.0	0.0	1.0
 de	02_wind_on	1	180	0.0	0.0	0.0
 de	03_wind_off	1	180	0.0	0.0	0.0
 de	04_res	1	180	0.0	0.0	0.0
@@ -1619,7 +1619,7 @@ de	06_coal	1	180	0.0	0.0	0.0
 de	07_gas	1	180	0.0	0.0	0.0
 de	08_non-res	1	180	0.0	0.0	0.0
 de	09_hydro_pump	1	180	0.0	0.0	0.0
-de	01_solar	1	181	1200.0	1.0	0.0
+de	01_solar	1	181	1200.0	0.0	1.0
 de	02_wind_on	1	181	0.0	0.0	0.0
 de	03_wind_off	1	181	0.0	0.0	0.0
 de	04_res	1	181	0.0	0.0	0.0
@@ -1628,7 +1628,7 @@ de	06_coal	1	181	0.0	0.0	0.0
 de	07_gas	1	181	0.0	0.0	0.0
 de	08_non-res	1	181	0.0	0.0	0.0
 de	09_hydro_pump	1	181	0.0	0.0	0.0
-de	01_solar	1	182	1300.0	1.0	0.0
+de	01_solar	1	182	1300.0	0.0	1.0
 de	02_wind_on	1	182	0.0	0.0	0.0
 de	03_wind_off	1	182	0.0	0.0	0.0
 de	04_res	1	182	0.0	0.0	0.0
@@ -1637,7 +1637,7 @@ de	06_coal	1	182	0.0	0.0	0.0
 de	07_gas	1	182	0.0	0.0	0.0
 de	08_non-res	1	182	0.0	0.0	0.0
 de	09_hydro_pump	1	182	0.0	0.0	0.0
-de	01_solar	1	183	1400.0	1.0	0.0
+de	01_solar	1	183	1400.0	0.0	1.0
 de	02_wind_on	1	183	0.0	0.0	0.0
 de	03_wind_off	1	183	0.0	0.0	0.0
 de	04_res	1	183	0.0	0.0	0.0
@@ -1646,7 +1646,7 @@ de	06_coal	1	183	0.0	0.0	0.0
 de	07_gas	1	183	0.0	0.0	0.0
 de	08_non-res	1	183	0.0	0.0	0.0
 de	09_hydro_pump	1	183	0.0	0.0	0.0
-de	01_solar	1	184	1500.0	1.0	0.0
+de	01_solar	1	184	1500.0	0.0	1.0
 de	02_wind_on	1	184	0.0	0.0	0.0
 de	03_wind_off	1	184	0.0	0.0	0.0
 de	04_res	1	184	0.0	0.0	0.0
@@ -1655,7 +1655,7 @@ de	06_coal	1	184	0.0	0.0	0.0
 de	07_gas	1	184	0.0	0.0	0.0
 de	08_non-res	1	184	0.0	0.0	0.0
 de	09_hydro_pump	1	184	0.0	0.0	0.0
-de	01_solar	1	185	1600.0	1.0	0.0
+de	01_solar	1	185	1600.0	0.0	1.0
 de	02_wind_on	1	185	0.0	0.0	0.0
 de	03_wind_off	1	185	0.0	0.0	0.0
 de	04_res	1	185	0.0	0.0	0.0
@@ -1664,7 +1664,7 @@ de	06_coal	1	185	0.0	0.0	0.0
 de	07_gas	1	185	0.0	0.0	0.0
 de	08_non-res	1	185	0.0	0.0	0.0
 de	09_hydro_pump	1	185	0.0	0.0	0.0
-de	01_solar	1	186	1700.0	1.0	0.0
+de	01_solar	1	186	1700.0	0.0	1.0
 de	02_wind_on	1	186	0.0	0.0	0.0
 de	03_wind_off	1	186	0.0	0.0	0.0
 de	04_res	1	186	0.0	0.0	0.0
@@ -1673,7 +1673,7 @@ de	06_coal	1	186	0.0	0.0	0.0
 de	07_gas	1	186	0.0	0.0	0.0
 de	08_non-res	1	186	0.0	0.0	0.0
 de	09_hydro_pump	1	186	0.0	0.0	0.0
-de	01_solar	1	187	1800.0	1.0	0.0
+de	01_solar	1	187	1800.0	0.0	1.0
 de	02_wind_on	1	187	0.0	0.0	0.0
 de	03_wind_off	1	187	0.0	0.0	0.0
 de	04_res	1	187	0.0	0.0	0.0
@@ -1682,7 +1682,7 @@ de	06_coal	1	187	0.0	0.0	0.0
 de	07_gas	1	187	0.0	0.0	0.0
 de	08_non-res	1	187	0.0	0.0	0.0
 de	09_hydro_pump	1	187	0.0	0.0	0.0
-de	01_solar	1	188	1900.0	1.0	0.0
+de	01_solar	1	188	1900.0	0.0	1.0
 de	02_wind_on	1	188	0.0	0.0	0.0
 de	03_wind_off	1	188	0.0	0.0	0.0
 de	04_res	1	188	0.0	0.0	0.0
@@ -1691,7 +1691,7 @@ de	06_coal	1	188	0.0	0.0	0.0
 de	07_gas	1	188	0.0	0.0	0.0
 de	08_non-res	1	188	0.0	0.0	0.0
 de	09_hydro_pump	1	188	0.0	0.0	0.0
-de	01_solar	1	189	2000.0	1.0	0.0
+de	01_solar	1	189	2000.0	0.0	1.0
 de	02_wind_on	1	189	0.0	0.0	0.0
 de	03_wind_off	1	189	0.0	0.0	0.0
 de	04_res	1	189	0.0	0.0	0.0
@@ -1700,8 +1700,8 @@ de	06_coal	1	189	0.0	0.0	0.0
 de	07_gas	1	189	0.0	0.0	0.0
 de	08_non-res	1	189	0.0	0.0	0.0
 de	09_hydro_pump	1	189	0.0	0.0	0.0
-de	01_solar	1	190	2000.0	1.0	0.0
-de	02_wind_on	1	190	100.0	1.0	0.0
+de	01_solar	1	190	2000.0	0.0	1.0
+de	02_wind_on	1	190	100.0	0.0	1.0
 de	03_wind_off	1	190	0.0	0.0	0.0
 de	04_res	1	190	0.0	0.0	0.0
 de	05_nuclear	1	190	0.0	0.0	0.0
@@ -1709,8 +1709,8 @@ de	06_coal	1	190	0.0	0.0	0.0
 de	07_gas	1	190	0.0	0.0	0.0
 de	08_non-res	1	190	0.0	0.0	0.0
 de	09_hydro_pump	1	190	0.0	0.0	0.0
-de	01_solar	1	191	2000.0	1.0	0.0
-de	02_wind_on	1	191	200.0	1.0	0.0
+de	01_solar	1	191	2000.0	0.0	1.0
+de	02_wind_on	1	191	200.0	0.0	1.0
 de	03_wind_off	1	191	0.0	0.0	0.0
 de	04_res	1	191	0.0	0.0	0.0
 de	05_nuclear	1	191	0.0	0.0	0.0
@@ -1718,8 +1718,8 @@ de	06_coal	1	191	0.0	0.0	0.0
 de	07_gas	1	191	0.0	0.0	0.0
 de	08_non-res	1	191	0.0	0.0	0.0
 de	09_hydro_pump	1	191	0.0	0.0	0.0
-de	01_solar	1	192	2000.0	1.0	0.0
-de	02_wind_on	1	192	300.0	1.0	0.0
+de	01_solar	1	192	2000.0	0.0	1.0
+de	02_wind_on	1	192	300.0	0.0	1.0
 de	03_wind_off	1	192	0.0	0.0	0.0
 de	04_res	1	192	0.0	0.0	0.0
 de	05_nuclear	1	192	0.0	0.0	0.0
@@ -1727,8 +1727,8 @@ de	06_coal	1	192	0.0	0.0	0.0
 de	07_gas	1	192	0.0	0.0	0.0
 de	08_non-res	1	192	0.0	0.0	0.0
 de	09_hydro_pump	1	192	0.0	0.0	0.0
-de	01_solar	1	193	2000.0	1.0	0.0
-de	02_wind_on	1	193	400.0	1.0	0.0
+de	01_solar	1	193	2000.0	0.0	1.0
+de	02_wind_on	1	193	400.0	0.0	1.0
 de	03_wind_off	1	193	0.0	0.0	0.0
 de	04_res	1	193	0.0	0.0	0.0
 de	05_nuclear	1	193	0.0	0.0	0.0
@@ -1736,8 +1736,8 @@ de	06_coal	1	193	0.0	0.0	0.0
 de	07_gas	1	193	0.0	0.0	0.0
 de	08_non-res	1	193	0.0	0.0	0.0
 de	09_hydro_pump	1	193	0.0	0.0	0.0
-de	01_solar	1	194	2000.0	1.0	0.0
-de	02_wind_on	1	194	500.0	1.0	0.0
+de	01_solar	1	194	2000.0	0.0	1.0
+de	02_wind_on	1	194	500.0	0.0	1.0
 de	03_wind_off	1	194	0.0	0.0	0.0
 de	04_res	1	194	0.0	0.0	0.0
 de	05_nuclear	1	194	0.0	0.0	0.0
@@ -1745,8 +1745,8 @@ de	06_coal	1	194	0.0	0.0	0.0
 de	07_gas	1	194	0.0	0.0	0.0
 de	08_non-res	1	194	0.0	0.0	0.0
 de	09_hydro_pump	1	194	0.0	0.0	0.0
-de	01_solar	1	195	2000.0	1.0	0.0
-de	02_wind_on	1	195	600.0	1.0	0.0
+de	01_solar	1	195	2000.0	0.0	1.0
+de	02_wind_on	1	195	600.0	0.0	1.0
 de	03_wind_off	1	195	0.0	0.0	0.0
 de	04_res	1	195	0.0	0.0	0.0
 de	05_nuclear	1	195	0.0	0.0	0.0
@@ -1754,8 +1754,8 @@ de	06_coal	1	195	0.0	0.0	0.0
 de	07_gas	1	195	0.0	0.0	0.0
 de	08_non-res	1	195	0.0	0.0	0.0
 de	09_hydro_pump	1	195	0.0	0.0	0.0
-de	01_solar	1	196	2000.0	1.0	0.0
-de	02_wind_on	1	196	700.0	1.0	0.0
+de	01_solar	1	196	2000.0	0.0	1.0
+de	02_wind_on	1	196	700.0	0.0	1.0
 de	03_wind_off	1	196	0.0	0.0	0.0
 de	04_res	1	196	0.0	0.0	0.0
 de	05_nuclear	1	196	0.0	0.0	0.0
@@ -1763,8 +1763,8 @@ de	06_coal	1	196	0.0	0.0	0.0
 de	07_gas	1	196	0.0	0.0	0.0
 de	08_non-res	1	196	0.0	0.0	0.0
 de	09_hydro_pump	1	196	0.0	0.0	0.0
-de	01_solar	1	197	2000.0	1.0	0.0
-de	02_wind_on	1	197	800.0	1.0	0.0
+de	01_solar	1	197	2000.0	0.0	1.0
+de	02_wind_on	1	197	800.0	0.0	1.0
 de	03_wind_off	1	197	0.0	0.0	0.0
 de	04_res	1	197	0.0	0.0	0.0
 de	05_nuclear	1	197	0.0	0.0	0.0
@@ -1772,8 +1772,8 @@ de	06_coal	1	197	0.0	0.0	0.0
 de	07_gas	1	197	0.0	0.0	0.0
 de	08_non-res	1	197	0.0	0.0	0.0
 de	09_hydro_pump	1	197	0.0	0.0	0.0
-de	01_solar	1	198	2000.0	1.0	0.0
-de	02_wind_on	1	198	900.0	1.0	0.0
+de	01_solar	1	198	2000.0	0.0	1.0
+de	02_wind_on	1	198	900.0	0.0	1.0
 de	03_wind_off	1	198	0.0	0.0	0.0
 de	04_res	1	198	0.0	0.0	0.0
 de	05_nuclear	1	198	0.0	0.0	0.0
@@ -1781,8 +1781,8 @@ de	06_coal	1	198	0.0	0.0	0.0
 de	07_gas	1	198	0.0	0.0	0.0
 de	08_non-res	1	198	0.0	0.0	0.0
 de	09_hydro_pump	1	198	0.0	0.0	0.0
-de	01_solar	1	199	2000.0	1.0	0.0
-de	02_wind_on	1	199	1000.0	1.0	0.0
+de	01_solar	1	199	2000.0	0.0	1.0
+de	02_wind_on	1	199	1000.0	0.0	1.0
 de	03_wind_off	1	199	0.0	0.0	0.0
 de	04_res	1	199	0.0	0.0	0.0
 de	05_nuclear	1	199	0.0	0.0	0.0
@@ -1790,8 +1790,8 @@ de	06_coal	1	199	0.0	0.0	0.0
 de	07_gas	1	199	0.0	0.0	0.0
 de	08_non-res	1	199	0.0	0.0	0.0
 de	09_hydro_pump	1	199	0.0	0.0	0.0
-de	01_solar	1	200	2000.0	1.0	0.0
-de	02_wind_on	1	200	1100.0	1.0	0.0
+de	01_solar	1	200	2000.0	0.0	1.0
+de	02_wind_on	1	200	1100.0	0.0	1.0
 de	03_wind_off	1	200	0.0	0.0	0.0
 de	04_res	1	200	0.0	0.0	0.0
 de	05_nuclear	1	200	0.0	0.0	0.0
@@ -1799,8 +1799,8 @@ de	06_coal	1	200	0.0	0.0	0.0
 de	07_gas	1	200	0.0	0.0	0.0
 de	08_non-res	1	200	0.0	0.0	0.0
 de	09_hydro_pump	1	200	0.0	0.0	0.0
-de	01_solar	1	201	2000.0	1.0	0.0
-de	02_wind_on	1	201	1200.0	1.0	0.0
+de	01_solar	1	201	2000.0	0.0	1.0
+de	02_wind_on	1	201	1200.0	0.0	1.0
 de	03_wind_off	1	201	0.0	0.0	0.0
 de	04_res	1	201	0.0	0.0	0.0
 de	05_nuclear	1	201	0.0	0.0	0.0
@@ -1808,8 +1808,8 @@ de	06_coal	1	201	0.0	0.0	0.0
 de	07_gas	1	201	0.0	0.0	0.0
 de	08_non-res	1	201	0.0	0.0	0.0
 de	09_hydro_pump	1	201	0.0	0.0	0.0
-de	01_solar	1	202	2000.0	1.0	0.0
-de	02_wind_on	1	202	1300.0	1.0	0.0
+de	01_solar	1	202	2000.0	0.0	1.0
+de	02_wind_on	1	202	1300.0	0.0	1.0
 de	03_wind_off	1	202	0.0	0.0	0.0
 de	04_res	1	202	0.0	0.0	0.0
 de	05_nuclear	1	202	0.0	0.0	0.0
@@ -1817,8 +1817,8 @@ de	06_coal	1	202	0.0	0.0	0.0
 de	07_gas	1	202	0.0	0.0	0.0
 de	08_non-res	1	202	0.0	0.0	0.0
 de	09_hydro_pump	1	202	0.0	0.0	0.0
-de	01_solar	1	203	2000.0	1.0	0.0
-de	02_wind_on	1	203	1400.0	1.0	0.0
+de	01_solar	1	203	2000.0	0.0	1.0
+de	02_wind_on	1	203	1400.0	0.0	1.0
 de	03_wind_off	1	203	0.0	0.0	0.0
 de	04_res	1	203	0.0	0.0	0.0
 de	05_nuclear	1	203	0.0	0.0	0.0
@@ -1826,8 +1826,8 @@ de	06_coal	1	203	0.0	0.0	0.0
 de	07_gas	1	203	0.0	0.0	0.0
 de	08_non-res	1	203	0.0	0.0	0.0
 de	09_hydro_pump	1	203	0.0	0.0	0.0
-de	01_solar	1	204	2000.0	1.0	0.0
-de	02_wind_on	1	204	1500.0	1.0	0.0
+de	01_solar	1	204	2000.0	0.0	1.0
+de	02_wind_on	1	204	1500.0	0.0	1.0
 de	03_wind_off	1	204	0.0	0.0	0.0
 de	04_res	1	204	0.0	0.0	0.0
 de	05_nuclear	1	204	0.0	0.0	0.0
@@ -1835,8 +1835,8 @@ de	06_coal	1	204	0.0	0.0	0.0
 de	07_gas	1	204	0.0	0.0	0.0
 de	08_non-res	1	204	0.0	0.0	0.0
 de	09_hydro_pump	1	204	0.0	0.0	0.0
-de	01_solar	1	205	2000.0	1.0	0.0
-de	02_wind_on	1	205	1600.0	1.0	0.0
+de	01_solar	1	205	2000.0	0.0	1.0
+de	02_wind_on	1	205	1600.0	0.0	1.0
 de	03_wind_off	1	205	0.0	0.0	0.0
 de	04_res	1	205	0.0	0.0	0.0
 de	05_nuclear	1	205	0.0	0.0	0.0
@@ -1844,8 +1844,8 @@ de	06_coal	1	205	0.0	0.0	0.0
 de	07_gas	1	205	0.0	0.0	0.0
 de	08_non-res	1	205	0.0	0.0	0.0
 de	09_hydro_pump	1	205	0.0	0.0	0.0
-de	01_solar	1	206	2000.0	1.0	0.0
-de	02_wind_on	1	206	1700.0	1.0	0.0
+de	01_solar	1	206	2000.0	0.0	1.0
+de	02_wind_on	1	206	1700.0	0.0	1.0
 de	03_wind_off	1	206	0.0	0.0	0.0
 de	04_res	1	206	0.0	0.0	0.0
 de	05_nuclear	1	206	0.0	0.0	0.0
@@ -1853,8 +1853,8 @@ de	06_coal	1	206	0.0	0.0	0.0
 de	07_gas	1	206	0.0	0.0	0.0
 de	08_non-res	1	206	0.0	0.0	0.0
 de	09_hydro_pump	1	206	0.0	0.0	0.0
-de	01_solar	1	207	2000.0	1.0	0.0
-de	02_wind_on	1	207	1800.0	1.0	0.0
+de	01_solar	1	207	2000.0	0.0	1.0
+de	02_wind_on	1	207	1800.0	0.0	1.0
 de	03_wind_off	1	207	0.0	0.0	0.0
 de	04_res	1	207	0.0	0.0	0.0
 de	05_nuclear	1	207	0.0	0.0	0.0
@@ -1862,8 +1862,8 @@ de	06_coal	1	207	0.0	0.0	0.0
 de	07_gas	1	207	0.0	0.0	0.0
 de	08_non-res	1	207	0.0	0.0	0.0
 de	09_hydro_pump	1	207	0.0	0.0	0.0
-de	01_solar	1	208	2000.0	1.0	0.0
-de	02_wind_on	1	208	1900.0	1.0	0.0
+de	01_solar	1	208	2000.0	0.0	1.0
+de	02_wind_on	1	208	1900.0	0.0	1.0
 de	03_wind_off	1	208	0.0	0.0	0.0
 de	04_res	1	208	0.0	0.0	0.0
 de	05_nuclear	1	208	0.0	0.0	0.0
@@ -1871,8 +1871,8 @@ de	06_coal	1	208	0.0	0.0	0.0
 de	07_gas	1	208	0.0	0.0	0.0
 de	08_non-res	1	208	0.0	0.0	0.0
 de	09_hydro_pump	1	208	0.0	0.0	0.0
-de	01_solar	1	209	2000.0	1.0	0.0
-de	02_wind_on	1	209	2000.0	1.0	0.0
+de	01_solar	1	209	2000.0	0.0	1.0
+de	02_wind_on	1	209	2000.0	0.0	1.0
 de	03_wind_off	1	209	0.0	0.0	0.0
 de	04_res	1	209	0.0	0.0	0.0
 de	05_nuclear	1	209	0.0	0.0	0.0
@@ -1880,1149 +1880,1149 @@ de	06_coal	1	209	0.0	0.0	0.0
 de	07_gas	1	209	0.0	0.0	0.0
 de	08_non-res	1	209	0.0	0.0	0.0
 de	09_hydro_pump	1	209	0.0	0.0	0.0
-de	01_solar	1	210	2000.0	1.0	0.0
-de	02_wind_on	1	210	2000.0	1.0	0.0
-de	03_wind_off	1	210	100.0	1.0	0.0
+de	01_solar	1	210	2000.0	0.0	1.0
+de	02_wind_on	1	210	2000.0	0.0	1.0
+de	03_wind_off	1	210	100.0	0.0	1.0
 de	04_res	1	210	0.0	0.0	0.0
 de	05_nuclear	1	210	0.0	0.0	0.0
 de	06_coal	1	210	0.0	0.0	0.0
 de	07_gas	1	210	0.0	0.0	0.0
 de	08_non-res	1	210	0.0	0.0	0.0
 de	09_hydro_pump	1	210	0.0	0.0	0.0
-de	01_solar	1	211	2000.0	1.0	0.0
-de	02_wind_on	1	211	2000.0	1.0	0.0
-de	03_wind_off	1	211	200.0	1.0	0.0
+de	01_solar	1	211	2000.0	0.0	1.0
+de	02_wind_on	1	211	2000.0	0.0	1.0
+de	03_wind_off	1	211	200.0	0.0	1.0
 de	04_res	1	211	0.0	0.0	0.0
 de	05_nuclear	1	211	0.0	0.0	0.0
 de	06_coal	1	211	0.0	0.0	0.0
 de	07_gas	1	211	0.0	0.0	0.0
 de	08_non-res	1	211	0.0	0.0	0.0
 de	09_hydro_pump	1	211	0.0	0.0	0.0
-de	01_solar	1	212	2000.0	1.0	0.0
-de	02_wind_on	1	212	2000.0	1.0	0.0
-de	03_wind_off	1	212	300.0	1.0	0.0
+de	01_solar	1	212	2000.0	0.0	1.0
+de	02_wind_on	1	212	2000.0	0.0	1.0
+de	03_wind_off	1	212	300.0	0.0	1.0
 de	04_res	1	212	0.0	0.0	0.0
 de	05_nuclear	1	212	0.0	0.0	0.0
 de	06_coal	1	212	0.0	0.0	0.0
 de	07_gas	1	212	0.0	0.0	0.0
 de	08_non-res	1	212	0.0	0.0	0.0
 de	09_hydro_pump	1	212	0.0	0.0	0.0
-de	01_solar	1	213	2000.0	1.0	0.0
-de	02_wind_on	1	213	2000.0	1.0	0.0
-de	03_wind_off	1	213	400.0	1.0	0.0
+de	01_solar	1	213	2000.0	0.0	1.0
+de	02_wind_on	1	213	2000.0	0.0	1.0
+de	03_wind_off	1	213	400.0	0.0	1.0
 de	04_res	1	213	0.0	0.0	0.0
 de	05_nuclear	1	213	0.0	0.0	0.0
 de	06_coal	1	213	0.0	0.0	0.0
 de	07_gas	1	213	0.0	0.0	0.0
 de	08_non-res	1	213	0.0	0.0	0.0
 de	09_hydro_pump	1	213	0.0	0.0	0.0
-de	01_solar	1	214	2000.0	1.0	0.0
-de	02_wind_on	1	214	2000.0	1.0	0.0
-de	03_wind_off	1	214	500.0	1.0	0.0
+de	01_solar	1	214	2000.0	0.0	1.0
+de	02_wind_on	1	214	2000.0	0.0	1.0
+de	03_wind_off	1	214	500.0	0.0	1.0
 de	04_res	1	214	0.0	0.0	0.0
 de	05_nuclear	1	214	0.0	0.0	0.0
 de	06_coal	1	214	0.0	0.0	0.0
 de	07_gas	1	214	0.0	0.0	0.0
 de	08_non-res	1	214	0.0	0.0	0.0
 de	09_hydro_pump	1	214	0.0	0.0	0.0
-de	01_solar	1	215	2000.0	1.0	0.0
-de	02_wind_on	1	215	2000.0	1.0	0.0
-de	03_wind_off	1	215	600.0	1.0	0.0
+de	01_solar	1	215	2000.0	0.0	1.0
+de	02_wind_on	1	215	2000.0	0.0	1.0
+de	03_wind_off	1	215	600.0	0.0	1.0
 de	04_res	1	215	0.0	0.0	0.0
 de	05_nuclear	1	215	0.0	0.0	0.0
 de	06_coal	1	215	0.0	0.0	0.0
 de	07_gas	1	215	0.0	0.0	0.0
 de	08_non-res	1	215	0.0	0.0	0.0
 de	09_hydro_pump	1	215	0.0	0.0	0.0
-de	01_solar	1	216	2000.0	1.0	0.0
-de	02_wind_on	1	216	2000.0	1.0	0.0
-de	03_wind_off	1	216	700.0	1.0	0.0
+de	01_solar	1	216	2000.0	0.0	1.0
+de	02_wind_on	1	216	2000.0	0.0	1.0
+de	03_wind_off	1	216	700.0	0.0	1.0
 de	04_res	1	216	0.0	0.0	0.0
 de	05_nuclear	1	216	0.0	0.0	0.0
 de	06_coal	1	216	0.0	0.0	0.0
 de	07_gas	1	216	0.0	0.0	0.0
 de	08_non-res	1	216	0.0	0.0	0.0
 de	09_hydro_pump	1	216	0.0	0.0	0.0
-de	01_solar	1	217	2000.0	1.0	0.0
-de	02_wind_on	1	217	2000.0	1.0	0.0
-de	03_wind_off	1	217	800.0	1.0	0.0
+de	01_solar	1	217	2000.0	0.0	1.0
+de	02_wind_on	1	217	2000.0	0.0	1.0
+de	03_wind_off	1	217	800.0	0.0	1.0
 de	04_res	1	217	0.0	0.0	0.0
 de	05_nuclear	1	217	0.0	0.0	0.0
 de	06_coal	1	217	0.0	0.0	0.0
 de	07_gas	1	217	0.0	0.0	0.0
 de	08_non-res	1	217	0.0	0.0	0.0
 de	09_hydro_pump	1	217	0.0	0.0	0.0
-de	01_solar	1	218	2000.0	1.0	0.0
-de	02_wind_on	1	218	2000.0	1.0	0.0
-de	03_wind_off	1	218	900.0	1.0	0.0
+de	01_solar	1	218	2000.0	0.0	1.0
+de	02_wind_on	1	218	2000.0	0.0	1.0
+de	03_wind_off	1	218	900.0	0.0	1.0
 de	04_res	1	218	0.0	0.0	0.0
 de	05_nuclear	1	218	0.0	0.0	0.0
 de	06_coal	1	218	0.0	0.0	0.0
 de	07_gas	1	218	0.0	0.0	0.0
 de	08_non-res	1	218	0.0	0.0	0.0
 de	09_hydro_pump	1	218	0.0	0.0	0.0
-de	01_solar	1	219	2000.0	1.0	0.0
-de	02_wind_on	1	219	2000.0	1.0	0.0
-de	03_wind_off	1	219	1000.0	1.0	0.0
+de	01_solar	1	219	2000.0	0.0	1.0
+de	02_wind_on	1	219	2000.0	0.0	1.0
+de	03_wind_off	1	219	1000.0	0.0	1.0
 de	04_res	1	219	0.0	0.0	0.0
 de	05_nuclear	1	219	0.0	0.0	0.0
 de	06_coal	1	219	0.0	0.0	0.0
 de	07_gas	1	219	0.0	0.0	0.0
 de	08_non-res	1	219	0.0	0.0	0.0
 de	09_hydro_pump	1	219	0.0	0.0	0.0
-de	01_solar	1	220	2000.0	1.0	0.0
-de	02_wind_on	1	220	2000.0	1.0	0.0
-de	03_wind_off	1	220	1100.0	1.0	0.0
+de	01_solar	1	220	2000.0	0.0	1.0
+de	02_wind_on	1	220	2000.0	0.0	1.0
+de	03_wind_off	1	220	1100.0	0.0	1.0
 de	04_res	1	220	0.0	0.0	0.0
 de	05_nuclear	1	220	0.0	0.0	0.0
 de	06_coal	1	220	0.0	0.0	0.0
 de	07_gas	1	220	0.0	0.0	0.0
 de	08_non-res	1	220	0.0	0.0	0.0
 de	09_hydro_pump	1	220	0.0	0.0	0.0
-de	01_solar	1	221	2000.0	1.0	0.0
-de	02_wind_on	1	221	2000.0	1.0	0.0
-de	03_wind_off	1	221	1200.0	1.0	0.0
+de	01_solar	1	221	2000.0	0.0	1.0
+de	02_wind_on	1	221	2000.0	0.0	1.0
+de	03_wind_off	1	221	1200.0	0.0	1.0
 de	04_res	1	221	0.0	0.0	0.0
 de	05_nuclear	1	221	0.0	0.0	0.0
 de	06_coal	1	221	0.0	0.0	0.0
 de	07_gas	1	221	0.0	0.0	0.0
 de	08_non-res	1	221	0.0	0.0	0.0
 de	09_hydro_pump	1	221	0.0	0.0	0.0
-de	01_solar	1	222	2000.0	1.0	0.0
-de	02_wind_on	1	222	2000.0	1.0	0.0
-de	03_wind_off	1	222	1300.0	1.0	0.0
+de	01_solar	1	222	2000.0	0.0	1.0
+de	02_wind_on	1	222	2000.0	0.0	1.0
+de	03_wind_off	1	222	1300.0	0.0	1.0
 de	04_res	1	222	0.0	0.0	0.0
 de	05_nuclear	1	222	0.0	0.0	0.0
 de	06_coal	1	222	0.0	0.0	0.0
 de	07_gas	1	222	0.0	0.0	0.0
 de	08_non-res	1	222	0.0	0.0	0.0
 de	09_hydro_pump	1	222	0.0	0.0	0.0
-de	01_solar	1	223	2000.0	1.0	0.0
-de	02_wind_on	1	223	2000.0	1.0	0.0
-de	03_wind_off	1	223	1400.0	1.0	0.0
+de	01_solar	1	223	2000.0	0.0	1.0
+de	02_wind_on	1	223	2000.0	0.0	1.0
+de	03_wind_off	1	223	1400.0	0.0	1.0
 de	04_res	1	223	0.0	0.0	0.0
 de	05_nuclear	1	223	0.0	0.0	0.0
 de	06_coal	1	223	0.0	0.0	0.0
 de	07_gas	1	223	0.0	0.0	0.0
 de	08_non-res	1	223	0.0	0.0	0.0
 de	09_hydro_pump	1	223	0.0	0.0	0.0
-de	01_solar	1	224	2000.0	1.0	0.0
-de	02_wind_on	1	224	2000.0	1.0	0.0
-de	03_wind_off	1	224	1500.0	1.0	0.0
+de	01_solar	1	224	2000.0	0.0	1.0
+de	02_wind_on	1	224	2000.0	0.0	1.0
+de	03_wind_off	1	224	1500.0	0.0	1.0
 de	04_res	1	224	0.0	0.0	0.0
 de	05_nuclear	1	224	0.0	0.0	0.0
 de	06_coal	1	224	0.0	0.0	0.0
 de	07_gas	1	224	0.0	0.0	0.0
 de	08_non-res	1	224	0.0	0.0	0.0
 de	09_hydro_pump	1	224	0.0	0.0	0.0
-de	01_solar	1	225	2000.0	1.0	0.0
-de	02_wind_on	1	225	2000.0	1.0	0.0
-de	03_wind_off	1	225	1600.0	1.0	0.0
+de	01_solar	1	225	2000.0	0.0	1.0
+de	02_wind_on	1	225	2000.0	0.0	1.0
+de	03_wind_off	1	225	1600.0	0.0	1.0
 de	04_res	1	225	0.0	0.0	0.0
 de	05_nuclear	1	225	0.0	0.0	0.0
 de	06_coal	1	225	0.0	0.0	0.0
 de	07_gas	1	225	0.0	0.0	0.0
 de	08_non-res	1	225	0.0	0.0	0.0
 de	09_hydro_pump	1	225	0.0	0.0	0.0
-de	01_solar	1	226	2000.0	1.0	0.0
-de	02_wind_on	1	226	2000.0	1.0	0.0
-de	03_wind_off	1	226	1700.0	1.0	0.0
+de	01_solar	1	226	2000.0	0.0	1.0
+de	02_wind_on	1	226	2000.0	0.0	1.0
+de	03_wind_off	1	226	1700.0	0.0	1.0
 de	04_res	1	226	0.0	0.0	0.0
 de	05_nuclear	1	226	0.0	0.0	0.0
 de	06_coal	1	226	0.0	0.0	0.0
 de	07_gas	1	226	0.0	0.0	0.0
 de	08_non-res	1	226	0.0	0.0	0.0
 de	09_hydro_pump	1	226	0.0	0.0	0.0
-de	01_solar	1	227	2000.0	1.0	0.0
-de	02_wind_on	1	227	2000.0	1.0	0.0
-de	03_wind_off	1	227	1800.0	1.0	0.0
+de	01_solar	1	227	2000.0	0.0	1.0
+de	02_wind_on	1	227	2000.0	0.0	1.0
+de	03_wind_off	1	227	1800.0	0.0	1.0
 de	04_res	1	227	0.0	0.0	0.0
 de	05_nuclear	1	227	0.0	0.0	0.0
 de	06_coal	1	227	0.0	0.0	0.0
 de	07_gas	1	227	0.0	0.0	0.0
 de	08_non-res	1	227	0.0	0.0	0.0
 de	09_hydro_pump	1	227	0.0	0.0	0.0
-de	01_solar	1	228	2000.0	1.0	0.0
-de	02_wind_on	1	228	2000.0	1.0	0.0
-de	03_wind_off	1	228	1900.0	1.0	0.0
+de	01_solar	1	228	2000.0	0.0	1.0
+de	02_wind_on	1	228	2000.0	0.0	1.0
+de	03_wind_off	1	228	1900.0	0.0	1.0
 de	04_res	1	228	0.0	0.0	0.0
 de	05_nuclear	1	228	0.0	0.0	0.0
 de	06_coal	1	228	0.0	0.0	0.0
 de	07_gas	1	228	0.0	0.0	0.0
 de	08_non-res	1	228	0.0	0.0	0.0
 de	09_hydro_pump	1	228	0.0	0.0	0.0
-de	01_solar	1	229	2000.0	1.0	0.0
-de	02_wind_on	1	229	2000.0	1.0	0.0
-de	03_wind_off	1	229	2000.0	1.0	0.0
+de	01_solar	1	229	2000.0	0.0	1.0
+de	02_wind_on	1	229	2000.0	0.0	1.0
+de	03_wind_off	1	229	2000.0	0.0	1.0
 de	04_res	1	229	0.0	0.0	0.0
 de	05_nuclear	1	229	0.0	0.0	0.0
 de	06_coal	1	229	0.0	0.0	0.0
 de	07_gas	1	229	0.0	0.0	0.0
 de	08_non-res	1	229	0.0	0.0	0.0
 de	09_hydro_pump	1	229	0.0	0.0	0.0
-de	01_solar	1	230	2000.0	1.0	0.0
-de	02_wind_on	1	230	2000.0	1.0	0.0
-de	03_wind_off	1	230	2000.0	1.0	0.0
-de	04_res	1	230	100.0	1.0	0.0
+de	01_solar	1	230	2000.0	0.0	1.0
+de	02_wind_on	1	230	2000.0	0.0	1.0
+de	03_wind_off	1	230	2000.0	0.0	1.0
+de	04_res	1	230	100.0	0.0	1.0
 de	05_nuclear	1	230	0.0	0.0	0.0
 de	06_coal	1	230	0.0	0.0	0.0
 de	07_gas	1	230	0.0	0.0	0.0
 de	08_non-res	1	230	0.0	0.0	0.0
 de	09_hydro_pump	1	230	0.0	0.0	0.0
-de	01_solar	1	231	2000.0	1.0	0.0
-de	02_wind_on	1	231	2000.0	1.0	0.0
-de	03_wind_off	1	231	2000.0	1.0	0.0
-de	04_res	1	231	200.0	1.0	0.0
+de	01_solar	1	231	2000.0	0.0	1.0
+de	02_wind_on	1	231	2000.0	0.0	1.0
+de	03_wind_off	1	231	2000.0	0.0	1.0
+de	04_res	1	231	200.0	0.0	1.0
 de	05_nuclear	1	231	0.0	0.0	0.0
 de	06_coal	1	231	0.0	0.0	0.0
 de	07_gas	1	231	0.0	0.0	0.0
 de	08_non-res	1	231	0.0	0.0	0.0
 de	09_hydro_pump	1	231	0.0	0.0	0.0
-de	01_solar	1	232	2000.0	1.0	0.0
-de	02_wind_on	1	232	2000.0	1.0	0.0
-de	03_wind_off	1	232	2000.0	1.0	0.0
-de	04_res	1	232	300.0	1.0	0.0
+de	01_solar	1	232	2000.0	0.0	1.0
+de	02_wind_on	1	232	2000.0	0.0	1.0
+de	03_wind_off	1	232	2000.0	0.0	1.0
+de	04_res	1	232	300.0	0.0	1.0
 de	05_nuclear	1	232	0.0	0.0	0.0
 de	06_coal	1	232	0.0	0.0	0.0
 de	07_gas	1	232	0.0	0.0	0.0
 de	08_non-res	1	232	0.0	0.0	0.0
 de	09_hydro_pump	1	232	0.0	0.0	0.0
-de	01_solar	1	233	2000.0	1.0	0.0
-de	02_wind_on	1	233	2000.0	1.0	0.0
-de	03_wind_off	1	233	2000.0	1.0	0.0
-de	04_res	1	233	400.0	1.0	0.0
+de	01_solar	1	233	2000.0	0.0	1.0
+de	02_wind_on	1	233	2000.0	0.0	1.0
+de	03_wind_off	1	233	2000.0	0.0	1.0
+de	04_res	1	233	400.0	0.0	1.0
 de	05_nuclear	1	233	0.0	0.0	0.0
 de	06_coal	1	233	0.0	0.0	0.0
 de	07_gas	1	233	0.0	0.0	0.0
 de	08_non-res	1	233	0.0	0.0	0.0
 de	09_hydro_pump	1	233	0.0	0.0	0.0
-de	01_solar	1	234	2000.0	1.0	0.0
-de	02_wind_on	1	234	2000.0	1.0	0.0
-de	03_wind_off	1	234	2000.0	1.0	0.0
-de	04_res	1	234	500.0	1.0	0.0
+de	01_solar	1	234	2000.0	0.0	1.0
+de	02_wind_on	1	234	2000.0	0.0	1.0
+de	03_wind_off	1	234	2000.0	0.0	1.0
+de	04_res	1	234	500.0	0.0	1.0
 de	05_nuclear	1	234	0.0	0.0	0.0
 de	06_coal	1	234	0.0	0.0	0.0
 de	07_gas	1	234	0.0	0.0	0.0
 de	08_non-res	1	234	0.0	0.0	0.0
 de	09_hydro_pump	1	234	0.0	0.0	0.0
-de	01_solar	1	235	2000.0	1.0	0.0
-de	02_wind_on	1	235	2000.0	1.0	0.0
-de	03_wind_off	1	235	2000.0	1.0	0.0
-de	04_res	1	235	600.0	1.0	0.0
+de	01_solar	1	235	2000.0	0.0	1.0
+de	02_wind_on	1	235	2000.0	0.0	1.0
+de	03_wind_off	1	235	2000.0	0.0	1.0
+de	04_res	1	235	600.0	0.0	1.0
 de	05_nuclear	1	235	0.0	0.0	0.0
 de	06_coal	1	235	0.0	0.0	0.0
 de	07_gas	1	235	0.0	0.0	0.0
 de	08_non-res	1	235	0.0	0.0	0.0
 de	09_hydro_pump	1	235	0.0	0.0	0.0
-de	01_solar	1	236	2000.0	1.0	0.0
-de	02_wind_on	1	236	2000.0	1.0	0.0
-de	03_wind_off	1	236	2000.0	1.0	0.0
-de	04_res	1	236	700.0	1.0	0.0
+de	01_solar	1	236	2000.0	0.0	1.0
+de	02_wind_on	1	236	2000.0	0.0	1.0
+de	03_wind_off	1	236	2000.0	0.0	1.0
+de	04_res	1	236	700.0	0.0	1.0
 de	05_nuclear	1	236	0.0	0.0	0.0
 de	06_coal	1	236	0.0	0.0	0.0
 de	07_gas	1	236	0.0	0.0	0.0
 de	08_non-res	1	236	0.0	0.0	0.0
 de	09_hydro_pump	1	236	0.0	0.0	0.0
-de	01_solar	1	237	2000.0	1.0	0.0
-de	02_wind_on	1	237	2000.0	1.0	0.0
-de	03_wind_off	1	237	2000.0	1.0	0.0
-de	04_res	1	237	800.0	1.0	0.0
+de	01_solar	1	237	2000.0	0.0	1.0
+de	02_wind_on	1	237	2000.0	0.0	1.0
+de	03_wind_off	1	237	2000.0	0.0	1.0
+de	04_res	1	237	800.0	0.0	1.0
 de	05_nuclear	1	237	0.0	0.0	0.0
 de	06_coal	1	237	0.0	0.0	0.0
 de	07_gas	1	237	0.0	0.0	0.0
 de	08_non-res	1	237	0.0	0.0	0.0
 de	09_hydro_pump	1	237	0.0	0.0	0.0
-de	01_solar	1	238	2000.0	1.0	0.0
-de	02_wind_on	1	238	2000.0	1.0	0.0
-de	03_wind_off	1	238	2000.0	1.0	0.0
-de	04_res	1	238	900.0	1.0	0.0
+de	01_solar	1	238	2000.0	0.0	1.0
+de	02_wind_on	1	238	2000.0	0.0	1.0
+de	03_wind_off	1	238	2000.0	0.0	1.0
+de	04_res	1	238	900.0	0.0	1.0
 de	05_nuclear	1	238	0.0	0.0	0.0
 de	06_coal	1	238	0.0	0.0	0.0
 de	07_gas	1	238	0.0	0.0	0.0
 de	08_non-res	1	238	0.0	0.0	0.0
 de	09_hydro_pump	1	238	0.0	0.0	0.0
-de	01_solar	1	239	2000.0	1.0	0.0
-de	02_wind_on	1	239	2000.0	1.0	0.0
-de	03_wind_off	1	239	2000.0	1.0	0.0
-de	04_res	1	239	1000.0	1.0	0.0
+de	01_solar	1	239	2000.0	0.0	1.0
+de	02_wind_on	1	239	2000.0	0.0	1.0
+de	03_wind_off	1	239	2000.0	0.0	1.0
+de	04_res	1	239	1000.0	0.0	1.0
 de	05_nuclear	1	239	0.0	0.0	0.0
 de	06_coal	1	239	0.0	0.0	0.0
 de	07_gas	1	239	0.0	0.0	0.0
 de	08_non-res	1	239	0.0	0.0	0.0
 de	09_hydro_pump	1	239	0.0	0.0	0.0
-de	01_solar	1	240	2000.0	1.0	0.0
-de	02_wind_on	1	240	2000.0	1.0	0.0
-de	03_wind_off	1	240	2000.0	1.0	0.0
-de	04_res	1	240	1100.0	1.0	0.0
+de	01_solar	1	240	2000.0	0.0	1.0
+de	02_wind_on	1	240	2000.0	0.0	1.0
+de	03_wind_off	1	240	2000.0	0.0	1.0
+de	04_res	1	240	1100.0	0.0	1.0
 de	05_nuclear	1	240	0.0	0.0	0.0
 de	06_coal	1	240	0.0	0.0	0.0
 de	07_gas	1	240	0.0	0.0	0.0
 de	08_non-res	1	240	0.0	0.0	0.0
 de	09_hydro_pump	1	240	0.0	0.0	0.0
-de	01_solar	1	241	2000.0	1.0	0.0
-de	02_wind_on	1	241	2000.0	1.0	0.0
-de	03_wind_off	1	241	2000.0	1.0	0.0
-de	04_res	1	241	1200.0	1.0	0.0
+de	01_solar	1	241	2000.0	0.0	1.0
+de	02_wind_on	1	241	2000.0	0.0	1.0
+de	03_wind_off	1	241	2000.0	0.0	1.0
+de	04_res	1	241	1200.0	0.0	1.0
 de	05_nuclear	1	241	0.0	0.0	0.0
 de	06_coal	1	241	0.0	0.0	0.0
 de	07_gas	1	241	0.0	0.0	0.0
 de	08_non-res	1	241	0.0	0.0	0.0
 de	09_hydro_pump	1	241	0.0	0.0	0.0
-de	01_solar	1	242	2000.0	1.0	0.0
-de	02_wind_on	1	242	2000.0	1.0	0.0
-de	03_wind_off	1	242	2000.0	1.0	0.0
-de	04_res	1	242	1300.0	1.0	0.0
+de	01_solar	1	242	2000.0	0.0	1.0
+de	02_wind_on	1	242	2000.0	0.0	1.0
+de	03_wind_off	1	242	2000.0	0.0	1.0
+de	04_res	1	242	1300.0	0.0	1.0
 de	05_nuclear	1	242	0.0	0.0	0.0
 de	06_coal	1	242	0.0	0.0	0.0
 de	07_gas	1	242	0.0	0.0	0.0
 de	08_non-res	1	242	0.0	0.0	0.0
 de	09_hydro_pump	1	242	0.0	0.0	0.0
-de	01_solar	1	243	2000.0	1.0	0.0
-de	02_wind_on	1	243	2000.0	1.0	0.0
-de	03_wind_off	1	243	2000.0	1.0	0.0
-de	04_res	1	243	1400.0	1.0	0.0
+de	01_solar	1	243	2000.0	0.0	1.0
+de	02_wind_on	1	243	2000.0	0.0	1.0
+de	03_wind_off	1	243	2000.0	0.0	1.0
+de	04_res	1	243	1400.0	0.0	1.0
 de	05_nuclear	1	243	0.0	0.0	0.0
 de	06_coal	1	243	0.0	0.0	0.0
 de	07_gas	1	243	0.0	0.0	0.0
 de	08_non-res	1	243	0.0	0.0	0.0
 de	09_hydro_pump	1	243	0.0	0.0	0.0
-de	01_solar	1	244	2000.0	1.0	0.0
-de	02_wind_on	1	244	2000.0	1.0	0.0
-de	03_wind_off	1	244	2000.0	1.0	0.0
-de	04_res	1	244	1500.0	1.0	0.0
+de	01_solar	1	244	2000.0	0.0	1.0
+de	02_wind_on	1	244	2000.0	0.0	1.0
+de	03_wind_off	1	244	2000.0	0.0	1.0
+de	04_res	1	244	1500.0	0.0	1.0
 de	05_nuclear	1	244	0.0	0.0	0.0
 de	06_coal	1	244	0.0	0.0	0.0
 de	07_gas	1	244	0.0	0.0	0.0
 de	08_non-res	1	244	0.0	0.0	0.0
 de	09_hydro_pump	1	244	0.0	0.0	0.0
-de	01_solar	1	245	2000.0	1.0	0.0
-de	02_wind_on	1	245	2000.0	1.0	0.0
-de	03_wind_off	1	245	2000.0	1.0	0.0
-de	04_res	1	245	1600.0	1.0	0.0
+de	01_solar	1	245	2000.0	0.0	1.0
+de	02_wind_on	1	245	2000.0	0.0	1.0
+de	03_wind_off	1	245	2000.0	0.0	1.0
+de	04_res	1	245	1600.0	0.0	1.0
 de	05_nuclear	1	245	0.0	0.0	0.0
 de	06_coal	1	245	0.0	0.0	0.0
 de	07_gas	1	245	0.0	0.0	0.0
 de	08_non-res	1	245	0.0	0.0	0.0
 de	09_hydro_pump	1	245	0.0	0.0	0.0
-de	01_solar	1	246	2000.0	1.0	0.0
-de	02_wind_on	1	246	2000.0	1.0	0.0
-de	03_wind_off	1	246	2000.0	1.0	0.0
-de	04_res	1	246	1700.0	1.0	0.0
+de	01_solar	1	246	2000.0	0.0	1.0
+de	02_wind_on	1	246	2000.0	0.0	1.0
+de	03_wind_off	1	246	2000.0	0.0	1.0
+de	04_res	1	246	1700.0	0.0	1.0
 de	05_nuclear	1	246	0.0	0.0	0.0
 de	06_coal	1	246	0.0	0.0	0.0
 de	07_gas	1	246	0.0	0.0	0.0
 de	08_non-res	1	246	0.0	0.0	0.0
 de	09_hydro_pump	1	246	0.0	0.0	0.0
-de	01_solar	1	247	2000.0	1.0	0.0
-de	02_wind_on	1	247	2000.0	1.0	0.0
-de	03_wind_off	1	247	2000.0	1.0	0.0
-de	04_res	1	247	1800.0	1.0	0.0
+de	01_solar	1	247	2000.0	0.0	1.0
+de	02_wind_on	1	247	2000.0	0.0	1.0
+de	03_wind_off	1	247	2000.0	0.0	1.0
+de	04_res	1	247	1800.0	0.0	1.0
 de	05_nuclear	1	247	0.0	0.0	0.0
 de	06_coal	1	247	0.0	0.0	0.0
 de	07_gas	1	247	0.0	0.0	0.0
 de	08_non-res	1	247	0.0	0.0	0.0
 de	09_hydro_pump	1	247	0.0	0.0	0.0
-de	01_solar	1	248	2000.0	1.0	0.0
-de	02_wind_on	1	248	2000.0	1.0	0.0
-de	03_wind_off	1	248	2000.0	1.0	0.0
-de	04_res	1	248	1900.0	1.0	0.0
+de	01_solar	1	248	2000.0	0.0	1.0
+de	02_wind_on	1	248	2000.0	0.0	1.0
+de	03_wind_off	1	248	2000.0	0.0	1.0
+de	04_res	1	248	1900.0	0.0	1.0
 de	05_nuclear	1	248	0.0	0.0	0.0
 de	06_coal	1	248	0.0	0.0	0.0
 de	07_gas	1	248	0.0	0.0	0.0
 de	08_non-res	1	248	0.0	0.0	0.0
 de	09_hydro_pump	1	248	0.0	0.0	0.0
-de	01_solar	1	249	2000.0	1.0	0.0
-de	02_wind_on	1	249	2000.0	1.0	0.0
-de	03_wind_off	1	249	2000.0	1.0	0.0
-de	04_res	1	249	2000.0	1.0	0.0
+de	01_solar	1	249	2000.0	0.0	1.0
+de	02_wind_on	1	249	2000.0	0.0	1.0
+de	03_wind_off	1	249	2000.0	0.0	1.0
+de	04_res	1	249	2000.0	0.0	1.0
 de	05_nuclear	1	249	0.0	0.0	0.0
 de	06_coal	1	249	0.0	0.0	0.0
 de	07_gas	1	249	0.0	0.0	0.0
 de	08_non-res	1	249	0.0	0.0	0.0
 de	09_hydro_pump	1	249	0.0	0.0	0.0
-de	01_solar	1	250	2000.0	1.0	0.0
-de	02_wind_on	1	250	2000.0	1.0	0.0
-de	03_wind_off	1	250	2000.0	1.0	0.0
-de	04_res	1	250	2000.0	1.0	0.0
-de	05_nuclear	1	250	100.0	1.0	0.0
+de	01_solar	1	250	2000.0	0.0	1.0
+de	02_wind_on	1	250	2000.0	0.0	1.0
+de	03_wind_off	1	250	2000.0	0.0	1.0
+de	04_res	1	250	2000.0	0.0	1.0
+de	05_nuclear	1	250	100.0	0.0	1.0
 de	06_coal	1	250	0.0	0.0	0.0
 de	07_gas	1	250	0.0	0.0	0.0
 de	08_non-res	1	250	0.0	0.0	0.0
 de	09_hydro_pump	1	250	0.0	0.0	0.0
-de	01_solar	1	251	2000.0	1.0	0.0
-de	02_wind_on	1	251	2000.0	1.0	0.0
-de	03_wind_off	1	251	2000.0	1.0	0.0
-de	04_res	1	251	2000.0	1.0	0.0
-de	05_nuclear	1	251	200.0	1.0	0.0
+de	01_solar	1	251	2000.0	0.0	1.0
+de	02_wind_on	1	251	2000.0	0.0	1.0
+de	03_wind_off	1	251	2000.0	0.0	1.0
+de	04_res	1	251	2000.0	0.0	1.0
+de	05_nuclear	1	251	200.0	0.0	1.0
 de	06_coal	1	251	0.0	0.0	0.0
 de	07_gas	1	251	0.0	0.0	0.0
 de	08_non-res	1	251	0.0	0.0	0.0
 de	09_hydro_pump	1	251	0.0	0.0	0.0
-de	01_solar	1	252	2000.0	1.0	0.0
-de	02_wind_on	1	252	2000.0	1.0	0.0
-de	03_wind_off	1	252	2000.0	1.0	0.0
-de	04_res	1	252	2000.0	1.0	0.0
-de	05_nuclear	1	252	300.0	1.0	0.0
+de	01_solar	1	252	2000.0	0.0	1.0
+de	02_wind_on	1	252	2000.0	0.0	1.0
+de	03_wind_off	1	252	2000.0	0.0	1.0
+de	04_res	1	252	2000.0	0.0	1.0
+de	05_nuclear	1	252	300.0	0.0	1.0
 de	06_coal	1	252	0.0	0.0	0.0
 de	07_gas	1	252	0.0	0.0	0.0
 de	08_non-res	1	252	0.0	0.0	0.0
 de	09_hydro_pump	1	252	0.0	0.0	0.0
-de	01_solar	1	253	2000.0	1.0	0.0
-de	02_wind_on	1	253	2000.0	1.0	0.0
-de	03_wind_off	1	253	2000.0	1.0	0.0
-de	04_res	1	253	2000.0	1.0	0.0
-de	05_nuclear	1	253	400.0	1.0	0.0
+de	01_solar	1	253	2000.0	0.0	1.0
+de	02_wind_on	1	253	2000.0	0.0	1.0
+de	03_wind_off	1	253	2000.0	0.0	1.0
+de	04_res	1	253	2000.0	0.0	1.0
+de	05_nuclear	1	253	400.0	0.0	1.0
 de	06_coal	1	253	0.0	0.0	0.0
 de	07_gas	1	253	0.0	0.0	0.0
 de	08_non-res	1	253	0.0	0.0	0.0
 de	09_hydro_pump	1	253	0.0	0.0	0.0
-de	01_solar	1	254	2000.0	1.0	0.0
-de	02_wind_on	1	254	2000.0	1.0	0.0
-de	03_wind_off	1	254	2000.0	1.0	0.0
-de	04_res	1	254	2000.0	1.0	0.0
-de	05_nuclear	1	254	500.0	1.0	0.0
+de	01_solar	1	254	2000.0	0.0	1.0
+de	02_wind_on	1	254	2000.0	0.0	1.0
+de	03_wind_off	1	254	2000.0	0.0	1.0
+de	04_res	1	254	2000.0	0.0	1.0
+de	05_nuclear	1	254	500.0	0.0	1.0
 de	06_coal	1	254	0.0	0.0	0.0
 de	07_gas	1	254	0.0	0.0	0.0
 de	08_non-res	1	254	0.0	0.0	0.0
 de	09_hydro_pump	1	254	0.0	0.0	0.0
-de	01_solar	1	255	2000.0	1.0	0.0
-de	02_wind_on	1	255	2000.0	1.0	0.0
-de	03_wind_off	1	255	2000.0	1.0	0.0
-de	04_res	1	255	2000.0	1.0	0.0
-de	05_nuclear	1	255	600.0	1.0	0.0
+de	01_solar	1	255	2000.0	0.0	1.0
+de	02_wind_on	1	255	2000.0	0.0	1.0
+de	03_wind_off	1	255	2000.0	0.0	1.0
+de	04_res	1	255	2000.0	0.0	1.0
+de	05_nuclear	1	255	600.0	0.0	1.0
 de	06_coal	1	255	0.0	0.0	0.0
 de	07_gas	1	255	0.0	0.0	0.0
 de	08_non-res	1	255	0.0	0.0	0.0
 de	09_hydro_pump	1	255	0.0	0.0	0.0
-de	01_solar	1	256	2000.0	1.0	0.0
-de	02_wind_on	1	256	2000.0	1.0	0.0
-de	03_wind_off	1	256	2000.0	1.0	0.0
-de	04_res	1	256	2000.0	1.0	0.0
-de	05_nuclear	1	256	700.0	1.0	0.0
+de	01_solar	1	256	2000.0	0.0	1.0
+de	02_wind_on	1	256	2000.0	0.0	1.0
+de	03_wind_off	1	256	2000.0	0.0	1.0
+de	04_res	1	256	2000.0	0.0	1.0
+de	05_nuclear	1	256	700.0	0.0	1.0
 de	06_coal	1	256	0.0	0.0	0.0
 de	07_gas	1	256	0.0	0.0	0.0
 de	08_non-res	1	256	0.0	0.0	0.0
 de	09_hydro_pump	1	256	0.0	0.0	0.0
-de	01_solar	1	257	2000.0	1.0	0.0
-de	02_wind_on	1	257	2000.0	1.0	0.0
-de	03_wind_off	1	257	2000.0	1.0	0.0
-de	04_res	1	257	2000.0	1.0	0.0
-de	05_nuclear	1	257	800.0	1.0	0.0
+de	01_solar	1	257	2000.0	0.0	1.0
+de	02_wind_on	1	257	2000.0	0.0	1.0
+de	03_wind_off	1	257	2000.0	0.0	1.0
+de	04_res	1	257	2000.0	0.0	1.0
+de	05_nuclear	1	257	800.0	0.0	1.0
 de	06_coal	1	257	0.0	0.0	0.0
 de	07_gas	1	257	0.0	0.0	0.0
 de	08_non-res	1	257	0.0	0.0	0.0
 de	09_hydro_pump	1	257	0.0	0.0	0.0
-de	01_solar	1	258	2000.0	1.0	0.0
-de	02_wind_on	1	258	2000.0	1.0	0.0
-de	03_wind_off	1	258	2000.0	1.0	0.0
-de	04_res	1	258	2000.0	1.0	0.0
-de	05_nuclear	1	258	900.0	1.0	0.0
+de	01_solar	1	258	2000.0	0.0	1.0
+de	02_wind_on	1	258	2000.0	0.0	1.0
+de	03_wind_off	1	258	2000.0	0.0	1.0
+de	04_res	1	258	2000.0	0.0	1.0
+de	05_nuclear	1	258	900.0	0.0	1.0
 de	06_coal	1	258	0.0	0.0	0.0
 de	07_gas	1	258	0.0	0.0	0.0
 de	08_non-res	1	258	0.0	0.0	0.0
 de	09_hydro_pump	1	258	0.0	0.0	0.0
-de	01_solar	1	259	2000.0	1.0	0.0
-de	02_wind_on	1	259	2000.0	1.0	0.0
-de	03_wind_off	1	259	2000.0	1.0	0.0
-de	04_res	1	259	2000.0	1.0	0.0
-de	05_nuclear	1	259	1000.0	1.0	0.0
+de	01_solar	1	259	2000.0	0.0	1.0
+de	02_wind_on	1	259	2000.0	0.0	1.0
+de	03_wind_off	1	259	2000.0	0.0	1.0
+de	04_res	1	259	2000.0	0.0	1.0
+de	05_nuclear	1	259	1000.0	0.0	1.0
 de	06_coal	1	259	0.0	0.0	0.0
 de	07_gas	1	259	0.0	0.0	0.0
 de	08_non-res	1	259	0.0	0.0	0.0
 de	09_hydro_pump	1	259	0.0	0.0	0.0
-de	01_solar	1	260	2000.0	1.0	0.0
-de	02_wind_on	1	260	2000.0	1.0	0.0
-de	03_wind_off	1	260	2000.0	1.0	0.0
-de	04_res	1	260	2000.0	1.0	0.0
-de	05_nuclear	1	260	1100.0	1.0	0.0
+de	01_solar	1	260	2000.0	0.0	1.0
+de	02_wind_on	1	260	2000.0	0.0	1.0
+de	03_wind_off	1	260	2000.0	0.0	1.0
+de	04_res	1	260	2000.0	0.0	1.0
+de	05_nuclear	1	260	1100.0	0.0	1.0
 de	06_coal	1	260	0.0	0.0	0.0
 de	07_gas	1	260	0.0	0.0	0.0
 de	08_non-res	1	260	0.0	0.0	0.0
 de	09_hydro_pump	1	260	0.0	0.0	0.0
-de	01_solar	1	261	2000.0	1.0	0.0
-de	02_wind_on	1	261	2000.0	1.0	0.0
-de	03_wind_off	1	261	2000.0	1.0	0.0
-de	04_res	1	261	2000.0	1.0	0.0
-de	05_nuclear	1	261	1200.0	1.0	0.0
+de	01_solar	1	261	2000.0	0.0	1.0
+de	02_wind_on	1	261	2000.0	0.0	1.0
+de	03_wind_off	1	261	2000.0	0.0	1.0
+de	04_res	1	261	2000.0	0.0	1.0
+de	05_nuclear	1	261	1200.0	0.0	1.0
 de	06_coal	1	261	0.0	0.0	0.0
 de	07_gas	1	261	0.0	0.0	0.0
 de	08_non-res	1	261	0.0	0.0	0.0
 de	09_hydro_pump	1	261	0.0	0.0	0.0
-de	01_solar	1	262	2000.0	1.0	0.0
-de	02_wind_on	1	262	2000.0	1.0	0.0
-de	03_wind_off	1	262	2000.0	1.0	0.0
-de	04_res	1	262	2000.0	1.0	0.0
-de	05_nuclear	1	262	1300.0	1.0	0.0
+de	01_solar	1	262	2000.0	0.0	1.0
+de	02_wind_on	1	262	2000.0	0.0	1.0
+de	03_wind_off	1	262	2000.0	0.0	1.0
+de	04_res	1	262	2000.0	0.0	1.0
+de	05_nuclear	1	262	1300.0	0.0	1.0
 de	06_coal	1	262	0.0	0.0	0.0
 de	07_gas	1	262	0.0	0.0	0.0
 de	08_non-res	1	262	0.0	0.0	0.0
 de	09_hydro_pump	1	262	0.0	0.0	0.0
-de	01_solar	1	263	2000.0	1.0	0.0
-de	02_wind_on	1	263	2000.0	1.0	0.0
-de	03_wind_off	1	263	2000.0	1.0	0.0
-de	04_res	1	263	2000.0	1.0	0.0
-de	05_nuclear	1	263	1400.0	1.0	0.0
+de	01_solar	1	263	2000.0	0.0	1.0
+de	02_wind_on	1	263	2000.0	0.0	1.0
+de	03_wind_off	1	263	2000.0	0.0	1.0
+de	04_res	1	263	2000.0	0.0	1.0
+de	05_nuclear	1	263	1400.0	0.0	1.0
 de	06_coal	1	263	0.0	0.0	0.0
 de	07_gas	1	263	0.0	0.0	0.0
 de	08_non-res	1	263	0.0	0.0	0.0
 de	09_hydro_pump	1	263	0.0	0.0	0.0
-de	01_solar	1	264	2000.0	1.0	0.0
-de	02_wind_on	1	264	2000.0	1.0	0.0
-de	03_wind_off	1	264	2000.0	1.0	0.0
-de	04_res	1	264	2000.0	1.0	0.0
-de	05_nuclear	1	264	1500.0	1.0	0.0
+de	01_solar	1	264	2000.0	0.0	1.0
+de	02_wind_on	1	264	2000.0	0.0	1.0
+de	03_wind_off	1	264	2000.0	0.0	1.0
+de	04_res	1	264	2000.0	0.0	1.0
+de	05_nuclear	1	264	1500.0	0.0	1.0
 de	06_coal	1	264	0.0	0.0	0.0
 de	07_gas	1	264	0.0	0.0	0.0
 de	08_non-res	1	264	0.0	0.0	0.0
 de	09_hydro_pump	1	264	0.0	0.0	0.0
-de	01_solar	1	265	2000.0	1.0	0.0
-de	02_wind_on	1	265	2000.0	1.0	0.0
-de	03_wind_off	1	265	2000.0	1.0	0.0
-de	04_res	1	265	2000.0	1.0	0.0
-de	05_nuclear	1	265	1600.0	1.0	0.0
+de	01_solar	1	265	2000.0	0.0	1.0
+de	02_wind_on	1	265	2000.0	0.0	1.0
+de	03_wind_off	1	265	2000.0	0.0	1.0
+de	04_res	1	265	2000.0	0.0	1.0
+de	05_nuclear	1	265	1600.0	0.0	1.0
 de	06_coal	1	265	0.0	0.0	0.0
 de	07_gas	1	265	0.0	0.0	0.0
 de	08_non-res	1	265	0.0	0.0	0.0
 de	09_hydro_pump	1	265	0.0	0.0	0.0
-de	01_solar	1	266	2000.0	1.0	0.0
-de	02_wind_on	1	266	2000.0	1.0	0.0
-de	03_wind_off	1	266	2000.0	1.0	0.0
-de	04_res	1	266	2000.0	1.0	0.0
-de	05_nuclear	1	266	1700.0	1.0	0.0
+de	01_solar	1	266	2000.0	0.0	1.0
+de	02_wind_on	1	266	2000.0	0.0	1.0
+de	03_wind_off	1	266	2000.0	0.0	1.0
+de	04_res	1	266	2000.0	0.0	1.0
+de	05_nuclear	1	266	1700.0	0.0	1.0
 de	06_coal	1	266	0.0	0.0	0.0
 de	07_gas	1	266	0.0	0.0	0.0
 de	08_non-res	1	266	0.0	0.0	0.0
 de	09_hydro_pump	1	266	0.0	0.0	0.0
-de	01_solar	1	267	2000.0	1.0	0.0
-de	02_wind_on	1	267	2000.0	1.0	0.0
-de	03_wind_off	1	267	2000.0	1.0	0.0
-de	04_res	1	267	2000.0	1.0	0.0
-de	05_nuclear	1	267	1800.0	1.0	0.0
+de	01_solar	1	267	2000.0	0.0	1.0
+de	02_wind_on	1	267	2000.0	0.0	1.0
+de	03_wind_off	1	267	2000.0	0.0	1.0
+de	04_res	1	267	2000.0	0.0	1.0
+de	05_nuclear	1	267	1800.0	0.0	1.0
 de	06_coal	1	267	0.0	0.0	0.0
 de	07_gas	1	267	0.0	0.0	0.0
 de	08_non-res	1	267	0.0	0.0	0.0
 de	09_hydro_pump	1	267	0.0	0.0	0.0
-de	01_solar	1	268	2000.0	1.0	0.0
-de	02_wind_on	1	268	2000.0	1.0	0.0
-de	03_wind_off	1	268	2000.0	1.0	0.0
-de	04_res	1	268	2000.0	1.0	0.0
-de	05_nuclear	1	268	1900.0	1.0	0.0
+de	01_solar	1	268	2000.0	0.0	1.0
+de	02_wind_on	1	268	2000.0	0.0	1.0
+de	03_wind_off	1	268	2000.0	0.0	1.0
+de	04_res	1	268	2000.0	0.0	1.0
+de	05_nuclear	1	268	1900.0	0.0	1.0
 de	06_coal	1	268	0.0	0.0	0.0
 de	07_gas	1	268	0.0	0.0	0.0
 de	08_non-res	1	268	0.0	0.0	0.0
 de	09_hydro_pump	1	268	0.0	0.0	0.0
-de	01_solar	1	269	2000.0	1.0	0.0
-de	02_wind_on	1	269	2000.0	1.0	0.0
-de	03_wind_off	1	269	2000.0	1.0	0.0
-de	04_res	1	269	2000.0	1.0	0.0
-de	05_nuclear	1	269	2000.0	1.0	0.0
+de	01_solar	1	269	2000.0	0.0	1.0
+de	02_wind_on	1	269	2000.0	0.0	1.0
+de	03_wind_off	1	269	2000.0	0.0	1.0
+de	04_res	1	269	2000.0	0.0	1.0
+de	05_nuclear	1	269	2000.0	0.0	1.0
 de	06_coal	1	269	0.0	0.0	0.0
 de	07_gas	1	269	0.0	0.0	0.0
 de	08_non-res	1	269	0.0	0.0	0.0
 de	09_hydro_pump	1	269	0.0	0.0	0.0
-de	01_solar	1	270	2000.0	1.0	0.0
-de	02_wind_on	1	270	2000.0	1.0	0.0
-de	03_wind_off	1	270	2000.0	1.0	0.0
-de	04_res	1	270	2000.0	1.0	0.0
-de	05_nuclear	1	270	2000.0	1.0	0.0
-de	06_coal	1	270	100.0	1.0	0.0
+de	01_solar	1	270	2000.0	0.0	1.0
+de	02_wind_on	1	270	2000.0	0.0	1.0
+de	03_wind_off	1	270	2000.0	0.0	1.0
+de	04_res	1	270	2000.0	0.0	1.0
+de	05_nuclear	1	270	2000.0	0.0	1.0
+de	06_coal	1	270	100.0	0.0	1.0
 de	07_gas	1	270	0.0	0.0	0.0
 de	08_non-res	1	270	0.0	0.0	0.0
 de	09_hydro_pump	1	270	0.0	0.0	0.0
-de	01_solar	1	271	2000.0	1.0	0.0
-de	02_wind_on	1	271	2000.0	1.0	0.0
-de	03_wind_off	1	271	2000.0	1.0	0.0
-de	04_res	1	271	2000.0	1.0	0.0
-de	05_nuclear	1	271	2000.0	1.0	0.0
-de	06_coal	1	271	200.0	1.0	0.0
+de	01_solar	1	271	2000.0	0.0	1.0
+de	02_wind_on	1	271	2000.0	0.0	1.0
+de	03_wind_off	1	271	2000.0	0.0	1.0
+de	04_res	1	271	2000.0	0.0	1.0
+de	05_nuclear	1	271	2000.0	0.0	1.0
+de	06_coal	1	271	200.0	0.0	1.0
 de	07_gas	1	271	0.0	0.0	0.0
 de	08_non-res	1	271	0.0	0.0	0.0
 de	09_hydro_pump	1	271	0.0	0.0	0.0
-de	01_solar	1	272	2000.0	1.0	0.0
-de	02_wind_on	1	272	2000.0	1.0	0.0
-de	03_wind_off	1	272	2000.0	1.0	0.0
-de	04_res	1	272	2000.0	1.0	0.0
-de	05_nuclear	1	272	2000.0	1.0	0.0
-de	06_coal	1	272	300.0	1.0	0.0
+de	01_solar	1	272	2000.0	0.0	1.0
+de	02_wind_on	1	272	2000.0	0.0	1.0
+de	03_wind_off	1	272	2000.0	0.0	1.0
+de	04_res	1	272	2000.0	0.0	1.0
+de	05_nuclear	1	272	2000.0	0.0	1.0
+de	06_coal	1	272	300.0	0.0	1.0
 de	07_gas	1	272	0.0	0.0	0.0
 de	08_non-res	1	272	0.0	0.0	0.0
 de	09_hydro_pump	1	272	0.0	0.0	0.0
-de	01_solar	1	273	2000.0	1.0	0.0
-de	02_wind_on	1	273	2000.0	1.0	0.0
-de	03_wind_off	1	273	2000.0	1.0	0.0
-de	04_res	1	273	2000.0	1.0	0.0
-de	05_nuclear	1	273	2000.0	1.0	0.0
-de	06_coal	1	273	400.0	1.0	0.0
+de	01_solar	1	273	2000.0	0.0	1.0
+de	02_wind_on	1	273	2000.0	0.0	1.0
+de	03_wind_off	1	273	2000.0	0.0	1.0
+de	04_res	1	273	2000.0	0.0	1.0
+de	05_nuclear	1	273	2000.0	0.0	1.0
+de	06_coal	1	273	400.0	0.0	1.0
 de	07_gas	1	273	0.0	0.0	0.0
 de	08_non-res	1	273	0.0	0.0	0.0
 de	09_hydro_pump	1	273	0.0	0.0	0.0
-de	01_solar	1	274	2000.0	1.0	0.0
-de	02_wind_on	1	274	2000.0	1.0	0.0
-de	03_wind_off	1	274	2000.0	1.0	0.0
-de	04_res	1	274	2000.0	1.0	0.0
-de	05_nuclear	1	274	2000.0	1.0	0.0
-de	06_coal	1	274	500.0	1.0	0.0
+de	01_solar	1	274	2000.0	0.0	1.0
+de	02_wind_on	1	274	2000.0	0.0	1.0
+de	03_wind_off	1	274	2000.0	0.0	1.0
+de	04_res	1	274	2000.0	0.0	1.0
+de	05_nuclear	1	274	2000.0	0.0	1.0
+de	06_coal	1	274	500.0	0.0	1.0
 de	07_gas	1	274	0.0	0.0	0.0
 de	08_non-res	1	274	0.0	0.0	0.0
 de	09_hydro_pump	1	274	0.0	0.0	0.0
-de	01_solar	1	275	2000.0	1.0	0.0
-de	02_wind_on	1	275	2000.0	1.0	0.0
-de	03_wind_off	1	275	2000.0	1.0	0.0
-de	04_res	1	275	2000.0	1.0	0.0
-de	05_nuclear	1	275	2000.0	1.0	0.0
-de	06_coal	1	275	600.0	1.0	0.0
+de	01_solar	1	275	2000.0	0.0	1.0
+de	02_wind_on	1	275	2000.0	0.0	1.0
+de	03_wind_off	1	275	2000.0	0.0	1.0
+de	04_res	1	275	2000.0	0.0	1.0
+de	05_nuclear	1	275	2000.0	0.0	1.0
+de	06_coal	1	275	600.0	0.0	1.0
 de	07_gas	1	275	0.0	0.0	0.0
 de	08_non-res	1	275	0.0	0.0	0.0
 de	09_hydro_pump	1	275	0.0	0.0	0.0
-de	01_solar	1	276	2000.0	1.0	0.0
-de	02_wind_on	1	276	2000.0	1.0	0.0
-de	03_wind_off	1	276	2000.0	1.0	0.0
-de	04_res	1	276	2000.0	1.0	0.0
-de	05_nuclear	1	276	2000.0	1.0	0.0
-de	06_coal	1	276	700.0	1.0	0.0
+de	01_solar	1	276	2000.0	0.0	1.0
+de	02_wind_on	1	276	2000.0	0.0	1.0
+de	03_wind_off	1	276	2000.0	0.0	1.0
+de	04_res	1	276	2000.0	0.0	1.0
+de	05_nuclear	1	276	2000.0	0.0	1.0
+de	06_coal	1	276	700.0	0.0	1.0
 de	07_gas	1	276	0.0	0.0	0.0
 de	08_non-res	1	276	0.0	0.0	0.0
 de	09_hydro_pump	1	276	0.0	0.0	0.0
-de	01_solar	1	277	2000.0	1.0	0.0
-de	02_wind_on	1	277	2000.0	1.0	0.0
-de	03_wind_off	1	277	2000.0	1.0	0.0
-de	04_res	1	277	2000.0	1.0	0.0
-de	05_nuclear	1	277	2000.0	1.0	0.0
-de	06_coal	1	277	800.0	1.0	0.0
+de	01_solar	1	277	2000.0	0.0	1.0
+de	02_wind_on	1	277	2000.0	0.0	1.0
+de	03_wind_off	1	277	2000.0	0.0	1.0
+de	04_res	1	277	2000.0	0.0	1.0
+de	05_nuclear	1	277	2000.0	0.0	1.0
+de	06_coal	1	277	800.0	0.0	1.0
 de	07_gas	1	277	0.0	0.0	0.0
 de	08_non-res	1	277	0.0	0.0	0.0
 de	09_hydro_pump	1	277	0.0	0.0	0.0
-de	01_solar	1	278	2000.0	1.0	0.0
-de	02_wind_on	1	278	2000.0	1.0	0.0
-de	03_wind_off	1	278	2000.0	1.0	0.0
-de	04_res	1	278	2000.0	1.0	0.0
-de	05_nuclear	1	278	2000.0	1.0	0.0
-de	06_coal	1	278	900.0	1.0	0.0
+de	01_solar	1	278	2000.0	0.0	1.0
+de	02_wind_on	1	278	2000.0	0.0	1.0
+de	03_wind_off	1	278	2000.0	0.0	1.0
+de	04_res	1	278	2000.0	0.0	1.0
+de	05_nuclear	1	278	2000.0	0.0	1.0
+de	06_coal	1	278	900.0	0.0	1.0
 de	07_gas	1	278	0.0	0.0	0.0
 de	08_non-res	1	278	0.0	0.0	0.0
 de	09_hydro_pump	1	278	0.0	0.0	0.0
-de	01_solar	1	279	2000.0	1.0	0.0
-de	02_wind_on	1	279	2000.0	1.0	0.0
-de	03_wind_off	1	279	2000.0	1.0	0.0
-de	04_res	1	279	2000.0	1.0	0.0
-de	05_nuclear	1	279	2000.0	1.0	0.0
-de	06_coal	1	279	1000.0	1.0	0.0
+de	01_solar	1	279	2000.0	0.0	1.0
+de	02_wind_on	1	279	2000.0	0.0	1.0
+de	03_wind_off	1	279	2000.0	0.0	1.0
+de	04_res	1	279	2000.0	0.0	1.0
+de	05_nuclear	1	279	2000.0	0.0	1.0
+de	06_coal	1	279	1000.0	0.0	1.0
 de	07_gas	1	279	0.0	0.0	0.0
 de	08_non-res	1	279	0.0	0.0	0.0
 de	09_hydro_pump	1	279	0.0	0.0	0.0
-de	01_solar	1	280	2000.0	1.0	0.0
-de	02_wind_on	1	280	2000.0	1.0	0.0
-de	03_wind_off	1	280	2000.0	1.0	0.0
-de	04_res	1	280	2000.0	1.0	0.0
-de	05_nuclear	1	280	2000.0	1.0	0.0
-de	06_coal	1	280	1100.0	1.0	0.0
+de	01_solar	1	280	2000.0	0.0	1.0
+de	02_wind_on	1	280	2000.0	0.0	1.0
+de	03_wind_off	1	280	2000.0	0.0	1.0
+de	04_res	1	280	2000.0	0.0	1.0
+de	05_nuclear	1	280	2000.0	0.0	1.0
+de	06_coal	1	280	1100.0	0.0	1.0
 de	07_gas	1	280	0.0	0.0	0.0
 de	08_non-res	1	280	0.0	0.0	0.0
 de	09_hydro_pump	1	280	0.0	0.0	0.0
-de	01_solar	1	281	2000.0	1.0	0.0
-de	02_wind_on	1	281	2000.0	1.0	0.0
-de	03_wind_off	1	281	2000.0	1.0	0.0
-de	04_res	1	281	2000.0	1.0	0.0
-de	05_nuclear	1	281	2000.0	1.0	0.0
-de	06_coal	1	281	1200.0	1.0	0.0
+de	01_solar	1	281	2000.0	0.0	1.0
+de	02_wind_on	1	281	2000.0	0.0	1.0
+de	03_wind_off	1	281	2000.0	0.0	1.0
+de	04_res	1	281	2000.0	0.0	1.0
+de	05_nuclear	1	281	2000.0	0.0	1.0
+de	06_coal	1	281	1200.0	0.0	1.0
 de	07_gas	1	281	0.0	0.0	0.0
 de	08_non-res	1	281	0.0	0.0	0.0
 de	09_hydro_pump	1	281	0.0	0.0	0.0
-de	01_solar	1	282	2000.0	1.0	0.0
-de	02_wind_on	1	282	2000.0	1.0	0.0
-de	03_wind_off	1	282	2000.0	1.0	0.0
-de	04_res	1	282	2000.0	1.0	0.0
-de	05_nuclear	1	282	2000.0	1.0	0.0
-de	06_coal	1	282	1300.0	1.0	0.0
+de	01_solar	1	282	2000.0	0.0	1.0
+de	02_wind_on	1	282	2000.0	0.0	1.0
+de	03_wind_off	1	282	2000.0	0.0	1.0
+de	04_res	1	282	2000.0	0.0	1.0
+de	05_nuclear	1	282	2000.0	0.0	1.0
+de	06_coal	1	282	1300.0	0.0	1.0
 de	07_gas	1	282	0.0	0.0	0.0
 de	08_non-res	1	282	0.0	0.0	0.0
 de	09_hydro_pump	1	282	0.0	0.0	0.0
-de	01_solar	1	283	2000.0	1.0	0.0
-de	02_wind_on	1	283	2000.0	1.0	0.0
-de	03_wind_off	1	283	2000.0	1.0	0.0
-de	04_res	1	283	2000.0	1.0	0.0
-de	05_nuclear	1	283	2000.0	1.0	0.0
-de	06_coal	1	283	1400.0	1.0	0.0
+de	01_solar	1	283	2000.0	0.0	1.0
+de	02_wind_on	1	283	2000.0	0.0	1.0
+de	03_wind_off	1	283	2000.0	0.0	1.0
+de	04_res	1	283	2000.0	0.0	1.0
+de	05_nuclear	1	283	2000.0	0.0	1.0
+de	06_coal	1	283	1400.0	0.0	1.0
 de	07_gas	1	283	0.0	0.0	0.0
 de	08_non-res	1	283	0.0	0.0	0.0
 de	09_hydro_pump	1	283	0.0	0.0	0.0
-de	01_solar	1	284	2000.0	1.0	0.0
-de	02_wind_on	1	284	2000.0	1.0	0.0
-de	03_wind_off	1	284	2000.0	1.0	0.0
-de	04_res	1	284	2000.0	1.0	0.0
-de	05_nuclear	1	284	2000.0	1.0	0.0
-de	06_coal	1	284	1500.0	1.0	0.0
+de	01_solar	1	284	2000.0	0.0	1.0
+de	02_wind_on	1	284	2000.0	0.0	1.0
+de	03_wind_off	1	284	2000.0	0.0	1.0
+de	04_res	1	284	2000.0	0.0	1.0
+de	05_nuclear	1	284	2000.0	0.0	1.0
+de	06_coal	1	284	1500.0	0.0	1.0
 de	07_gas	1	284	0.0	0.0	0.0
 de	08_non-res	1	284	0.0	0.0	0.0
 de	09_hydro_pump	1	284	0.0	0.0	0.0
-de	01_solar	1	285	2000.0	1.0	0.0
-de	02_wind_on	1	285	2000.0	1.0	0.0
-de	03_wind_off	1	285	2000.0	1.0	0.0
-de	04_res	1	285	2000.0	1.0	0.0
-de	05_nuclear	1	285	2000.0	1.0	0.0
-de	06_coal	1	285	1600.0	1.0	0.0
+de	01_solar	1	285	2000.0	0.0	1.0
+de	02_wind_on	1	285	2000.0	0.0	1.0
+de	03_wind_off	1	285	2000.0	0.0	1.0
+de	04_res	1	285	2000.0	0.0	1.0
+de	05_nuclear	1	285	2000.0	0.0	1.0
+de	06_coal	1	285	1600.0	0.0	1.0
 de	07_gas	1	285	0.0	0.0	0.0
 de	08_non-res	1	285	0.0	0.0	0.0
 de	09_hydro_pump	1	285	0.0	0.0	0.0
-de	01_solar	1	286	2000.0	1.0	0.0
-de	02_wind_on	1	286	2000.0	1.0	0.0
-de	03_wind_off	1	286	2000.0	1.0	0.0
-de	04_res	1	286	2000.0	1.0	0.0
-de	05_nuclear	1	286	2000.0	1.0	0.0
-de	06_coal	1	286	1700.0	1.0	0.0
+de	01_solar	1	286	2000.0	0.0	1.0
+de	02_wind_on	1	286	2000.0	0.0	1.0
+de	03_wind_off	1	286	2000.0	0.0	1.0
+de	04_res	1	286	2000.0	0.0	1.0
+de	05_nuclear	1	286	2000.0	0.0	1.0
+de	06_coal	1	286	1700.0	0.0	1.0
 de	07_gas	1	286	0.0	0.0	0.0
 de	08_non-res	1	286	0.0	0.0	0.0
 de	09_hydro_pump	1	286	0.0	0.0	0.0
-de	01_solar	1	287	2000.0	1.0	0.0
-de	02_wind_on	1	287	2000.0	1.0	0.0
-de	03_wind_off	1	287	2000.0	1.0	0.0
-de	04_res	1	287	2000.0	1.0	0.0
-de	05_nuclear	1	287	2000.0	1.0	0.0
-de	06_coal	1	287	1800.0	1.0	0.0
+de	01_solar	1	287	2000.0	0.0	1.0
+de	02_wind_on	1	287	2000.0	0.0	1.0
+de	03_wind_off	1	287	2000.0	0.0	1.0
+de	04_res	1	287	2000.0	0.0	1.0
+de	05_nuclear	1	287	2000.0	0.0	1.0
+de	06_coal	1	287	1800.0	0.0	1.0
 de	07_gas	1	287	0.0	0.0	0.0
 de	08_non-res	1	287	0.0	0.0	0.0
 de	09_hydro_pump	1	287	0.0	0.0	0.0
-de	01_solar	1	288	2000.0	1.0	0.0
-de	02_wind_on	1	288	2000.0	1.0	0.0
-de	03_wind_off	1	288	2000.0	1.0	0.0
-de	04_res	1	288	2000.0	1.0	0.0
-de	05_nuclear	1	288	2000.0	1.0	0.0
-de	06_coal	1	288	1900.0	1.0	0.0
+de	01_solar	1	288	2000.0	0.0	1.0
+de	02_wind_on	1	288	2000.0	0.0	1.0
+de	03_wind_off	1	288	2000.0	0.0	1.0
+de	04_res	1	288	2000.0	0.0	1.0
+de	05_nuclear	1	288	2000.0	0.0	1.0
+de	06_coal	1	288	1900.0	0.0	1.0
 de	07_gas	1	288	0.0	0.0	0.0
 de	08_non-res	1	288	0.0	0.0	0.0
 de	09_hydro_pump	1	288	0.0	0.0	0.0
-de	01_solar	1	289	2000.0	1.0	0.0
-de	02_wind_on	1	289	2000.0	1.0	0.0
-de	03_wind_off	1	289	2000.0	1.0	0.0
-de	04_res	1	289	2000.0	1.0	0.0
-de	05_nuclear	1	289	2000.0	1.0	0.0
-de	06_coal	1	289	2000.0	1.0	0.0
+de	01_solar	1	289	2000.0	0.0	1.0
+de	02_wind_on	1	289	2000.0	0.0	1.0
+de	03_wind_off	1	289	2000.0	0.0	1.0
+de	04_res	1	289	2000.0	0.0	1.0
+de	05_nuclear	1	289	2000.0	0.0	1.0
+de	06_coal	1	289	2000.0	0.0	1.0
 de	07_gas	1	289	0.0	0.0	0.0
 de	08_non-res	1	289	0.0	0.0	0.0
 de	09_hydro_pump	1	289	0.0	0.0	0.0
-de	01_solar	1	290	2000.0	1.0	0.0
-de	02_wind_on	1	290	2000.0	1.0	0.0
-de	03_wind_off	1	290	2000.0	1.0	0.0
-de	04_res	1	290	2000.0	1.0	0.0
-de	05_nuclear	1	290	2000.0	1.0	0.0
-de	06_coal	1	290	2000.0	1.0	0.0
-de	07_gas	1	290	100.0	1.0	0.0
+de	01_solar	1	290	2000.0	0.0	1.0
+de	02_wind_on	1	290	2000.0	0.0	1.0
+de	03_wind_off	1	290	2000.0	0.0	1.0
+de	04_res	1	290	2000.0	0.0	1.0
+de	05_nuclear	1	290	2000.0	0.0	1.0
+de	06_coal	1	290	2000.0	0.0	1.0
+de	07_gas	1	290	100.0	0.0	1.0
 de	08_non-res	1	290	0.0	0.0	0.0
 de	09_hydro_pump	1	290	0.0	0.0	0.0
-de	01_solar	1	291	2000.0	1.0	0.0
-de	02_wind_on	1	291	2000.0	1.0	0.0
-de	03_wind_off	1	291	2000.0	1.0	0.0
-de	04_res	1	291	2000.0	1.0	0.0
-de	05_nuclear	1	291	2000.0	1.0	0.0
-de	06_coal	1	291	2000.0	1.0	0.0
-de	07_gas	1	291	200.0	1.0	0.0
+de	01_solar	1	291	2000.0	0.0	1.0
+de	02_wind_on	1	291	2000.0	0.0	1.0
+de	03_wind_off	1	291	2000.0	0.0	1.0
+de	04_res	1	291	2000.0	0.0	1.0
+de	05_nuclear	1	291	2000.0	0.0	1.0
+de	06_coal	1	291	2000.0	0.0	1.0
+de	07_gas	1	291	200.0	0.0	1.0
 de	08_non-res	1	291	0.0	0.0	0.0
 de	09_hydro_pump	1	291	0.0	0.0	0.0
-de	01_solar	1	292	2000.0	1.0	0.0
-de	02_wind_on	1	292	2000.0	1.0	0.0
-de	03_wind_off	1	292	2000.0	1.0	0.0
-de	04_res	1	292	2000.0	1.0	0.0
-de	05_nuclear	1	292	2000.0	1.0	0.0
-de	06_coal	1	292	2000.0	1.0	0.0
-de	07_gas	1	292	300.0	1.0	0.0
+de	01_solar	1	292	2000.0	0.0	1.0
+de	02_wind_on	1	292	2000.0	0.0	1.0
+de	03_wind_off	1	292	2000.0	0.0	1.0
+de	04_res	1	292	2000.0	0.0	1.0
+de	05_nuclear	1	292	2000.0	0.0	1.0
+de	06_coal	1	292	2000.0	0.0	1.0
+de	07_gas	1	292	300.0	0.0	1.0
 de	08_non-res	1	292	0.0	0.0	0.0
 de	09_hydro_pump	1	292	0.0	0.0	0.0
-de	01_solar	1	293	2000.0	1.0	0.0
-de	02_wind_on	1	293	2000.0	1.0	0.0
-de	03_wind_off	1	293	2000.0	1.0	0.0
-de	04_res	1	293	2000.0	1.0	0.0
-de	05_nuclear	1	293	2000.0	1.0	0.0
-de	06_coal	1	293	2000.0	1.0	0.0
-de	07_gas	1	293	400.0	1.0	0.0
+de	01_solar	1	293	2000.0	0.0	1.0
+de	02_wind_on	1	293	2000.0	0.0	1.0
+de	03_wind_off	1	293	2000.0	0.0	1.0
+de	04_res	1	293	2000.0	0.0	1.0
+de	05_nuclear	1	293	2000.0	0.0	1.0
+de	06_coal	1	293	2000.0	0.0	1.0
+de	07_gas	1	293	400.0	0.0	1.0
 de	08_non-res	1	293	0.0	0.0	0.0
 de	09_hydro_pump	1	293	0.0	0.0	0.0
-de	01_solar	1	294	2000.0	1.0	0.0
-de	02_wind_on	1	294	2000.0	1.0	0.0
-de	03_wind_off	1	294	2000.0	1.0	0.0
-de	04_res	1	294	2000.0	1.0	0.0
-de	05_nuclear	1	294	2000.0	1.0	0.0
-de	06_coal	1	294	2000.0	1.0	0.0
-de	07_gas	1	294	500.0	1.0	0.0
+de	01_solar	1	294	2000.0	0.0	1.0
+de	02_wind_on	1	294	2000.0	0.0	1.0
+de	03_wind_off	1	294	2000.0	0.0	1.0
+de	04_res	1	294	2000.0	0.0	1.0
+de	05_nuclear	1	294	2000.0	0.0	1.0
+de	06_coal	1	294	2000.0	0.0	1.0
+de	07_gas	1	294	500.0	0.0	1.0
 de	08_non-res	1	294	0.0	0.0	0.0
 de	09_hydro_pump	1	294	0.0	0.0	0.0
-de	01_solar	1	295	2000.0	1.0	0.0
-de	02_wind_on	1	295	2000.0	1.0	0.0
-de	03_wind_off	1	295	2000.0	1.0	0.0
-de	04_res	1	295	2000.0	1.0	0.0
-de	05_nuclear	1	295	2000.0	1.0	0.0
-de	06_coal	1	295	2000.0	1.0	0.0
-de	07_gas	1	295	600.0	1.0	0.0
+de	01_solar	1	295	2000.0	0.0	1.0
+de	02_wind_on	1	295	2000.0	0.0	1.0
+de	03_wind_off	1	295	2000.0	0.0	1.0
+de	04_res	1	295	2000.0	0.0	1.0
+de	05_nuclear	1	295	2000.0	0.0	1.0
+de	06_coal	1	295	2000.0	0.0	1.0
+de	07_gas	1	295	600.0	0.0	1.0
 de	08_non-res	1	295	0.0	0.0	0.0
 de	09_hydro_pump	1	295	0.0	0.0	0.0
-de	01_solar	1	296	2000.0	1.0	0.0
-de	02_wind_on	1	296	2000.0	1.0	0.0
-de	03_wind_off	1	296	2000.0	1.0	0.0
-de	04_res	1	296	2000.0	1.0	0.0
-de	05_nuclear	1	296	2000.0	1.0	0.0
-de	06_coal	1	296	2000.0	1.0	0.0
-de	07_gas	1	296	700.0	1.0	0.0
+de	01_solar	1	296	2000.0	0.0	1.0
+de	02_wind_on	1	296	2000.0	0.0	1.0
+de	03_wind_off	1	296	2000.0	0.0	1.0
+de	04_res	1	296	2000.0	0.0	1.0
+de	05_nuclear	1	296	2000.0	0.0	1.0
+de	06_coal	1	296	2000.0	0.0	1.0
+de	07_gas	1	296	700.0	0.0	1.0
 de	08_non-res	1	296	0.0	0.0	0.0
 de	09_hydro_pump	1	296	0.0	0.0	0.0
-de	01_solar	1	297	2000.0	1.0	0.0
-de	02_wind_on	1	297	2000.0	1.0	0.0
-de	03_wind_off	1	297	2000.0	1.0	0.0
-de	04_res	1	297	2000.0	1.0	0.0
-de	05_nuclear	1	297	2000.0	1.0	0.0
-de	06_coal	1	297	2000.0	1.0	0.0
-de	07_gas	1	297	800.0	1.0	0.0
+de	01_solar	1	297	2000.0	0.0	1.0
+de	02_wind_on	1	297	2000.0	0.0	1.0
+de	03_wind_off	1	297	2000.0	0.0	1.0
+de	04_res	1	297	2000.0	0.0	1.0
+de	05_nuclear	1	297	2000.0	0.0	1.0
+de	06_coal	1	297	2000.0	0.0	1.0
+de	07_gas	1	297	800.0	0.0	1.0
 de	08_non-res	1	297	0.0	0.0	0.0
 de	09_hydro_pump	1	297	0.0	0.0	0.0
-de	01_solar	1	298	2000.0	1.0	0.0
-de	02_wind_on	1	298	2000.0	1.0	0.0
-de	03_wind_off	1	298	2000.0	1.0	0.0
-de	04_res	1	298	2000.0	1.0	0.0
-de	05_nuclear	1	298	2000.0	1.0	0.0
-de	06_coal	1	298	2000.0	1.0	0.0
-de	07_gas	1	298	900.0	1.0	0.0
+de	01_solar	1	298	2000.0	0.0	1.0
+de	02_wind_on	1	298	2000.0	0.0	1.0
+de	03_wind_off	1	298	2000.0	0.0	1.0
+de	04_res	1	298	2000.0	0.0	1.0
+de	05_nuclear	1	298	2000.0	0.0	1.0
+de	06_coal	1	298	2000.0	0.0	1.0
+de	07_gas	1	298	900.0	0.0	1.0
 de	08_non-res	1	298	0.0	0.0	0.0
 de	09_hydro_pump	1	298	0.0	0.0	0.0
-de	01_solar	1	299	2000.0	1.0	0.0
-de	02_wind_on	1	299	2000.0	1.0	0.0
-de	03_wind_off	1	299	2000.0	1.0	0.0
-de	04_res	1	299	2000.0	1.0	0.0
-de	05_nuclear	1	299	2000.0	1.0	0.0
-de	06_coal	1	299	2000.0	1.0	0.0
-de	07_gas	1	299	1000.0	1.0	0.0
+de	01_solar	1	299	2000.0	0.0	1.0
+de	02_wind_on	1	299	2000.0	0.0	1.0
+de	03_wind_off	1	299	2000.0	0.0	1.0
+de	04_res	1	299	2000.0	0.0	1.0
+de	05_nuclear	1	299	2000.0	0.0	1.0
+de	06_coal	1	299	2000.0	0.0	1.0
+de	07_gas	1	299	1000.0	0.0	1.0
 de	08_non-res	1	299	0.0	0.0	0.0
 de	09_hydro_pump	1	299	0.0	0.0	0.0
-de	01_solar	1	300	2000.0	1.0	0.0
-de	02_wind_on	1	300	2000.0	1.0	0.0
-de	03_wind_off	1	300	2000.0	1.0	0.0
-de	04_res	1	300	2000.0	1.0	0.0
-de	05_nuclear	1	300	2000.0	1.0	0.0
-de	06_coal	1	300	2000.0	1.0	0.0
-de	07_gas	1	300	1100.0	1.0	0.0
+de	01_solar	1	300	2000.0	0.0	1.0
+de	02_wind_on	1	300	2000.0	0.0	1.0
+de	03_wind_off	1	300	2000.0	0.0	1.0
+de	04_res	1	300	2000.0	0.0	1.0
+de	05_nuclear	1	300	2000.0	0.0	1.0
+de	06_coal	1	300	2000.0	0.0	1.0
+de	07_gas	1	300	1100.0	0.0	1.0
 de	08_non-res	1	300	0.0	0.0	0.0
 de	09_hydro_pump	1	300	0.0	0.0	0.0
-de	01_solar	1	301	2000.0	1.0	0.0
-de	02_wind_on	1	301	2000.0	1.0	0.0
-de	03_wind_off	1	301	2000.0	1.0	0.0
-de	04_res	1	301	2000.0	1.0	0.0
-de	05_nuclear	1	301	2000.0	1.0	0.0
-de	06_coal	1	301	2000.0	1.0	0.0
-de	07_gas	1	301	1200.0	1.0	0.0
+de	01_solar	1	301	2000.0	0.0	1.0
+de	02_wind_on	1	301	2000.0	0.0	1.0
+de	03_wind_off	1	301	2000.0	0.0	1.0
+de	04_res	1	301	2000.0	0.0	1.0
+de	05_nuclear	1	301	2000.0	0.0	1.0
+de	06_coal	1	301	2000.0	0.0	1.0
+de	07_gas	1	301	1200.0	0.0	1.0
 de	08_non-res	1	301	0.0	0.0	0.0
 de	09_hydro_pump	1	301	0.0	0.0	0.0
-de	01_solar	1	302	2000.0	1.0	0.0
-de	02_wind_on	1	302	2000.0	1.0	0.0
-de	03_wind_off	1	302	2000.0	1.0	0.0
-de	04_res	1	302	2000.0	1.0	0.0
-de	05_nuclear	1	302	2000.0	1.0	0.0
-de	06_coal	1	302	2000.0	1.0	0.0
-de	07_gas	1	302	1300.0	1.0	0.0
+de	01_solar	1	302	2000.0	0.0	1.0
+de	02_wind_on	1	302	2000.0	0.0	1.0
+de	03_wind_off	1	302	2000.0	0.0	1.0
+de	04_res	1	302	2000.0	0.0	1.0
+de	05_nuclear	1	302	2000.0	0.0	1.0
+de	06_coal	1	302	2000.0	0.0	1.0
+de	07_gas	1	302	1300.0	0.0	1.0
 de	08_non-res	1	302	0.0	0.0	0.0
 de	09_hydro_pump	1	302	0.0	0.0	0.0
-de	01_solar	1	303	2000.0	1.0	0.0
-de	02_wind_on	1	303	2000.0	1.0	0.0
-de	03_wind_off	1	303	2000.0	1.0	0.0
-de	04_res	1	303	2000.0	1.0	0.0
-de	05_nuclear	1	303	2000.0	1.0	0.0
-de	06_coal	1	303	2000.0	1.0	0.0
-de	07_gas	1	303	1400.0	1.0	0.0
+de	01_solar	1	303	2000.0	0.0	1.0
+de	02_wind_on	1	303	2000.0	0.0	1.0
+de	03_wind_off	1	303	2000.0	0.0	1.0
+de	04_res	1	303	2000.0	0.0	1.0
+de	05_nuclear	1	303	2000.0	0.0	1.0
+de	06_coal	1	303	2000.0	0.0	1.0
+de	07_gas	1	303	1400.0	0.0	1.0
 de	08_non-res	1	303	0.0	0.0	0.0
 de	09_hydro_pump	1	303	0.0	0.0	0.0
-de	01_solar	1	304	2000.0	1.0	0.0
-de	02_wind_on	1	304	2000.0	1.0	0.0
-de	03_wind_off	1	304	2000.0	1.0	0.0
-de	04_res	1	304	2000.0	1.0	0.0
-de	05_nuclear	1	304	2000.0	1.0	0.0
-de	06_coal	1	304	2000.0	1.0	0.0
-de	07_gas	1	304	1500.0	1.0	0.0
+de	01_solar	1	304	2000.0	0.0	1.0
+de	02_wind_on	1	304	2000.0	0.0	1.0
+de	03_wind_off	1	304	2000.0	0.0	1.0
+de	04_res	1	304	2000.0	0.0	1.0
+de	05_nuclear	1	304	2000.0	0.0	1.0
+de	06_coal	1	304	2000.0	0.0	1.0
+de	07_gas	1	304	1500.0	0.0	1.0
 de	08_non-res	1	304	0.0	0.0	0.0
 de	09_hydro_pump	1	304	0.0	0.0	0.0
-de	01_solar	1	305	2000.0	1.0	0.0
-de	02_wind_on	1	305	2000.0	1.0	0.0
-de	03_wind_off	1	305	2000.0	1.0	0.0
-de	04_res	1	305	2000.0	1.0	0.0
-de	05_nuclear	1	305	2000.0	1.0	0.0
-de	06_coal	1	305	2000.0	1.0	0.0
-de	07_gas	1	305	1600.0	1.0	0.0
+de	01_solar	1	305	2000.0	0.0	1.0
+de	02_wind_on	1	305	2000.0	0.0	1.0
+de	03_wind_off	1	305	2000.0	0.0	1.0
+de	04_res	1	305	2000.0	0.0	1.0
+de	05_nuclear	1	305	2000.0	0.0	1.0
+de	06_coal	1	305	2000.0	0.0	1.0
+de	07_gas	1	305	1600.0	0.0	1.0
 de	08_non-res	1	305	0.0	0.0	0.0
 de	09_hydro_pump	1	305	0.0	0.0	0.0
-de	01_solar	1	306	2000.0	1.0	0.0
-de	02_wind_on	1	306	2000.0	1.0	0.0
-de	03_wind_off	1	306	2000.0	1.0	0.0
-de	04_res	1	306	2000.0	1.0	0.0
-de	05_nuclear	1	306	2000.0	1.0	0.0
-de	06_coal	1	306	2000.0	1.0	0.0
-de	07_gas	1	306	1700.0	1.0	0.0
+de	01_solar	1	306	2000.0	0.0	1.0
+de	02_wind_on	1	306	2000.0	0.0	1.0
+de	03_wind_off	1	306	2000.0	0.0	1.0
+de	04_res	1	306	2000.0	0.0	1.0
+de	05_nuclear	1	306	2000.0	0.0	1.0
+de	06_coal	1	306	2000.0	0.0	1.0
+de	07_gas	1	306	1700.0	0.0	1.0
 de	08_non-res	1	306	0.0	0.0	0.0
 de	09_hydro_pump	1	306	0.0	0.0	0.0
-de	01_solar	1	307	2000.0	1.0	0.0
-de	02_wind_on	1	307	2000.0	1.0	0.0
-de	03_wind_off	1	307	2000.0	1.0	0.0
-de	04_res	1	307	2000.0	1.0	0.0
-de	05_nuclear	1	307	2000.0	1.0	0.0
-de	06_coal	1	307	2000.0	1.0	0.0
-de	07_gas	1	307	1800.0	1.0	0.0
+de	01_solar	1	307	2000.0	0.0	1.0
+de	02_wind_on	1	307	2000.0	0.0	1.0
+de	03_wind_off	1	307	2000.0	0.0	1.0
+de	04_res	1	307	2000.0	0.0	1.0
+de	05_nuclear	1	307	2000.0	0.0	1.0
+de	06_coal	1	307	2000.0	0.0	1.0
+de	07_gas	1	307	1800.0	0.0	1.0
 de	08_non-res	1	307	0.0	0.0	0.0
 de	09_hydro_pump	1	307	0.0	0.0	0.0
-de	01_solar	1	308	2000.0	1.0	0.0
-de	02_wind_on	1	308	2000.0	1.0	0.0
-de	03_wind_off	1	308	2000.0	1.0	0.0
-de	04_res	1	308	2000.0	1.0	0.0
-de	05_nuclear	1	308	2000.0	1.0	0.0
-de	06_coal	1	308	2000.0	1.0	0.0
-de	07_gas	1	308	1900.0	1.0	0.0
+de	01_solar	1	308	2000.0	0.0	1.0
+de	02_wind_on	1	308	2000.0	0.0	1.0
+de	03_wind_off	1	308	2000.0	0.0	1.0
+de	04_res	1	308	2000.0	0.0	1.0
+de	05_nuclear	1	308	2000.0	0.0	1.0
+de	06_coal	1	308	2000.0	0.0	1.0
+de	07_gas	1	308	1900.0	0.0	1.0
 de	08_non-res	1	308	0.0	0.0	0.0
 de	09_hydro_pump	1	308	0.0	0.0	0.0
-de	01_solar	1	309	2000.0	1.0	0.0
-de	02_wind_on	1	309	2000.0	1.0	0.0
-de	03_wind_off	1	309	2000.0	1.0	0.0
-de	04_res	1	309	2000.0	1.0	0.0
-de	05_nuclear	1	309	2000.0	1.0	0.0
-de	06_coal	1	309	2000.0	1.0	0.0
-de	07_gas	1	309	2000.0	1.0	0.0
+de	01_solar	1	309	2000.0	0.0	1.0
+de	02_wind_on	1	309	2000.0	0.0	1.0
+de	03_wind_off	1	309	2000.0	0.0	1.0
+de	04_res	1	309	2000.0	0.0	1.0
+de	05_nuclear	1	309	2000.0	0.0	1.0
+de	06_coal	1	309	2000.0	0.0	1.0
+de	07_gas	1	309	2000.0	0.0	1.0
 de	08_non-res	1	309	0.0	0.0	0.0
 de	09_hydro_pump	1	309	0.0	0.0	0.0
-de	01_solar	1	310	2000.0	1.0	0.0
-de	02_wind_on	1	310	2000.0	1.0	0.0
-de	03_wind_off	1	310	2000.0	1.0	0.0
-de	04_res	1	310	2000.0	1.0	0.0
-de	05_nuclear	1	310	2000.0	1.0	0.0
-de	06_coal	1	310	2000.0	1.0	0.0
-de	07_gas	1	310	2000.0	1.0	0.0
-de	08_non-res	1	310	100.0	1.0	0.0
+de	01_solar	1	310	2000.0	0.0	1.0
+de	02_wind_on	1	310	2000.0	0.0	1.0
+de	03_wind_off	1	310	2000.0	0.0	1.0
+de	04_res	1	310	2000.0	0.0	1.0
+de	05_nuclear	1	310	2000.0	0.0	1.0
+de	06_coal	1	310	2000.0	0.0	1.0
+de	07_gas	1	310	2000.0	0.0	1.0
+de	08_non-res	1	310	100.0	0.0	1.0
 de	09_hydro_pump	1	310	0.0	0.0	0.0
-de	01_solar	1	311	2000.0	1.0	0.0
-de	02_wind_on	1	311	2000.0	1.0	0.0
-de	03_wind_off	1	311	2000.0	1.0	0.0
-de	04_res	1	311	2000.0	1.0	0.0
-de	05_nuclear	1	311	2000.0	1.0	0.0
-de	06_coal	1	311	2000.0	1.0	0.0
-de	07_gas	1	311	2000.0	1.0	0.0
-de	08_non-res	1	311	200.0	1.0	0.0
+de	01_solar	1	311	2000.0	0.0	1.0
+de	02_wind_on	1	311	2000.0	0.0	1.0
+de	03_wind_off	1	311	2000.0	0.0	1.0
+de	04_res	1	311	2000.0	0.0	1.0
+de	05_nuclear	1	311	2000.0	0.0	1.0
+de	06_coal	1	311	2000.0	0.0	1.0
+de	07_gas	1	311	2000.0	0.0	1.0
+de	08_non-res	1	311	200.0	0.0	1.0
 de	09_hydro_pump	1	311	0.0	0.0	0.0
-de	01_solar	1	312	2000.0	1.0	0.0
-de	02_wind_on	1	312	2000.0	1.0	0.0
-de	03_wind_off	1	312	2000.0	1.0	0.0
-de	04_res	1	312	2000.0	1.0	0.0
-de	05_nuclear	1	312	2000.0	1.0	0.0
-de	06_coal	1	312	2000.0	1.0	0.0
-de	07_gas	1	312	2000.0	1.0	0.0
-de	08_non-res	1	312	300.0	1.0	0.0
+de	01_solar	1	312	2000.0	0.0	1.0
+de	02_wind_on	1	312	2000.0	0.0	1.0
+de	03_wind_off	1	312	2000.0	0.0	1.0
+de	04_res	1	312	2000.0	0.0	1.0
+de	05_nuclear	1	312	2000.0	0.0	1.0
+de	06_coal	1	312	2000.0	0.0	1.0
+de	07_gas	1	312	2000.0	0.0	1.0
+de	08_non-res	1	312	300.0	0.0	1.0
 de	09_hydro_pump	1	312	0.0	0.0	0.0
-de	01_solar	1	313	2000.0	1.0	0.0
-de	02_wind_on	1	313	2000.0	1.0	0.0
-de	03_wind_off	1	313	2000.0	1.0	0.0
-de	04_res	1	313	2000.0	1.0	0.0
-de	05_nuclear	1	313	2000.0	1.0	0.0
-de	06_coal	1	313	2000.0	1.0	0.0
-de	07_gas	1	313	2000.0	1.0	0.0
-de	08_non-res	1	313	400.0	1.0	0.0
+de	01_solar	1	313	2000.0	0.0	1.0
+de	02_wind_on	1	313	2000.0	0.0	1.0
+de	03_wind_off	1	313	2000.0	0.0	1.0
+de	04_res	1	313	2000.0	0.0	1.0
+de	05_nuclear	1	313	2000.0	0.0	1.0
+de	06_coal	1	313	2000.0	0.0	1.0
+de	07_gas	1	313	2000.0	0.0	1.0
+de	08_non-res	1	313	400.0	0.0	1.0
 de	09_hydro_pump	1	313	0.0	0.0	0.0
-de	01_solar	1	314	2000.0	1.0	0.0
-de	02_wind_on	1	314	2000.0	1.0	0.0
-de	03_wind_off	1	314	2000.0	1.0	0.0
-de	04_res	1	314	2000.0	1.0	0.0
-de	05_nuclear	1	314	2000.0	1.0	0.0
-de	06_coal	1	314	2000.0	1.0	0.0
-de	07_gas	1	314	2000.0	1.0	0.0
-de	08_non-res	1	314	500.0	1.0	0.0
+de	01_solar	1	314	2000.0	0.0	1.0
+de	02_wind_on	1	314	2000.0	0.0	1.0
+de	03_wind_off	1	314	2000.0	0.0	1.0
+de	04_res	1	314	2000.0	0.0	1.0
+de	05_nuclear	1	314	2000.0	0.0	1.0
+de	06_coal	1	314	2000.0	0.0	1.0
+de	07_gas	1	314	2000.0	0.0	1.0
+de	08_non-res	1	314	500.0	0.0	1.0
 de	09_hydro_pump	1	314	0.0	0.0	0.0
-de	01_solar	1	315	2000.0	1.0	0.0
-de	02_wind_on	1	315	2000.0	1.0	0.0
-de	03_wind_off	1	315	2000.0	1.0	0.0
-de	04_res	1	315	2000.0	1.0	0.0
-de	05_nuclear	1	315	2000.0	1.0	0.0
-de	06_coal	1	315	2000.0	1.0	0.0
-de	07_gas	1	315	2000.0	1.0	0.0
-de	08_non-res	1	315	600.0	1.0	0.0
+de	01_solar	1	315	2000.0	0.0	1.0
+de	02_wind_on	1	315	2000.0	0.0	1.0
+de	03_wind_off	1	315	2000.0	0.0	1.0
+de	04_res	1	315	2000.0	0.0	1.0
+de	05_nuclear	1	315	2000.0	0.0	1.0
+de	06_coal	1	315	2000.0	0.0	1.0
+de	07_gas	1	315	2000.0	0.0	1.0
+de	08_non-res	1	315	600.0	0.0	1.0
 de	09_hydro_pump	1	315	0.0	0.0	0.0
-de	01_solar	1	316	2000.0	1.0	0.0
-de	02_wind_on	1	316	2000.0	1.0	0.0
-de	03_wind_off	1	316	2000.0	1.0	0.0
-de	04_res	1	316	2000.0	1.0	0.0
-de	05_nuclear	1	316	2000.0	1.0	0.0
-de	06_coal	1	316	2000.0	1.0	0.0
-de	07_gas	1	316	2000.0	1.0	0.0
-de	08_non-res	1	316	700.0	1.0	0.0
+de	01_solar	1	316	2000.0	0.0	1.0
+de	02_wind_on	1	316	2000.0	0.0	1.0
+de	03_wind_off	1	316	2000.0	0.0	1.0
+de	04_res	1	316	2000.0	0.0	1.0
+de	05_nuclear	1	316	2000.0	0.0	1.0
+de	06_coal	1	316	2000.0	0.0	1.0
+de	07_gas	1	316	2000.0	0.0	1.0
+de	08_non-res	1	316	700.0	0.0	1.0
 de	09_hydro_pump	1	316	0.0	0.0	0.0
-de	01_solar	1	317	2000.0	1.0	0.0
-de	02_wind_on	1	317	2000.0	1.0	0.0
-de	03_wind_off	1	317	2000.0	1.0	0.0
-de	04_res	1	317	2000.0	1.0	0.0
-de	05_nuclear	1	317	2000.0	1.0	0.0
-de	06_coal	1	317	2000.0	1.0	0.0
-de	07_gas	1	317	2000.0	1.0	0.0
-de	08_non-res	1	317	800.0	1.0	0.0
+de	01_solar	1	317	2000.0	0.0	1.0
+de	02_wind_on	1	317	2000.0	0.0	1.0
+de	03_wind_off	1	317	2000.0	0.0	1.0
+de	04_res	1	317	2000.0	0.0	1.0
+de	05_nuclear	1	317	2000.0	0.0	1.0
+de	06_coal	1	317	2000.0	0.0	1.0
+de	07_gas	1	317	2000.0	0.0	1.0
+de	08_non-res	1	317	800.0	0.0	1.0
 de	09_hydro_pump	1	317	0.0	0.0	0.0
-de	01_solar	1	318	2000.0	1.0	0.0
-de	02_wind_on	1	318	2000.0	1.0	0.0
-de	03_wind_off	1	318	2000.0	1.0	0.0
-de	04_res	1	318	2000.0	1.0	0.0
-de	05_nuclear	1	318	2000.0	1.0	0.0
-de	06_coal	1	318	2000.0	1.0	0.0
-de	07_gas	1	318	2000.0	1.0	0.0
-de	08_non-res	1	318	900.0	1.0	0.0
+de	01_solar	1	318	2000.0	0.0	1.0
+de	02_wind_on	1	318	2000.0	0.0	1.0
+de	03_wind_off	1	318	2000.0	0.0	1.0
+de	04_res	1	318	2000.0	0.0	1.0
+de	05_nuclear	1	318	2000.0	0.0	1.0
+de	06_coal	1	318	2000.0	0.0	1.0
+de	07_gas	1	318	2000.0	0.0	1.0
+de	08_non-res	1	318	900.0	0.0	1.0
 de	09_hydro_pump	1	318	0.0	0.0	0.0
-de	01_solar	1	319	2000.0	1.0	0.0
-de	02_wind_on	1	319	2000.0	1.0	0.0
-de	03_wind_off	1	319	2000.0	1.0	0.0
-de	04_res	1	319	2000.0	1.0	0.0
-de	05_nuclear	1	319	2000.0	1.0	0.0
-de	06_coal	1	319	2000.0	1.0	0.0
-de	07_gas	1	319	2000.0	1.0	0.0
-de	08_non-res	1	319	1000.0	1.0	0.0
+de	01_solar	1	319	2000.0	0.0	1.0
+de	02_wind_on	1	319	2000.0	0.0	1.0
+de	03_wind_off	1	319	2000.0	0.0	1.0
+de	04_res	1	319	2000.0	0.0	1.0
+de	05_nuclear	1	319	2000.0	0.0	1.0
+de	06_coal	1	319	2000.0	0.0	1.0
+de	07_gas	1	319	2000.0	0.0	1.0
+de	08_non-res	1	319	1000.0	0.0	1.0
 de	09_hydro_pump	1	319	0.0	0.0	0.0
-de	01_solar	1	320	2000.0	1.0	0.0
-de	02_wind_on	1	320	2000.0	1.0	0.0
-de	03_wind_off	1	320	2000.0	1.0	0.0
-de	04_res	1	320	2000.0	1.0	0.0
-de	05_nuclear	1	320	2000.0	1.0	0.0
-de	06_coal	1	320	2000.0	1.0	0.0
-de	07_gas	1	320	2000.0	1.0	0.0
-de	08_non-res	1	320	1100.0	1.0	0.0
+de	01_solar	1	320	2000.0	0.0	1.0
+de	02_wind_on	1	320	2000.0	0.0	1.0
+de	03_wind_off	1	320	2000.0	0.0	1.0
+de	04_res	1	320	2000.0	0.0	1.0
+de	05_nuclear	1	320	2000.0	0.0	1.0
+de	06_coal	1	320	2000.0	0.0	1.0
+de	07_gas	1	320	2000.0	0.0	1.0
+de	08_non-res	1	320	1100.0	0.0	1.0
 de	09_hydro_pump	1	320	0.0	0.0	0.0
-de	01_solar	1	321	2000.0	1.0	0.0
-de	02_wind_on	1	321	2000.0	1.0	0.0
-de	03_wind_off	1	321	2000.0	1.0	0.0
-de	04_res	1	321	2000.0	1.0	0.0
-de	05_nuclear	1	321	2000.0	1.0	0.0
-de	06_coal	1	321	2000.0	1.0	0.0
-de	07_gas	1	321	2000.0	1.0	0.0
-de	08_non-res	1	321	1200.0	1.0	0.0
+de	01_solar	1	321	2000.0	0.0	1.0
+de	02_wind_on	1	321	2000.0	0.0	1.0
+de	03_wind_off	1	321	2000.0	0.0	1.0
+de	04_res	1	321	2000.0	0.0	1.0
+de	05_nuclear	1	321	2000.0	0.0	1.0
+de	06_coal	1	321	2000.0	0.0	1.0
+de	07_gas	1	321	2000.0	0.0	1.0
+de	08_non-res	1	321	1200.0	0.0	1.0
 de	09_hydro_pump	1	321	0.0	0.0	0.0
-de	01_solar	1	322	2000.0	1.0	0.0
-de	02_wind_on	1	322	2000.0	1.0	0.0
-de	03_wind_off	1	322	2000.0	1.0	0.0
-de	04_res	1	322	2000.0	1.0	0.0
-de	05_nuclear	1	322	2000.0	1.0	0.0
-de	06_coal	1	322	2000.0	1.0	0.0
-de	07_gas	1	322	2000.0	1.0	0.0
-de	08_non-res	1	322	1300.0	1.0	0.0
+de	01_solar	1	322	2000.0	0.0	1.0
+de	02_wind_on	1	322	2000.0	0.0	1.0
+de	03_wind_off	1	322	2000.0	0.0	1.0
+de	04_res	1	322	2000.0	0.0	1.0
+de	05_nuclear	1	322	2000.0	0.0	1.0
+de	06_coal	1	322	2000.0	0.0	1.0
+de	07_gas	1	322	2000.0	0.0	1.0
+de	08_non-res	1	322	1300.0	0.0	1.0
 de	09_hydro_pump	1	322	0.0	0.0	0.0
-de	01_solar	1	323	2000.0	1.0	0.0
-de	02_wind_on	1	323	2000.0	1.0	0.0
-de	03_wind_off	1	323	2000.0	1.0	0.0
-de	04_res	1	323	2000.0	1.0	0.0
-de	05_nuclear	1	323	2000.0	1.0	0.0
-de	06_coal	1	323	2000.0	1.0	0.0
-de	07_gas	1	323	2000.0	1.0	0.0
-de	08_non-res	1	323	1400.0	1.0	0.0
+de	01_solar	1	323	2000.0	0.0	1.0
+de	02_wind_on	1	323	2000.0	0.0	1.0
+de	03_wind_off	1	323	2000.0	0.0	1.0
+de	04_res	1	323	2000.0	0.0	1.0
+de	05_nuclear	1	323	2000.0	0.0	1.0
+de	06_coal	1	323	2000.0	0.0	1.0
+de	07_gas	1	323	2000.0	0.0	1.0
+de	08_non-res	1	323	1400.0	0.0	1.0
 de	09_hydro_pump	1	323	0.0	0.0	0.0
-de	01_solar	1	324	2000.0	1.0	0.0
-de	02_wind_on	1	324	2000.0	1.0	0.0
-de	03_wind_off	1	324	2000.0	1.0	0.0
-de	04_res	1	324	2000.0	1.0	0.0
-de	05_nuclear	1	324	2000.0	1.0	0.0
-de	06_coal	1	324	2000.0	1.0	0.0
-de	07_gas	1	324	2000.0	1.0	0.0
-de	08_non-res	1	324	1500.0	1.0	0.0
+de	01_solar	1	324	2000.0	0.0	1.0
+de	02_wind_on	1	324	2000.0	0.0	1.0
+de	03_wind_off	1	324	2000.0	0.0	1.0
+de	04_res	1	324	2000.0	0.0	1.0
+de	05_nuclear	1	324	2000.0	0.0	1.0
+de	06_coal	1	324	2000.0	0.0	1.0
+de	07_gas	1	324	2000.0	0.0	1.0
+de	08_non-res	1	324	1500.0	0.0	1.0
 de	09_hydro_pump	1	324	0.0	0.0	0.0
-de	01_solar	1	325	2000.0	1.0	0.0
-de	02_wind_on	1	325	2000.0	1.0	0.0
-de	03_wind_off	1	325	2000.0	1.0	0.0
-de	04_res	1	325	2000.0	1.0	0.0
-de	05_nuclear	1	325	2000.0	1.0	0.0
-de	06_coal	1	325	2000.0	1.0	0.0
-de	07_gas	1	325	2000.0	1.0	0.0
-de	08_non-res	1	325	1600.0	1.0	0.0
+de	01_solar	1	325	2000.0	0.0	1.0
+de	02_wind_on	1	325	2000.0	0.0	1.0
+de	03_wind_off	1	325	2000.0	0.0	1.0
+de	04_res	1	325	2000.0	0.0	1.0
+de	05_nuclear	1	325	2000.0	0.0	1.0
+de	06_coal	1	325	2000.0	0.0	1.0
+de	07_gas	1	325	2000.0	0.0	1.0
+de	08_non-res	1	325	1600.0	0.0	1.0
 de	09_hydro_pump	1	325	0.0	0.0	0.0
-de	01_solar	1	326	2000.0	1.0	0.0
-de	02_wind_on	1	326	2000.0	1.0	0.0
-de	03_wind_off	1	326	2000.0	1.0	0.0
-de	04_res	1	326	2000.0	1.0	0.0
-de	05_nuclear	1	326	2000.0	1.0	0.0
-de	06_coal	1	326	2000.0	1.0	0.0
-de	07_gas	1	326	2000.0	1.0	0.0
-de	08_non-res	1	326	1700.0	1.0	0.0
+de	01_solar	1	326	2000.0	0.0	1.0
+de	02_wind_on	1	326	2000.0	0.0	1.0
+de	03_wind_off	1	326	2000.0	0.0	1.0
+de	04_res	1	326	2000.0	0.0	1.0
+de	05_nuclear	1	326	2000.0	0.0	1.0
+de	06_coal	1	326	2000.0	0.0	1.0
+de	07_gas	1	326	2000.0	0.0	1.0
+de	08_non-res	1	326	1700.0	0.0	1.0
 de	09_hydro_pump	1	326	0.0	0.0	0.0
-de	01_solar	1	327	2000.0	1.0	0.0
-de	02_wind_on	1	327	2000.0	1.0	0.0
-de	03_wind_off	1	327	2000.0	1.0	0.0
-de	04_res	1	327	2000.0	1.0	0.0
-de	05_nuclear	1	327	2000.0	1.0	0.0
-de	06_coal	1	327	2000.0	1.0	0.0
-de	07_gas	1	327	2000.0	1.0	0.0
-de	08_non-res	1	327	1800.0	1.0	0.0
+de	01_solar	1	327	2000.0	0.0	1.0
+de	02_wind_on	1	327	2000.0	0.0	1.0
+de	03_wind_off	1	327	2000.0	0.0	1.0
+de	04_res	1	327	2000.0	0.0	1.0
+de	05_nuclear	1	327	2000.0	0.0	1.0
+de	06_coal	1	327	2000.0	0.0	1.0
+de	07_gas	1	327	2000.0	0.0	1.0
+de	08_non-res	1	327	1800.0	0.0	1.0
 de	09_hydro_pump	1	327	0.0	0.0	0.0
-de	01_solar	1	328	2000.0	1.0	0.0
-de	02_wind_on	1	328	2000.0	1.0	0.0
-de	03_wind_off	1	328	2000.0	1.0	0.0
-de	04_res	1	328	2000.0	1.0	0.0
-de	05_nuclear	1	328	2000.0	1.0	0.0
-de	06_coal	1	328	2000.0	1.0	0.0
-de	07_gas	1	328	2000.0	1.0	0.0
-de	08_non-res	1	328	1900.0	1.0	0.0
+de	01_solar	1	328	2000.0	0.0	1.0
+de	02_wind_on	1	328	2000.0	0.0	1.0
+de	03_wind_off	1	328	2000.0	0.0	1.0
+de	04_res	1	328	2000.0	0.0	1.0
+de	05_nuclear	1	328	2000.0	0.0	1.0
+de	06_coal	1	328	2000.0	0.0	1.0
+de	07_gas	1	328	2000.0	0.0	1.0
+de	08_non-res	1	328	1900.0	0.0	1.0
 de	09_hydro_pump	1	328	0.0	0.0	0.0
-de	01_solar	1	329	2000.0	1.0	0.0
-de	02_wind_on	1	329	2000.0	1.0	0.0
-de	03_wind_off	1	329	2000.0	1.0	0.0
-de	04_res	1	329	2000.0	1.0	0.0
-de	05_nuclear	1	329	2000.0	1.0	0.0
-de	06_coal	1	329	2000.0	1.0	0.0
-de	07_gas	1	329	2000.0	1.0	0.0
-de	08_non-res	1	329	2000.0	1.0	0.0
+de	01_solar	1	329	2000.0	0.0	1.0
+de	02_wind_on	1	329	2000.0	0.0	1.0
+de	03_wind_off	1	329	2000.0	0.0	1.0
+de	04_res	1	329	2000.0	0.0	1.0
+de	05_nuclear	1	329	2000.0	0.0	1.0
+de	06_coal	1	329	2000.0	0.0	1.0
+de	07_gas	1	329	2000.0	0.0	1.0
+de	08_non-res	1	329	2000.0	0.0	1.0
 de	09_hydro_pump	1	329	0.0	0.0	0.0
-de	01_solar	1	330	2000.0	1.0	0.0
-de	02_wind_on	1	330	2000.0	1.0	0.0
-de	03_wind_off	1	330	2000.0	1.0	0.0
-de	04_res	1	330	2000.0	1.0	0.0
-de	05_nuclear	1	330	2000.0	1.0	0.0
-de	06_coal	1	330	2000.0	1.0	0.0
-de	07_gas	1	330	2000.0	1.0	0.0
-de	08_non-res	1	330	2000.0	1.0	0.0
-de	09_hydro_pump	1	330	100.0	1.0	0.0
-de	01_solar	1	331	2000.0	1.0	0.0
-de	02_wind_on	1	331	2000.0	1.0	0.0
-de	03_wind_off	1	331	2000.0	1.0	0.0
-de	04_res	1	331	2000.0	1.0	0.0
-de	05_nuclear	1	331	2000.0	1.0	0.0
-de	06_coal	1	331	2000.0	1.0	0.0
-de	07_gas	1	331	2000.0	1.0	0.0
-de	08_non-res	1	331	2000.0	1.0	0.0
-de	09_hydro_pump	1	331	200.0	1.0	0.0
-de	01_solar	1	332	2000.0	1.0	0.0
-de	02_wind_on	1	332	2000.0	1.0	0.0
-de	03_wind_off	1	332	2000.0	1.0	0.0
-de	04_res	1	332	2000.0	1.0	0.0
-de	05_nuclear	1	332	2000.0	1.0	0.0
-de	06_coal	1	332	2000.0	1.0	0.0
-de	07_gas	1	332	2000.0	1.0	0.0
-de	08_non-res	1	332	2000.0	1.0	0.0
-de	09_hydro_pump	1	332	300.0	1.0	0.0
-de	01_solar	1	333	2000.0	1.0	0.0
-de	02_wind_on	1	333	2000.0	1.0	0.0
-de	03_wind_off	1	333	2000.0	1.0	0.0
-de	04_res	1	333	2000.0	1.0	0.0
-de	05_nuclear	1	333	2000.0	1.0	0.0
-de	06_coal	1	333	2000.0	1.0	0.0
-de	07_gas	1	333	2000.0	1.0	0.0
-de	08_non-res	1	333	2000.0	1.0	0.0
-de	09_hydro_pump	1	333	400.0	1.0	0.0
-de	01_solar	1	334	2000.0	1.0	0.0
-de	02_wind_on	1	334	2000.0	1.0	0.0
-de	03_wind_off	1	334	2000.0	1.0	0.0
-de	04_res	1	334	2000.0	1.0	0.0
-de	05_nuclear	1	334	2000.0	1.0	0.0
-de	06_coal	1	334	2000.0	1.0	0.0
-de	07_gas	1	334	2000.0	1.0	0.0
-de	08_non-res	1	334	2000.0	1.0	0.0
-de	09_hydro_pump	1	334	500.0	1.0	0.0
-de	01_solar	1	335	2000.0	1.0	0.0
-de	02_wind_on	1	335	2000.0	1.0	0.0
-de	03_wind_off	1	335	2000.0	1.0	0.0
-de	04_res	1	335	2000.0	1.0	0.0
-de	05_nuclear	1	335	2000.0	1.0	0.0
-de	06_coal	1	335	2000.0	1.0	0.0
-de	07_gas	1	335	2000.0	1.0	0.0
-de	08_non-res	1	335	2000.0	1.0	0.0
-de	09_hydro_pump	1	335	600.0	1.0	0.0
-de	01_solar	1	336	2000.0	1.0	0.0
-de	02_wind_on	1	336	2000.0	1.0	0.0
-de	03_wind_off	1	336	2000.0	1.0	0.0
-de	04_res	1	336	2000.0	1.0	0.0
-de	05_nuclear	1	336	2000.0	1.0	0.0
-de	06_coal	1	336	2000.0	1.0	0.0
-de	07_gas	1	336	2000.0	1.0	0.0
-de	08_non-res	1	336	2000.0	1.0	0.0
-de	09_hydro_pump	1	336	700.0	1.0	0.0
+de	01_solar	1	330	2000.0	0.0	1.0
+de	02_wind_on	1	330	2000.0	0.0	1.0
+de	03_wind_off	1	330	2000.0	0.0	1.0
+de	04_res	1	330	2000.0	0.0	1.0
+de	05_nuclear	1	330	2000.0	0.0	1.0
+de	06_coal	1	330	2000.0	0.0	1.0
+de	07_gas	1	330	2000.0	0.0	1.0
+de	08_non-res	1	330	2000.0	0.0	1.0
+de	09_hydro_pump	1	330	100.0	0.0	1.0
+de	01_solar	1	331	2000.0	0.0	1.0
+de	02_wind_on	1	331	2000.0	0.0	1.0
+de	03_wind_off	1	331	2000.0	0.0	1.0
+de	04_res	1	331	2000.0	0.0	1.0
+de	05_nuclear	1	331	2000.0	0.0	1.0
+de	06_coal	1	331	2000.0	0.0	1.0
+de	07_gas	1	331	2000.0	0.0	1.0
+de	08_non-res	1	331	2000.0	0.0	1.0
+de	09_hydro_pump	1	331	200.0	0.0	1.0
+de	01_solar	1	332	2000.0	0.0	1.0
+de	02_wind_on	1	332	2000.0	0.0	1.0
+de	03_wind_off	1	332	2000.0	0.0	1.0
+de	04_res	1	332	2000.0	0.0	1.0
+de	05_nuclear	1	332	2000.0	0.0	1.0
+de	06_coal	1	332	2000.0	0.0	1.0
+de	07_gas	1	332	2000.0	0.0	1.0
+de	08_non-res	1	332	2000.0	0.0	1.0
+de	09_hydro_pump	1	332	300.0	0.0	1.0
+de	01_solar	1	333	2000.0	0.0	1.0
+de	02_wind_on	1	333	2000.0	0.0	1.0
+de	03_wind_off	1	333	2000.0	0.0	1.0
+de	04_res	1	333	2000.0	0.0	1.0
+de	05_nuclear	1	333	2000.0	0.0	1.0
+de	06_coal	1	333	2000.0	0.0	1.0
+de	07_gas	1	333	2000.0	0.0	1.0
+de	08_non-res	1	333	2000.0	0.0	1.0
+de	09_hydro_pump	1	333	400.0	0.0	1.0
+de	01_solar	1	334	2000.0	0.0	1.0
+de	02_wind_on	1	334	2000.0	0.0	1.0
+de	03_wind_off	1	334	2000.0	0.0	1.0
+de	04_res	1	334	2000.0	0.0	1.0
+de	05_nuclear	1	334	2000.0	0.0	1.0
+de	06_coal	1	334	2000.0	0.0	1.0
+de	07_gas	1	334	2000.0	0.0	1.0
+de	08_non-res	1	334	2000.0	0.0	1.0
+de	09_hydro_pump	1	334	500.0	0.0	1.0
+de	01_solar	1	335	2000.0	0.0	1.0
+de	02_wind_on	1	335	2000.0	0.0	1.0
+de	03_wind_off	1	335	2000.0	0.0	1.0
+de	04_res	1	335	2000.0	0.0	1.0
+de	05_nuclear	1	335	2000.0	0.0	1.0
+de	06_coal	1	335	2000.0	0.0	1.0
+de	07_gas	1	335	2000.0	0.0	1.0
+de	08_non-res	1	335	2000.0	0.0	1.0
+de	09_hydro_pump	1	335	600.0	0.0	1.0
+de	01_solar	1	336	2000.0	0.0	1.0
+de	02_wind_on	1	336	2000.0	0.0	1.0
+de	03_wind_off	1	336	2000.0	0.0	1.0
+de	04_res	1	336	2000.0	0.0	1.0
+de	05_nuclear	1	336	2000.0	0.0	1.0
+de	06_coal	1	336	2000.0	0.0	1.0
+de	07_gas	1	336	2000.0	0.0	1.0
+de	08_non-res	1	336	2000.0	0.0	1.0
+de	09_hydro_pump	1	336	700.0	0.0	1.0
 fr	01_solar	1	1	0.0	0.0	0.0
 fr	02_wind_on	1	1	0.0	0.0	0.0
 fr	03_wind_off	1	1	0.0	0.0	0.0
@@ -3032,7 +3032,7 @@ fr	06_coal	1	1	0.0	0.0	0.0
 fr	07_gas	1	1	0.0	0.0	0.0
 fr	08_non-res	1	1	0.0	0.0	0.0
 fr	09_hydro_pump	1	1	0.0	0.0	0.0
-fr	01_solar	1	2	100.0	1.0	0.0
+fr	01_solar	1	2	100.0	0.0	1.0
 fr	02_wind_on	1	2	0.0	0.0	0.0
 fr	03_wind_off	1	2	0.0	0.0	0.0
 fr	04_res	1	2	0.0	0.0	0.0
@@ -3041,7 +3041,7 @@ fr	06_coal	1	2	0.0	0.0	0.0
 fr	07_gas	1	2	0.0	0.0	0.0
 fr	08_non-res	1	2	0.0	0.0	0.0
 fr	09_hydro_pump	1	2	0.0	0.0	0.0
-fr	01_solar	1	3	200.0	1.0	0.0
+fr	01_solar	1	3	200.0	0.0	1.0
 fr	02_wind_on	1	3	0.0	0.0	0.0
 fr	03_wind_off	1	3	0.0	0.0	0.0
 fr	04_res	1	3	0.0	0.0	0.0
@@ -3050,7 +3050,7 @@ fr	06_coal	1	3	0.0	0.0	0.0
 fr	07_gas	1	3	0.0	0.0	0.0
 fr	08_non-res	1	3	0.0	0.0	0.0
 fr	09_hydro_pump	1	3	0.0	0.0	0.0
-fr	01_solar	1	4	300.0	1.0	0.0
+fr	01_solar	1	4	300.0	0.0	1.0
 fr	02_wind_on	1	4	0.0	0.0	0.0
 fr	03_wind_off	1	4	0.0	0.0	0.0
 fr	04_res	1	4	0.0	0.0	0.0
@@ -3059,7 +3059,7 @@ fr	06_coal	1	4	0.0	0.0	0.0
 fr	07_gas	1	4	0.0	0.0	0.0
 fr	08_non-res	1	4	0.0	0.0	0.0
 fr	09_hydro_pump	1	4	0.0	0.0	0.0
-fr	01_solar	1	5	400.0	1.0	0.0
+fr	01_solar	1	5	400.0	0.0	1.0
 fr	02_wind_on	1	5	0.0	0.0	0.0
 fr	03_wind_off	1	5	0.0	0.0	0.0
 fr	04_res	1	5	0.0	0.0	0.0
@@ -3068,7 +3068,7 @@ fr	06_coal	1	5	0.0	0.0	0.0
 fr	07_gas	1	5	0.0	0.0	0.0
 fr	08_non-res	1	5	0.0	0.0	0.0
 fr	09_hydro_pump	1	5	0.0	0.0	0.0
-fr	01_solar	1	6	500.0	1.0	0.0
+fr	01_solar	1	6	500.0	0.0	1.0
 fr	02_wind_on	1	6	0.0	0.0	0.0
 fr	03_wind_off	1	6	0.0	0.0	0.0
 fr	04_res	1	6	0.0	0.0	0.0
@@ -3077,7 +3077,7 @@ fr	06_coal	1	6	0.0	0.0	0.0
 fr	07_gas	1	6	0.0	0.0	0.0
 fr	08_non-res	1	6	0.0	0.0	0.0
 fr	09_hydro_pump	1	6	0.0	0.0	0.0
-fr	01_solar	1	7	600.0	1.0	0.0
+fr	01_solar	1	7	600.0	0.0	1.0
 fr	02_wind_on	1	7	0.0	0.0	0.0
 fr	03_wind_off	1	7	0.0	0.0	0.0
 fr	04_res	1	7	0.0	0.0	0.0
@@ -3086,7 +3086,7 @@ fr	06_coal	1	7	0.0	0.0	0.0
 fr	07_gas	1	7	0.0	0.0	0.0
 fr	08_non-res	1	7	0.0	0.0	0.0
 fr	09_hydro_pump	1	7	0.0	0.0	0.0
-fr	01_solar	1	8	700.0	1.0	0.0
+fr	01_solar	1	8	700.0	0.0	1.0
 fr	02_wind_on	1	8	0.0	0.0	0.0
 fr	03_wind_off	1	8	0.0	0.0	0.0
 fr	04_res	1	8	0.0	0.0	0.0
@@ -3095,7 +3095,7 @@ fr	06_coal	1	8	0.0	0.0	0.0
 fr	07_gas	1	8	0.0	0.0	0.0
 fr	08_non-res	1	8	0.0	0.0	0.0
 fr	09_hydro_pump	1	8	0.0	0.0	0.0
-fr	01_solar	1	9	800.0	1.0	0.0
+fr	01_solar	1	9	800.0	0.0	1.0
 fr	02_wind_on	1	9	0.0	0.0	0.0
 fr	03_wind_off	1	9	0.0	0.0	0.0
 fr	04_res	1	9	0.0	0.0	0.0
@@ -3104,7 +3104,7 @@ fr	06_coal	1	9	0.0	0.0	0.0
 fr	07_gas	1	9	0.0	0.0	0.0
 fr	08_non-res	1	9	0.0	0.0	0.0
 fr	09_hydro_pump	1	9	0.0	0.0	0.0
-fr	01_solar	1	10	900.0	1.0	0.0
+fr	01_solar	1	10	900.0	0.0	1.0
 fr	02_wind_on	1	10	0.0	0.0	0.0
 fr	03_wind_off	1	10	0.0	0.0	0.0
 fr	04_res	1	10	0.0	0.0	0.0
@@ -3113,7 +3113,7 @@ fr	06_coal	1	10	0.0	0.0	0.0
 fr	07_gas	1	10	0.0	0.0	0.0
 fr	08_non-res	1	10	0.0	0.0	0.0
 fr	09_hydro_pump	1	10	0.0	0.0	0.0
-fr	01_solar	1	11	1000.0	1.0	0.0
+fr	01_solar	1	11	1000.0	0.0	1.0
 fr	02_wind_on	1	11	0.0	0.0	0.0
 fr	03_wind_off	1	11	0.0	0.0	0.0
 fr	04_res	1	11	0.0	0.0	0.0
@@ -3122,7 +3122,7 @@ fr	06_coal	1	11	0.0	0.0	0.0
 fr	07_gas	1	11	0.0	0.0	0.0
 fr	08_non-res	1	11	0.0	0.0	0.0
 fr	09_hydro_pump	1	11	0.0	0.0	0.0
-fr	01_solar	1	12	1100.0	1.0	0.0
+fr	01_solar	1	12	1100.0	0.0	1.0
 fr	02_wind_on	1	12	0.0	0.0	0.0
 fr	03_wind_off	1	12	0.0	0.0	0.0
 fr	04_res	1	12	0.0	0.0	0.0
@@ -3131,7 +3131,7 @@ fr	06_coal	1	12	0.0	0.0	0.0
 fr	07_gas	1	12	0.0	0.0	0.0
 fr	08_non-res	1	12	0.0	0.0	0.0
 fr	09_hydro_pump	1	12	0.0	0.0	0.0
-fr	01_solar	1	13	1200.0	1.0	0.0
+fr	01_solar	1	13	1200.0	0.0	1.0
 fr	02_wind_on	1	13	0.0	0.0	0.0
 fr	03_wind_off	1	13	0.0	0.0	0.0
 fr	04_res	1	13	0.0	0.0	0.0
@@ -3140,7 +3140,7 @@ fr	06_coal	1	13	0.0	0.0	0.0
 fr	07_gas	1	13	0.0	0.0	0.0
 fr	08_non-res	1	13	0.0	0.0	0.0
 fr	09_hydro_pump	1	13	0.0	0.0	0.0
-fr	01_solar	1	14	1300.0	1.0	0.0
+fr	01_solar	1	14	1300.0	0.0	1.0
 fr	02_wind_on	1	14	0.0	0.0	0.0
 fr	03_wind_off	1	14	0.0	0.0	0.0
 fr	04_res	1	14	0.0	0.0	0.0
@@ -3149,7 +3149,7 @@ fr	06_coal	1	14	0.0	0.0	0.0
 fr	07_gas	1	14	0.0	0.0	0.0
 fr	08_non-res	1	14	0.0	0.0	0.0
 fr	09_hydro_pump	1	14	0.0	0.0	0.0
-fr	01_solar	1	15	1400.0	1.0	0.0
+fr	01_solar	1	15	1400.0	0.0	1.0
 fr	02_wind_on	1	15	0.0	0.0	0.0
 fr	03_wind_off	1	15	0.0	0.0	0.0
 fr	04_res	1	15	0.0	0.0	0.0
@@ -3158,7 +3158,7 @@ fr	06_coal	1	15	0.0	0.0	0.0
 fr	07_gas	1	15	0.0	0.0	0.0
 fr	08_non-res	1	15	0.0	0.0	0.0
 fr	09_hydro_pump	1	15	0.0	0.0	0.0
-fr	01_solar	1	16	1500.0	1.0	0.0
+fr	01_solar	1	16	1500.0	0.0	1.0
 fr	02_wind_on	1	16	0.0	0.0	0.0
 fr	03_wind_off	1	16	0.0	0.0	0.0
 fr	04_res	1	16	0.0	0.0	0.0
@@ -3167,7 +3167,7 @@ fr	06_coal	1	16	0.0	0.0	0.0
 fr	07_gas	1	16	0.0	0.0	0.0
 fr	08_non-res	1	16	0.0	0.0	0.0
 fr	09_hydro_pump	1	16	0.0	0.0	0.0
-fr	01_solar	1	17	1600.0	1.0	0.0
+fr	01_solar	1	17	1600.0	0.0	1.0
 fr	02_wind_on	1	17	0.0	0.0	0.0
 fr	03_wind_off	1	17	0.0	0.0	0.0
 fr	04_res	1	17	0.0	0.0	0.0
@@ -3176,7 +3176,7 @@ fr	06_coal	1	17	0.0	0.0	0.0
 fr	07_gas	1	17	0.0	0.0	0.0
 fr	08_non-res	1	17	0.0	0.0	0.0
 fr	09_hydro_pump	1	17	0.0	0.0	0.0
-fr	01_solar	1	18	1700.0	1.0	0.0
+fr	01_solar	1	18	1700.0	0.0	1.0
 fr	02_wind_on	1	18	0.0	0.0	0.0
 fr	03_wind_off	1	18	0.0	0.0	0.0
 fr	04_res	1	18	0.0	0.0	0.0
@@ -3185,7 +3185,7 @@ fr	06_coal	1	18	0.0	0.0	0.0
 fr	07_gas	1	18	0.0	0.0	0.0
 fr	08_non-res	1	18	0.0	0.0	0.0
 fr	09_hydro_pump	1	18	0.0	0.0	0.0
-fr	01_solar	1	19	1800.0	1.0	0.0
+fr	01_solar	1	19	1800.0	0.0	1.0
 fr	02_wind_on	1	19	0.0	0.0	0.0
 fr	03_wind_off	1	19	0.0	0.0	0.0
 fr	04_res	1	19	0.0	0.0	0.0
@@ -3194,7 +3194,7 @@ fr	06_coal	1	19	0.0	0.0	0.0
 fr	07_gas	1	19	0.0	0.0	0.0
 fr	08_non-res	1	19	0.0	0.0	0.0
 fr	09_hydro_pump	1	19	0.0	0.0	0.0
-fr	01_solar	1	20	1900.0	1.0	0.0
+fr	01_solar	1	20	1900.0	0.0	1.0
 fr	02_wind_on	1	20	0.0	0.0	0.0
 fr	03_wind_off	1	20	0.0	0.0	0.0
 fr	04_res	1	20	0.0	0.0	0.0
@@ -3203,7 +3203,7 @@ fr	06_coal	1	20	0.0	0.0	0.0
 fr	07_gas	1	20	0.0	0.0	0.0
 fr	08_non-res	1	20	0.0	0.0	0.0
 fr	09_hydro_pump	1	20	0.0	0.0	0.0
-fr	01_solar	1	21	2000.0	1.0	0.0
+fr	01_solar	1	21	2000.0	0.0	1.0
 fr	02_wind_on	1	21	0.0	0.0	0.0
 fr	03_wind_off	1	21	0.0	0.0	0.0
 fr	04_res	1	21	0.0	0.0	0.0
@@ -3212,8 +3212,8 @@ fr	06_coal	1	21	0.0	0.0	0.0
 fr	07_gas	1	21	0.0	0.0	0.0
 fr	08_non-res	1	21	0.0	0.0	0.0
 fr	09_hydro_pump	1	21	0.0	0.0	0.0
-fr	01_solar	1	22	2000.0	1.0	0.0
-fr	02_wind_on	1	22	100.0	1.0	0.0
+fr	01_solar	1	22	2000.0	0.0	1.0
+fr	02_wind_on	1	22	100.0	0.0	1.0
 fr	03_wind_off	1	22	0.0	0.0	0.0
 fr	04_res	1	22	0.0	0.0	0.0
 fr	05_nuclear	1	22	0.0	0.0	0.0
@@ -3221,8 +3221,8 @@ fr	06_coal	1	22	0.0	0.0	0.0
 fr	07_gas	1	22	0.0	0.0	0.0
 fr	08_non-res	1	22	0.0	0.0	0.0
 fr	09_hydro_pump	1	22	0.0	0.0	0.0
-fr	01_solar	1	23	2000.0	1.0	0.0
-fr	02_wind_on	1	23	200.0	1.0	0.0
+fr	01_solar	1	23	2000.0	0.0	1.0
+fr	02_wind_on	1	23	200.0	0.0	1.0
 fr	03_wind_off	1	23	0.0	0.0	0.0
 fr	04_res	1	23	0.0	0.0	0.0
 fr	05_nuclear	1	23	0.0	0.0	0.0
@@ -3230,8 +3230,8 @@ fr	06_coal	1	23	0.0	0.0	0.0
 fr	07_gas	1	23	0.0	0.0	0.0
 fr	08_non-res	1	23	0.0	0.0	0.0
 fr	09_hydro_pump	1	23	0.0	0.0	0.0
-fr	01_solar	1	24	2000.0	1.0	0.0
-fr	02_wind_on	1	24	300.0	1.0	0.0
+fr	01_solar	1	24	2000.0	0.0	1.0
+fr	02_wind_on	1	24	300.0	0.0	1.0
 fr	03_wind_off	1	24	0.0	0.0	0.0
 fr	04_res	1	24	0.0	0.0	0.0
 fr	05_nuclear	1	24	0.0	0.0	0.0
@@ -3239,8 +3239,8 @@ fr	06_coal	1	24	0.0	0.0	0.0
 fr	07_gas	1	24	0.0	0.0	0.0
 fr	08_non-res	1	24	0.0	0.0	0.0
 fr	09_hydro_pump	1	24	0.0	0.0	0.0
-fr	01_solar	1	25	2000.0	1.0	0.0
-fr	02_wind_on	1	25	400.0	1.0	0.0
+fr	01_solar	1	25	2000.0	0.0	1.0
+fr	02_wind_on	1	25	400.0	0.0	1.0
 fr	03_wind_off	1	25	0.0	0.0	0.0
 fr	04_res	1	25	0.0	0.0	0.0
 fr	05_nuclear	1	25	0.0	0.0	0.0
@@ -3248,8 +3248,8 @@ fr	06_coal	1	25	0.0	0.0	0.0
 fr	07_gas	1	25	0.0	0.0	0.0
 fr	08_non-res	1	25	0.0	0.0	0.0
 fr	09_hydro_pump	1	25	0.0	0.0	0.0
-fr	01_solar	1	26	2000.0	1.0	0.0
-fr	02_wind_on	1	26	500.0	1.0	0.0
+fr	01_solar	1	26	2000.0	0.0	1.0
+fr	02_wind_on	1	26	500.0	0.0	1.0
 fr	03_wind_off	1	26	0.0	0.0	0.0
 fr	04_res	1	26	0.0	0.0	0.0
 fr	05_nuclear	1	26	0.0	0.0	0.0
@@ -3257,8 +3257,8 @@ fr	06_coal	1	26	0.0	0.0	0.0
 fr	07_gas	1	26	0.0	0.0	0.0
 fr	08_non-res	1	26	0.0	0.0	0.0
 fr	09_hydro_pump	1	26	0.0	0.0	0.0
-fr	01_solar	1	27	2000.0	1.0	0.0
-fr	02_wind_on	1	27	600.0	1.0	0.0
+fr	01_solar	1	27	2000.0	0.0	1.0
+fr	02_wind_on	1	27	600.0	0.0	1.0
 fr	03_wind_off	1	27	0.0	0.0	0.0
 fr	04_res	1	27	0.0	0.0	0.0
 fr	05_nuclear	1	27	0.0	0.0	0.0
@@ -3266,8 +3266,8 @@ fr	06_coal	1	27	0.0	0.0	0.0
 fr	07_gas	1	27	0.0	0.0	0.0
 fr	08_non-res	1	27	0.0	0.0	0.0
 fr	09_hydro_pump	1	27	0.0	0.0	0.0
-fr	01_solar	1	28	2000.0	1.0	0.0
-fr	02_wind_on	1	28	700.0	1.0	0.0
+fr	01_solar	1	28	2000.0	0.0	1.0
+fr	02_wind_on	1	28	700.0	0.0	1.0
 fr	03_wind_off	1	28	0.0	0.0	0.0
 fr	04_res	1	28	0.0	0.0	0.0
 fr	05_nuclear	1	28	0.0	0.0	0.0
@@ -3275,8 +3275,8 @@ fr	06_coal	1	28	0.0	0.0	0.0
 fr	07_gas	1	28	0.0	0.0	0.0
 fr	08_non-res	1	28	0.0	0.0	0.0
 fr	09_hydro_pump	1	28	0.0	0.0	0.0
-fr	01_solar	1	29	2000.0	1.0	0.0
-fr	02_wind_on	1	29	800.0	1.0	0.0
+fr	01_solar	1	29	2000.0	0.0	1.0
+fr	02_wind_on	1	29	800.0	0.0	1.0
 fr	03_wind_off	1	29	0.0	0.0	0.0
 fr	04_res	1	29	0.0	0.0	0.0
 fr	05_nuclear	1	29	0.0	0.0	0.0
@@ -3284,8 +3284,8 @@ fr	06_coal	1	29	0.0	0.0	0.0
 fr	07_gas	1	29	0.0	0.0	0.0
 fr	08_non-res	1	29	0.0	0.0	0.0
 fr	09_hydro_pump	1	29	0.0	0.0	0.0
-fr	01_solar	1	30	2000.0	1.0	0.0
-fr	02_wind_on	1	30	900.0	1.0	0.0
+fr	01_solar	1	30	2000.0	0.0	1.0
+fr	02_wind_on	1	30	900.0	0.0	1.0
 fr	03_wind_off	1	30	0.0	0.0	0.0
 fr	04_res	1	30	0.0	0.0	0.0
 fr	05_nuclear	1	30	0.0	0.0	0.0
@@ -3293,8 +3293,8 @@ fr	06_coal	1	30	0.0	0.0	0.0
 fr	07_gas	1	30	0.0	0.0	0.0
 fr	08_non-res	1	30	0.0	0.0	0.0
 fr	09_hydro_pump	1	30	0.0	0.0	0.0
-fr	01_solar	1	31	2000.0	1.0	0.0
-fr	02_wind_on	1	31	1000.0	1.0	0.0
+fr	01_solar	1	31	2000.0	0.0	1.0
+fr	02_wind_on	1	31	1000.0	0.0	1.0
 fr	03_wind_off	1	31	0.0	0.0	0.0
 fr	04_res	1	31	0.0	0.0	0.0
 fr	05_nuclear	1	31	0.0	0.0	0.0
@@ -3302,8 +3302,8 @@ fr	06_coal	1	31	0.0	0.0	0.0
 fr	07_gas	1	31	0.0	0.0	0.0
 fr	08_non-res	1	31	0.0	0.0	0.0
 fr	09_hydro_pump	1	31	0.0	0.0	0.0
-fr	01_solar	1	32	2000.0	1.0	0.0
-fr	02_wind_on	1	32	1100.0	1.0	0.0
+fr	01_solar	1	32	2000.0	0.0	1.0
+fr	02_wind_on	1	32	1100.0	0.0	1.0
 fr	03_wind_off	1	32	0.0	0.0	0.0
 fr	04_res	1	32	0.0	0.0	0.0
 fr	05_nuclear	1	32	0.0	0.0	0.0
@@ -3311,8 +3311,8 @@ fr	06_coal	1	32	0.0	0.0	0.0
 fr	07_gas	1	32	0.0	0.0	0.0
 fr	08_non-res	1	32	0.0	0.0	0.0
 fr	09_hydro_pump	1	32	0.0	0.0	0.0
-fr	01_solar	1	33	2000.0	1.0	0.0
-fr	02_wind_on	1	33	1200.0	1.0	0.0
+fr	01_solar	1	33	2000.0	0.0	1.0
+fr	02_wind_on	1	33	1200.0	0.0	1.0
 fr	03_wind_off	1	33	0.0	0.0	0.0
 fr	04_res	1	33	0.0	0.0	0.0
 fr	05_nuclear	1	33	0.0	0.0	0.0
@@ -3320,8 +3320,8 @@ fr	06_coal	1	33	0.0	0.0	0.0
 fr	07_gas	1	33	0.0	0.0	0.0
 fr	08_non-res	1	33	0.0	0.0	0.0
 fr	09_hydro_pump	1	33	0.0	0.0	0.0
-fr	01_solar	1	34	2000.0	1.0	0.0
-fr	02_wind_on	1	34	1300.0	1.0	0.0
+fr	01_solar	1	34	2000.0	0.0	1.0
+fr	02_wind_on	1	34	1300.0	0.0	1.0
 fr	03_wind_off	1	34	0.0	0.0	0.0
 fr	04_res	1	34	0.0	0.0	0.0
 fr	05_nuclear	1	34	0.0	0.0	0.0
@@ -3329,8 +3329,8 @@ fr	06_coal	1	34	0.0	0.0	0.0
 fr	07_gas	1	34	0.0	0.0	0.0
 fr	08_non-res	1	34	0.0	0.0	0.0
 fr	09_hydro_pump	1	34	0.0	0.0	0.0
-fr	01_solar	1	35	2000.0	1.0	0.0
-fr	02_wind_on	1	35	1400.0	1.0	0.0
+fr	01_solar	1	35	2000.0	0.0	1.0
+fr	02_wind_on	1	35	1400.0	0.0	1.0
 fr	03_wind_off	1	35	0.0	0.0	0.0
 fr	04_res	1	35	0.0	0.0	0.0
 fr	05_nuclear	1	35	0.0	0.0	0.0
@@ -3338,8 +3338,8 @@ fr	06_coal	1	35	0.0	0.0	0.0
 fr	07_gas	1	35	0.0	0.0	0.0
 fr	08_non-res	1	35	0.0	0.0	0.0
 fr	09_hydro_pump	1	35	0.0	0.0	0.0
-fr	01_solar	1	36	2000.0	1.0	0.0
-fr	02_wind_on	1	36	1500.0	1.0	0.0
+fr	01_solar	1	36	2000.0	0.0	1.0
+fr	02_wind_on	1	36	1500.0	0.0	1.0
 fr	03_wind_off	1	36	0.0	0.0	0.0
 fr	04_res	1	36	0.0	0.0	0.0
 fr	05_nuclear	1	36	0.0	0.0	0.0
@@ -3347,8 +3347,8 @@ fr	06_coal	1	36	0.0	0.0	0.0
 fr	07_gas	1	36	0.0	0.0	0.0
 fr	08_non-res	1	36	0.0	0.0	0.0
 fr	09_hydro_pump	1	36	0.0	0.0	0.0
-fr	01_solar	1	37	2000.0	1.0	0.0
-fr	02_wind_on	1	37	1600.0	1.0	0.0
+fr	01_solar	1	37	2000.0	0.0	1.0
+fr	02_wind_on	1	37	1600.0	0.0	1.0
 fr	03_wind_off	1	37	0.0	0.0	0.0
 fr	04_res	1	37	0.0	0.0	0.0
 fr	05_nuclear	1	37	0.0	0.0	0.0
@@ -3356,8 +3356,8 @@ fr	06_coal	1	37	0.0	0.0	0.0
 fr	07_gas	1	37	0.0	0.0	0.0
 fr	08_non-res	1	37	0.0	0.0	0.0
 fr	09_hydro_pump	1	37	0.0	0.0	0.0
-fr	01_solar	1	38	2000.0	1.0	0.0
-fr	02_wind_on	1	38	1700.0	1.0	0.0
+fr	01_solar	1	38	2000.0	0.0	1.0
+fr	02_wind_on	1	38	1700.0	0.0	1.0
 fr	03_wind_off	1	38	0.0	0.0	0.0
 fr	04_res	1	38	0.0	0.0	0.0
 fr	05_nuclear	1	38	0.0	0.0	0.0
@@ -3365,8 +3365,8 @@ fr	06_coal	1	38	0.0	0.0	0.0
 fr	07_gas	1	38	0.0	0.0	0.0
 fr	08_non-res	1	38	0.0	0.0	0.0
 fr	09_hydro_pump	1	38	0.0	0.0	0.0
-fr	01_solar	1	39	2000.0	1.0	0.0
-fr	02_wind_on	1	39	1800.0	1.0	0.0
+fr	01_solar	1	39	2000.0	0.0	1.0
+fr	02_wind_on	1	39	1800.0	0.0	1.0
 fr	03_wind_off	1	39	0.0	0.0	0.0
 fr	04_res	1	39	0.0	0.0	0.0
 fr	05_nuclear	1	39	0.0	0.0	0.0
@@ -3374,8 +3374,8 @@ fr	06_coal	1	39	0.0	0.0	0.0
 fr	07_gas	1	39	0.0	0.0	0.0
 fr	08_non-res	1	39	0.0	0.0	0.0
 fr	09_hydro_pump	1	39	0.0	0.0	0.0
-fr	01_solar	1	40	2000.0	1.0	0.0
-fr	02_wind_on	1	40	1900.0	1.0	0.0
+fr	01_solar	1	40	2000.0	0.0	1.0
+fr	02_wind_on	1	40	1900.0	0.0	1.0
 fr	03_wind_off	1	40	0.0	0.0	0.0
 fr	04_res	1	40	0.0	0.0	0.0
 fr	05_nuclear	1	40	0.0	0.0	0.0
@@ -3383,8 +3383,8 @@ fr	06_coal	1	40	0.0	0.0	0.0
 fr	07_gas	1	40	0.0	0.0	0.0
 fr	08_non-res	1	40	0.0	0.0	0.0
 fr	09_hydro_pump	1	40	0.0	0.0	0.0
-fr	01_solar	1	41	2000.0	1.0	0.0
-fr	02_wind_on	1	41	2000.0	1.0	0.0
+fr	01_solar	1	41	2000.0	0.0	1.0
+fr	02_wind_on	1	41	2000.0	0.0	1.0
 fr	03_wind_off	1	41	0.0	0.0	0.0
 fr	04_res	1	41	0.0	0.0	0.0
 fr	05_nuclear	1	41	0.0	0.0	0.0
@@ -3392,1149 +3392,1149 @@ fr	06_coal	1	41	0.0	0.0	0.0
 fr	07_gas	1	41	0.0	0.0	0.0
 fr	08_non-res	1	41	0.0	0.0	0.0
 fr	09_hydro_pump	1	41	0.0	0.0	0.0
-fr	01_solar	1	42	2000.0	1.0	0.0
-fr	02_wind_on	1	42	2000.0	1.0	0.0
-fr	03_wind_off	1	42	100.0	1.0	0.0
+fr	01_solar	1	42	2000.0	0.0	1.0
+fr	02_wind_on	1	42	2000.0	0.0	1.0
+fr	03_wind_off	1	42	100.0	0.0	1.0
 fr	04_res	1	42	0.0	0.0	0.0
 fr	05_nuclear	1	42	0.0	0.0	0.0
 fr	06_coal	1	42	0.0	0.0	0.0
 fr	07_gas	1	42	0.0	0.0	0.0
 fr	08_non-res	1	42	0.0	0.0	0.0
 fr	09_hydro_pump	1	42	0.0	0.0	0.0
-fr	01_solar	1	43	2000.0	1.0	0.0
-fr	02_wind_on	1	43	2000.0	1.0	0.0
-fr	03_wind_off	1	43	200.0	1.0	0.0
+fr	01_solar	1	43	2000.0	0.0	1.0
+fr	02_wind_on	1	43	2000.0	0.0	1.0
+fr	03_wind_off	1	43	200.0	0.0	1.0
 fr	04_res	1	43	0.0	0.0	0.0
 fr	05_nuclear	1	43	0.0	0.0	0.0
 fr	06_coal	1	43	0.0	0.0	0.0
 fr	07_gas	1	43	0.0	0.0	0.0
 fr	08_non-res	1	43	0.0	0.0	0.0
 fr	09_hydro_pump	1	43	0.0	0.0	0.0
-fr	01_solar	1	44	2000.0	1.0	0.0
-fr	02_wind_on	1	44	2000.0	1.0	0.0
-fr	03_wind_off	1	44	300.0	1.0	0.0
+fr	01_solar	1	44	2000.0	0.0	1.0
+fr	02_wind_on	1	44	2000.0	0.0	1.0
+fr	03_wind_off	1	44	300.0	0.0	1.0
 fr	04_res	1	44	0.0	0.0	0.0
 fr	05_nuclear	1	44	0.0	0.0	0.0
 fr	06_coal	1	44	0.0	0.0	0.0
 fr	07_gas	1	44	0.0	0.0	0.0
 fr	08_non-res	1	44	0.0	0.0	0.0
 fr	09_hydro_pump	1	44	0.0	0.0	0.0
-fr	01_solar	1	45	2000.0	1.0	0.0
-fr	02_wind_on	1	45	2000.0	1.0	0.0
-fr	03_wind_off	1	45	400.0	1.0	0.0
+fr	01_solar	1	45	2000.0	0.0	1.0
+fr	02_wind_on	1	45	2000.0	0.0	1.0
+fr	03_wind_off	1	45	400.0	0.0	1.0
 fr	04_res	1	45	0.0	0.0	0.0
 fr	05_nuclear	1	45	0.0	0.0	0.0
 fr	06_coal	1	45	0.0	0.0	0.0
 fr	07_gas	1	45	0.0	0.0	0.0
 fr	08_non-res	1	45	0.0	0.0	0.0
 fr	09_hydro_pump	1	45	0.0	0.0	0.0
-fr	01_solar	1	46	2000.0	1.0	0.0
-fr	02_wind_on	1	46	2000.0	1.0	0.0
-fr	03_wind_off	1	46	500.0	1.0	0.0
+fr	01_solar	1	46	2000.0	0.0	1.0
+fr	02_wind_on	1	46	2000.0	0.0	1.0
+fr	03_wind_off	1	46	500.0	0.0	1.0
 fr	04_res	1	46	0.0	0.0	0.0
 fr	05_nuclear	1	46	0.0	0.0	0.0
 fr	06_coal	1	46	0.0	0.0	0.0
 fr	07_gas	1	46	0.0	0.0	0.0
 fr	08_non-res	1	46	0.0	0.0	0.0
 fr	09_hydro_pump	1	46	0.0	0.0	0.0
-fr	01_solar	1	47	2000.0	1.0	0.0
-fr	02_wind_on	1	47	2000.0	1.0	0.0
-fr	03_wind_off	1	47	600.0	1.0	0.0
+fr	01_solar	1	47	2000.0	0.0	1.0
+fr	02_wind_on	1	47	2000.0	0.0	1.0
+fr	03_wind_off	1	47	600.0	0.0	1.0
 fr	04_res	1	47	0.0	0.0	0.0
 fr	05_nuclear	1	47	0.0	0.0	0.0
 fr	06_coal	1	47	0.0	0.0	0.0
 fr	07_gas	1	47	0.0	0.0	0.0
 fr	08_non-res	1	47	0.0	0.0	0.0
 fr	09_hydro_pump	1	47	0.0	0.0	0.0
-fr	01_solar	1	48	2000.0	1.0	0.0
-fr	02_wind_on	1	48	2000.0	1.0	0.0
-fr	03_wind_off	1	48	700.0	1.0	0.0
+fr	01_solar	1	48	2000.0	0.0	1.0
+fr	02_wind_on	1	48	2000.0	0.0	1.0
+fr	03_wind_off	1	48	700.0	0.0	1.0
 fr	04_res	1	48	0.0	0.0	0.0
 fr	05_nuclear	1	48	0.0	0.0	0.0
 fr	06_coal	1	48	0.0	0.0	0.0
 fr	07_gas	1	48	0.0	0.0	0.0
 fr	08_non-res	1	48	0.0	0.0	0.0
 fr	09_hydro_pump	1	48	0.0	0.0	0.0
-fr	01_solar	1	49	2000.0	1.0	0.0
-fr	02_wind_on	1	49	2000.0	1.0	0.0
-fr	03_wind_off	1	49	800.0	1.0	0.0
+fr	01_solar	1	49	2000.0	0.0	1.0
+fr	02_wind_on	1	49	2000.0	0.0	1.0
+fr	03_wind_off	1	49	800.0	0.0	1.0
 fr	04_res	1	49	0.0	0.0	0.0
 fr	05_nuclear	1	49	0.0	0.0	0.0
 fr	06_coal	1	49	0.0	0.0	0.0
 fr	07_gas	1	49	0.0	0.0	0.0
 fr	08_non-res	1	49	0.0	0.0	0.0
 fr	09_hydro_pump	1	49	0.0	0.0	0.0
-fr	01_solar	1	50	2000.0	1.0	0.0
-fr	02_wind_on	1	50	2000.0	1.0	0.0
-fr	03_wind_off	1	50	900.0	1.0	0.0
+fr	01_solar	1	50	2000.0	0.0	1.0
+fr	02_wind_on	1	50	2000.0	0.0	1.0
+fr	03_wind_off	1	50	900.0	0.0	1.0
 fr	04_res	1	50	0.0	0.0	0.0
 fr	05_nuclear	1	50	0.0	0.0	0.0
 fr	06_coal	1	50	0.0	0.0	0.0
 fr	07_gas	1	50	0.0	0.0	0.0
 fr	08_non-res	1	50	0.0	0.0	0.0
 fr	09_hydro_pump	1	50	0.0	0.0	0.0
-fr	01_solar	1	51	2000.0	1.0	0.0
-fr	02_wind_on	1	51	2000.0	1.0	0.0
-fr	03_wind_off	1	51	1000.0	1.0	0.0
+fr	01_solar	1	51	2000.0	0.0	1.0
+fr	02_wind_on	1	51	2000.0	0.0	1.0
+fr	03_wind_off	1	51	1000.0	0.0	1.0
 fr	04_res	1	51	0.0	0.0	0.0
 fr	05_nuclear	1	51	0.0	0.0	0.0
 fr	06_coal	1	51	0.0	0.0	0.0
 fr	07_gas	1	51	0.0	0.0	0.0
 fr	08_non-res	1	51	0.0	0.0	0.0
 fr	09_hydro_pump	1	51	0.0	0.0	0.0
-fr	01_solar	1	52	2000.0	1.0	0.0
-fr	02_wind_on	1	52	2000.0	1.0	0.0
-fr	03_wind_off	1	52	1100.0	1.0	0.0
+fr	01_solar	1	52	2000.0	0.0	1.0
+fr	02_wind_on	1	52	2000.0	0.0	1.0
+fr	03_wind_off	1	52	1100.0	0.0	1.0
 fr	04_res	1	52	0.0	0.0	0.0
 fr	05_nuclear	1	52	0.0	0.0	0.0
 fr	06_coal	1	52	0.0	0.0	0.0
 fr	07_gas	1	52	0.0	0.0	0.0
 fr	08_non-res	1	52	0.0	0.0	0.0
 fr	09_hydro_pump	1	52	0.0	0.0	0.0
-fr	01_solar	1	53	2000.0	1.0	0.0
-fr	02_wind_on	1	53	2000.0	1.0	0.0
-fr	03_wind_off	1	53	1200.0	1.0	0.0
+fr	01_solar	1	53	2000.0	0.0	1.0
+fr	02_wind_on	1	53	2000.0	0.0	1.0
+fr	03_wind_off	1	53	1200.0	0.0	1.0
 fr	04_res	1	53	0.0	0.0	0.0
 fr	05_nuclear	1	53	0.0	0.0	0.0
 fr	06_coal	1	53	0.0	0.0	0.0
 fr	07_gas	1	53	0.0	0.0	0.0
 fr	08_non-res	1	53	0.0	0.0	0.0
 fr	09_hydro_pump	1	53	0.0	0.0	0.0
-fr	01_solar	1	54	2000.0	1.0	0.0
-fr	02_wind_on	1	54	2000.0	1.0	0.0
-fr	03_wind_off	1	54	1300.0	1.0	0.0
+fr	01_solar	1	54	2000.0	0.0	1.0
+fr	02_wind_on	1	54	2000.0	0.0	1.0
+fr	03_wind_off	1	54	1300.0	0.0	1.0
 fr	04_res	1	54	0.0	0.0	0.0
 fr	05_nuclear	1	54	0.0	0.0	0.0
 fr	06_coal	1	54	0.0	0.0	0.0
 fr	07_gas	1	54	0.0	0.0	0.0
 fr	08_non-res	1	54	0.0	0.0	0.0
 fr	09_hydro_pump	1	54	0.0	0.0	0.0
-fr	01_solar	1	55	2000.0	1.0	0.0
-fr	02_wind_on	1	55	2000.0	1.0	0.0
-fr	03_wind_off	1	55	1400.0	1.0	0.0
+fr	01_solar	1	55	2000.0	0.0	1.0
+fr	02_wind_on	1	55	2000.0	0.0	1.0
+fr	03_wind_off	1	55	1400.0	0.0	1.0
 fr	04_res	1	55	0.0	0.0	0.0
 fr	05_nuclear	1	55	0.0	0.0	0.0
 fr	06_coal	1	55	0.0	0.0	0.0
 fr	07_gas	1	55	0.0	0.0	0.0
 fr	08_non-res	1	55	0.0	0.0	0.0
 fr	09_hydro_pump	1	55	0.0	0.0	0.0
-fr	01_solar	1	56	2000.0	1.0	0.0
-fr	02_wind_on	1	56	2000.0	1.0	0.0
-fr	03_wind_off	1	56	1500.0	1.0	0.0
+fr	01_solar	1	56	2000.0	0.0	1.0
+fr	02_wind_on	1	56	2000.0	0.0	1.0
+fr	03_wind_off	1	56	1500.0	0.0	1.0
 fr	04_res	1	56	0.0	0.0	0.0
 fr	05_nuclear	1	56	0.0	0.0	0.0
 fr	06_coal	1	56	0.0	0.0	0.0
 fr	07_gas	1	56	0.0	0.0	0.0
 fr	08_non-res	1	56	0.0	0.0	0.0
 fr	09_hydro_pump	1	56	0.0	0.0	0.0
-fr	01_solar	1	57	2000.0	1.0	0.0
-fr	02_wind_on	1	57	2000.0	1.0	0.0
-fr	03_wind_off	1	57	1600.0	1.0	0.0
+fr	01_solar	1	57	2000.0	0.0	1.0
+fr	02_wind_on	1	57	2000.0	0.0	1.0
+fr	03_wind_off	1	57	1600.0	0.0	1.0
 fr	04_res	1	57	0.0	0.0	0.0
 fr	05_nuclear	1	57	0.0	0.0	0.0
 fr	06_coal	1	57	0.0	0.0	0.0
 fr	07_gas	1	57	0.0	0.0	0.0
 fr	08_non-res	1	57	0.0	0.0	0.0
 fr	09_hydro_pump	1	57	0.0	0.0	0.0
-fr	01_solar	1	58	2000.0	1.0	0.0
-fr	02_wind_on	1	58	2000.0	1.0	0.0
-fr	03_wind_off	1	58	1700.0	1.0	0.0
+fr	01_solar	1	58	2000.0	0.0	1.0
+fr	02_wind_on	1	58	2000.0	0.0	1.0
+fr	03_wind_off	1	58	1700.0	0.0	1.0
 fr	04_res	1	58	0.0	0.0	0.0
 fr	05_nuclear	1	58	0.0	0.0	0.0
 fr	06_coal	1	58	0.0	0.0	0.0
 fr	07_gas	1	58	0.0	0.0	0.0
 fr	08_non-res	1	58	0.0	0.0	0.0
 fr	09_hydro_pump	1	58	0.0	0.0	0.0
-fr	01_solar	1	59	2000.0	1.0	0.0
-fr	02_wind_on	1	59	2000.0	1.0	0.0
-fr	03_wind_off	1	59	1800.0	1.0	0.0
+fr	01_solar	1	59	2000.0	0.0	1.0
+fr	02_wind_on	1	59	2000.0	0.0	1.0
+fr	03_wind_off	1	59	1800.0	0.0	1.0
 fr	04_res	1	59	0.0	0.0	0.0
 fr	05_nuclear	1	59	0.0	0.0	0.0
 fr	06_coal	1	59	0.0	0.0	0.0
 fr	07_gas	1	59	0.0	0.0	0.0
 fr	08_non-res	1	59	0.0	0.0	0.0
 fr	09_hydro_pump	1	59	0.0	0.0	0.0
-fr	01_solar	1	60	2000.0	1.0	0.0
-fr	02_wind_on	1	60	2000.0	1.0	0.0
-fr	03_wind_off	1	60	1900.0	1.0	0.0
+fr	01_solar	1	60	2000.0	0.0	1.0
+fr	02_wind_on	1	60	2000.0	0.0	1.0
+fr	03_wind_off	1	60	1900.0	0.0	1.0
 fr	04_res	1	60	0.0	0.0	0.0
 fr	05_nuclear	1	60	0.0	0.0	0.0
 fr	06_coal	1	60	0.0	0.0	0.0
 fr	07_gas	1	60	0.0	0.0	0.0
 fr	08_non-res	1	60	0.0	0.0	0.0
 fr	09_hydro_pump	1	60	0.0	0.0	0.0
-fr	01_solar	1	61	2000.0	1.0	0.0
-fr	02_wind_on	1	61	2000.0	1.0	0.0
-fr	03_wind_off	1	61	2000.0	1.0	0.0
+fr	01_solar	1	61	2000.0	0.0	1.0
+fr	02_wind_on	1	61	2000.0	0.0	1.0
+fr	03_wind_off	1	61	2000.0	0.0	1.0
 fr	04_res	1	61	0.0	0.0	0.0
 fr	05_nuclear	1	61	0.0	0.0	0.0
 fr	06_coal	1	61	0.0	0.0	0.0
 fr	07_gas	1	61	0.0	0.0	0.0
 fr	08_non-res	1	61	0.0	0.0	0.0
 fr	09_hydro_pump	1	61	0.0	0.0	0.0
-fr	01_solar	1	62	2000.0	1.0	0.0
-fr	02_wind_on	1	62	2000.0	1.0	0.0
-fr	03_wind_off	1	62	2000.0	1.0	0.0
-fr	04_res	1	62	100.0	1.0	0.0
+fr	01_solar	1	62	2000.0	0.0	1.0
+fr	02_wind_on	1	62	2000.0	0.0	1.0
+fr	03_wind_off	1	62	2000.0	0.0	1.0
+fr	04_res	1	62	100.0	0.0	1.0
 fr	05_nuclear	1	62	0.0	0.0	0.0
 fr	06_coal	1	62	0.0	0.0	0.0
 fr	07_gas	1	62	0.0	0.0	0.0
 fr	08_non-res	1	62	0.0	0.0	0.0
 fr	09_hydro_pump	1	62	0.0	0.0	0.0
-fr	01_solar	1	63	2000.0	1.0	0.0
-fr	02_wind_on	1	63	2000.0	1.0	0.0
-fr	03_wind_off	1	63	2000.0	1.0	0.0
-fr	04_res	1	63	200.0	1.0	0.0
+fr	01_solar	1	63	2000.0	0.0	1.0
+fr	02_wind_on	1	63	2000.0	0.0	1.0
+fr	03_wind_off	1	63	2000.0	0.0	1.0
+fr	04_res	1	63	200.0	0.0	1.0
 fr	05_nuclear	1	63	0.0	0.0	0.0
 fr	06_coal	1	63	0.0	0.0	0.0
 fr	07_gas	1	63	0.0	0.0	0.0
 fr	08_non-res	1	63	0.0	0.0	0.0
 fr	09_hydro_pump	1	63	0.0	0.0	0.0
-fr	01_solar	1	64	2000.0	1.0	0.0
-fr	02_wind_on	1	64	2000.0	1.0	0.0
-fr	03_wind_off	1	64	2000.0	1.0	0.0
-fr	04_res	1	64	300.0	1.0	0.0
+fr	01_solar	1	64	2000.0	0.0	1.0
+fr	02_wind_on	1	64	2000.0	0.0	1.0
+fr	03_wind_off	1	64	2000.0	0.0	1.0
+fr	04_res	1	64	300.0	0.0	1.0
 fr	05_nuclear	1	64	0.0	0.0	0.0
 fr	06_coal	1	64	0.0	0.0	0.0
 fr	07_gas	1	64	0.0	0.0	0.0
 fr	08_non-res	1	64	0.0	0.0	0.0
 fr	09_hydro_pump	1	64	0.0	0.0	0.0
-fr	01_solar	1	65	2000.0	1.0	0.0
-fr	02_wind_on	1	65	2000.0	1.0	0.0
-fr	03_wind_off	1	65	2000.0	1.0	0.0
-fr	04_res	1	65	400.0	1.0	0.0
+fr	01_solar	1	65	2000.0	0.0	1.0
+fr	02_wind_on	1	65	2000.0	0.0	1.0
+fr	03_wind_off	1	65	2000.0	0.0	1.0
+fr	04_res	1	65	400.0	0.0	1.0
 fr	05_nuclear	1	65	0.0	0.0	0.0
 fr	06_coal	1	65	0.0	0.0	0.0
 fr	07_gas	1	65	0.0	0.0	0.0
 fr	08_non-res	1	65	0.0	0.0	0.0
 fr	09_hydro_pump	1	65	0.0	0.0	0.0
-fr	01_solar	1	66	2000.0	1.0	0.0
-fr	02_wind_on	1	66	2000.0	1.0	0.0
-fr	03_wind_off	1	66	2000.0	1.0	0.0
-fr	04_res	1	66	500.0	1.0	0.0
+fr	01_solar	1	66	2000.0	0.0	1.0
+fr	02_wind_on	1	66	2000.0	0.0	1.0
+fr	03_wind_off	1	66	2000.0	0.0	1.0
+fr	04_res	1	66	500.0	0.0	1.0
 fr	05_nuclear	1	66	0.0	0.0	0.0
 fr	06_coal	1	66	0.0	0.0	0.0
 fr	07_gas	1	66	0.0	0.0	0.0
 fr	08_non-res	1	66	0.0	0.0	0.0
 fr	09_hydro_pump	1	66	0.0	0.0	0.0
-fr	01_solar	1	67	2000.0	1.0	0.0
-fr	02_wind_on	1	67	2000.0	1.0	0.0
-fr	03_wind_off	1	67	2000.0	1.0	0.0
-fr	04_res	1	67	600.0	1.0	0.0
+fr	01_solar	1	67	2000.0	0.0	1.0
+fr	02_wind_on	1	67	2000.0	0.0	1.0
+fr	03_wind_off	1	67	2000.0	0.0	1.0
+fr	04_res	1	67	600.0	0.0	1.0
 fr	05_nuclear	1	67	0.0	0.0	0.0
 fr	06_coal	1	67	0.0	0.0	0.0
 fr	07_gas	1	67	0.0	0.0	0.0
 fr	08_non-res	1	67	0.0	0.0	0.0
 fr	09_hydro_pump	1	67	0.0	0.0	0.0
-fr	01_solar	1	68	2000.0	1.0	0.0
-fr	02_wind_on	1	68	2000.0	1.0	0.0
-fr	03_wind_off	1	68	2000.0	1.0	0.0
-fr	04_res	1	68	700.0	1.0	0.0
+fr	01_solar	1	68	2000.0	0.0	1.0
+fr	02_wind_on	1	68	2000.0	0.0	1.0
+fr	03_wind_off	1	68	2000.0	0.0	1.0
+fr	04_res	1	68	700.0	0.0	1.0
 fr	05_nuclear	1	68	0.0	0.0	0.0
 fr	06_coal	1	68	0.0	0.0	0.0
 fr	07_gas	1	68	0.0	0.0	0.0
 fr	08_non-res	1	68	0.0	0.0	0.0
 fr	09_hydro_pump	1	68	0.0	0.0	0.0
-fr	01_solar	1	69	2000.0	1.0	0.0
-fr	02_wind_on	1	69	2000.0	1.0	0.0
-fr	03_wind_off	1	69	2000.0	1.0	0.0
-fr	04_res	1	69	800.0	1.0	0.0
+fr	01_solar	1	69	2000.0	0.0	1.0
+fr	02_wind_on	1	69	2000.0	0.0	1.0
+fr	03_wind_off	1	69	2000.0	0.0	1.0
+fr	04_res	1	69	800.0	0.0	1.0
 fr	05_nuclear	1	69	0.0	0.0	0.0
 fr	06_coal	1	69	0.0	0.0	0.0
 fr	07_gas	1	69	0.0	0.0	0.0
 fr	08_non-res	1	69	0.0	0.0	0.0
 fr	09_hydro_pump	1	69	0.0	0.0	0.0
-fr	01_solar	1	70	2000.0	1.0	0.0
-fr	02_wind_on	1	70	2000.0	1.0	0.0
-fr	03_wind_off	1	70	2000.0	1.0	0.0
-fr	04_res	1	70	900.0	1.0	0.0
+fr	01_solar	1	70	2000.0	0.0	1.0
+fr	02_wind_on	1	70	2000.0	0.0	1.0
+fr	03_wind_off	1	70	2000.0	0.0	1.0
+fr	04_res	1	70	900.0	0.0	1.0
 fr	05_nuclear	1	70	0.0	0.0	0.0
 fr	06_coal	1	70	0.0	0.0	0.0
 fr	07_gas	1	70	0.0	0.0	0.0
 fr	08_non-res	1	70	0.0	0.0	0.0
 fr	09_hydro_pump	1	70	0.0	0.0	0.0
-fr	01_solar	1	71	2000.0	1.0	0.0
-fr	02_wind_on	1	71	2000.0	1.0	0.0
-fr	03_wind_off	1	71	2000.0	1.0	0.0
-fr	04_res	1	71	1000.0	1.0	0.0
+fr	01_solar	1	71	2000.0	0.0	1.0
+fr	02_wind_on	1	71	2000.0	0.0	1.0
+fr	03_wind_off	1	71	2000.0	0.0	1.0
+fr	04_res	1	71	1000.0	0.0	1.0
 fr	05_nuclear	1	71	0.0	0.0	0.0
 fr	06_coal	1	71	0.0	0.0	0.0
 fr	07_gas	1	71	0.0	0.0	0.0
 fr	08_non-res	1	71	0.0	0.0	0.0
 fr	09_hydro_pump	1	71	0.0	0.0	0.0
-fr	01_solar	1	72	2000.0	1.0	0.0
-fr	02_wind_on	1	72	2000.0	1.0	0.0
-fr	03_wind_off	1	72	2000.0	1.0	0.0
-fr	04_res	1	72	1100.0	1.0	0.0
+fr	01_solar	1	72	2000.0	0.0	1.0
+fr	02_wind_on	1	72	2000.0	0.0	1.0
+fr	03_wind_off	1	72	2000.0	0.0	1.0
+fr	04_res	1	72	1100.0	0.0	1.0
 fr	05_nuclear	1	72	0.0	0.0	0.0
 fr	06_coal	1	72	0.0	0.0	0.0
 fr	07_gas	1	72	0.0	0.0	0.0
 fr	08_non-res	1	72	0.0	0.0	0.0
 fr	09_hydro_pump	1	72	0.0	0.0	0.0
-fr	01_solar	1	73	2000.0	1.0	0.0
-fr	02_wind_on	1	73	2000.0	1.0	0.0
-fr	03_wind_off	1	73	2000.0	1.0	0.0
-fr	04_res	1	73	1200.0	1.0	0.0
+fr	01_solar	1	73	2000.0	0.0	1.0
+fr	02_wind_on	1	73	2000.0	0.0	1.0
+fr	03_wind_off	1	73	2000.0	0.0	1.0
+fr	04_res	1	73	1200.0	0.0	1.0
 fr	05_nuclear	1	73	0.0	0.0	0.0
 fr	06_coal	1	73	0.0	0.0	0.0
 fr	07_gas	1	73	0.0	0.0	0.0
 fr	08_non-res	1	73	0.0	0.0	0.0
 fr	09_hydro_pump	1	73	0.0	0.0	0.0
-fr	01_solar	1	74	2000.0	1.0	0.0
-fr	02_wind_on	1	74	2000.0	1.0	0.0
-fr	03_wind_off	1	74	2000.0	1.0	0.0
-fr	04_res	1	74	1300.0	1.0	0.0
+fr	01_solar	1	74	2000.0	0.0	1.0
+fr	02_wind_on	1	74	2000.0	0.0	1.0
+fr	03_wind_off	1	74	2000.0	0.0	1.0
+fr	04_res	1	74	1300.0	0.0	1.0
 fr	05_nuclear	1	74	0.0	0.0	0.0
 fr	06_coal	1	74	0.0	0.0	0.0
 fr	07_gas	1	74	0.0	0.0	0.0
 fr	08_non-res	1	74	0.0	0.0	0.0
 fr	09_hydro_pump	1	74	0.0	0.0	0.0
-fr	01_solar	1	75	2000.0	1.0	0.0
-fr	02_wind_on	1	75	2000.0	1.0	0.0
-fr	03_wind_off	1	75	2000.0	1.0	0.0
-fr	04_res	1	75	1400.0	1.0	0.0
+fr	01_solar	1	75	2000.0	0.0	1.0
+fr	02_wind_on	1	75	2000.0	0.0	1.0
+fr	03_wind_off	1	75	2000.0	0.0	1.0
+fr	04_res	1	75	1400.0	0.0	1.0
 fr	05_nuclear	1	75	0.0	0.0	0.0
 fr	06_coal	1	75	0.0	0.0	0.0
 fr	07_gas	1	75	0.0	0.0	0.0
 fr	08_non-res	1	75	0.0	0.0	0.0
 fr	09_hydro_pump	1	75	0.0	0.0	0.0
-fr	01_solar	1	76	2000.0	1.0	0.0
-fr	02_wind_on	1	76	2000.0	1.0	0.0
-fr	03_wind_off	1	76	2000.0	1.0	0.0
-fr	04_res	1	76	1500.0	1.0	0.0
+fr	01_solar	1	76	2000.0	0.0	1.0
+fr	02_wind_on	1	76	2000.0	0.0	1.0
+fr	03_wind_off	1	76	2000.0	0.0	1.0
+fr	04_res	1	76	1500.0	0.0	1.0
 fr	05_nuclear	1	76	0.0	0.0	0.0
 fr	06_coal	1	76	0.0	0.0	0.0
 fr	07_gas	1	76	0.0	0.0	0.0
 fr	08_non-res	1	76	0.0	0.0	0.0
 fr	09_hydro_pump	1	76	0.0	0.0	0.0
-fr	01_solar	1	77	2000.0	1.0	0.0
-fr	02_wind_on	1	77	2000.0	1.0	0.0
-fr	03_wind_off	1	77	2000.0	1.0	0.0
-fr	04_res	1	77	1600.0	1.0	0.0
+fr	01_solar	1	77	2000.0	0.0	1.0
+fr	02_wind_on	1	77	2000.0	0.0	1.0
+fr	03_wind_off	1	77	2000.0	0.0	1.0
+fr	04_res	1	77	1600.0	0.0	1.0
 fr	05_nuclear	1	77	0.0	0.0	0.0
 fr	06_coal	1	77	0.0	0.0	0.0
 fr	07_gas	1	77	0.0	0.0	0.0
 fr	08_non-res	1	77	0.0	0.0	0.0
 fr	09_hydro_pump	1	77	0.0	0.0	0.0
-fr	01_solar	1	78	2000.0	1.0	0.0
-fr	02_wind_on	1	78	2000.0	1.0	0.0
-fr	03_wind_off	1	78	2000.0	1.0	0.0
-fr	04_res	1	78	1700.0	1.0	0.0
+fr	01_solar	1	78	2000.0	0.0	1.0
+fr	02_wind_on	1	78	2000.0	0.0	1.0
+fr	03_wind_off	1	78	2000.0	0.0	1.0
+fr	04_res	1	78	1700.0	0.0	1.0
 fr	05_nuclear	1	78	0.0	0.0	0.0
 fr	06_coal	1	78	0.0	0.0	0.0
 fr	07_gas	1	78	0.0	0.0	0.0
 fr	08_non-res	1	78	0.0	0.0	0.0
 fr	09_hydro_pump	1	78	0.0	0.0	0.0
-fr	01_solar	1	79	2000.0	1.0	0.0
-fr	02_wind_on	1	79	2000.0	1.0	0.0
-fr	03_wind_off	1	79	2000.0	1.0	0.0
-fr	04_res	1	79	1800.0	1.0	0.0
+fr	01_solar	1	79	2000.0	0.0	1.0
+fr	02_wind_on	1	79	2000.0	0.0	1.0
+fr	03_wind_off	1	79	2000.0	0.0	1.0
+fr	04_res	1	79	1800.0	0.0	1.0
 fr	05_nuclear	1	79	0.0	0.0	0.0
 fr	06_coal	1	79	0.0	0.0	0.0
 fr	07_gas	1	79	0.0	0.0	0.0
 fr	08_non-res	1	79	0.0	0.0	0.0
 fr	09_hydro_pump	1	79	0.0	0.0	0.0
-fr	01_solar	1	80	2000.0	1.0	0.0
-fr	02_wind_on	1	80	2000.0	1.0	0.0
-fr	03_wind_off	1	80	2000.0	1.0	0.0
-fr	04_res	1	80	1900.0	1.0	0.0
+fr	01_solar	1	80	2000.0	0.0	1.0
+fr	02_wind_on	1	80	2000.0	0.0	1.0
+fr	03_wind_off	1	80	2000.0	0.0	1.0
+fr	04_res	1	80	1900.0	0.0	1.0
 fr	05_nuclear	1	80	0.0	0.0	0.0
 fr	06_coal	1	80	0.0	0.0	0.0
 fr	07_gas	1	80	0.0	0.0	0.0
 fr	08_non-res	1	80	0.0	0.0	0.0
 fr	09_hydro_pump	1	80	0.0	0.0	0.0
-fr	01_solar	1	81	2000.0	1.0	0.0
-fr	02_wind_on	1	81	2000.0	1.0	0.0
-fr	03_wind_off	1	81	2000.0	1.0	0.0
-fr	04_res	1	81	2000.0	1.0	0.0
+fr	01_solar	1	81	2000.0	0.0	1.0
+fr	02_wind_on	1	81	2000.0	0.0	1.0
+fr	03_wind_off	1	81	2000.0	0.0	1.0
+fr	04_res	1	81	2000.0	0.0	1.0
 fr	05_nuclear	1	81	0.0	0.0	0.0
 fr	06_coal	1	81	0.0	0.0	0.0
 fr	07_gas	1	81	0.0	0.0	0.0
 fr	08_non-res	1	81	0.0	0.0	0.0
 fr	09_hydro_pump	1	81	0.0	0.0	0.0
-fr	01_solar	1	82	2000.0	1.0	0.0
-fr	02_wind_on	1	82	2000.0	1.0	0.0
-fr	03_wind_off	1	82	2000.0	1.0	0.0
-fr	04_res	1	82	2000.0	1.0	0.0
-fr	05_nuclear	1	82	100.0	1.0	0.0
+fr	01_solar	1	82	2000.0	0.0	1.0
+fr	02_wind_on	1	82	2000.0	0.0	1.0
+fr	03_wind_off	1	82	2000.0	0.0	1.0
+fr	04_res	1	82	2000.0	0.0	1.0
+fr	05_nuclear	1	82	100.0	0.0	1.0
 fr	06_coal	1	82	0.0	0.0	0.0
 fr	07_gas	1	82	0.0	0.0	0.0
 fr	08_non-res	1	82	0.0	0.0	0.0
 fr	09_hydro_pump	1	82	0.0	0.0	0.0
-fr	01_solar	1	83	2000.0	1.0	0.0
-fr	02_wind_on	1	83	2000.0	1.0	0.0
-fr	03_wind_off	1	83	2000.0	1.0	0.0
-fr	04_res	1	83	2000.0	1.0	0.0
-fr	05_nuclear	1	83	200.0	1.0	0.0
+fr	01_solar	1	83	2000.0	0.0	1.0
+fr	02_wind_on	1	83	2000.0	0.0	1.0
+fr	03_wind_off	1	83	2000.0	0.0	1.0
+fr	04_res	1	83	2000.0	0.0	1.0
+fr	05_nuclear	1	83	200.0	0.0	1.0
 fr	06_coal	1	83	0.0	0.0	0.0
 fr	07_gas	1	83	0.0	0.0	0.0
 fr	08_non-res	1	83	0.0	0.0	0.0
 fr	09_hydro_pump	1	83	0.0	0.0	0.0
-fr	01_solar	1	84	2000.0	1.0	0.0
-fr	02_wind_on	1	84	2000.0	1.0	0.0
-fr	03_wind_off	1	84	2000.0	1.0	0.0
-fr	04_res	1	84	2000.0	1.0	0.0
-fr	05_nuclear	1	84	300.0	1.0	0.0
+fr	01_solar	1	84	2000.0	0.0	1.0
+fr	02_wind_on	1	84	2000.0	0.0	1.0
+fr	03_wind_off	1	84	2000.0	0.0	1.0
+fr	04_res	1	84	2000.0	0.0	1.0
+fr	05_nuclear	1	84	300.0	0.0	1.0
 fr	06_coal	1	84	0.0	0.0	0.0
 fr	07_gas	1	84	0.0	0.0	0.0
 fr	08_non-res	1	84	0.0	0.0	0.0
 fr	09_hydro_pump	1	84	0.0	0.0	0.0
-fr	01_solar	1	85	2000.0	1.0	0.0
-fr	02_wind_on	1	85	2000.0	1.0	0.0
-fr	03_wind_off	1	85	2000.0	1.0	0.0
-fr	04_res	1	85	2000.0	1.0	0.0
-fr	05_nuclear	1	85	400.0	1.0	0.0
+fr	01_solar	1	85	2000.0	0.0	1.0
+fr	02_wind_on	1	85	2000.0	0.0	1.0
+fr	03_wind_off	1	85	2000.0	0.0	1.0
+fr	04_res	1	85	2000.0	0.0	1.0
+fr	05_nuclear	1	85	400.0	0.0	1.0
 fr	06_coal	1	85	0.0	0.0	0.0
 fr	07_gas	1	85	0.0	0.0	0.0
 fr	08_non-res	1	85	0.0	0.0	0.0
 fr	09_hydro_pump	1	85	0.0	0.0	0.0
-fr	01_solar	1	86	2000.0	1.0	0.0
-fr	02_wind_on	1	86	2000.0	1.0	0.0
-fr	03_wind_off	1	86	2000.0	1.0	0.0
-fr	04_res	1	86	2000.0	1.0	0.0
-fr	05_nuclear	1	86	500.0	1.0	0.0
+fr	01_solar	1	86	2000.0	0.0	1.0
+fr	02_wind_on	1	86	2000.0	0.0	1.0
+fr	03_wind_off	1	86	2000.0	0.0	1.0
+fr	04_res	1	86	2000.0	0.0	1.0
+fr	05_nuclear	1	86	500.0	0.0	1.0
 fr	06_coal	1	86	0.0	0.0	0.0
 fr	07_gas	1	86	0.0	0.0	0.0
 fr	08_non-res	1	86	0.0	0.0	0.0
 fr	09_hydro_pump	1	86	0.0	0.0	0.0
-fr	01_solar	1	87	2000.0	1.0	0.0
-fr	02_wind_on	1	87	2000.0	1.0	0.0
-fr	03_wind_off	1	87	2000.0	1.0	0.0
-fr	04_res	1	87	2000.0	1.0	0.0
-fr	05_nuclear	1	87	600.0	1.0	0.0
+fr	01_solar	1	87	2000.0	0.0	1.0
+fr	02_wind_on	1	87	2000.0	0.0	1.0
+fr	03_wind_off	1	87	2000.0	0.0	1.0
+fr	04_res	1	87	2000.0	0.0	1.0
+fr	05_nuclear	1	87	600.0	0.0	1.0
 fr	06_coal	1	87	0.0	0.0	0.0
 fr	07_gas	1	87	0.0	0.0	0.0
 fr	08_non-res	1	87	0.0	0.0	0.0
 fr	09_hydro_pump	1	87	0.0	0.0	0.0
-fr	01_solar	1	88	2000.0	1.0	0.0
-fr	02_wind_on	1	88	2000.0	1.0	0.0
-fr	03_wind_off	1	88	2000.0	1.0	0.0
-fr	04_res	1	88	2000.0	1.0	0.0
-fr	05_nuclear	1	88	700.0	1.0	0.0
+fr	01_solar	1	88	2000.0	0.0	1.0
+fr	02_wind_on	1	88	2000.0	0.0	1.0
+fr	03_wind_off	1	88	2000.0	0.0	1.0
+fr	04_res	1	88	2000.0	0.0	1.0
+fr	05_nuclear	1	88	700.0	0.0	1.0
 fr	06_coal	1	88	0.0	0.0	0.0
 fr	07_gas	1	88	0.0	0.0	0.0
 fr	08_non-res	1	88	0.0	0.0	0.0
 fr	09_hydro_pump	1	88	0.0	0.0	0.0
-fr	01_solar	1	89	2000.0	1.0	0.0
-fr	02_wind_on	1	89	2000.0	1.0	0.0
-fr	03_wind_off	1	89	2000.0	1.0	0.0
-fr	04_res	1	89	2000.0	1.0	0.0
-fr	05_nuclear	1	89	800.0	1.0	0.0
+fr	01_solar	1	89	2000.0	0.0	1.0
+fr	02_wind_on	1	89	2000.0	0.0	1.0
+fr	03_wind_off	1	89	2000.0	0.0	1.0
+fr	04_res	1	89	2000.0	0.0	1.0
+fr	05_nuclear	1	89	800.0	0.0	1.0
 fr	06_coal	1	89	0.0	0.0	0.0
 fr	07_gas	1	89	0.0	0.0	0.0
 fr	08_non-res	1	89	0.0	0.0	0.0
 fr	09_hydro_pump	1	89	0.0	0.0	0.0
-fr	01_solar	1	90	2000.0	1.0	0.0
-fr	02_wind_on	1	90	2000.0	1.0	0.0
-fr	03_wind_off	1	90	2000.0	1.0	0.0
-fr	04_res	1	90	2000.0	1.0	0.0
-fr	05_nuclear	1	90	900.0	1.0	0.0
+fr	01_solar	1	90	2000.0	0.0	1.0
+fr	02_wind_on	1	90	2000.0	0.0	1.0
+fr	03_wind_off	1	90	2000.0	0.0	1.0
+fr	04_res	1	90	2000.0	0.0	1.0
+fr	05_nuclear	1	90	900.0	0.0	1.0
 fr	06_coal	1	90	0.0	0.0	0.0
 fr	07_gas	1	90	0.0	0.0	0.0
 fr	08_non-res	1	90	0.0	0.0	0.0
 fr	09_hydro_pump	1	90	0.0	0.0	0.0
-fr	01_solar	1	91	2000.0	1.0	0.0
-fr	02_wind_on	1	91	2000.0	1.0	0.0
-fr	03_wind_off	1	91	2000.0	1.0	0.0
-fr	04_res	1	91	2000.0	1.0	0.0
-fr	05_nuclear	1	91	1000.0	1.0	0.0
+fr	01_solar	1	91	2000.0	0.0	1.0
+fr	02_wind_on	1	91	2000.0	0.0	1.0
+fr	03_wind_off	1	91	2000.0	0.0	1.0
+fr	04_res	1	91	2000.0	0.0	1.0
+fr	05_nuclear	1	91	1000.0	0.0	1.0
 fr	06_coal	1	91	0.0	0.0	0.0
 fr	07_gas	1	91	0.0	0.0	0.0
 fr	08_non-res	1	91	0.0	0.0	0.0
 fr	09_hydro_pump	1	91	0.0	0.0	0.0
-fr	01_solar	1	92	2000.0	1.0	0.0
-fr	02_wind_on	1	92	2000.0	1.0	0.0
-fr	03_wind_off	1	92	2000.0	1.0	0.0
-fr	04_res	1	92	2000.0	1.0	0.0
-fr	05_nuclear	1	92	1100.0	1.0	0.0
+fr	01_solar	1	92	2000.0	0.0	1.0
+fr	02_wind_on	1	92	2000.0	0.0	1.0
+fr	03_wind_off	1	92	2000.0	0.0	1.0
+fr	04_res	1	92	2000.0	0.0	1.0
+fr	05_nuclear	1	92	1100.0	0.0	1.0
 fr	06_coal	1	92	0.0	0.0	0.0
 fr	07_gas	1	92	0.0	0.0	0.0
 fr	08_non-res	1	92	0.0	0.0	0.0
 fr	09_hydro_pump	1	92	0.0	0.0	0.0
-fr	01_solar	1	93	2000.0	1.0	0.0
-fr	02_wind_on	1	93	2000.0	1.0	0.0
-fr	03_wind_off	1	93	2000.0	1.0	0.0
-fr	04_res	1	93	2000.0	1.0	0.0
-fr	05_nuclear	1	93	1200.0	1.0	0.0
+fr	01_solar	1	93	2000.0	0.0	1.0
+fr	02_wind_on	1	93	2000.0	0.0	1.0
+fr	03_wind_off	1	93	2000.0	0.0	1.0
+fr	04_res	1	93	2000.0	0.0	1.0
+fr	05_nuclear	1	93	1200.0	0.0	1.0
 fr	06_coal	1	93	0.0	0.0	0.0
 fr	07_gas	1	93	0.0	0.0	0.0
 fr	08_non-res	1	93	0.0	0.0	0.0
 fr	09_hydro_pump	1	93	0.0	0.0	0.0
-fr	01_solar	1	94	2000.0	1.0	0.0
-fr	02_wind_on	1	94	2000.0	1.0	0.0
-fr	03_wind_off	1	94	2000.0	1.0	0.0
-fr	04_res	1	94	2000.0	1.0	0.0
-fr	05_nuclear	1	94	1300.0	1.0	0.0
+fr	01_solar	1	94	2000.0	0.0	1.0
+fr	02_wind_on	1	94	2000.0	0.0	1.0
+fr	03_wind_off	1	94	2000.0	0.0	1.0
+fr	04_res	1	94	2000.0	0.0	1.0
+fr	05_nuclear	1	94	1300.0	0.0	1.0
 fr	06_coal	1	94	0.0	0.0	0.0
 fr	07_gas	1	94	0.0	0.0	0.0
 fr	08_non-res	1	94	0.0	0.0	0.0
 fr	09_hydro_pump	1	94	0.0	0.0	0.0
-fr	01_solar	1	95	2000.0	1.0	0.0
-fr	02_wind_on	1	95	2000.0	1.0	0.0
-fr	03_wind_off	1	95	2000.0	1.0	0.0
-fr	04_res	1	95	2000.0	1.0	0.0
-fr	05_nuclear	1	95	1400.0	1.0	0.0
+fr	01_solar	1	95	2000.0	0.0	1.0
+fr	02_wind_on	1	95	2000.0	0.0	1.0
+fr	03_wind_off	1	95	2000.0	0.0	1.0
+fr	04_res	1	95	2000.0	0.0	1.0
+fr	05_nuclear	1	95	1400.0	0.0	1.0
 fr	06_coal	1	95	0.0	0.0	0.0
 fr	07_gas	1	95	0.0	0.0	0.0
 fr	08_non-res	1	95	0.0	0.0	0.0
 fr	09_hydro_pump	1	95	0.0	0.0	0.0
-fr	01_solar	1	96	2000.0	1.0	0.0
-fr	02_wind_on	1	96	2000.0	1.0	0.0
-fr	03_wind_off	1	96	2000.0	1.0	0.0
-fr	04_res	1	96	2000.0	1.0	0.0
-fr	05_nuclear	1	96	1500.0	1.0	0.0
+fr	01_solar	1	96	2000.0	0.0	1.0
+fr	02_wind_on	1	96	2000.0	0.0	1.0
+fr	03_wind_off	1	96	2000.0	0.0	1.0
+fr	04_res	1	96	2000.0	0.0	1.0
+fr	05_nuclear	1	96	1500.0	0.0	1.0
 fr	06_coal	1	96	0.0	0.0	0.0
 fr	07_gas	1	96	0.0	0.0	0.0
 fr	08_non-res	1	96	0.0	0.0	0.0
 fr	09_hydro_pump	1	96	0.0	0.0	0.0
-fr	01_solar	1	97	2000.0	1.0	0.0
-fr	02_wind_on	1	97	2000.0	1.0	0.0
-fr	03_wind_off	1	97	2000.0	1.0	0.0
-fr	04_res	1	97	2000.0	1.0	0.0
-fr	05_nuclear	1	97	1600.0	1.0	0.0
+fr	01_solar	1	97	2000.0	0.0	1.0
+fr	02_wind_on	1	97	2000.0	0.0	1.0
+fr	03_wind_off	1	97	2000.0	0.0	1.0
+fr	04_res	1	97	2000.0	0.0	1.0
+fr	05_nuclear	1	97	1600.0	0.0	1.0
 fr	06_coal	1	97	0.0	0.0	0.0
 fr	07_gas	1	97	0.0	0.0	0.0
 fr	08_non-res	1	97	0.0	0.0	0.0
 fr	09_hydro_pump	1	97	0.0	0.0	0.0
-fr	01_solar	1	98	2000.0	1.0	0.0
-fr	02_wind_on	1	98	2000.0	1.0	0.0
-fr	03_wind_off	1	98	2000.0	1.0	0.0
-fr	04_res	1	98	2000.0	1.0	0.0
-fr	05_nuclear	1	98	1700.0	1.0	0.0
+fr	01_solar	1	98	2000.0	0.0	1.0
+fr	02_wind_on	1	98	2000.0	0.0	1.0
+fr	03_wind_off	1	98	2000.0	0.0	1.0
+fr	04_res	1	98	2000.0	0.0	1.0
+fr	05_nuclear	1	98	1700.0	0.0	1.0
 fr	06_coal	1	98	0.0	0.0	0.0
 fr	07_gas	1	98	0.0	0.0	0.0
 fr	08_non-res	1	98	0.0	0.0	0.0
 fr	09_hydro_pump	1	98	0.0	0.0	0.0
-fr	01_solar	1	99	2000.0	1.0	0.0
-fr	02_wind_on	1	99	2000.0	1.0	0.0
-fr	03_wind_off	1	99	2000.0	1.0	0.0
-fr	04_res	1	99	2000.0	1.0	0.0
-fr	05_nuclear	1	99	1800.0	1.0	0.0
+fr	01_solar	1	99	2000.0	0.0	1.0
+fr	02_wind_on	1	99	2000.0	0.0	1.0
+fr	03_wind_off	1	99	2000.0	0.0	1.0
+fr	04_res	1	99	2000.0	0.0	1.0
+fr	05_nuclear	1	99	1800.0	0.0	1.0
 fr	06_coal	1	99	0.0	0.0	0.0
 fr	07_gas	1	99	0.0	0.0	0.0
 fr	08_non-res	1	99	0.0	0.0	0.0
 fr	09_hydro_pump	1	99	0.0	0.0	0.0
-fr	01_solar	1	100	2000.0	1.0	0.0
-fr	02_wind_on	1	100	2000.0	1.0	0.0
-fr	03_wind_off	1	100	2000.0	1.0	0.0
-fr	04_res	1	100	2000.0	1.0	0.0
-fr	05_nuclear	1	100	1900.0	1.0	0.0
+fr	01_solar	1	100	2000.0	0.0	1.0
+fr	02_wind_on	1	100	2000.0	0.0	1.0
+fr	03_wind_off	1	100	2000.0	0.0	1.0
+fr	04_res	1	100	2000.0	0.0	1.0
+fr	05_nuclear	1	100	1900.0	0.0	1.0
 fr	06_coal	1	100	0.0	0.0	0.0
 fr	07_gas	1	100	0.0	0.0	0.0
 fr	08_non-res	1	100	0.0	0.0	0.0
 fr	09_hydro_pump	1	100	0.0	0.0	0.0
-fr	01_solar	1	101	2000.0	1.0	0.0
-fr	02_wind_on	1	101	2000.0	1.0	0.0
-fr	03_wind_off	1	101	2000.0	1.0	0.0
-fr	04_res	1	101	2000.0	1.0	0.0
-fr	05_nuclear	1	101	2000.0	1.0	0.0
+fr	01_solar	1	101	2000.0	0.0	1.0
+fr	02_wind_on	1	101	2000.0	0.0	1.0
+fr	03_wind_off	1	101	2000.0	0.0	1.0
+fr	04_res	1	101	2000.0	0.0	1.0
+fr	05_nuclear	1	101	2000.0	0.0	1.0
 fr	06_coal	1	101	0.0	0.0	0.0
 fr	07_gas	1	101	0.0	0.0	0.0
 fr	08_non-res	1	101	0.0	0.0	0.0
 fr	09_hydro_pump	1	101	0.0	0.0	0.0
-fr	01_solar	1	102	2000.0	1.0	0.0
-fr	02_wind_on	1	102	2000.0	1.0	0.0
-fr	03_wind_off	1	102	2000.0	1.0	0.0
-fr	04_res	1	102	2000.0	1.0	0.0
-fr	05_nuclear	1	102	2000.0	1.0	0.0
-fr	06_coal	1	102	100.0	1.0	0.0
+fr	01_solar	1	102	2000.0	0.0	1.0
+fr	02_wind_on	1	102	2000.0	0.0	1.0
+fr	03_wind_off	1	102	2000.0	0.0	1.0
+fr	04_res	1	102	2000.0	0.0	1.0
+fr	05_nuclear	1	102	2000.0	0.0	1.0
+fr	06_coal	1	102	100.0	0.0	1.0
 fr	07_gas	1	102	0.0	0.0	0.0
 fr	08_non-res	1	102	0.0	0.0	0.0
 fr	09_hydro_pump	1	102	0.0	0.0	0.0
-fr	01_solar	1	103	2000.0	1.0	0.0
-fr	02_wind_on	1	103	2000.0	1.0	0.0
-fr	03_wind_off	1	103	2000.0	1.0	0.0
-fr	04_res	1	103	2000.0	1.0	0.0
-fr	05_nuclear	1	103	2000.0	1.0	0.0
-fr	06_coal	1	103	200.0	1.0	0.0
+fr	01_solar	1	103	2000.0	0.0	1.0
+fr	02_wind_on	1	103	2000.0	0.0	1.0
+fr	03_wind_off	1	103	2000.0	0.0	1.0
+fr	04_res	1	103	2000.0	0.0	1.0
+fr	05_nuclear	1	103	2000.0	0.0	1.0
+fr	06_coal	1	103	200.0	0.0	1.0
 fr	07_gas	1	103	0.0	0.0	0.0
 fr	08_non-res	1	103	0.0	0.0	0.0
 fr	09_hydro_pump	1	103	0.0	0.0	0.0
-fr	01_solar	1	104	2000.0	1.0	0.0
-fr	02_wind_on	1	104	2000.0	1.0	0.0
-fr	03_wind_off	1	104	2000.0	1.0	0.0
-fr	04_res	1	104	2000.0	1.0	0.0
-fr	05_nuclear	1	104	2000.0	1.0	0.0
-fr	06_coal	1	104	300.0	1.0	0.0
+fr	01_solar	1	104	2000.0	0.0	1.0
+fr	02_wind_on	1	104	2000.0	0.0	1.0
+fr	03_wind_off	1	104	2000.0	0.0	1.0
+fr	04_res	1	104	2000.0	0.0	1.0
+fr	05_nuclear	1	104	2000.0	0.0	1.0
+fr	06_coal	1	104	300.0	0.0	1.0
 fr	07_gas	1	104	0.0	0.0	0.0
 fr	08_non-res	1	104	0.0	0.0	0.0
 fr	09_hydro_pump	1	104	0.0	0.0	0.0
-fr	01_solar	1	105	2000.0	1.0	0.0
-fr	02_wind_on	1	105	2000.0	1.0	0.0
-fr	03_wind_off	1	105	2000.0	1.0	0.0
-fr	04_res	1	105	2000.0	1.0	0.0
-fr	05_nuclear	1	105	2000.0	1.0	0.0
-fr	06_coal	1	105	400.0	1.0	0.0
+fr	01_solar	1	105	2000.0	0.0	1.0
+fr	02_wind_on	1	105	2000.0	0.0	1.0
+fr	03_wind_off	1	105	2000.0	0.0	1.0
+fr	04_res	1	105	2000.0	0.0	1.0
+fr	05_nuclear	1	105	2000.0	0.0	1.0
+fr	06_coal	1	105	400.0	0.0	1.0
 fr	07_gas	1	105	0.0	0.0	0.0
 fr	08_non-res	1	105	0.0	0.0	0.0
 fr	09_hydro_pump	1	105	0.0	0.0	0.0
-fr	01_solar	1	106	2000.0	1.0	0.0
-fr	02_wind_on	1	106	2000.0	1.0	0.0
-fr	03_wind_off	1	106	2000.0	1.0	0.0
-fr	04_res	1	106	2000.0	1.0	0.0
-fr	05_nuclear	1	106	2000.0	1.0	0.0
-fr	06_coal	1	106	500.0	1.0	0.0
+fr	01_solar	1	106	2000.0	0.0	1.0
+fr	02_wind_on	1	106	2000.0	0.0	1.0
+fr	03_wind_off	1	106	2000.0	0.0	1.0
+fr	04_res	1	106	2000.0	0.0	1.0
+fr	05_nuclear	1	106	2000.0	0.0	1.0
+fr	06_coal	1	106	500.0	0.0	1.0
 fr	07_gas	1	106	0.0	0.0	0.0
 fr	08_non-res	1	106	0.0	0.0	0.0
 fr	09_hydro_pump	1	106	0.0	0.0	0.0
-fr	01_solar	1	107	2000.0	1.0	0.0
-fr	02_wind_on	1	107	2000.0	1.0	0.0
-fr	03_wind_off	1	107	2000.0	1.0	0.0
-fr	04_res	1	107	2000.0	1.0	0.0
-fr	05_nuclear	1	107	2000.0	1.0	0.0
-fr	06_coal	1	107	600.0	1.0	0.0
+fr	01_solar	1	107	2000.0	0.0	1.0
+fr	02_wind_on	1	107	2000.0	0.0	1.0
+fr	03_wind_off	1	107	2000.0	0.0	1.0
+fr	04_res	1	107	2000.0	0.0	1.0
+fr	05_nuclear	1	107	2000.0	0.0	1.0
+fr	06_coal	1	107	600.0	0.0	1.0
 fr	07_gas	1	107	0.0	0.0	0.0
 fr	08_non-res	1	107	0.0	0.0	0.0
 fr	09_hydro_pump	1	107	0.0	0.0	0.0
-fr	01_solar	1	108	2000.0	1.0	0.0
-fr	02_wind_on	1	108	2000.0	1.0	0.0
-fr	03_wind_off	1	108	2000.0	1.0	0.0
-fr	04_res	1	108	2000.0	1.0	0.0
-fr	05_nuclear	1	108	2000.0	1.0	0.0
-fr	06_coal	1	108	700.0	1.0	0.0
+fr	01_solar	1	108	2000.0	0.0	1.0
+fr	02_wind_on	1	108	2000.0	0.0	1.0
+fr	03_wind_off	1	108	2000.0	0.0	1.0
+fr	04_res	1	108	2000.0	0.0	1.0
+fr	05_nuclear	1	108	2000.0	0.0	1.0
+fr	06_coal	1	108	700.0	0.0	1.0
 fr	07_gas	1	108	0.0	0.0	0.0
 fr	08_non-res	1	108	0.0	0.0	0.0
 fr	09_hydro_pump	1	108	0.0	0.0	0.0
-fr	01_solar	1	109	2000.0	1.0	0.0
-fr	02_wind_on	1	109	2000.0	1.0	0.0
-fr	03_wind_off	1	109	2000.0	1.0	0.0
-fr	04_res	1	109	2000.0	1.0	0.0
-fr	05_nuclear	1	109	2000.0	1.0	0.0
-fr	06_coal	1	109	800.0	1.0	0.0
+fr	01_solar	1	109	2000.0	0.0	1.0
+fr	02_wind_on	1	109	2000.0	0.0	1.0
+fr	03_wind_off	1	109	2000.0	0.0	1.0
+fr	04_res	1	109	2000.0	0.0	1.0
+fr	05_nuclear	1	109	2000.0	0.0	1.0
+fr	06_coal	1	109	800.0	0.0	1.0
 fr	07_gas	1	109	0.0	0.0	0.0
 fr	08_non-res	1	109	0.0	0.0	0.0
 fr	09_hydro_pump	1	109	0.0	0.0	0.0
-fr	01_solar	1	110	2000.0	1.0	0.0
-fr	02_wind_on	1	110	2000.0	1.0	0.0
-fr	03_wind_off	1	110	2000.0	1.0	0.0
-fr	04_res	1	110	2000.0	1.0	0.0
-fr	05_nuclear	1	110	2000.0	1.0	0.0
-fr	06_coal	1	110	900.0	1.0	0.0
+fr	01_solar	1	110	2000.0	0.0	1.0
+fr	02_wind_on	1	110	2000.0	0.0	1.0
+fr	03_wind_off	1	110	2000.0	0.0	1.0
+fr	04_res	1	110	2000.0	0.0	1.0
+fr	05_nuclear	1	110	2000.0	0.0	1.0
+fr	06_coal	1	110	900.0	0.0	1.0
 fr	07_gas	1	110	0.0	0.0	0.0
 fr	08_non-res	1	110	0.0	0.0	0.0
 fr	09_hydro_pump	1	110	0.0	0.0	0.0
-fr	01_solar	1	111	2000.0	1.0	0.0
-fr	02_wind_on	1	111	2000.0	1.0	0.0
-fr	03_wind_off	1	111	2000.0	1.0	0.0
-fr	04_res	1	111	2000.0	1.0	0.0
-fr	05_nuclear	1	111	2000.0	1.0	0.0
-fr	06_coal	1	111	1000.0	1.0	0.0
+fr	01_solar	1	111	2000.0	0.0	1.0
+fr	02_wind_on	1	111	2000.0	0.0	1.0
+fr	03_wind_off	1	111	2000.0	0.0	1.0
+fr	04_res	1	111	2000.0	0.0	1.0
+fr	05_nuclear	1	111	2000.0	0.0	1.0
+fr	06_coal	1	111	1000.0	0.0	1.0
 fr	07_gas	1	111	0.0	0.0	0.0
 fr	08_non-res	1	111	0.0	0.0	0.0
 fr	09_hydro_pump	1	111	0.0	0.0	0.0
-fr	01_solar	1	112	2000.0	1.0	0.0
-fr	02_wind_on	1	112	2000.0	1.0	0.0
-fr	03_wind_off	1	112	2000.0	1.0	0.0
-fr	04_res	1	112	2000.0	1.0	0.0
-fr	05_nuclear	1	112	2000.0	1.0	0.0
-fr	06_coal	1	112	1100.0	1.0	0.0
+fr	01_solar	1	112	2000.0	0.0	1.0
+fr	02_wind_on	1	112	2000.0	0.0	1.0
+fr	03_wind_off	1	112	2000.0	0.0	1.0
+fr	04_res	1	112	2000.0	0.0	1.0
+fr	05_nuclear	1	112	2000.0	0.0	1.0
+fr	06_coal	1	112	1100.0	0.0	1.0
 fr	07_gas	1	112	0.0	0.0	0.0
 fr	08_non-res	1	112	0.0	0.0	0.0
 fr	09_hydro_pump	1	112	0.0	0.0	0.0
-fr	01_solar	1	113	2000.0	1.0	0.0
-fr	02_wind_on	1	113	2000.0	1.0	0.0
-fr	03_wind_off	1	113	2000.0	1.0	0.0
-fr	04_res	1	113	2000.0	1.0	0.0
-fr	05_nuclear	1	113	2000.0	1.0	0.0
-fr	06_coal	1	113	1200.0	1.0	0.0
+fr	01_solar	1	113	2000.0	0.0	1.0
+fr	02_wind_on	1	113	2000.0	0.0	1.0
+fr	03_wind_off	1	113	2000.0	0.0	1.0
+fr	04_res	1	113	2000.0	0.0	1.0
+fr	05_nuclear	1	113	2000.0	0.0	1.0
+fr	06_coal	1	113	1200.0	0.0	1.0
 fr	07_gas	1	113	0.0	0.0	0.0
 fr	08_non-res	1	113	0.0	0.0	0.0
 fr	09_hydro_pump	1	113	0.0	0.0	0.0
-fr	01_solar	1	114	2000.0	1.0	0.0
-fr	02_wind_on	1	114	2000.0	1.0	0.0
-fr	03_wind_off	1	114	2000.0	1.0	0.0
-fr	04_res	1	114	2000.0	1.0	0.0
-fr	05_nuclear	1	114	2000.0	1.0	0.0
-fr	06_coal	1	114	1300.0	1.0	0.0
+fr	01_solar	1	114	2000.0	0.0	1.0
+fr	02_wind_on	1	114	2000.0	0.0	1.0
+fr	03_wind_off	1	114	2000.0	0.0	1.0
+fr	04_res	1	114	2000.0	0.0	1.0
+fr	05_nuclear	1	114	2000.0	0.0	1.0
+fr	06_coal	1	114	1300.0	0.0	1.0
 fr	07_gas	1	114	0.0	0.0	0.0
 fr	08_non-res	1	114	0.0	0.0	0.0
 fr	09_hydro_pump	1	114	0.0	0.0	0.0
-fr	01_solar	1	115	2000.0	1.0	0.0
-fr	02_wind_on	1	115	2000.0	1.0	0.0
-fr	03_wind_off	1	115	2000.0	1.0	0.0
-fr	04_res	1	115	2000.0	1.0	0.0
-fr	05_nuclear	1	115	2000.0	1.0	0.0
-fr	06_coal	1	115	1400.0	1.0	0.0
+fr	01_solar	1	115	2000.0	0.0	1.0
+fr	02_wind_on	1	115	2000.0	0.0	1.0
+fr	03_wind_off	1	115	2000.0	0.0	1.0
+fr	04_res	1	115	2000.0	0.0	1.0
+fr	05_nuclear	1	115	2000.0	0.0	1.0
+fr	06_coal	1	115	1400.0	0.0	1.0
 fr	07_gas	1	115	0.0	0.0	0.0
 fr	08_non-res	1	115	0.0	0.0	0.0
 fr	09_hydro_pump	1	115	0.0	0.0	0.0
-fr	01_solar	1	116	2000.0	1.0	0.0
-fr	02_wind_on	1	116	2000.0	1.0	0.0
-fr	03_wind_off	1	116	2000.0	1.0	0.0
-fr	04_res	1	116	2000.0	1.0	0.0
-fr	05_nuclear	1	116	2000.0	1.0	0.0
-fr	06_coal	1	116	1500.0	1.0	0.0
+fr	01_solar	1	116	2000.0	0.0	1.0
+fr	02_wind_on	1	116	2000.0	0.0	1.0
+fr	03_wind_off	1	116	2000.0	0.0	1.0
+fr	04_res	1	116	2000.0	0.0	1.0
+fr	05_nuclear	1	116	2000.0	0.0	1.0
+fr	06_coal	1	116	1500.0	0.0	1.0
 fr	07_gas	1	116	0.0	0.0	0.0
 fr	08_non-res	1	116	0.0	0.0	0.0
 fr	09_hydro_pump	1	116	0.0	0.0	0.0
-fr	01_solar	1	117	2000.0	1.0	0.0
-fr	02_wind_on	1	117	2000.0	1.0	0.0
-fr	03_wind_off	1	117	2000.0	1.0	0.0
-fr	04_res	1	117	2000.0	1.0	0.0
-fr	05_nuclear	1	117	2000.0	1.0	0.0
-fr	06_coal	1	117	1600.0	1.0	0.0
+fr	01_solar	1	117	2000.0	0.0	1.0
+fr	02_wind_on	1	117	2000.0	0.0	1.0
+fr	03_wind_off	1	117	2000.0	0.0	1.0
+fr	04_res	1	117	2000.0	0.0	1.0
+fr	05_nuclear	1	117	2000.0	0.0	1.0
+fr	06_coal	1	117	1600.0	0.0	1.0
 fr	07_gas	1	117	0.0	0.0	0.0
 fr	08_non-res	1	117	0.0	0.0	0.0
 fr	09_hydro_pump	1	117	0.0	0.0	0.0
-fr	01_solar	1	118	2000.0	1.0	0.0
-fr	02_wind_on	1	118	2000.0	1.0	0.0
-fr	03_wind_off	1	118	2000.0	1.0	0.0
-fr	04_res	1	118	2000.0	1.0	0.0
-fr	05_nuclear	1	118	2000.0	1.0	0.0
-fr	06_coal	1	118	1700.0	1.0	0.0
+fr	01_solar	1	118	2000.0	0.0	1.0
+fr	02_wind_on	1	118	2000.0	0.0	1.0
+fr	03_wind_off	1	118	2000.0	0.0	1.0
+fr	04_res	1	118	2000.0	0.0	1.0
+fr	05_nuclear	1	118	2000.0	0.0	1.0
+fr	06_coal	1	118	1700.0	0.0	1.0
 fr	07_gas	1	118	0.0	0.0	0.0
 fr	08_non-res	1	118	0.0	0.0	0.0
 fr	09_hydro_pump	1	118	0.0	0.0	0.0
-fr	01_solar	1	119	2000.0	1.0	0.0
-fr	02_wind_on	1	119	2000.0	1.0	0.0
-fr	03_wind_off	1	119	2000.0	1.0	0.0
-fr	04_res	1	119	2000.0	1.0	0.0
-fr	05_nuclear	1	119	2000.0	1.0	0.0
-fr	06_coal	1	119	1800.0	1.0	0.0
+fr	01_solar	1	119	2000.0	0.0	1.0
+fr	02_wind_on	1	119	2000.0	0.0	1.0
+fr	03_wind_off	1	119	2000.0	0.0	1.0
+fr	04_res	1	119	2000.0	0.0	1.0
+fr	05_nuclear	1	119	2000.0	0.0	1.0
+fr	06_coal	1	119	1800.0	0.0	1.0
 fr	07_gas	1	119	0.0	0.0	0.0
 fr	08_non-res	1	119	0.0	0.0	0.0
 fr	09_hydro_pump	1	119	0.0	0.0	0.0
-fr	01_solar	1	120	2000.0	1.0	0.0
-fr	02_wind_on	1	120	2000.0	1.0	0.0
-fr	03_wind_off	1	120	2000.0	1.0	0.0
-fr	04_res	1	120	2000.0	1.0	0.0
-fr	05_nuclear	1	120	2000.0	1.0	0.0
-fr	06_coal	1	120	1900.0	1.0	0.0
+fr	01_solar	1	120	2000.0	0.0	1.0
+fr	02_wind_on	1	120	2000.0	0.0	1.0
+fr	03_wind_off	1	120	2000.0	0.0	1.0
+fr	04_res	1	120	2000.0	0.0	1.0
+fr	05_nuclear	1	120	2000.0	0.0	1.0
+fr	06_coal	1	120	1900.0	0.0	1.0
 fr	07_gas	1	120	0.0	0.0	0.0
 fr	08_non-res	1	120	0.0	0.0	0.0
 fr	09_hydro_pump	1	120	0.0	0.0	0.0
-fr	01_solar	1	121	2000.0	1.0	0.0
-fr	02_wind_on	1	121	2000.0	1.0	0.0
-fr	03_wind_off	1	121	2000.0	1.0	0.0
-fr	04_res	1	121	2000.0	1.0	0.0
-fr	05_nuclear	1	121	2000.0	1.0	0.0
-fr	06_coal	1	121	2000.0	1.0	0.0
+fr	01_solar	1	121	2000.0	0.0	1.0
+fr	02_wind_on	1	121	2000.0	0.0	1.0
+fr	03_wind_off	1	121	2000.0	0.0	1.0
+fr	04_res	1	121	2000.0	0.0	1.0
+fr	05_nuclear	1	121	2000.0	0.0	1.0
+fr	06_coal	1	121	2000.0	0.0	1.0
 fr	07_gas	1	121	0.0	0.0	0.0
 fr	08_non-res	1	121	0.0	0.0	0.0
 fr	09_hydro_pump	1	121	0.0	0.0	0.0
-fr	01_solar	1	122	2000.0	1.0	0.0
-fr	02_wind_on	1	122	2000.0	1.0	0.0
-fr	03_wind_off	1	122	2000.0	1.0	0.0
-fr	04_res	1	122	2000.0	1.0	0.0
-fr	05_nuclear	1	122	2000.0	1.0	0.0
-fr	06_coal	1	122	2000.0	1.0	0.0
-fr	07_gas	1	122	100.0	1.0	0.0
+fr	01_solar	1	122	2000.0	0.0	1.0
+fr	02_wind_on	1	122	2000.0	0.0	1.0
+fr	03_wind_off	1	122	2000.0	0.0	1.0
+fr	04_res	1	122	2000.0	0.0	1.0
+fr	05_nuclear	1	122	2000.0	0.0	1.0
+fr	06_coal	1	122	2000.0	0.0	1.0
+fr	07_gas	1	122	100.0	0.0	1.0
 fr	08_non-res	1	122	0.0	0.0	0.0
 fr	09_hydro_pump	1	122	0.0	0.0	0.0
-fr	01_solar	1	123	2000.0	1.0	0.0
-fr	02_wind_on	1	123	2000.0	1.0	0.0
-fr	03_wind_off	1	123	2000.0	1.0	0.0
-fr	04_res	1	123	2000.0	1.0	0.0
-fr	05_nuclear	1	123	2000.0	1.0	0.0
-fr	06_coal	1	123	2000.0	1.0	0.0
-fr	07_gas	1	123	200.0	1.0	0.0
+fr	01_solar	1	123	2000.0	0.0	1.0
+fr	02_wind_on	1	123	2000.0	0.0	1.0
+fr	03_wind_off	1	123	2000.0	0.0	1.0
+fr	04_res	1	123	2000.0	0.0	1.0
+fr	05_nuclear	1	123	2000.0	0.0	1.0
+fr	06_coal	1	123	2000.0	0.0	1.0
+fr	07_gas	1	123	200.0	0.0	1.0
 fr	08_non-res	1	123	0.0	0.0	0.0
 fr	09_hydro_pump	1	123	0.0	0.0	0.0
-fr	01_solar	1	124	2000.0	1.0	0.0
-fr	02_wind_on	1	124	2000.0	1.0	0.0
-fr	03_wind_off	1	124	2000.0	1.0	0.0
-fr	04_res	1	124	2000.0	1.0	0.0
-fr	05_nuclear	1	124	2000.0	1.0	0.0
-fr	06_coal	1	124	2000.0	1.0	0.0
-fr	07_gas	1	124	300.0	1.0	0.0
+fr	01_solar	1	124	2000.0	0.0	1.0
+fr	02_wind_on	1	124	2000.0	0.0	1.0
+fr	03_wind_off	1	124	2000.0	0.0	1.0
+fr	04_res	1	124	2000.0	0.0	1.0
+fr	05_nuclear	1	124	2000.0	0.0	1.0
+fr	06_coal	1	124	2000.0	0.0	1.0
+fr	07_gas	1	124	300.0	0.0	1.0
 fr	08_non-res	1	124	0.0	0.0	0.0
 fr	09_hydro_pump	1	124	0.0	0.0	0.0
-fr	01_solar	1	125	2000.0	1.0	0.0
-fr	02_wind_on	1	125	2000.0	1.0	0.0
-fr	03_wind_off	1	125	2000.0	1.0	0.0
-fr	04_res	1	125	2000.0	1.0	0.0
-fr	05_nuclear	1	125	2000.0	1.0	0.0
-fr	06_coal	1	125	2000.0	1.0	0.0
-fr	07_gas	1	125	400.0	1.0	0.0
+fr	01_solar	1	125	2000.0	0.0	1.0
+fr	02_wind_on	1	125	2000.0	0.0	1.0
+fr	03_wind_off	1	125	2000.0	0.0	1.0
+fr	04_res	1	125	2000.0	0.0	1.0
+fr	05_nuclear	1	125	2000.0	0.0	1.0
+fr	06_coal	1	125	2000.0	0.0	1.0
+fr	07_gas	1	125	400.0	0.0	1.0
 fr	08_non-res	1	125	0.0	0.0	0.0
 fr	09_hydro_pump	1	125	0.0	0.0	0.0
-fr	01_solar	1	126	2000.0	1.0	0.0
-fr	02_wind_on	1	126	2000.0	1.0	0.0
-fr	03_wind_off	1	126	2000.0	1.0	0.0
-fr	04_res	1	126	2000.0	1.0	0.0
-fr	05_nuclear	1	126	2000.0	1.0	0.0
-fr	06_coal	1	126	2000.0	1.0	0.0
-fr	07_gas	1	126	500.0	1.0	0.0
+fr	01_solar	1	126	2000.0	0.0	1.0
+fr	02_wind_on	1	126	2000.0	0.0	1.0
+fr	03_wind_off	1	126	2000.0	0.0	1.0
+fr	04_res	1	126	2000.0	0.0	1.0
+fr	05_nuclear	1	126	2000.0	0.0	1.0
+fr	06_coal	1	126	2000.0	0.0	1.0
+fr	07_gas	1	126	500.0	0.0	1.0
 fr	08_non-res	1	126	0.0	0.0	0.0
 fr	09_hydro_pump	1	126	0.0	0.0	0.0
-fr	01_solar	1	127	2000.0	1.0	0.0
-fr	02_wind_on	1	127	2000.0	1.0	0.0
-fr	03_wind_off	1	127	2000.0	1.0	0.0
-fr	04_res	1	127	2000.0	1.0	0.0
-fr	05_nuclear	1	127	2000.0	1.0	0.0
-fr	06_coal	1	127	2000.0	1.0	0.0
-fr	07_gas	1	127	600.0	1.0	0.0
+fr	01_solar	1	127	2000.0	0.0	1.0
+fr	02_wind_on	1	127	2000.0	0.0	1.0
+fr	03_wind_off	1	127	2000.0	0.0	1.0
+fr	04_res	1	127	2000.0	0.0	1.0
+fr	05_nuclear	1	127	2000.0	0.0	1.0
+fr	06_coal	1	127	2000.0	0.0	1.0
+fr	07_gas	1	127	600.0	0.0	1.0
 fr	08_non-res	1	127	0.0	0.0	0.0
 fr	09_hydro_pump	1	127	0.0	0.0	0.0
-fr	01_solar	1	128	2000.0	1.0	0.0
-fr	02_wind_on	1	128	2000.0	1.0	0.0
-fr	03_wind_off	1	128	2000.0	1.0	0.0
-fr	04_res	1	128	2000.0	1.0	0.0
-fr	05_nuclear	1	128	2000.0	1.0	0.0
-fr	06_coal	1	128	2000.0	1.0	0.0
-fr	07_gas	1	128	700.0	1.0	0.0
+fr	01_solar	1	128	2000.0	0.0	1.0
+fr	02_wind_on	1	128	2000.0	0.0	1.0
+fr	03_wind_off	1	128	2000.0	0.0	1.0
+fr	04_res	1	128	2000.0	0.0	1.0
+fr	05_nuclear	1	128	2000.0	0.0	1.0
+fr	06_coal	1	128	2000.0	0.0	1.0
+fr	07_gas	1	128	700.0	0.0	1.0
 fr	08_non-res	1	128	0.0	0.0	0.0
 fr	09_hydro_pump	1	128	0.0	0.0	0.0
-fr	01_solar	1	129	2000.0	1.0	0.0
-fr	02_wind_on	1	129	2000.0	1.0	0.0
-fr	03_wind_off	1	129	2000.0	1.0	0.0
-fr	04_res	1	129	2000.0	1.0	0.0
-fr	05_nuclear	1	129	2000.0	1.0	0.0
-fr	06_coal	1	129	2000.0	1.0	0.0
-fr	07_gas	1	129	800.0	1.0	0.0
+fr	01_solar	1	129	2000.0	0.0	1.0
+fr	02_wind_on	1	129	2000.0	0.0	1.0
+fr	03_wind_off	1	129	2000.0	0.0	1.0
+fr	04_res	1	129	2000.0	0.0	1.0
+fr	05_nuclear	1	129	2000.0	0.0	1.0
+fr	06_coal	1	129	2000.0	0.0	1.0
+fr	07_gas	1	129	800.0	0.0	1.0
 fr	08_non-res	1	129	0.0	0.0	0.0
 fr	09_hydro_pump	1	129	0.0	0.0	0.0
-fr	01_solar	1	130	2000.0	1.0	0.0
-fr	02_wind_on	1	130	2000.0	1.0	0.0
-fr	03_wind_off	1	130	2000.0	1.0	0.0
-fr	04_res	1	130	2000.0	1.0	0.0
-fr	05_nuclear	1	130	2000.0	1.0	0.0
-fr	06_coal	1	130	2000.0	1.0	0.0
-fr	07_gas	1	130	900.0	1.0	0.0
+fr	01_solar	1	130	2000.0	0.0	1.0
+fr	02_wind_on	1	130	2000.0	0.0	1.0
+fr	03_wind_off	1	130	2000.0	0.0	1.0
+fr	04_res	1	130	2000.0	0.0	1.0
+fr	05_nuclear	1	130	2000.0	0.0	1.0
+fr	06_coal	1	130	2000.0	0.0	1.0
+fr	07_gas	1	130	900.0	0.0	1.0
 fr	08_non-res	1	130	0.0	0.0	0.0
 fr	09_hydro_pump	1	130	0.0	0.0	0.0
-fr	01_solar	1	131	2000.0	1.0	0.0
-fr	02_wind_on	1	131	2000.0	1.0	0.0
-fr	03_wind_off	1	131	2000.0	1.0	0.0
-fr	04_res	1	131	2000.0	1.0	0.0
-fr	05_nuclear	1	131	2000.0	1.0	0.0
-fr	06_coal	1	131	2000.0	1.0	0.0
-fr	07_gas	1	131	1000.0	1.0	0.0
+fr	01_solar	1	131	2000.0	0.0	1.0
+fr	02_wind_on	1	131	2000.0	0.0	1.0
+fr	03_wind_off	1	131	2000.0	0.0	1.0
+fr	04_res	1	131	2000.0	0.0	1.0
+fr	05_nuclear	1	131	2000.0	0.0	1.0
+fr	06_coal	1	131	2000.0	0.0	1.0
+fr	07_gas	1	131	1000.0	0.0	1.0
 fr	08_non-res	1	131	0.0	0.0	0.0
 fr	09_hydro_pump	1	131	0.0	0.0	0.0
-fr	01_solar	1	132	2000.0	1.0	0.0
-fr	02_wind_on	1	132	2000.0	1.0	0.0
-fr	03_wind_off	1	132	2000.0	1.0	0.0
-fr	04_res	1	132	2000.0	1.0	0.0
-fr	05_nuclear	1	132	2000.0	1.0	0.0
-fr	06_coal	1	132	2000.0	1.0	0.0
-fr	07_gas	1	132	1100.0	1.0	0.0
+fr	01_solar	1	132	2000.0	0.0	1.0
+fr	02_wind_on	1	132	2000.0	0.0	1.0
+fr	03_wind_off	1	132	2000.0	0.0	1.0
+fr	04_res	1	132	2000.0	0.0	1.0
+fr	05_nuclear	1	132	2000.0	0.0	1.0
+fr	06_coal	1	132	2000.0	0.0	1.0
+fr	07_gas	1	132	1100.0	0.0	1.0
 fr	08_non-res	1	132	0.0	0.0	0.0
 fr	09_hydro_pump	1	132	0.0	0.0	0.0
-fr	01_solar	1	133	2000.0	1.0	0.0
-fr	02_wind_on	1	133	2000.0	1.0	0.0
-fr	03_wind_off	1	133	2000.0	1.0	0.0
-fr	04_res	1	133	2000.0	1.0	0.0
-fr	05_nuclear	1	133	2000.0	1.0	0.0
-fr	06_coal	1	133	2000.0	1.0	0.0
-fr	07_gas	1	133	1200.0	1.0	0.0
+fr	01_solar	1	133	2000.0	0.0	1.0
+fr	02_wind_on	1	133	2000.0	0.0	1.0
+fr	03_wind_off	1	133	2000.0	0.0	1.0
+fr	04_res	1	133	2000.0	0.0	1.0
+fr	05_nuclear	1	133	2000.0	0.0	1.0
+fr	06_coal	1	133	2000.0	0.0	1.0
+fr	07_gas	1	133	1200.0	0.0	1.0
 fr	08_non-res	1	133	0.0	0.0	0.0
 fr	09_hydro_pump	1	133	0.0	0.0	0.0
-fr	01_solar	1	134	2000.0	1.0	0.0
-fr	02_wind_on	1	134	2000.0	1.0	0.0
-fr	03_wind_off	1	134	2000.0	1.0	0.0
-fr	04_res	1	134	2000.0	1.0	0.0
-fr	05_nuclear	1	134	2000.0	1.0	0.0
-fr	06_coal	1	134	2000.0	1.0	0.0
-fr	07_gas	1	134	1300.0	1.0	0.0
+fr	01_solar	1	134	2000.0	0.0	1.0
+fr	02_wind_on	1	134	2000.0	0.0	1.0
+fr	03_wind_off	1	134	2000.0	0.0	1.0
+fr	04_res	1	134	2000.0	0.0	1.0
+fr	05_nuclear	1	134	2000.0	0.0	1.0
+fr	06_coal	1	134	2000.0	0.0	1.0
+fr	07_gas	1	134	1300.0	0.0	1.0
 fr	08_non-res	1	134	0.0	0.0	0.0
 fr	09_hydro_pump	1	134	0.0	0.0	0.0
-fr	01_solar	1	135	2000.0	1.0	0.0
-fr	02_wind_on	1	135	2000.0	1.0	0.0
-fr	03_wind_off	1	135	2000.0	1.0	0.0
-fr	04_res	1	135	2000.0	1.0	0.0
-fr	05_nuclear	1	135	2000.0	1.0	0.0
-fr	06_coal	1	135	2000.0	1.0	0.0
-fr	07_gas	1	135	1400.0	1.0	0.0
+fr	01_solar	1	135	2000.0	0.0	1.0
+fr	02_wind_on	1	135	2000.0	0.0	1.0
+fr	03_wind_off	1	135	2000.0	0.0	1.0
+fr	04_res	1	135	2000.0	0.0	1.0
+fr	05_nuclear	1	135	2000.0	0.0	1.0
+fr	06_coal	1	135	2000.0	0.0	1.0
+fr	07_gas	1	135	1400.0	0.0	1.0
 fr	08_non-res	1	135	0.0	0.0	0.0
 fr	09_hydro_pump	1	135	0.0	0.0	0.0
-fr	01_solar	1	136	2000.0	1.0	0.0
-fr	02_wind_on	1	136	2000.0	1.0	0.0
-fr	03_wind_off	1	136	2000.0	1.0	0.0
-fr	04_res	1	136	2000.0	1.0	0.0
-fr	05_nuclear	1	136	2000.0	1.0	0.0
-fr	06_coal	1	136	2000.0	1.0	0.0
-fr	07_gas	1	136	1500.0	1.0	0.0
+fr	01_solar	1	136	2000.0	0.0	1.0
+fr	02_wind_on	1	136	2000.0	0.0	1.0
+fr	03_wind_off	1	136	2000.0	0.0	1.0
+fr	04_res	1	136	2000.0	0.0	1.0
+fr	05_nuclear	1	136	2000.0	0.0	1.0
+fr	06_coal	1	136	2000.0	0.0	1.0
+fr	07_gas	1	136	1500.0	0.0	1.0
 fr	08_non-res	1	136	0.0	0.0	0.0
 fr	09_hydro_pump	1	136	0.0	0.0	0.0
-fr	01_solar	1	137	2000.0	1.0	0.0
-fr	02_wind_on	1	137	2000.0	1.0	0.0
-fr	03_wind_off	1	137	2000.0	1.0	0.0
-fr	04_res	1	137	2000.0	1.0	0.0
-fr	05_nuclear	1	137	2000.0	1.0	0.0
-fr	06_coal	1	137	2000.0	1.0	0.0
-fr	07_gas	1	137	1600.0	1.0	0.0
+fr	01_solar	1	137	2000.0	0.0	1.0
+fr	02_wind_on	1	137	2000.0	0.0	1.0
+fr	03_wind_off	1	137	2000.0	0.0	1.0
+fr	04_res	1	137	2000.0	0.0	1.0
+fr	05_nuclear	1	137	2000.0	0.0	1.0
+fr	06_coal	1	137	2000.0	0.0	1.0
+fr	07_gas	1	137	1600.0	0.0	1.0
 fr	08_non-res	1	137	0.0	0.0	0.0
 fr	09_hydro_pump	1	137	0.0	0.0	0.0
-fr	01_solar	1	138	2000.0	1.0	0.0
-fr	02_wind_on	1	138	2000.0	1.0	0.0
-fr	03_wind_off	1	138	2000.0	1.0	0.0
-fr	04_res	1	138	2000.0	1.0	0.0
-fr	05_nuclear	1	138	2000.0	1.0	0.0
-fr	06_coal	1	138	2000.0	1.0	0.0
-fr	07_gas	1	138	1700.0	1.0	0.0
+fr	01_solar	1	138	2000.0	0.0	1.0
+fr	02_wind_on	1	138	2000.0	0.0	1.0
+fr	03_wind_off	1	138	2000.0	0.0	1.0
+fr	04_res	1	138	2000.0	0.0	1.0
+fr	05_nuclear	1	138	2000.0	0.0	1.0
+fr	06_coal	1	138	2000.0	0.0	1.0
+fr	07_gas	1	138	1700.0	0.0	1.0
 fr	08_non-res	1	138	0.0	0.0	0.0
 fr	09_hydro_pump	1	138	0.0	0.0	0.0
-fr	01_solar	1	139	2000.0	1.0	0.0
-fr	02_wind_on	1	139	2000.0	1.0	0.0
-fr	03_wind_off	1	139	2000.0	1.0	0.0
-fr	04_res	1	139	2000.0	1.0	0.0
-fr	05_nuclear	1	139	2000.0	1.0	0.0
-fr	06_coal	1	139	2000.0	1.0	0.0
-fr	07_gas	1	139	1800.0	1.0	0.0
+fr	01_solar	1	139	2000.0	0.0	1.0
+fr	02_wind_on	1	139	2000.0	0.0	1.0
+fr	03_wind_off	1	139	2000.0	0.0	1.0
+fr	04_res	1	139	2000.0	0.0	1.0
+fr	05_nuclear	1	139	2000.0	0.0	1.0
+fr	06_coal	1	139	2000.0	0.0	1.0
+fr	07_gas	1	139	1800.0	0.0	1.0
 fr	08_non-res	1	139	0.0	0.0	0.0
 fr	09_hydro_pump	1	139	0.0	0.0	0.0
-fr	01_solar	1	140	2000.0	1.0	0.0
-fr	02_wind_on	1	140	2000.0	1.0	0.0
-fr	03_wind_off	1	140	2000.0	1.0	0.0
-fr	04_res	1	140	2000.0	1.0	0.0
-fr	05_nuclear	1	140	2000.0	1.0	0.0
-fr	06_coal	1	140	2000.0	1.0	0.0
-fr	07_gas	1	140	1900.0	1.0	0.0
+fr	01_solar	1	140	2000.0	0.0	1.0
+fr	02_wind_on	1	140	2000.0	0.0	1.0
+fr	03_wind_off	1	140	2000.0	0.0	1.0
+fr	04_res	1	140	2000.0	0.0	1.0
+fr	05_nuclear	1	140	2000.0	0.0	1.0
+fr	06_coal	1	140	2000.0	0.0	1.0
+fr	07_gas	1	140	1900.0	0.0	1.0
 fr	08_non-res	1	140	0.0	0.0	0.0
 fr	09_hydro_pump	1	140	0.0	0.0	0.0
-fr	01_solar	1	141	2000.0	1.0	0.0
-fr	02_wind_on	1	141	2000.0	1.0	0.0
-fr	03_wind_off	1	141	2000.0	1.0	0.0
-fr	04_res	1	141	2000.0	1.0	0.0
-fr	05_nuclear	1	141	2000.0	1.0	0.0
-fr	06_coal	1	141	2000.0	1.0	0.0
-fr	07_gas	1	141	2000.0	1.0	0.0
+fr	01_solar	1	141	2000.0	0.0	1.0
+fr	02_wind_on	1	141	2000.0	0.0	1.0
+fr	03_wind_off	1	141	2000.0	0.0	1.0
+fr	04_res	1	141	2000.0	0.0	1.0
+fr	05_nuclear	1	141	2000.0	0.0	1.0
+fr	06_coal	1	141	2000.0	0.0	1.0
+fr	07_gas	1	141	2000.0	0.0	1.0
 fr	08_non-res	1	141	0.0	0.0	0.0
 fr	09_hydro_pump	1	141	0.0	0.0	0.0
-fr	01_solar	1	142	2000.0	1.0	0.0
-fr	02_wind_on	1	142	2000.0	1.0	0.0
-fr	03_wind_off	1	142	2000.0	1.0	0.0
-fr	04_res	1	142	2000.0	1.0	0.0
-fr	05_nuclear	1	142	2000.0	1.0	0.0
-fr	06_coal	1	142	2000.0	1.0	0.0
-fr	07_gas	1	142	2000.0	1.0	0.0
-fr	08_non-res	1	142	100.0	1.0	0.0
+fr	01_solar	1	142	2000.0	0.0	1.0
+fr	02_wind_on	1	142	2000.0	0.0	1.0
+fr	03_wind_off	1	142	2000.0	0.0	1.0
+fr	04_res	1	142	2000.0	0.0	1.0
+fr	05_nuclear	1	142	2000.0	0.0	1.0
+fr	06_coal	1	142	2000.0	0.0	1.0
+fr	07_gas	1	142	2000.0	0.0	1.0
+fr	08_non-res	1	142	100.0	0.0	1.0
 fr	09_hydro_pump	1	142	0.0	0.0	0.0
-fr	01_solar	1	143	2000.0	1.0	0.0
-fr	02_wind_on	1	143	2000.0	1.0	0.0
-fr	03_wind_off	1	143	2000.0	1.0	0.0
-fr	04_res	1	143	2000.0	1.0	0.0
-fr	05_nuclear	1	143	2000.0	1.0	0.0
-fr	06_coal	1	143	2000.0	1.0	0.0
-fr	07_gas	1	143	2000.0	1.0	0.0
-fr	08_non-res	1	143	200.0	1.0	0.0
+fr	01_solar	1	143	2000.0	0.0	1.0
+fr	02_wind_on	1	143	2000.0	0.0	1.0
+fr	03_wind_off	1	143	2000.0	0.0	1.0
+fr	04_res	1	143	2000.0	0.0	1.0
+fr	05_nuclear	1	143	2000.0	0.0	1.0
+fr	06_coal	1	143	2000.0	0.0	1.0
+fr	07_gas	1	143	2000.0	0.0	1.0
+fr	08_non-res	1	143	200.0	0.0	1.0
 fr	09_hydro_pump	1	143	0.0	0.0	0.0
-fr	01_solar	1	144	2000.0	1.0	0.0
-fr	02_wind_on	1	144	2000.0	1.0	0.0
-fr	03_wind_off	1	144	2000.0	1.0	0.0
-fr	04_res	1	144	2000.0	1.0	0.0
-fr	05_nuclear	1	144	2000.0	1.0	0.0
-fr	06_coal	1	144	2000.0	1.0	0.0
-fr	07_gas	1	144	2000.0	1.0	0.0
-fr	08_non-res	1	144	300.0	1.0	0.0
+fr	01_solar	1	144	2000.0	0.0	1.0
+fr	02_wind_on	1	144	2000.0	0.0	1.0
+fr	03_wind_off	1	144	2000.0	0.0	1.0
+fr	04_res	1	144	2000.0	0.0	1.0
+fr	05_nuclear	1	144	2000.0	0.0	1.0
+fr	06_coal	1	144	2000.0	0.0	1.0
+fr	07_gas	1	144	2000.0	0.0	1.0
+fr	08_non-res	1	144	300.0	0.0	1.0
 fr	09_hydro_pump	1	144	0.0	0.0	0.0
-fr	01_solar	1	145	2000.0	1.0	0.0
-fr	02_wind_on	1	145	2000.0	1.0	0.0
-fr	03_wind_off	1	145	2000.0	1.0	0.0
-fr	04_res	1	145	2000.0	1.0	0.0
-fr	05_nuclear	1	145	2000.0	1.0	0.0
-fr	06_coal	1	145	2000.0	1.0	0.0
-fr	07_gas	1	145	2000.0	1.0	0.0
-fr	08_non-res	1	145	400.0	1.0	0.0
+fr	01_solar	1	145	2000.0	0.0	1.0
+fr	02_wind_on	1	145	2000.0	0.0	1.0
+fr	03_wind_off	1	145	2000.0	0.0	1.0
+fr	04_res	1	145	2000.0	0.0	1.0
+fr	05_nuclear	1	145	2000.0	0.0	1.0
+fr	06_coal	1	145	2000.0	0.0	1.0
+fr	07_gas	1	145	2000.0	0.0	1.0
+fr	08_non-res	1	145	400.0	0.0	1.0
 fr	09_hydro_pump	1	145	0.0	0.0	0.0
-fr	01_solar	1	146	2000.0	1.0	0.0
-fr	02_wind_on	1	146	2000.0	1.0	0.0
-fr	03_wind_off	1	146	2000.0	1.0	0.0
-fr	04_res	1	146	2000.0	1.0	0.0
-fr	05_nuclear	1	146	2000.0	1.0	0.0
-fr	06_coal	1	146	2000.0	1.0	0.0
-fr	07_gas	1	146	2000.0	1.0	0.0
-fr	08_non-res	1	146	500.0	1.0	0.0
+fr	01_solar	1	146	2000.0	0.0	1.0
+fr	02_wind_on	1	146	2000.0	0.0	1.0
+fr	03_wind_off	1	146	2000.0	0.0	1.0
+fr	04_res	1	146	2000.0	0.0	1.0
+fr	05_nuclear	1	146	2000.0	0.0	1.0
+fr	06_coal	1	146	2000.0	0.0	1.0
+fr	07_gas	1	146	2000.0	0.0	1.0
+fr	08_non-res	1	146	500.0	0.0	1.0
 fr	09_hydro_pump	1	146	0.0	0.0	0.0
-fr	01_solar	1	147	2000.0	1.0	0.0
-fr	02_wind_on	1	147	2000.0	1.0	0.0
-fr	03_wind_off	1	147	2000.0	1.0	0.0
-fr	04_res	1	147	2000.0	1.0	0.0
-fr	05_nuclear	1	147	2000.0	1.0	0.0
-fr	06_coal	1	147	2000.0	1.0	0.0
-fr	07_gas	1	147	2000.0	1.0	0.0
-fr	08_non-res	1	147	600.0	1.0	0.0
+fr	01_solar	1	147	2000.0	0.0	1.0
+fr	02_wind_on	1	147	2000.0	0.0	1.0
+fr	03_wind_off	1	147	2000.0	0.0	1.0
+fr	04_res	1	147	2000.0	0.0	1.0
+fr	05_nuclear	1	147	2000.0	0.0	1.0
+fr	06_coal	1	147	2000.0	0.0	1.0
+fr	07_gas	1	147	2000.0	0.0	1.0
+fr	08_non-res	1	147	600.0	0.0	1.0
 fr	09_hydro_pump	1	147	0.0	0.0	0.0
-fr	01_solar	1	148	2000.0	1.0	0.0
-fr	02_wind_on	1	148	2000.0	1.0	0.0
-fr	03_wind_off	1	148	2000.0	1.0	0.0
-fr	04_res	1	148	2000.0	1.0	0.0
-fr	05_nuclear	1	148	2000.0	1.0	0.0
-fr	06_coal	1	148	2000.0	1.0	0.0
-fr	07_gas	1	148	2000.0	1.0	0.0
-fr	08_non-res	1	148	700.0	1.0	0.0
+fr	01_solar	1	148	2000.0	0.0	1.0
+fr	02_wind_on	1	148	2000.0	0.0	1.0
+fr	03_wind_off	1	148	2000.0	0.0	1.0
+fr	04_res	1	148	2000.0	0.0	1.0
+fr	05_nuclear	1	148	2000.0	0.0	1.0
+fr	06_coal	1	148	2000.0	0.0	1.0
+fr	07_gas	1	148	2000.0	0.0	1.0
+fr	08_non-res	1	148	700.0	0.0	1.0
 fr	09_hydro_pump	1	148	0.0	0.0	0.0
-fr	01_solar	1	149	2000.0	1.0	0.0
-fr	02_wind_on	1	149	2000.0	1.0	0.0
-fr	03_wind_off	1	149	2000.0	1.0	0.0
-fr	04_res	1	149	2000.0	1.0	0.0
-fr	05_nuclear	1	149	2000.0	1.0	0.0
-fr	06_coal	1	149	2000.0	1.0	0.0
-fr	07_gas	1	149	2000.0	1.0	0.0
-fr	08_non-res	1	149	800.0	1.0	0.0
+fr	01_solar	1	149	2000.0	0.0	1.0
+fr	02_wind_on	1	149	2000.0	0.0	1.0
+fr	03_wind_off	1	149	2000.0	0.0	1.0
+fr	04_res	1	149	2000.0	0.0	1.0
+fr	05_nuclear	1	149	2000.0	0.0	1.0
+fr	06_coal	1	149	2000.0	0.0	1.0
+fr	07_gas	1	149	2000.0	0.0	1.0
+fr	08_non-res	1	149	800.0	0.0	1.0
 fr	09_hydro_pump	1	149	0.0	0.0	0.0
-fr	01_solar	1	150	2000.0	1.0	0.0
-fr	02_wind_on	1	150	2000.0	1.0	0.0
-fr	03_wind_off	1	150	2000.0	1.0	0.0
-fr	04_res	1	150	2000.0	1.0	0.0
-fr	05_nuclear	1	150	2000.0	1.0	0.0
-fr	06_coal	1	150	2000.0	1.0	0.0
-fr	07_gas	1	150	2000.0	1.0	0.0
-fr	08_non-res	1	150	900.0	1.0	0.0
+fr	01_solar	1	150	2000.0	0.0	1.0
+fr	02_wind_on	1	150	2000.0	0.0	1.0
+fr	03_wind_off	1	150	2000.0	0.0	1.0
+fr	04_res	1	150	2000.0	0.0	1.0
+fr	05_nuclear	1	150	2000.0	0.0	1.0
+fr	06_coal	1	150	2000.0	0.0	1.0
+fr	07_gas	1	150	2000.0	0.0	1.0
+fr	08_non-res	1	150	900.0	0.0	1.0
 fr	09_hydro_pump	1	150	0.0	0.0	0.0
-fr	01_solar	1	151	2000.0	1.0	0.0
-fr	02_wind_on	1	151	2000.0	1.0	0.0
-fr	03_wind_off	1	151	2000.0	1.0	0.0
-fr	04_res	1	151	2000.0	1.0	0.0
-fr	05_nuclear	1	151	2000.0	1.0	0.0
-fr	06_coal	1	151	2000.0	1.0	0.0
-fr	07_gas	1	151	2000.0	1.0	0.0
-fr	08_non-res	1	151	1000.0	1.0	0.0
+fr	01_solar	1	151	2000.0	0.0	1.0
+fr	02_wind_on	1	151	2000.0	0.0	1.0
+fr	03_wind_off	1	151	2000.0	0.0	1.0
+fr	04_res	1	151	2000.0	0.0	1.0
+fr	05_nuclear	1	151	2000.0	0.0	1.0
+fr	06_coal	1	151	2000.0	0.0	1.0
+fr	07_gas	1	151	2000.0	0.0	1.0
+fr	08_non-res	1	151	1000.0	0.0	1.0
 fr	09_hydro_pump	1	151	0.0	0.0	0.0
-fr	01_solar	1	152	2000.0	1.0	0.0
-fr	02_wind_on	1	152	2000.0	1.0	0.0
-fr	03_wind_off	1	152	2000.0	1.0	0.0
-fr	04_res	1	152	2000.0	1.0	0.0
-fr	05_nuclear	1	152	2000.0	1.0	0.0
-fr	06_coal	1	152	2000.0	1.0	0.0
-fr	07_gas	1	152	2000.0	1.0	0.0
-fr	08_non-res	1	152	1100.0	1.0	0.0
+fr	01_solar	1	152	2000.0	0.0	1.0
+fr	02_wind_on	1	152	2000.0	0.0	1.0
+fr	03_wind_off	1	152	2000.0	0.0	1.0
+fr	04_res	1	152	2000.0	0.0	1.0
+fr	05_nuclear	1	152	2000.0	0.0	1.0
+fr	06_coal	1	152	2000.0	0.0	1.0
+fr	07_gas	1	152	2000.0	0.0	1.0
+fr	08_non-res	1	152	1100.0	0.0	1.0
 fr	09_hydro_pump	1	152	0.0	0.0	0.0
-fr	01_solar	1	153	2000.0	1.0	0.0
-fr	02_wind_on	1	153	2000.0	1.0	0.0
-fr	03_wind_off	1	153	2000.0	1.0	0.0
-fr	04_res	1	153	2000.0	1.0	0.0
-fr	05_nuclear	1	153	2000.0	1.0	0.0
-fr	06_coal	1	153	2000.0	1.0	0.0
-fr	07_gas	1	153	2000.0	1.0	0.0
-fr	08_non-res	1	153	1200.0	1.0	0.0
+fr	01_solar	1	153	2000.0	0.0	1.0
+fr	02_wind_on	1	153	2000.0	0.0	1.0
+fr	03_wind_off	1	153	2000.0	0.0	1.0
+fr	04_res	1	153	2000.0	0.0	1.0
+fr	05_nuclear	1	153	2000.0	0.0	1.0
+fr	06_coal	1	153	2000.0	0.0	1.0
+fr	07_gas	1	153	2000.0	0.0	1.0
+fr	08_non-res	1	153	1200.0	0.0	1.0
 fr	09_hydro_pump	1	153	0.0	0.0	0.0
-fr	01_solar	1	154	2000.0	1.0	0.0
-fr	02_wind_on	1	154	2000.0	1.0	0.0
-fr	03_wind_off	1	154	2000.0	1.0	0.0
-fr	04_res	1	154	2000.0	1.0	0.0
-fr	05_nuclear	1	154	2000.0	1.0	0.0
-fr	06_coal	1	154	2000.0	1.0	0.0
-fr	07_gas	1	154	2000.0	1.0	0.0
-fr	08_non-res	1	154	1300.0	1.0	0.0
+fr	01_solar	1	154	2000.0	0.0	1.0
+fr	02_wind_on	1	154	2000.0	0.0	1.0
+fr	03_wind_off	1	154	2000.0	0.0	1.0
+fr	04_res	1	154	2000.0	0.0	1.0
+fr	05_nuclear	1	154	2000.0	0.0	1.0
+fr	06_coal	1	154	2000.0	0.0	1.0
+fr	07_gas	1	154	2000.0	0.0	1.0
+fr	08_non-res	1	154	1300.0	0.0	1.0
 fr	09_hydro_pump	1	154	0.0	0.0	0.0
-fr	01_solar	1	155	2000.0	1.0	0.0
-fr	02_wind_on	1	155	2000.0	1.0	0.0
-fr	03_wind_off	1	155	2000.0	1.0	0.0
-fr	04_res	1	155	2000.0	1.0	0.0
-fr	05_nuclear	1	155	2000.0	1.0	0.0
-fr	06_coal	1	155	2000.0	1.0	0.0
-fr	07_gas	1	155	2000.0	1.0	0.0
-fr	08_non-res	1	155	1400.0	1.0	0.0
+fr	01_solar	1	155	2000.0	0.0	1.0
+fr	02_wind_on	1	155	2000.0	0.0	1.0
+fr	03_wind_off	1	155	2000.0	0.0	1.0
+fr	04_res	1	155	2000.0	0.0	1.0
+fr	05_nuclear	1	155	2000.0	0.0	1.0
+fr	06_coal	1	155	2000.0	0.0	1.0
+fr	07_gas	1	155	2000.0	0.0	1.0
+fr	08_non-res	1	155	1400.0	0.0	1.0
 fr	09_hydro_pump	1	155	0.0	0.0	0.0
-fr	01_solar	1	156	2000.0	1.0	0.0
-fr	02_wind_on	1	156	2000.0	1.0	0.0
-fr	03_wind_off	1	156	2000.0	1.0	0.0
-fr	04_res	1	156	2000.0	1.0	0.0
-fr	05_nuclear	1	156	2000.0	1.0	0.0
-fr	06_coal	1	156	2000.0	1.0	0.0
-fr	07_gas	1	156	2000.0	1.0	0.0
-fr	08_non-res	1	156	1500.0	1.0	0.0
+fr	01_solar	1	156	2000.0	0.0	1.0
+fr	02_wind_on	1	156	2000.0	0.0	1.0
+fr	03_wind_off	1	156	2000.0	0.0	1.0
+fr	04_res	1	156	2000.0	0.0	1.0
+fr	05_nuclear	1	156	2000.0	0.0	1.0
+fr	06_coal	1	156	2000.0	0.0	1.0
+fr	07_gas	1	156	2000.0	0.0	1.0
+fr	08_non-res	1	156	1500.0	0.0	1.0
 fr	09_hydro_pump	1	156	0.0	0.0	0.0
-fr	01_solar	1	157	2000.0	1.0	0.0
-fr	02_wind_on	1	157	2000.0	1.0	0.0
-fr	03_wind_off	1	157	2000.0	1.0	0.0
-fr	04_res	1	157	2000.0	1.0	0.0
-fr	05_nuclear	1	157	2000.0	1.0	0.0
-fr	06_coal	1	157	2000.0	1.0	0.0
-fr	07_gas	1	157	2000.0	1.0	0.0
-fr	08_non-res	1	157	1600.0	1.0	0.0
+fr	01_solar	1	157	2000.0	0.0	1.0
+fr	02_wind_on	1	157	2000.0	0.0	1.0
+fr	03_wind_off	1	157	2000.0	0.0	1.0
+fr	04_res	1	157	2000.0	0.0	1.0
+fr	05_nuclear	1	157	2000.0	0.0	1.0
+fr	06_coal	1	157	2000.0	0.0	1.0
+fr	07_gas	1	157	2000.0	0.0	1.0
+fr	08_non-res	1	157	1600.0	0.0	1.0
 fr	09_hydro_pump	1	157	0.0	0.0	0.0
-fr	01_solar	1	158	2000.0	1.0	0.0
-fr	02_wind_on	1	158	2000.0	1.0	0.0
-fr	03_wind_off	1	158	2000.0	1.0	0.0
-fr	04_res	1	158	2000.0	1.0	0.0
-fr	05_nuclear	1	158	2000.0	1.0	0.0
-fr	06_coal	1	158	2000.0	1.0	0.0
-fr	07_gas	1	158	2000.0	1.0	0.0
-fr	08_non-res	1	158	1700.0	1.0	0.0
+fr	01_solar	1	158	2000.0	0.0	1.0
+fr	02_wind_on	1	158	2000.0	0.0	1.0
+fr	03_wind_off	1	158	2000.0	0.0	1.0
+fr	04_res	1	158	2000.0	0.0	1.0
+fr	05_nuclear	1	158	2000.0	0.0	1.0
+fr	06_coal	1	158	2000.0	0.0	1.0
+fr	07_gas	1	158	2000.0	0.0	1.0
+fr	08_non-res	1	158	1700.0	0.0	1.0
 fr	09_hydro_pump	1	158	0.0	0.0	0.0
-fr	01_solar	1	159	2000.0	1.0	0.0
-fr	02_wind_on	1	159	2000.0	1.0	0.0
-fr	03_wind_off	1	159	2000.0	1.0	0.0
-fr	04_res	1	159	2000.0	1.0	0.0
-fr	05_nuclear	1	159	2000.0	1.0	0.0
-fr	06_coal	1	159	2000.0	1.0	0.0
-fr	07_gas	1	159	2000.0	1.0	0.0
-fr	08_non-res	1	159	1800.0	1.0	0.0
+fr	01_solar	1	159	2000.0	0.0	1.0
+fr	02_wind_on	1	159	2000.0	0.0	1.0
+fr	03_wind_off	1	159	2000.0	0.0	1.0
+fr	04_res	1	159	2000.0	0.0	1.0
+fr	05_nuclear	1	159	2000.0	0.0	1.0
+fr	06_coal	1	159	2000.0	0.0	1.0
+fr	07_gas	1	159	2000.0	0.0	1.0
+fr	08_non-res	1	159	1800.0	0.0	1.0
 fr	09_hydro_pump	1	159	0.0	0.0	0.0
-fr	01_solar	1	160	2000.0	1.0	0.0
-fr	02_wind_on	1	160	2000.0	1.0	0.0
-fr	03_wind_off	1	160	2000.0	1.0	0.0
-fr	04_res	1	160	2000.0	1.0	0.0
-fr	05_nuclear	1	160	2000.0	1.0	0.0
-fr	06_coal	1	160	2000.0	1.0	0.0
-fr	07_gas	1	160	2000.0	1.0	0.0
-fr	08_non-res	1	160	1900.0	1.0	0.0
+fr	01_solar	1	160	2000.0	0.0	1.0
+fr	02_wind_on	1	160	2000.0	0.0	1.0
+fr	03_wind_off	1	160	2000.0	0.0	1.0
+fr	04_res	1	160	2000.0	0.0	1.0
+fr	05_nuclear	1	160	2000.0	0.0	1.0
+fr	06_coal	1	160	2000.0	0.0	1.0
+fr	07_gas	1	160	2000.0	0.0	1.0
+fr	08_non-res	1	160	1900.0	0.0	1.0
 fr	09_hydro_pump	1	160	0.0	0.0	0.0
-fr	01_solar	1	161	2000.0	1.0	0.0
-fr	02_wind_on	1	161	2000.0	1.0	0.0
-fr	03_wind_off	1	161	2000.0	1.0	0.0
-fr	04_res	1	161	2000.0	1.0	0.0
-fr	05_nuclear	1	161	2000.0	1.0	0.0
-fr	06_coal	1	161	2000.0	1.0	0.0
-fr	07_gas	1	161	2000.0	1.0	0.0
-fr	08_non-res	1	161	2000.0	1.0	0.0
+fr	01_solar	1	161	2000.0	0.0	1.0
+fr	02_wind_on	1	161	2000.0	0.0	1.0
+fr	03_wind_off	1	161	2000.0	0.0	1.0
+fr	04_res	1	161	2000.0	0.0	1.0
+fr	05_nuclear	1	161	2000.0	0.0	1.0
+fr	06_coal	1	161	2000.0	0.0	1.0
+fr	07_gas	1	161	2000.0	0.0	1.0
+fr	08_non-res	1	161	2000.0	0.0	1.0
 fr	09_hydro_pump	1	161	0.0	0.0	0.0
-fr	01_solar	1	162	2000.0	1.0	0.0
-fr	02_wind_on	1	162	2000.0	1.0	0.0
-fr	03_wind_off	1	162	2000.0	1.0	0.0
-fr	04_res	1	162	2000.0	1.0	0.0
-fr	05_nuclear	1	162	2000.0	1.0	0.0
-fr	06_coal	1	162	2000.0	1.0	0.0
-fr	07_gas	1	162	2000.0	1.0	0.0
-fr	08_non-res	1	162	2000.0	1.0	0.0
-fr	09_hydro_pump	1	162	100.0	1.0	0.0
-fr	01_solar	1	163	2000.0	1.0	0.0
-fr	02_wind_on	1	163	2000.0	1.0	0.0
-fr	03_wind_off	1	163	2000.0	1.0	0.0
-fr	04_res	1	163	2000.0	1.0	0.0
-fr	05_nuclear	1	163	2000.0	1.0	0.0
-fr	06_coal	1	163	2000.0	1.0	0.0
-fr	07_gas	1	163	2000.0	1.0	0.0
-fr	08_non-res	1	163	2000.0	1.0	0.0
-fr	09_hydro_pump	1	163	200.0	1.0	0.0
-fr	01_solar	1	164	2000.0	1.0	0.0
-fr	02_wind_on	1	164	2000.0	1.0	0.0
-fr	03_wind_off	1	164	2000.0	1.0	0.0
-fr	04_res	1	164	2000.0	1.0	0.0
-fr	05_nuclear	1	164	2000.0	1.0	0.0
-fr	06_coal	1	164	2000.0	1.0	0.0
-fr	07_gas	1	164	2000.0	1.0	0.0
-fr	08_non-res	1	164	2000.0	1.0	0.0
-fr	09_hydro_pump	1	164	300.0	1.0	0.0
-fr	01_solar	1	165	2000.0	1.0	0.0
-fr	02_wind_on	1	165	2000.0	1.0	0.0
-fr	03_wind_off	1	165	2000.0	1.0	0.0
-fr	04_res	1	165	2000.0	1.0	0.0
-fr	05_nuclear	1	165	2000.0	1.0	0.0
-fr	06_coal	1	165	2000.0	1.0	0.0
-fr	07_gas	1	165	2000.0	1.0	0.0
-fr	08_non-res	1	165	2000.0	1.0	0.0
-fr	09_hydro_pump	1	165	400.0	1.0	0.0
-fr	01_solar	1	166	2000.0	1.0	0.0
-fr	02_wind_on	1	166	2000.0	1.0	0.0
-fr	03_wind_off	1	166	2000.0	1.0	0.0
-fr	04_res	1	166	2000.0	1.0	0.0
-fr	05_nuclear	1	166	2000.0	1.0	0.0
-fr	06_coal	1	166	2000.0	1.0	0.0
-fr	07_gas	1	166	2000.0	1.0	0.0
-fr	08_non-res	1	166	2000.0	1.0	0.0
-fr	09_hydro_pump	1	166	500.0	1.0	0.0
-fr	01_solar	1	167	2000.0	1.0	0.0
-fr	02_wind_on	1	167	2000.0	1.0	0.0
-fr	03_wind_off	1	167	2000.0	1.0	0.0
-fr	04_res	1	167	2000.0	1.0	0.0
-fr	05_nuclear	1	167	2000.0	1.0	0.0
-fr	06_coal	1	167	2000.0	1.0	0.0
-fr	07_gas	1	167	2000.0	1.0	0.0
-fr	08_non-res	1	167	2000.0	1.0	0.0
-fr	09_hydro_pump	1	167	600.0	1.0	0.0
-fr	01_solar	1	168	2000.0	1.0	0.0
-fr	02_wind_on	1	168	2000.0	1.0	0.0
-fr	03_wind_off	1	168	2000.0	1.0	0.0
-fr	04_res	1	168	2000.0	1.0	0.0
-fr	05_nuclear	1	168	2000.0	1.0	0.0
-fr	06_coal	1	168	2000.0	1.0	0.0
-fr	07_gas	1	168	2000.0	1.0	0.0
-fr	08_non-res	1	168	2000.0	1.0	0.0
-fr	09_hydro_pump	1	168	700.0	1.0	0.0
+fr	01_solar	1	162	2000.0	0.0	1.0
+fr	02_wind_on	1	162	2000.0	0.0	1.0
+fr	03_wind_off	1	162	2000.0	0.0	1.0
+fr	04_res	1	162	2000.0	0.0	1.0
+fr	05_nuclear	1	162	2000.0	0.0	1.0
+fr	06_coal	1	162	2000.0	0.0	1.0
+fr	07_gas	1	162	2000.0	0.0	1.0
+fr	08_non-res	1	162	2000.0	0.0	1.0
+fr	09_hydro_pump	1	162	100.0	0.0	1.0
+fr	01_solar	1	163	2000.0	0.0	1.0
+fr	02_wind_on	1	163	2000.0	0.0	1.0
+fr	03_wind_off	1	163	2000.0	0.0	1.0
+fr	04_res	1	163	2000.0	0.0	1.0
+fr	05_nuclear	1	163	2000.0	0.0	1.0
+fr	06_coal	1	163	2000.0	0.0	1.0
+fr	07_gas	1	163	2000.0	0.0	1.0
+fr	08_non-res	1	163	2000.0	0.0	1.0
+fr	09_hydro_pump	1	163	200.0	0.0	1.0
+fr	01_solar	1	164	2000.0	0.0	1.0
+fr	02_wind_on	1	164	2000.0	0.0	1.0
+fr	03_wind_off	1	164	2000.0	0.0	1.0
+fr	04_res	1	164	2000.0	0.0	1.0
+fr	05_nuclear	1	164	2000.0	0.0	1.0
+fr	06_coal	1	164	2000.0	0.0	1.0
+fr	07_gas	1	164	2000.0	0.0	1.0
+fr	08_non-res	1	164	2000.0	0.0	1.0
+fr	09_hydro_pump	1	164	300.0	0.0	1.0
+fr	01_solar	1	165	2000.0	0.0	1.0
+fr	02_wind_on	1	165	2000.0	0.0	1.0
+fr	03_wind_off	1	165	2000.0	0.0	1.0
+fr	04_res	1	165	2000.0	0.0	1.0
+fr	05_nuclear	1	165	2000.0	0.0	1.0
+fr	06_coal	1	165	2000.0	0.0	1.0
+fr	07_gas	1	165	2000.0	0.0	1.0
+fr	08_non-res	1	165	2000.0	0.0	1.0
+fr	09_hydro_pump	1	165	400.0	0.0	1.0
+fr	01_solar	1	166	2000.0	0.0	1.0
+fr	02_wind_on	1	166	2000.0	0.0	1.0
+fr	03_wind_off	1	166	2000.0	0.0	1.0
+fr	04_res	1	166	2000.0	0.0	1.0
+fr	05_nuclear	1	166	2000.0	0.0	1.0
+fr	06_coal	1	166	2000.0	0.0	1.0
+fr	07_gas	1	166	2000.0	0.0	1.0
+fr	08_non-res	1	166	2000.0	0.0	1.0
+fr	09_hydro_pump	1	166	500.0	0.0	1.0
+fr	01_solar	1	167	2000.0	0.0	1.0
+fr	02_wind_on	1	167	2000.0	0.0	1.0
+fr	03_wind_off	1	167	2000.0	0.0	1.0
+fr	04_res	1	167	2000.0	0.0	1.0
+fr	05_nuclear	1	167	2000.0	0.0	1.0
+fr	06_coal	1	167	2000.0	0.0	1.0
+fr	07_gas	1	167	2000.0	0.0	1.0
+fr	08_non-res	1	167	2000.0	0.0	1.0
+fr	09_hydro_pump	1	167	600.0	0.0	1.0
+fr	01_solar	1	168	2000.0	0.0	1.0
+fr	02_wind_on	1	168	2000.0	0.0	1.0
+fr	03_wind_off	1	168	2000.0	0.0	1.0
+fr	04_res	1	168	2000.0	0.0	1.0
+fr	05_nuclear	1	168	2000.0	0.0	1.0
+fr	06_coal	1	168	2000.0	0.0	1.0
+fr	07_gas	1	168	2000.0	0.0	1.0
+fr	08_non-res	1	168	2000.0	0.0	1.0
+fr	09_hydro_pump	1	168	700.0	0.0	1.0
 fr	01_solar	1	169	0.0	0.0	0.0
 fr	02_wind_on	1	169	0.0	0.0	0.0
 fr	03_wind_off	1	169	0.0	0.0	0.0
@@ -4544,7 +4544,7 @@ fr	06_coal	1	169	0.0	0.0	0.0
 fr	07_gas	1	169	0.0	0.0	0.0
 fr	08_non-res	1	169	0.0	0.0	0.0
 fr	09_hydro_pump	1	169	0.0	0.0	0.0
-fr	01_solar	1	170	100.0	1.0	0.0
+fr	01_solar	1	170	100.0	0.0	1.0
 fr	02_wind_on	1	170	0.0	0.0	0.0
 fr	03_wind_off	1	170	0.0	0.0	0.0
 fr	04_res	1	170	0.0	0.0	0.0
@@ -4553,7 +4553,7 @@ fr	06_coal	1	170	0.0	0.0	0.0
 fr	07_gas	1	170	0.0	0.0	0.0
 fr	08_non-res	1	170	0.0	0.0	0.0
 fr	09_hydro_pump	1	170	0.0	0.0	0.0
-fr	01_solar	1	171	200.0	1.0	0.0
+fr	01_solar	1	171	200.0	0.0	1.0
 fr	02_wind_on	1	171	0.0	0.0	0.0
 fr	03_wind_off	1	171	0.0	0.0	0.0
 fr	04_res	1	171	0.0	0.0	0.0
@@ -4562,7 +4562,7 @@ fr	06_coal	1	171	0.0	0.0	0.0
 fr	07_gas	1	171	0.0	0.0	0.0
 fr	08_non-res	1	171	0.0	0.0	0.0
 fr	09_hydro_pump	1	171	0.0	0.0	0.0
-fr	01_solar	1	172	300.0	1.0	0.0
+fr	01_solar	1	172	300.0	0.0	1.0
 fr	02_wind_on	1	172	0.0	0.0	0.0
 fr	03_wind_off	1	172	0.0	0.0	0.0
 fr	04_res	1	172	0.0	0.0	0.0
@@ -4571,7 +4571,7 @@ fr	06_coal	1	172	0.0	0.0	0.0
 fr	07_gas	1	172	0.0	0.0	0.0
 fr	08_non-res	1	172	0.0	0.0	0.0
 fr	09_hydro_pump	1	172	0.0	0.0	0.0
-fr	01_solar	1	173	400.0	1.0	0.0
+fr	01_solar	1	173	400.0	0.0	1.0
 fr	02_wind_on	1	173	0.0	0.0	0.0
 fr	03_wind_off	1	173	0.0	0.0	0.0
 fr	04_res	1	173	0.0	0.0	0.0
@@ -4580,7 +4580,7 @@ fr	06_coal	1	173	0.0	0.0	0.0
 fr	07_gas	1	173	0.0	0.0	0.0
 fr	08_non-res	1	173	0.0	0.0	0.0
 fr	09_hydro_pump	1	173	0.0	0.0	0.0
-fr	01_solar	1	174	500.0	1.0	0.0
+fr	01_solar	1	174	500.0	0.0	1.0
 fr	02_wind_on	1	174	0.0	0.0	0.0
 fr	03_wind_off	1	174	0.0	0.0	0.0
 fr	04_res	1	174	0.0	0.0	0.0
@@ -4589,7 +4589,7 @@ fr	06_coal	1	174	0.0	0.0	0.0
 fr	07_gas	1	174	0.0	0.0	0.0
 fr	08_non-res	1	174	0.0	0.0	0.0
 fr	09_hydro_pump	1	174	0.0	0.0	0.0
-fr	01_solar	1	175	600.0	1.0	0.0
+fr	01_solar	1	175	600.0	0.0	1.0
 fr	02_wind_on	1	175	0.0	0.0	0.0
 fr	03_wind_off	1	175	0.0	0.0	0.0
 fr	04_res	1	175	0.0	0.0	0.0
@@ -4598,7 +4598,7 @@ fr	06_coal	1	175	0.0	0.0	0.0
 fr	07_gas	1	175	0.0	0.0	0.0
 fr	08_non-res	1	175	0.0	0.0	0.0
 fr	09_hydro_pump	1	175	0.0	0.0	0.0
-fr	01_solar	1	176	700.0	1.0	0.0
+fr	01_solar	1	176	700.0	0.0	1.0
 fr	02_wind_on	1	176	0.0	0.0	0.0
 fr	03_wind_off	1	176	0.0	0.0	0.0
 fr	04_res	1	176	0.0	0.0	0.0
@@ -4607,7 +4607,7 @@ fr	06_coal	1	176	0.0	0.0	0.0
 fr	07_gas	1	176	0.0	0.0	0.0
 fr	08_non-res	1	176	0.0	0.0	0.0
 fr	09_hydro_pump	1	176	0.0	0.0	0.0
-fr	01_solar	1	177	800.0	1.0	0.0
+fr	01_solar	1	177	800.0	0.0	1.0
 fr	02_wind_on	1	177	0.0	0.0	0.0
 fr	03_wind_off	1	177	0.0	0.0	0.0
 fr	04_res	1	177	0.0	0.0	0.0
@@ -4616,7 +4616,7 @@ fr	06_coal	1	177	0.0	0.0	0.0
 fr	07_gas	1	177	0.0	0.0	0.0
 fr	08_non-res	1	177	0.0	0.0	0.0
 fr	09_hydro_pump	1	177	0.0	0.0	0.0
-fr	01_solar	1	178	900.0	1.0	0.0
+fr	01_solar	1	178	900.0	0.0	1.0
 fr	02_wind_on	1	178	0.0	0.0	0.0
 fr	03_wind_off	1	178	0.0	0.0	0.0
 fr	04_res	1	178	0.0	0.0	0.0
@@ -4625,7 +4625,7 @@ fr	06_coal	1	178	0.0	0.0	0.0
 fr	07_gas	1	178	0.0	0.0	0.0
 fr	08_non-res	1	178	0.0	0.0	0.0
 fr	09_hydro_pump	1	178	0.0	0.0	0.0
-fr	01_solar	1	179	1000.0	1.0	0.0
+fr	01_solar	1	179	1000.0	0.0	1.0
 fr	02_wind_on	1	179	0.0	0.0	0.0
 fr	03_wind_off	1	179	0.0	0.0	0.0
 fr	04_res	1	179	0.0	0.0	0.0
@@ -4634,7 +4634,7 @@ fr	06_coal	1	179	0.0	0.0	0.0
 fr	07_gas	1	179	0.0	0.0	0.0
 fr	08_non-res	1	179	0.0	0.0	0.0
 fr	09_hydro_pump	1	179	0.0	0.0	0.0
-fr	01_solar	1	180	1100.0	1.0	0.0
+fr	01_solar	1	180	1100.0	0.0	1.0
 fr	02_wind_on	1	180	0.0	0.0	0.0
 fr	03_wind_off	1	180	0.0	0.0	0.0
 fr	04_res	1	180	0.0	0.0	0.0
@@ -4643,7 +4643,7 @@ fr	06_coal	1	180	0.0	0.0	0.0
 fr	07_gas	1	180	0.0	0.0	0.0
 fr	08_non-res	1	180	0.0	0.0	0.0
 fr	09_hydro_pump	1	180	0.0	0.0	0.0
-fr	01_solar	1	181	1200.0	1.0	0.0
+fr	01_solar	1	181	1200.0	0.0	1.0
 fr	02_wind_on	1	181	0.0	0.0	0.0
 fr	03_wind_off	1	181	0.0	0.0	0.0
 fr	04_res	1	181	0.0	0.0	0.0
@@ -4652,7 +4652,7 @@ fr	06_coal	1	181	0.0	0.0	0.0
 fr	07_gas	1	181	0.0	0.0	0.0
 fr	08_non-res	1	181	0.0	0.0	0.0
 fr	09_hydro_pump	1	181	0.0	0.0	0.0
-fr	01_solar	1	182	1300.0	1.0	0.0
+fr	01_solar	1	182	1300.0	0.0	1.0
 fr	02_wind_on	1	182	0.0	0.0	0.0
 fr	03_wind_off	1	182	0.0	0.0	0.0
 fr	04_res	1	182	0.0	0.0	0.0
@@ -4661,7 +4661,7 @@ fr	06_coal	1	182	0.0	0.0	0.0
 fr	07_gas	1	182	0.0	0.0	0.0
 fr	08_non-res	1	182	0.0	0.0	0.0
 fr	09_hydro_pump	1	182	0.0	0.0	0.0
-fr	01_solar	1	183	1400.0	1.0	0.0
+fr	01_solar	1	183	1400.0	0.0	1.0
 fr	02_wind_on	1	183	0.0	0.0	0.0
 fr	03_wind_off	1	183	0.0	0.0	0.0
 fr	04_res	1	183	0.0	0.0	0.0
@@ -4670,7 +4670,7 @@ fr	06_coal	1	183	0.0	0.0	0.0
 fr	07_gas	1	183	0.0	0.0	0.0
 fr	08_non-res	1	183	0.0	0.0	0.0
 fr	09_hydro_pump	1	183	0.0	0.0	0.0
-fr	01_solar	1	184	1500.0	1.0	0.0
+fr	01_solar	1	184	1500.0	0.0	1.0
 fr	02_wind_on	1	184	0.0	0.0	0.0
 fr	03_wind_off	1	184	0.0	0.0	0.0
 fr	04_res	1	184	0.0	0.0	0.0
@@ -4679,7 +4679,7 @@ fr	06_coal	1	184	0.0	0.0	0.0
 fr	07_gas	1	184	0.0	0.0	0.0
 fr	08_non-res	1	184	0.0	0.0	0.0
 fr	09_hydro_pump	1	184	0.0	0.0	0.0
-fr	01_solar	1	185	1600.0	1.0	0.0
+fr	01_solar	1	185	1600.0	0.0	1.0
 fr	02_wind_on	1	185	0.0	0.0	0.0
 fr	03_wind_off	1	185	0.0	0.0	0.0
 fr	04_res	1	185	0.0	0.0	0.0
@@ -4688,7 +4688,7 @@ fr	06_coal	1	185	0.0	0.0	0.0
 fr	07_gas	1	185	0.0	0.0	0.0
 fr	08_non-res	1	185	0.0	0.0	0.0
 fr	09_hydro_pump	1	185	0.0	0.0	0.0
-fr	01_solar	1	186	1700.0	1.0	0.0
+fr	01_solar	1	186	1700.0	0.0	1.0
 fr	02_wind_on	1	186	0.0	0.0	0.0
 fr	03_wind_off	1	186	0.0	0.0	0.0
 fr	04_res	1	186	0.0	0.0	0.0
@@ -4697,7 +4697,7 @@ fr	06_coal	1	186	0.0	0.0	0.0
 fr	07_gas	1	186	0.0	0.0	0.0
 fr	08_non-res	1	186	0.0	0.0	0.0
 fr	09_hydro_pump	1	186	0.0	0.0	0.0
-fr	01_solar	1	187	1800.0	1.0	0.0
+fr	01_solar	1	187	1800.0	0.0	1.0
 fr	02_wind_on	1	187	0.0	0.0	0.0
 fr	03_wind_off	1	187	0.0	0.0	0.0
 fr	04_res	1	187	0.0	0.0	0.0
@@ -4706,7 +4706,7 @@ fr	06_coal	1	187	0.0	0.0	0.0
 fr	07_gas	1	187	0.0	0.0	0.0
 fr	08_non-res	1	187	0.0	0.0	0.0
 fr	09_hydro_pump	1	187	0.0	0.0	0.0
-fr	01_solar	1	188	1900.0	1.0	0.0
+fr	01_solar	1	188	1900.0	0.0	1.0
 fr	02_wind_on	1	188	0.0	0.0	0.0
 fr	03_wind_off	1	188	0.0	0.0	0.0
 fr	04_res	1	188	0.0	0.0	0.0
@@ -4715,7 +4715,7 @@ fr	06_coal	1	188	0.0	0.0	0.0
 fr	07_gas	1	188	0.0	0.0	0.0
 fr	08_non-res	1	188	0.0	0.0	0.0
 fr	09_hydro_pump	1	188	0.0	0.0	0.0
-fr	01_solar	1	189	2000.0	1.0	0.0
+fr	01_solar	1	189	2000.0	0.0	1.0
 fr	02_wind_on	1	189	0.0	0.0	0.0
 fr	03_wind_off	1	189	0.0	0.0	0.0
 fr	04_res	1	189	0.0	0.0	0.0
@@ -4724,8 +4724,8 @@ fr	06_coal	1	189	0.0	0.0	0.0
 fr	07_gas	1	189	0.0	0.0	0.0
 fr	08_non-res	1	189	0.0	0.0	0.0
 fr	09_hydro_pump	1	189	0.0	0.0	0.0
-fr	01_solar	1	190	2000.0	1.0	0.0
-fr	02_wind_on	1	190	100.0	1.0	0.0
+fr	01_solar	1	190	2000.0	0.0	1.0
+fr	02_wind_on	1	190	100.0	0.0	1.0
 fr	03_wind_off	1	190	0.0	0.0	0.0
 fr	04_res	1	190	0.0	0.0	0.0
 fr	05_nuclear	1	190	0.0	0.0	0.0
@@ -4733,8 +4733,8 @@ fr	06_coal	1	190	0.0	0.0	0.0
 fr	07_gas	1	190	0.0	0.0	0.0
 fr	08_non-res	1	190	0.0	0.0	0.0
 fr	09_hydro_pump	1	190	0.0	0.0	0.0
-fr	01_solar	1	191	2000.0	1.0	0.0
-fr	02_wind_on	1	191	200.0	1.0	0.0
+fr	01_solar	1	191	2000.0	0.0	1.0
+fr	02_wind_on	1	191	200.0	0.0	1.0
 fr	03_wind_off	1	191	0.0	0.0	0.0
 fr	04_res	1	191	0.0	0.0	0.0
 fr	05_nuclear	1	191	0.0	0.0	0.0
@@ -4742,8 +4742,8 @@ fr	06_coal	1	191	0.0	0.0	0.0
 fr	07_gas	1	191	0.0	0.0	0.0
 fr	08_non-res	1	191	0.0	0.0	0.0
 fr	09_hydro_pump	1	191	0.0	0.0	0.0
-fr	01_solar	1	192	2000.0	1.0	0.0
-fr	02_wind_on	1	192	300.0	1.0	0.0
+fr	01_solar	1	192	2000.0	0.0	1.0
+fr	02_wind_on	1	192	300.0	0.0	1.0
 fr	03_wind_off	1	192	0.0	0.0	0.0
 fr	04_res	1	192	0.0	0.0	0.0
 fr	05_nuclear	1	192	0.0	0.0	0.0
@@ -4751,8 +4751,8 @@ fr	06_coal	1	192	0.0	0.0	0.0
 fr	07_gas	1	192	0.0	0.0	0.0
 fr	08_non-res	1	192	0.0	0.0	0.0
 fr	09_hydro_pump	1	192	0.0	0.0	0.0
-fr	01_solar	1	193	2000.0	1.0	0.0
-fr	02_wind_on	1	193	400.0	1.0	0.0
+fr	01_solar	1	193	2000.0	0.0	1.0
+fr	02_wind_on	1	193	400.0	0.0	1.0
 fr	03_wind_off	1	193	0.0	0.0	0.0
 fr	04_res	1	193	0.0	0.0	0.0
 fr	05_nuclear	1	193	0.0	0.0	0.0
@@ -4760,8 +4760,8 @@ fr	06_coal	1	193	0.0	0.0	0.0
 fr	07_gas	1	193	0.0	0.0	0.0
 fr	08_non-res	1	193	0.0	0.0	0.0
 fr	09_hydro_pump	1	193	0.0	0.0	0.0
-fr	01_solar	1	194	2000.0	1.0	0.0
-fr	02_wind_on	1	194	500.0	1.0	0.0
+fr	01_solar	1	194	2000.0	0.0	1.0
+fr	02_wind_on	1	194	500.0	0.0	1.0
 fr	03_wind_off	1	194	0.0	0.0	0.0
 fr	04_res	1	194	0.0	0.0	0.0
 fr	05_nuclear	1	194	0.0	0.0	0.0
@@ -4769,8 +4769,8 @@ fr	06_coal	1	194	0.0	0.0	0.0
 fr	07_gas	1	194	0.0	0.0	0.0
 fr	08_non-res	1	194	0.0	0.0	0.0
 fr	09_hydro_pump	1	194	0.0	0.0	0.0
-fr	01_solar	1	195	2000.0	1.0	0.0
-fr	02_wind_on	1	195	600.0	1.0	0.0
+fr	01_solar	1	195	2000.0	0.0	1.0
+fr	02_wind_on	1	195	600.0	0.0	1.0
 fr	03_wind_off	1	195	0.0	0.0	0.0
 fr	04_res	1	195	0.0	0.0	0.0
 fr	05_nuclear	1	195	0.0	0.0	0.0
@@ -4778,8 +4778,8 @@ fr	06_coal	1	195	0.0	0.0	0.0
 fr	07_gas	1	195	0.0	0.0	0.0
 fr	08_non-res	1	195	0.0	0.0	0.0
 fr	09_hydro_pump	1	195	0.0	0.0	0.0
-fr	01_solar	1	196	2000.0	1.0	0.0
-fr	02_wind_on	1	196	700.0	1.0	0.0
+fr	01_solar	1	196	2000.0	0.0	1.0
+fr	02_wind_on	1	196	700.0	0.0	1.0
 fr	03_wind_off	1	196	0.0	0.0	0.0
 fr	04_res	1	196	0.0	0.0	0.0
 fr	05_nuclear	1	196	0.0	0.0	0.0
@@ -4787,8 +4787,8 @@ fr	06_coal	1	196	0.0	0.0	0.0
 fr	07_gas	1	196	0.0	0.0	0.0
 fr	08_non-res	1	196	0.0	0.0	0.0
 fr	09_hydro_pump	1	196	0.0	0.0	0.0
-fr	01_solar	1	197	2000.0	1.0	0.0
-fr	02_wind_on	1	197	800.0	1.0	0.0
+fr	01_solar	1	197	2000.0	0.0	1.0
+fr	02_wind_on	1	197	800.0	0.0	1.0
 fr	03_wind_off	1	197	0.0	0.0	0.0
 fr	04_res	1	197	0.0	0.0	0.0
 fr	05_nuclear	1	197	0.0	0.0	0.0
@@ -4796,8 +4796,8 @@ fr	06_coal	1	197	0.0	0.0	0.0
 fr	07_gas	1	197	0.0	0.0	0.0
 fr	08_non-res	1	197	0.0	0.0	0.0
 fr	09_hydro_pump	1	197	0.0	0.0	0.0
-fr	01_solar	1	198	2000.0	1.0	0.0
-fr	02_wind_on	1	198	900.0	1.0	0.0
+fr	01_solar	1	198	2000.0	0.0	1.0
+fr	02_wind_on	1	198	900.0	0.0	1.0
 fr	03_wind_off	1	198	0.0	0.0	0.0
 fr	04_res	1	198	0.0	0.0	0.0
 fr	05_nuclear	1	198	0.0	0.0	0.0
@@ -4805,8 +4805,8 @@ fr	06_coal	1	198	0.0	0.0	0.0
 fr	07_gas	1	198	0.0	0.0	0.0
 fr	08_non-res	1	198	0.0	0.0	0.0
 fr	09_hydro_pump	1	198	0.0	0.0	0.0
-fr	01_solar	1	199	2000.0	1.0	0.0
-fr	02_wind_on	1	199	1000.0	1.0	0.0
+fr	01_solar	1	199	2000.0	0.0	1.0
+fr	02_wind_on	1	199	1000.0	0.0	1.0
 fr	03_wind_off	1	199	0.0	0.0	0.0
 fr	04_res	1	199	0.0	0.0	0.0
 fr	05_nuclear	1	199	0.0	0.0	0.0
@@ -4814,8 +4814,8 @@ fr	06_coal	1	199	0.0	0.0	0.0
 fr	07_gas	1	199	0.0	0.0	0.0
 fr	08_non-res	1	199	0.0	0.0	0.0
 fr	09_hydro_pump	1	199	0.0	0.0	0.0
-fr	01_solar	1	200	2000.0	1.0	0.0
-fr	02_wind_on	1	200	1100.0	1.0	0.0
+fr	01_solar	1	200	2000.0	0.0	1.0
+fr	02_wind_on	1	200	1100.0	0.0	1.0
 fr	03_wind_off	1	200	0.0	0.0	0.0
 fr	04_res	1	200	0.0	0.0	0.0
 fr	05_nuclear	1	200	0.0	0.0	0.0
@@ -4823,8 +4823,8 @@ fr	06_coal	1	200	0.0	0.0	0.0
 fr	07_gas	1	200	0.0	0.0	0.0
 fr	08_non-res	1	200	0.0	0.0	0.0
 fr	09_hydro_pump	1	200	0.0	0.0	0.0
-fr	01_solar	1	201	2000.0	1.0	0.0
-fr	02_wind_on	1	201	1200.0	1.0	0.0
+fr	01_solar	1	201	2000.0	0.0	1.0
+fr	02_wind_on	1	201	1200.0	0.0	1.0
 fr	03_wind_off	1	201	0.0	0.0	0.0
 fr	04_res	1	201	0.0	0.0	0.0
 fr	05_nuclear	1	201	0.0	0.0	0.0
@@ -4832,8 +4832,8 @@ fr	06_coal	1	201	0.0	0.0	0.0
 fr	07_gas	1	201	0.0	0.0	0.0
 fr	08_non-res	1	201	0.0	0.0	0.0
 fr	09_hydro_pump	1	201	0.0	0.0	0.0
-fr	01_solar	1	202	2000.0	1.0	0.0
-fr	02_wind_on	1	202	1300.0	1.0	0.0
+fr	01_solar	1	202	2000.0	0.0	1.0
+fr	02_wind_on	1	202	1300.0	0.0	1.0
 fr	03_wind_off	1	202	0.0	0.0	0.0
 fr	04_res	1	202	0.0	0.0	0.0
 fr	05_nuclear	1	202	0.0	0.0	0.0
@@ -4841,8 +4841,8 @@ fr	06_coal	1	202	0.0	0.0	0.0
 fr	07_gas	1	202	0.0	0.0	0.0
 fr	08_non-res	1	202	0.0	0.0	0.0
 fr	09_hydro_pump	1	202	0.0	0.0	0.0
-fr	01_solar	1	203	2000.0	1.0	0.0
-fr	02_wind_on	1	203	1400.0	1.0	0.0
+fr	01_solar	1	203	2000.0	0.0	1.0
+fr	02_wind_on	1	203	1400.0	0.0	1.0
 fr	03_wind_off	1	203	0.0	0.0	0.0
 fr	04_res	1	203	0.0	0.0	0.0
 fr	05_nuclear	1	203	0.0	0.0	0.0
@@ -4850,8 +4850,8 @@ fr	06_coal	1	203	0.0	0.0	0.0
 fr	07_gas	1	203	0.0	0.0	0.0
 fr	08_non-res	1	203	0.0	0.0	0.0
 fr	09_hydro_pump	1	203	0.0	0.0	0.0
-fr	01_solar	1	204	2000.0	1.0	0.0
-fr	02_wind_on	1	204	1500.0	1.0	0.0
+fr	01_solar	1	204	2000.0	0.0	1.0
+fr	02_wind_on	1	204	1500.0	0.0	1.0
 fr	03_wind_off	1	204	0.0	0.0	0.0
 fr	04_res	1	204	0.0	0.0	0.0
 fr	05_nuclear	1	204	0.0	0.0	0.0
@@ -4859,8 +4859,8 @@ fr	06_coal	1	204	0.0	0.0	0.0
 fr	07_gas	1	204	0.0	0.0	0.0
 fr	08_non-res	1	204	0.0	0.0	0.0
 fr	09_hydro_pump	1	204	0.0	0.0	0.0
-fr	01_solar	1	205	2000.0	1.0	0.0
-fr	02_wind_on	1	205	1600.0	1.0	0.0
+fr	01_solar	1	205	2000.0	0.0	1.0
+fr	02_wind_on	1	205	1600.0	0.0	1.0
 fr	03_wind_off	1	205	0.0	0.0	0.0
 fr	04_res	1	205	0.0	0.0	0.0
 fr	05_nuclear	1	205	0.0	0.0	0.0
@@ -4868,8 +4868,8 @@ fr	06_coal	1	205	0.0	0.0	0.0
 fr	07_gas	1	205	0.0	0.0	0.0
 fr	08_non-res	1	205	0.0	0.0	0.0
 fr	09_hydro_pump	1	205	0.0	0.0	0.0
-fr	01_solar	1	206	2000.0	1.0	0.0
-fr	02_wind_on	1	206	1700.0	1.0	0.0
+fr	01_solar	1	206	2000.0	0.0	1.0
+fr	02_wind_on	1	206	1700.0	0.0	1.0
 fr	03_wind_off	1	206	0.0	0.0	0.0
 fr	04_res	1	206	0.0	0.0	0.0
 fr	05_nuclear	1	206	0.0	0.0	0.0
@@ -4877,8 +4877,8 @@ fr	06_coal	1	206	0.0	0.0	0.0
 fr	07_gas	1	206	0.0	0.0	0.0
 fr	08_non-res	1	206	0.0	0.0	0.0
 fr	09_hydro_pump	1	206	0.0	0.0	0.0
-fr	01_solar	1	207	2000.0	1.0	0.0
-fr	02_wind_on	1	207	1800.0	1.0	0.0
+fr	01_solar	1	207	2000.0	0.0	1.0
+fr	02_wind_on	1	207	1800.0	0.0	1.0
 fr	03_wind_off	1	207	0.0	0.0	0.0
 fr	04_res	1	207	0.0	0.0	0.0
 fr	05_nuclear	1	207	0.0	0.0	0.0
@@ -4886,8 +4886,8 @@ fr	06_coal	1	207	0.0	0.0	0.0
 fr	07_gas	1	207	0.0	0.0	0.0
 fr	08_non-res	1	207	0.0	0.0	0.0
 fr	09_hydro_pump	1	207	0.0	0.0	0.0
-fr	01_solar	1	208	2000.0	1.0	0.0
-fr	02_wind_on	1	208	1900.0	1.0	0.0
+fr	01_solar	1	208	2000.0	0.0	1.0
+fr	02_wind_on	1	208	1900.0	0.0	1.0
 fr	03_wind_off	1	208	0.0	0.0	0.0
 fr	04_res	1	208	0.0	0.0	0.0
 fr	05_nuclear	1	208	0.0	0.0	0.0
@@ -4895,8 +4895,8 @@ fr	06_coal	1	208	0.0	0.0	0.0
 fr	07_gas	1	208	0.0	0.0	0.0
 fr	08_non-res	1	208	0.0	0.0	0.0
 fr	09_hydro_pump	1	208	0.0	0.0	0.0
-fr	01_solar	1	209	2000.0	1.0	0.0
-fr	02_wind_on	1	209	2000.0	1.0	0.0
+fr	01_solar	1	209	2000.0	0.0	1.0
+fr	02_wind_on	1	209	2000.0	0.0	1.0
 fr	03_wind_off	1	209	0.0	0.0	0.0
 fr	04_res	1	209	0.0	0.0	0.0
 fr	05_nuclear	1	209	0.0	0.0	0.0
@@ -4904,1149 +4904,1149 @@ fr	06_coal	1	209	0.0	0.0	0.0
 fr	07_gas	1	209	0.0	0.0	0.0
 fr	08_non-res	1	209	0.0	0.0	0.0
 fr	09_hydro_pump	1	209	0.0	0.0	0.0
-fr	01_solar	1	210	2000.0	1.0	0.0
-fr	02_wind_on	1	210	2000.0	1.0	0.0
-fr	03_wind_off	1	210	100.0	1.0	0.0
+fr	01_solar	1	210	2000.0	0.0	1.0
+fr	02_wind_on	1	210	2000.0	0.0	1.0
+fr	03_wind_off	1	210	100.0	0.0	1.0
 fr	04_res	1	210	0.0	0.0	0.0
 fr	05_nuclear	1	210	0.0	0.0	0.0
 fr	06_coal	1	210	0.0	0.0	0.0
 fr	07_gas	1	210	0.0	0.0	0.0
 fr	08_non-res	1	210	0.0	0.0	0.0
 fr	09_hydro_pump	1	210	0.0	0.0	0.0
-fr	01_solar	1	211	2000.0	1.0	0.0
-fr	02_wind_on	1	211	2000.0	1.0	0.0
-fr	03_wind_off	1	211	200.0	1.0	0.0
+fr	01_solar	1	211	2000.0	0.0	1.0
+fr	02_wind_on	1	211	2000.0	0.0	1.0
+fr	03_wind_off	1	211	200.0	0.0	1.0
 fr	04_res	1	211	0.0	0.0	0.0
 fr	05_nuclear	1	211	0.0	0.0	0.0
 fr	06_coal	1	211	0.0	0.0	0.0
 fr	07_gas	1	211	0.0	0.0	0.0
 fr	08_non-res	1	211	0.0	0.0	0.0
 fr	09_hydro_pump	1	211	0.0	0.0	0.0
-fr	01_solar	1	212	2000.0	1.0	0.0
-fr	02_wind_on	1	212	2000.0	1.0	0.0
-fr	03_wind_off	1	212	300.0	1.0	0.0
+fr	01_solar	1	212	2000.0	0.0	1.0
+fr	02_wind_on	1	212	2000.0	0.0	1.0
+fr	03_wind_off	1	212	300.0	0.0	1.0
 fr	04_res	1	212	0.0	0.0	0.0
 fr	05_nuclear	1	212	0.0	0.0	0.0
 fr	06_coal	1	212	0.0	0.0	0.0
 fr	07_gas	1	212	0.0	0.0	0.0
 fr	08_non-res	1	212	0.0	0.0	0.0
 fr	09_hydro_pump	1	212	0.0	0.0	0.0
-fr	01_solar	1	213	2000.0	1.0	0.0
-fr	02_wind_on	1	213	2000.0	1.0	0.0
-fr	03_wind_off	1	213	400.0	1.0	0.0
+fr	01_solar	1	213	2000.0	0.0	1.0
+fr	02_wind_on	1	213	2000.0	0.0	1.0
+fr	03_wind_off	1	213	400.0	0.0	1.0
 fr	04_res	1	213	0.0	0.0	0.0
 fr	05_nuclear	1	213	0.0	0.0	0.0
 fr	06_coal	1	213	0.0	0.0	0.0
 fr	07_gas	1	213	0.0	0.0	0.0
 fr	08_non-res	1	213	0.0	0.0	0.0
 fr	09_hydro_pump	1	213	0.0	0.0	0.0
-fr	01_solar	1	214	2000.0	1.0	0.0
-fr	02_wind_on	1	214	2000.0	1.0	0.0
-fr	03_wind_off	1	214	500.0	1.0	0.0
+fr	01_solar	1	214	2000.0	0.0	1.0
+fr	02_wind_on	1	214	2000.0	0.0	1.0
+fr	03_wind_off	1	214	500.0	0.0	1.0
 fr	04_res	1	214	0.0	0.0	0.0
 fr	05_nuclear	1	214	0.0	0.0	0.0
 fr	06_coal	1	214	0.0	0.0	0.0
 fr	07_gas	1	214	0.0	0.0	0.0
 fr	08_non-res	1	214	0.0	0.0	0.0
 fr	09_hydro_pump	1	214	0.0	0.0	0.0
-fr	01_solar	1	215	2000.0	1.0	0.0
-fr	02_wind_on	1	215	2000.0	1.0	0.0
-fr	03_wind_off	1	215	600.0	1.0	0.0
+fr	01_solar	1	215	2000.0	0.0	1.0
+fr	02_wind_on	1	215	2000.0	0.0	1.0
+fr	03_wind_off	1	215	600.0	0.0	1.0
 fr	04_res	1	215	0.0	0.0	0.0
 fr	05_nuclear	1	215	0.0	0.0	0.0
 fr	06_coal	1	215	0.0	0.0	0.0
 fr	07_gas	1	215	0.0	0.0	0.0
 fr	08_non-res	1	215	0.0	0.0	0.0
 fr	09_hydro_pump	1	215	0.0	0.0	0.0
-fr	01_solar	1	216	2000.0	1.0	0.0
-fr	02_wind_on	1	216	2000.0	1.0	0.0
-fr	03_wind_off	1	216	700.0	1.0	0.0
+fr	01_solar	1	216	2000.0	0.0	1.0
+fr	02_wind_on	1	216	2000.0	0.0	1.0
+fr	03_wind_off	1	216	700.0	0.0	1.0
 fr	04_res	1	216	0.0	0.0	0.0
 fr	05_nuclear	1	216	0.0	0.0	0.0
 fr	06_coal	1	216	0.0	0.0	0.0
 fr	07_gas	1	216	0.0	0.0	0.0
 fr	08_non-res	1	216	0.0	0.0	0.0
 fr	09_hydro_pump	1	216	0.0	0.0	0.0
-fr	01_solar	1	217	2000.0	1.0	0.0
-fr	02_wind_on	1	217	2000.0	1.0	0.0
-fr	03_wind_off	1	217	800.0	1.0	0.0
+fr	01_solar	1	217	2000.0	0.0	1.0
+fr	02_wind_on	1	217	2000.0	0.0	1.0
+fr	03_wind_off	1	217	800.0	0.0	1.0
 fr	04_res	1	217	0.0	0.0	0.0
 fr	05_nuclear	1	217	0.0	0.0	0.0
 fr	06_coal	1	217	0.0	0.0	0.0
 fr	07_gas	1	217	0.0	0.0	0.0
 fr	08_non-res	1	217	0.0	0.0	0.0
 fr	09_hydro_pump	1	217	0.0	0.0	0.0
-fr	01_solar	1	218	2000.0	1.0	0.0
-fr	02_wind_on	1	218	2000.0	1.0	0.0
-fr	03_wind_off	1	218	900.0	1.0	0.0
+fr	01_solar	1	218	2000.0	0.0	1.0
+fr	02_wind_on	1	218	2000.0	0.0	1.0
+fr	03_wind_off	1	218	900.0	0.0	1.0
 fr	04_res	1	218	0.0	0.0	0.0
 fr	05_nuclear	1	218	0.0	0.0	0.0
 fr	06_coal	1	218	0.0	0.0	0.0
 fr	07_gas	1	218	0.0	0.0	0.0
 fr	08_non-res	1	218	0.0	0.0	0.0
 fr	09_hydro_pump	1	218	0.0	0.0	0.0
-fr	01_solar	1	219	2000.0	1.0	0.0
-fr	02_wind_on	1	219	2000.0	1.0	0.0
-fr	03_wind_off	1	219	1000.0	1.0	0.0
+fr	01_solar	1	219	2000.0	0.0	1.0
+fr	02_wind_on	1	219	2000.0	0.0	1.0
+fr	03_wind_off	1	219	1000.0	0.0	1.0
 fr	04_res	1	219	0.0	0.0	0.0
 fr	05_nuclear	1	219	0.0	0.0	0.0
 fr	06_coal	1	219	0.0	0.0	0.0
 fr	07_gas	1	219	0.0	0.0	0.0
 fr	08_non-res	1	219	0.0	0.0	0.0
 fr	09_hydro_pump	1	219	0.0	0.0	0.0
-fr	01_solar	1	220	2000.0	1.0	0.0
-fr	02_wind_on	1	220	2000.0	1.0	0.0
-fr	03_wind_off	1	220	1100.0	1.0	0.0
+fr	01_solar	1	220	2000.0	0.0	1.0
+fr	02_wind_on	1	220	2000.0	0.0	1.0
+fr	03_wind_off	1	220	1100.0	0.0	1.0
 fr	04_res	1	220	0.0	0.0	0.0
 fr	05_nuclear	1	220	0.0	0.0	0.0
 fr	06_coal	1	220	0.0	0.0	0.0
 fr	07_gas	1	220	0.0	0.0	0.0
 fr	08_non-res	1	220	0.0	0.0	0.0
 fr	09_hydro_pump	1	220	0.0	0.0	0.0
-fr	01_solar	1	221	2000.0	1.0	0.0
-fr	02_wind_on	1	221	2000.0	1.0	0.0
-fr	03_wind_off	1	221	1200.0	1.0	0.0
+fr	01_solar	1	221	2000.0	0.0	1.0
+fr	02_wind_on	1	221	2000.0	0.0	1.0
+fr	03_wind_off	1	221	1200.0	0.0	1.0
 fr	04_res	1	221	0.0	0.0	0.0
 fr	05_nuclear	1	221	0.0	0.0	0.0
 fr	06_coal	1	221	0.0	0.0	0.0
 fr	07_gas	1	221	0.0	0.0	0.0
 fr	08_non-res	1	221	0.0	0.0	0.0
 fr	09_hydro_pump	1	221	0.0	0.0	0.0
-fr	01_solar	1	222	2000.0	1.0	0.0
-fr	02_wind_on	1	222	2000.0	1.0	0.0
-fr	03_wind_off	1	222	1300.0	1.0	0.0
+fr	01_solar	1	222	2000.0	0.0	1.0
+fr	02_wind_on	1	222	2000.0	0.0	1.0
+fr	03_wind_off	1	222	1300.0	0.0	1.0
 fr	04_res	1	222	0.0	0.0	0.0
 fr	05_nuclear	1	222	0.0	0.0	0.0
 fr	06_coal	1	222	0.0	0.0	0.0
 fr	07_gas	1	222	0.0	0.0	0.0
 fr	08_non-res	1	222	0.0	0.0	0.0
 fr	09_hydro_pump	1	222	0.0	0.0	0.0
-fr	01_solar	1	223	2000.0	1.0	0.0
-fr	02_wind_on	1	223	2000.0	1.0	0.0
-fr	03_wind_off	1	223	1400.0	1.0	0.0
+fr	01_solar	1	223	2000.0	0.0	1.0
+fr	02_wind_on	1	223	2000.0	0.0	1.0
+fr	03_wind_off	1	223	1400.0	0.0	1.0
 fr	04_res	1	223	0.0	0.0	0.0
 fr	05_nuclear	1	223	0.0	0.0	0.0
 fr	06_coal	1	223	0.0	0.0	0.0
 fr	07_gas	1	223	0.0	0.0	0.0
 fr	08_non-res	1	223	0.0	0.0	0.0
 fr	09_hydro_pump	1	223	0.0	0.0	0.0
-fr	01_solar	1	224	2000.0	1.0	0.0
-fr	02_wind_on	1	224	2000.0	1.0	0.0
-fr	03_wind_off	1	224	1500.0	1.0	0.0
+fr	01_solar	1	224	2000.0	0.0	1.0
+fr	02_wind_on	1	224	2000.0	0.0	1.0
+fr	03_wind_off	1	224	1500.0	0.0	1.0
 fr	04_res	1	224	0.0	0.0	0.0
 fr	05_nuclear	1	224	0.0	0.0	0.0
 fr	06_coal	1	224	0.0	0.0	0.0
 fr	07_gas	1	224	0.0	0.0	0.0
 fr	08_non-res	1	224	0.0	0.0	0.0
 fr	09_hydro_pump	1	224	0.0	0.0	0.0
-fr	01_solar	1	225	2000.0	1.0	0.0
-fr	02_wind_on	1	225	2000.0	1.0	0.0
-fr	03_wind_off	1	225	1600.0	1.0	0.0
+fr	01_solar	1	225	2000.0	0.0	1.0
+fr	02_wind_on	1	225	2000.0	0.0	1.0
+fr	03_wind_off	1	225	1600.0	0.0	1.0
 fr	04_res	1	225	0.0	0.0	0.0
 fr	05_nuclear	1	225	0.0	0.0	0.0
 fr	06_coal	1	225	0.0	0.0	0.0
 fr	07_gas	1	225	0.0	0.0	0.0
 fr	08_non-res	1	225	0.0	0.0	0.0
 fr	09_hydro_pump	1	225	0.0	0.0	0.0
-fr	01_solar	1	226	2000.0	1.0	0.0
-fr	02_wind_on	1	226	2000.0	1.0	0.0
-fr	03_wind_off	1	226	1700.0	1.0	0.0
+fr	01_solar	1	226	2000.0	0.0	1.0
+fr	02_wind_on	1	226	2000.0	0.0	1.0
+fr	03_wind_off	1	226	1700.0	0.0	1.0
 fr	04_res	1	226	0.0	0.0	0.0
 fr	05_nuclear	1	226	0.0	0.0	0.0
 fr	06_coal	1	226	0.0	0.0	0.0
 fr	07_gas	1	226	0.0	0.0	0.0
 fr	08_non-res	1	226	0.0	0.0	0.0
 fr	09_hydro_pump	1	226	0.0	0.0	0.0
-fr	01_solar	1	227	2000.0	1.0	0.0
-fr	02_wind_on	1	227	2000.0	1.0	0.0
-fr	03_wind_off	1	227	1800.0	1.0	0.0
+fr	01_solar	1	227	2000.0	0.0	1.0
+fr	02_wind_on	1	227	2000.0	0.0	1.0
+fr	03_wind_off	1	227	1800.0	0.0	1.0
 fr	04_res	1	227	0.0	0.0	0.0
 fr	05_nuclear	1	227	0.0	0.0	0.0
 fr	06_coal	1	227	0.0	0.0	0.0
 fr	07_gas	1	227	0.0	0.0	0.0
 fr	08_non-res	1	227	0.0	0.0	0.0
 fr	09_hydro_pump	1	227	0.0	0.0	0.0
-fr	01_solar	1	228	2000.0	1.0	0.0
-fr	02_wind_on	1	228	2000.0	1.0	0.0
-fr	03_wind_off	1	228	1900.0	1.0	0.0
+fr	01_solar	1	228	2000.0	0.0	1.0
+fr	02_wind_on	1	228	2000.0	0.0	1.0
+fr	03_wind_off	1	228	1900.0	0.0	1.0
 fr	04_res	1	228	0.0	0.0	0.0
 fr	05_nuclear	1	228	0.0	0.0	0.0
 fr	06_coal	1	228	0.0	0.0	0.0
 fr	07_gas	1	228	0.0	0.0	0.0
 fr	08_non-res	1	228	0.0	0.0	0.0
 fr	09_hydro_pump	1	228	0.0	0.0	0.0
-fr	01_solar	1	229	2000.0	1.0	0.0
-fr	02_wind_on	1	229	2000.0	1.0	0.0
-fr	03_wind_off	1	229	2000.0	1.0	0.0
+fr	01_solar	1	229	2000.0	0.0	1.0
+fr	02_wind_on	1	229	2000.0	0.0	1.0
+fr	03_wind_off	1	229	2000.0	0.0	1.0
 fr	04_res	1	229	0.0	0.0	0.0
 fr	05_nuclear	1	229	0.0	0.0	0.0
 fr	06_coal	1	229	0.0	0.0	0.0
 fr	07_gas	1	229	0.0	0.0	0.0
 fr	08_non-res	1	229	0.0	0.0	0.0
 fr	09_hydro_pump	1	229	0.0	0.0	0.0
-fr	01_solar	1	230	2000.0	1.0	0.0
-fr	02_wind_on	1	230	2000.0	1.0	0.0
-fr	03_wind_off	1	230	2000.0	1.0	0.0
-fr	04_res	1	230	100.0	1.0	0.0
+fr	01_solar	1	230	2000.0	0.0	1.0
+fr	02_wind_on	1	230	2000.0	0.0	1.0
+fr	03_wind_off	1	230	2000.0	0.0	1.0
+fr	04_res	1	230	100.0	0.0	1.0
 fr	05_nuclear	1	230	0.0	0.0	0.0
 fr	06_coal	1	230	0.0	0.0	0.0
 fr	07_gas	1	230	0.0	0.0	0.0
 fr	08_non-res	1	230	0.0	0.0	0.0
 fr	09_hydro_pump	1	230	0.0	0.0	0.0
-fr	01_solar	1	231	2000.0	1.0	0.0
-fr	02_wind_on	1	231	2000.0	1.0	0.0
-fr	03_wind_off	1	231	2000.0	1.0	0.0
-fr	04_res	1	231	200.0	1.0	0.0
+fr	01_solar	1	231	2000.0	0.0	1.0
+fr	02_wind_on	1	231	2000.0	0.0	1.0
+fr	03_wind_off	1	231	2000.0	0.0	1.0
+fr	04_res	1	231	200.0	0.0	1.0
 fr	05_nuclear	1	231	0.0	0.0	0.0
 fr	06_coal	1	231	0.0	0.0	0.0
 fr	07_gas	1	231	0.0	0.0	0.0
 fr	08_non-res	1	231	0.0	0.0	0.0
 fr	09_hydro_pump	1	231	0.0	0.0	0.0
-fr	01_solar	1	232	2000.0	1.0	0.0
-fr	02_wind_on	1	232	2000.0	1.0	0.0
-fr	03_wind_off	1	232	2000.0	1.0	0.0
-fr	04_res	1	232	300.0	1.0	0.0
+fr	01_solar	1	232	2000.0	0.0	1.0
+fr	02_wind_on	1	232	2000.0	0.0	1.0
+fr	03_wind_off	1	232	2000.0	0.0	1.0
+fr	04_res	1	232	300.0	0.0	1.0
 fr	05_nuclear	1	232	0.0	0.0	0.0
 fr	06_coal	1	232	0.0	0.0	0.0
 fr	07_gas	1	232	0.0	0.0	0.0
 fr	08_non-res	1	232	0.0	0.0	0.0
 fr	09_hydro_pump	1	232	0.0	0.0	0.0
-fr	01_solar	1	233	2000.0	1.0	0.0
-fr	02_wind_on	1	233	2000.0	1.0	0.0
-fr	03_wind_off	1	233	2000.0	1.0	0.0
-fr	04_res	1	233	400.0	1.0	0.0
+fr	01_solar	1	233	2000.0	0.0	1.0
+fr	02_wind_on	1	233	2000.0	0.0	1.0
+fr	03_wind_off	1	233	2000.0	0.0	1.0
+fr	04_res	1	233	400.0	0.0	1.0
 fr	05_nuclear	1	233	0.0	0.0	0.0
 fr	06_coal	1	233	0.0	0.0	0.0
 fr	07_gas	1	233	0.0	0.0	0.0
 fr	08_non-res	1	233	0.0	0.0	0.0
 fr	09_hydro_pump	1	233	0.0	0.0	0.0
-fr	01_solar	1	234	2000.0	1.0	0.0
-fr	02_wind_on	1	234	2000.0	1.0	0.0
-fr	03_wind_off	1	234	2000.0	1.0	0.0
-fr	04_res	1	234	500.0	1.0	0.0
+fr	01_solar	1	234	2000.0	0.0	1.0
+fr	02_wind_on	1	234	2000.0	0.0	1.0
+fr	03_wind_off	1	234	2000.0	0.0	1.0
+fr	04_res	1	234	500.0	0.0	1.0
 fr	05_nuclear	1	234	0.0	0.0	0.0
 fr	06_coal	1	234	0.0	0.0	0.0
 fr	07_gas	1	234	0.0	0.0	0.0
 fr	08_non-res	1	234	0.0	0.0	0.0
 fr	09_hydro_pump	1	234	0.0	0.0	0.0
-fr	01_solar	1	235	2000.0	1.0	0.0
-fr	02_wind_on	1	235	2000.0	1.0	0.0
-fr	03_wind_off	1	235	2000.0	1.0	0.0
-fr	04_res	1	235	600.0	1.0	0.0
+fr	01_solar	1	235	2000.0	0.0	1.0
+fr	02_wind_on	1	235	2000.0	0.0	1.0
+fr	03_wind_off	1	235	2000.0	0.0	1.0
+fr	04_res	1	235	600.0	0.0	1.0
 fr	05_nuclear	1	235	0.0	0.0	0.0
 fr	06_coal	1	235	0.0	0.0	0.0
 fr	07_gas	1	235	0.0	0.0	0.0
 fr	08_non-res	1	235	0.0	0.0	0.0
 fr	09_hydro_pump	1	235	0.0	0.0	0.0
-fr	01_solar	1	236	2000.0	1.0	0.0
-fr	02_wind_on	1	236	2000.0	1.0	0.0
-fr	03_wind_off	1	236	2000.0	1.0	0.0
-fr	04_res	1	236	700.0	1.0	0.0
+fr	01_solar	1	236	2000.0	0.0	1.0
+fr	02_wind_on	1	236	2000.0	0.0	1.0
+fr	03_wind_off	1	236	2000.0	0.0	1.0
+fr	04_res	1	236	700.0	0.0	1.0
 fr	05_nuclear	1	236	0.0	0.0	0.0
 fr	06_coal	1	236	0.0	0.0	0.0
 fr	07_gas	1	236	0.0	0.0	0.0
 fr	08_non-res	1	236	0.0	0.0	0.0
 fr	09_hydro_pump	1	236	0.0	0.0	0.0
-fr	01_solar	1	237	2000.0	1.0	0.0
-fr	02_wind_on	1	237	2000.0	1.0	0.0
-fr	03_wind_off	1	237	2000.0	1.0	0.0
-fr	04_res	1	237	800.0	1.0	0.0
+fr	01_solar	1	237	2000.0	0.0	1.0
+fr	02_wind_on	1	237	2000.0	0.0	1.0
+fr	03_wind_off	1	237	2000.0	0.0	1.0
+fr	04_res	1	237	800.0	0.0	1.0
 fr	05_nuclear	1	237	0.0	0.0	0.0
 fr	06_coal	1	237	0.0	0.0	0.0
 fr	07_gas	1	237	0.0	0.0	0.0
 fr	08_non-res	1	237	0.0	0.0	0.0
 fr	09_hydro_pump	1	237	0.0	0.0	0.0
-fr	01_solar	1	238	2000.0	1.0	0.0
-fr	02_wind_on	1	238	2000.0	1.0	0.0
-fr	03_wind_off	1	238	2000.0	1.0	0.0
-fr	04_res	1	238	900.0	1.0	0.0
+fr	01_solar	1	238	2000.0	0.0	1.0
+fr	02_wind_on	1	238	2000.0	0.0	1.0
+fr	03_wind_off	1	238	2000.0	0.0	1.0
+fr	04_res	1	238	900.0	0.0	1.0
 fr	05_nuclear	1	238	0.0	0.0	0.0
 fr	06_coal	1	238	0.0	0.0	0.0
 fr	07_gas	1	238	0.0	0.0	0.0
 fr	08_non-res	1	238	0.0	0.0	0.0
 fr	09_hydro_pump	1	238	0.0	0.0	0.0
-fr	01_solar	1	239	2000.0	1.0	0.0
-fr	02_wind_on	1	239	2000.0	1.0	0.0
-fr	03_wind_off	1	239	2000.0	1.0	0.0
-fr	04_res	1	239	1000.0	1.0	0.0
+fr	01_solar	1	239	2000.0	0.0	1.0
+fr	02_wind_on	1	239	2000.0	0.0	1.0
+fr	03_wind_off	1	239	2000.0	0.0	1.0
+fr	04_res	1	239	1000.0	0.0	1.0
 fr	05_nuclear	1	239	0.0	0.0	0.0
 fr	06_coal	1	239	0.0	0.0	0.0
 fr	07_gas	1	239	0.0	0.0	0.0
 fr	08_non-res	1	239	0.0	0.0	0.0
 fr	09_hydro_pump	1	239	0.0	0.0	0.0
-fr	01_solar	1	240	2000.0	1.0	0.0
-fr	02_wind_on	1	240	2000.0	1.0	0.0
-fr	03_wind_off	1	240	2000.0	1.0	0.0
-fr	04_res	1	240	1100.0	1.0	0.0
+fr	01_solar	1	240	2000.0	0.0	1.0
+fr	02_wind_on	1	240	2000.0	0.0	1.0
+fr	03_wind_off	1	240	2000.0	0.0	1.0
+fr	04_res	1	240	1100.0	0.0	1.0
 fr	05_nuclear	1	240	0.0	0.0	0.0
 fr	06_coal	1	240	0.0	0.0	0.0
 fr	07_gas	1	240	0.0	0.0	0.0
 fr	08_non-res	1	240	0.0	0.0	0.0
 fr	09_hydro_pump	1	240	0.0	0.0	0.0
-fr	01_solar	1	241	2000.0	1.0	0.0
-fr	02_wind_on	1	241	2000.0	1.0	0.0
-fr	03_wind_off	1	241	2000.0	1.0	0.0
-fr	04_res	1	241	1200.0	1.0	0.0
+fr	01_solar	1	241	2000.0	0.0	1.0
+fr	02_wind_on	1	241	2000.0	0.0	1.0
+fr	03_wind_off	1	241	2000.0	0.0	1.0
+fr	04_res	1	241	1200.0	0.0	1.0
 fr	05_nuclear	1	241	0.0	0.0	0.0
 fr	06_coal	1	241	0.0	0.0	0.0
 fr	07_gas	1	241	0.0	0.0	0.0
 fr	08_non-res	1	241	0.0	0.0	0.0
 fr	09_hydro_pump	1	241	0.0	0.0	0.0
-fr	01_solar	1	242	2000.0	1.0	0.0
-fr	02_wind_on	1	242	2000.0	1.0	0.0
-fr	03_wind_off	1	242	2000.0	1.0	0.0
-fr	04_res	1	242	1300.0	1.0	0.0
+fr	01_solar	1	242	2000.0	0.0	1.0
+fr	02_wind_on	1	242	2000.0	0.0	1.0
+fr	03_wind_off	1	242	2000.0	0.0	1.0
+fr	04_res	1	242	1300.0	0.0	1.0
 fr	05_nuclear	1	242	0.0	0.0	0.0
 fr	06_coal	1	242	0.0	0.0	0.0
 fr	07_gas	1	242	0.0	0.0	0.0
 fr	08_non-res	1	242	0.0	0.0	0.0
 fr	09_hydro_pump	1	242	0.0	0.0	0.0
-fr	01_solar	1	243	2000.0	1.0	0.0
-fr	02_wind_on	1	243	2000.0	1.0	0.0
-fr	03_wind_off	1	243	2000.0	1.0	0.0
-fr	04_res	1	243	1400.0	1.0	0.0
+fr	01_solar	1	243	2000.0	0.0	1.0
+fr	02_wind_on	1	243	2000.0	0.0	1.0
+fr	03_wind_off	1	243	2000.0	0.0	1.0
+fr	04_res	1	243	1400.0	0.0	1.0
 fr	05_nuclear	1	243	0.0	0.0	0.0
 fr	06_coal	1	243	0.0	0.0	0.0
 fr	07_gas	1	243	0.0	0.0	0.0
 fr	08_non-res	1	243	0.0	0.0	0.0
 fr	09_hydro_pump	1	243	0.0	0.0	0.0
-fr	01_solar	1	244	2000.0	1.0	0.0
-fr	02_wind_on	1	244	2000.0	1.0	0.0
-fr	03_wind_off	1	244	2000.0	1.0	0.0
-fr	04_res	1	244	1500.0	1.0	0.0
+fr	01_solar	1	244	2000.0	0.0	1.0
+fr	02_wind_on	1	244	2000.0	0.0	1.0
+fr	03_wind_off	1	244	2000.0	0.0	1.0
+fr	04_res	1	244	1500.0	0.0	1.0
 fr	05_nuclear	1	244	0.0	0.0	0.0
 fr	06_coal	1	244	0.0	0.0	0.0
 fr	07_gas	1	244	0.0	0.0	0.0
 fr	08_non-res	1	244	0.0	0.0	0.0
 fr	09_hydro_pump	1	244	0.0	0.0	0.0
-fr	01_solar	1	245	2000.0	1.0	0.0
-fr	02_wind_on	1	245	2000.0	1.0	0.0
-fr	03_wind_off	1	245	2000.0	1.0	0.0
-fr	04_res	1	245	1600.0	1.0	0.0
+fr	01_solar	1	245	2000.0	0.0	1.0
+fr	02_wind_on	1	245	2000.0	0.0	1.0
+fr	03_wind_off	1	245	2000.0	0.0	1.0
+fr	04_res	1	245	1600.0	0.0	1.0
 fr	05_nuclear	1	245	0.0	0.0	0.0
 fr	06_coal	1	245	0.0	0.0	0.0
 fr	07_gas	1	245	0.0	0.0	0.0
 fr	08_non-res	1	245	0.0	0.0	0.0
 fr	09_hydro_pump	1	245	0.0	0.0	0.0
-fr	01_solar	1	246	2000.0	1.0	0.0
-fr	02_wind_on	1	246	2000.0	1.0	0.0
-fr	03_wind_off	1	246	2000.0	1.0	0.0
-fr	04_res	1	246	1700.0	1.0	0.0
+fr	01_solar	1	246	2000.0	0.0	1.0
+fr	02_wind_on	1	246	2000.0	0.0	1.0
+fr	03_wind_off	1	246	2000.0	0.0	1.0
+fr	04_res	1	246	1700.0	0.0	1.0
 fr	05_nuclear	1	246	0.0	0.0	0.0
 fr	06_coal	1	246	0.0	0.0	0.0
 fr	07_gas	1	246	0.0	0.0	0.0
 fr	08_non-res	1	246	0.0	0.0	0.0
 fr	09_hydro_pump	1	246	0.0	0.0	0.0
-fr	01_solar	1	247	2000.0	1.0	0.0
-fr	02_wind_on	1	247	2000.0	1.0	0.0
-fr	03_wind_off	1	247	2000.0	1.0	0.0
-fr	04_res	1	247	1800.0	1.0	0.0
+fr	01_solar	1	247	2000.0	0.0	1.0
+fr	02_wind_on	1	247	2000.0	0.0	1.0
+fr	03_wind_off	1	247	2000.0	0.0	1.0
+fr	04_res	1	247	1800.0	0.0	1.0
 fr	05_nuclear	1	247	0.0	0.0	0.0
 fr	06_coal	1	247	0.0	0.0	0.0
 fr	07_gas	1	247	0.0	0.0	0.0
 fr	08_non-res	1	247	0.0	0.0	0.0
 fr	09_hydro_pump	1	247	0.0	0.0	0.0
-fr	01_solar	1	248	2000.0	1.0	0.0
-fr	02_wind_on	1	248	2000.0	1.0	0.0
-fr	03_wind_off	1	248	2000.0	1.0	0.0
-fr	04_res	1	248	1900.0	1.0	0.0
+fr	01_solar	1	248	2000.0	0.0	1.0
+fr	02_wind_on	1	248	2000.0	0.0	1.0
+fr	03_wind_off	1	248	2000.0	0.0	1.0
+fr	04_res	1	248	1900.0	0.0	1.0
 fr	05_nuclear	1	248	0.0	0.0	0.0
 fr	06_coal	1	248	0.0	0.0	0.0
 fr	07_gas	1	248	0.0	0.0	0.0
 fr	08_non-res	1	248	0.0	0.0	0.0
 fr	09_hydro_pump	1	248	0.0	0.0	0.0
-fr	01_solar	1	249	2000.0	1.0	0.0
-fr	02_wind_on	1	249	2000.0	1.0	0.0
-fr	03_wind_off	1	249	2000.0	1.0	0.0
-fr	04_res	1	249	2000.0	1.0	0.0
+fr	01_solar	1	249	2000.0	0.0	1.0
+fr	02_wind_on	1	249	2000.0	0.0	1.0
+fr	03_wind_off	1	249	2000.0	0.0	1.0
+fr	04_res	1	249	2000.0	0.0	1.0
 fr	05_nuclear	1	249	0.0	0.0	0.0
 fr	06_coal	1	249	0.0	0.0	0.0
 fr	07_gas	1	249	0.0	0.0	0.0
 fr	08_non-res	1	249	0.0	0.0	0.0
 fr	09_hydro_pump	1	249	0.0	0.0	0.0
-fr	01_solar	1	250	2000.0	1.0	0.0
-fr	02_wind_on	1	250	2000.0	1.0	0.0
-fr	03_wind_off	1	250	2000.0	1.0	0.0
-fr	04_res	1	250	2000.0	1.0	0.0
-fr	05_nuclear	1	250	100.0	1.0	0.0
+fr	01_solar	1	250	2000.0	0.0	1.0
+fr	02_wind_on	1	250	2000.0	0.0	1.0
+fr	03_wind_off	1	250	2000.0	0.0	1.0
+fr	04_res	1	250	2000.0	0.0	1.0
+fr	05_nuclear	1	250	100.0	0.0	1.0
 fr	06_coal	1	250	0.0	0.0	0.0
 fr	07_gas	1	250	0.0	0.0	0.0
 fr	08_non-res	1	250	0.0	0.0	0.0
 fr	09_hydro_pump	1	250	0.0	0.0	0.0
-fr	01_solar	1	251	2000.0	1.0	0.0
-fr	02_wind_on	1	251	2000.0	1.0	0.0
-fr	03_wind_off	1	251	2000.0	1.0	0.0
-fr	04_res	1	251	2000.0	1.0	0.0
-fr	05_nuclear	1	251	200.0	1.0	0.0
+fr	01_solar	1	251	2000.0	0.0	1.0
+fr	02_wind_on	1	251	2000.0	0.0	1.0
+fr	03_wind_off	1	251	2000.0	0.0	1.0
+fr	04_res	1	251	2000.0	0.0	1.0
+fr	05_nuclear	1	251	200.0	0.0	1.0
 fr	06_coal	1	251	0.0	0.0	0.0
 fr	07_gas	1	251	0.0	0.0	0.0
 fr	08_non-res	1	251	0.0	0.0	0.0
 fr	09_hydro_pump	1	251	0.0	0.0	0.0
-fr	01_solar	1	252	2000.0	1.0	0.0
-fr	02_wind_on	1	252	2000.0	1.0	0.0
-fr	03_wind_off	1	252	2000.0	1.0	0.0
-fr	04_res	1	252	2000.0	1.0	0.0
-fr	05_nuclear	1	252	300.0	1.0	0.0
+fr	01_solar	1	252	2000.0	0.0	1.0
+fr	02_wind_on	1	252	2000.0	0.0	1.0
+fr	03_wind_off	1	252	2000.0	0.0	1.0
+fr	04_res	1	252	2000.0	0.0	1.0
+fr	05_nuclear	1	252	300.0	0.0	1.0
 fr	06_coal	1	252	0.0	0.0	0.0
 fr	07_gas	1	252	0.0	0.0	0.0
 fr	08_non-res	1	252	0.0	0.0	0.0
 fr	09_hydro_pump	1	252	0.0	0.0	0.0
-fr	01_solar	1	253	2000.0	1.0	0.0
-fr	02_wind_on	1	253	2000.0	1.0	0.0
-fr	03_wind_off	1	253	2000.0	1.0	0.0
-fr	04_res	1	253	2000.0	1.0	0.0
-fr	05_nuclear	1	253	400.0	1.0	0.0
+fr	01_solar	1	253	2000.0	0.0	1.0
+fr	02_wind_on	1	253	2000.0	0.0	1.0
+fr	03_wind_off	1	253	2000.0	0.0	1.0
+fr	04_res	1	253	2000.0	0.0	1.0
+fr	05_nuclear	1	253	400.0	0.0	1.0
 fr	06_coal	1	253	0.0	0.0	0.0
 fr	07_gas	1	253	0.0	0.0	0.0
 fr	08_non-res	1	253	0.0	0.0	0.0
 fr	09_hydro_pump	1	253	0.0	0.0	0.0
-fr	01_solar	1	254	2000.0	1.0	0.0
-fr	02_wind_on	1	254	2000.0	1.0	0.0
-fr	03_wind_off	1	254	2000.0	1.0	0.0
-fr	04_res	1	254	2000.0	1.0	0.0
-fr	05_nuclear	1	254	500.0	1.0	0.0
+fr	01_solar	1	254	2000.0	0.0	1.0
+fr	02_wind_on	1	254	2000.0	0.0	1.0
+fr	03_wind_off	1	254	2000.0	0.0	1.0
+fr	04_res	1	254	2000.0	0.0	1.0
+fr	05_nuclear	1	254	500.0	0.0	1.0
 fr	06_coal	1	254	0.0	0.0	0.0
 fr	07_gas	1	254	0.0	0.0	0.0
 fr	08_non-res	1	254	0.0	0.0	0.0
 fr	09_hydro_pump	1	254	0.0	0.0	0.0
-fr	01_solar	1	255	2000.0	1.0	0.0
-fr	02_wind_on	1	255	2000.0	1.0	0.0
-fr	03_wind_off	1	255	2000.0	1.0	0.0
-fr	04_res	1	255	2000.0	1.0	0.0
-fr	05_nuclear	1	255	600.0	1.0	0.0
+fr	01_solar	1	255	2000.0	0.0	1.0
+fr	02_wind_on	1	255	2000.0	0.0	1.0
+fr	03_wind_off	1	255	2000.0	0.0	1.0
+fr	04_res	1	255	2000.0	0.0	1.0
+fr	05_nuclear	1	255	600.0	0.0	1.0
 fr	06_coal	1	255	0.0	0.0	0.0
 fr	07_gas	1	255	0.0	0.0	0.0
 fr	08_non-res	1	255	0.0	0.0	0.0
 fr	09_hydro_pump	1	255	0.0	0.0	0.0
-fr	01_solar	1	256	2000.0	1.0	0.0
-fr	02_wind_on	1	256	2000.0	1.0	0.0
-fr	03_wind_off	1	256	2000.0	1.0	0.0
-fr	04_res	1	256	2000.0	1.0	0.0
-fr	05_nuclear	1	256	700.0	1.0	0.0
+fr	01_solar	1	256	2000.0	0.0	1.0
+fr	02_wind_on	1	256	2000.0	0.0	1.0
+fr	03_wind_off	1	256	2000.0	0.0	1.0
+fr	04_res	1	256	2000.0	0.0	1.0
+fr	05_nuclear	1	256	700.0	0.0	1.0
 fr	06_coal	1	256	0.0	0.0	0.0
 fr	07_gas	1	256	0.0	0.0	0.0
 fr	08_non-res	1	256	0.0	0.0	0.0
 fr	09_hydro_pump	1	256	0.0	0.0	0.0
-fr	01_solar	1	257	2000.0	1.0	0.0
-fr	02_wind_on	1	257	2000.0	1.0	0.0
-fr	03_wind_off	1	257	2000.0	1.0	0.0
-fr	04_res	1	257	2000.0	1.0	0.0
-fr	05_nuclear	1	257	800.0	1.0	0.0
+fr	01_solar	1	257	2000.0	0.0	1.0
+fr	02_wind_on	1	257	2000.0	0.0	1.0
+fr	03_wind_off	1	257	2000.0	0.0	1.0
+fr	04_res	1	257	2000.0	0.0	1.0
+fr	05_nuclear	1	257	800.0	0.0	1.0
 fr	06_coal	1	257	0.0	0.0	0.0
 fr	07_gas	1	257	0.0	0.0	0.0
 fr	08_non-res	1	257	0.0	0.0	0.0
 fr	09_hydro_pump	1	257	0.0	0.0	0.0
-fr	01_solar	1	258	2000.0	1.0	0.0
-fr	02_wind_on	1	258	2000.0	1.0	0.0
-fr	03_wind_off	1	258	2000.0	1.0	0.0
-fr	04_res	1	258	2000.0	1.0	0.0
-fr	05_nuclear	1	258	900.0	1.0	0.0
+fr	01_solar	1	258	2000.0	0.0	1.0
+fr	02_wind_on	1	258	2000.0	0.0	1.0
+fr	03_wind_off	1	258	2000.0	0.0	1.0
+fr	04_res	1	258	2000.0	0.0	1.0
+fr	05_nuclear	1	258	900.0	0.0	1.0
 fr	06_coal	1	258	0.0	0.0	0.0
 fr	07_gas	1	258	0.0	0.0	0.0
 fr	08_non-res	1	258	0.0	0.0	0.0
 fr	09_hydro_pump	1	258	0.0	0.0	0.0
-fr	01_solar	1	259	2000.0	1.0	0.0
-fr	02_wind_on	1	259	2000.0	1.0	0.0
-fr	03_wind_off	1	259	2000.0	1.0	0.0
-fr	04_res	1	259	2000.0	1.0	0.0
-fr	05_nuclear	1	259	1000.0	1.0	0.0
+fr	01_solar	1	259	2000.0	0.0	1.0
+fr	02_wind_on	1	259	2000.0	0.0	1.0
+fr	03_wind_off	1	259	2000.0	0.0	1.0
+fr	04_res	1	259	2000.0	0.0	1.0
+fr	05_nuclear	1	259	1000.0	0.0	1.0
 fr	06_coal	1	259	0.0	0.0	0.0
 fr	07_gas	1	259	0.0	0.0	0.0
 fr	08_non-res	1	259	0.0	0.0	0.0
 fr	09_hydro_pump	1	259	0.0	0.0	0.0
-fr	01_solar	1	260	2000.0	1.0	0.0
-fr	02_wind_on	1	260	2000.0	1.0	0.0
-fr	03_wind_off	1	260	2000.0	1.0	0.0
-fr	04_res	1	260	2000.0	1.0	0.0
-fr	05_nuclear	1	260	1100.0	1.0	0.0
+fr	01_solar	1	260	2000.0	0.0	1.0
+fr	02_wind_on	1	260	2000.0	0.0	1.0
+fr	03_wind_off	1	260	2000.0	0.0	1.0
+fr	04_res	1	260	2000.0	0.0	1.0
+fr	05_nuclear	1	260	1100.0	0.0	1.0
 fr	06_coal	1	260	0.0	0.0	0.0
 fr	07_gas	1	260	0.0	0.0	0.0
 fr	08_non-res	1	260	0.0	0.0	0.0
 fr	09_hydro_pump	1	260	0.0	0.0	0.0
-fr	01_solar	1	261	2000.0	1.0	0.0
-fr	02_wind_on	1	261	2000.0	1.0	0.0
-fr	03_wind_off	1	261	2000.0	1.0	0.0
-fr	04_res	1	261	2000.0	1.0	0.0
-fr	05_nuclear	1	261	1200.0	1.0	0.0
+fr	01_solar	1	261	2000.0	0.0	1.0
+fr	02_wind_on	1	261	2000.0	0.0	1.0
+fr	03_wind_off	1	261	2000.0	0.0	1.0
+fr	04_res	1	261	2000.0	0.0	1.0
+fr	05_nuclear	1	261	1200.0	0.0	1.0
 fr	06_coal	1	261	0.0	0.0	0.0
 fr	07_gas	1	261	0.0	0.0	0.0
 fr	08_non-res	1	261	0.0	0.0	0.0
 fr	09_hydro_pump	1	261	0.0	0.0	0.0
-fr	01_solar	1	262	2000.0	1.0	0.0
-fr	02_wind_on	1	262	2000.0	1.0	0.0
-fr	03_wind_off	1	262	2000.0	1.0	0.0
-fr	04_res	1	262	2000.0	1.0	0.0
-fr	05_nuclear	1	262	1300.0	1.0	0.0
+fr	01_solar	1	262	2000.0	0.0	1.0
+fr	02_wind_on	1	262	2000.0	0.0	1.0
+fr	03_wind_off	1	262	2000.0	0.0	1.0
+fr	04_res	1	262	2000.0	0.0	1.0
+fr	05_nuclear	1	262	1300.0	0.0	1.0
 fr	06_coal	1	262	0.0	0.0	0.0
 fr	07_gas	1	262	0.0	0.0	0.0
 fr	08_non-res	1	262	0.0	0.0	0.0
 fr	09_hydro_pump	1	262	0.0	0.0	0.0
-fr	01_solar	1	263	2000.0	1.0	0.0
-fr	02_wind_on	1	263	2000.0	1.0	0.0
-fr	03_wind_off	1	263	2000.0	1.0	0.0
-fr	04_res	1	263	2000.0	1.0	0.0
-fr	05_nuclear	1	263	1400.0	1.0	0.0
+fr	01_solar	1	263	2000.0	0.0	1.0
+fr	02_wind_on	1	263	2000.0	0.0	1.0
+fr	03_wind_off	1	263	2000.0	0.0	1.0
+fr	04_res	1	263	2000.0	0.0	1.0
+fr	05_nuclear	1	263	1400.0	0.0	1.0
 fr	06_coal	1	263	0.0	0.0	0.0
 fr	07_gas	1	263	0.0	0.0	0.0
 fr	08_non-res	1	263	0.0	0.0	0.0
 fr	09_hydro_pump	1	263	0.0	0.0	0.0
-fr	01_solar	1	264	2000.0	1.0	0.0
-fr	02_wind_on	1	264	2000.0	1.0	0.0
-fr	03_wind_off	1	264	2000.0	1.0	0.0
-fr	04_res	1	264	2000.0	1.0	0.0
-fr	05_nuclear	1	264	1500.0	1.0	0.0
+fr	01_solar	1	264	2000.0	0.0	1.0
+fr	02_wind_on	1	264	2000.0	0.0	1.0
+fr	03_wind_off	1	264	2000.0	0.0	1.0
+fr	04_res	1	264	2000.0	0.0	1.0
+fr	05_nuclear	1	264	1500.0	0.0	1.0
 fr	06_coal	1	264	0.0	0.0	0.0
 fr	07_gas	1	264	0.0	0.0	0.0
 fr	08_non-res	1	264	0.0	0.0	0.0
 fr	09_hydro_pump	1	264	0.0	0.0	0.0
-fr	01_solar	1	265	2000.0	1.0	0.0
-fr	02_wind_on	1	265	2000.0	1.0	0.0
-fr	03_wind_off	1	265	2000.0	1.0	0.0
-fr	04_res	1	265	2000.0	1.0	0.0
-fr	05_nuclear	1	265	1600.0	1.0	0.0
+fr	01_solar	1	265	2000.0	0.0	1.0
+fr	02_wind_on	1	265	2000.0	0.0	1.0
+fr	03_wind_off	1	265	2000.0	0.0	1.0
+fr	04_res	1	265	2000.0	0.0	1.0
+fr	05_nuclear	1	265	1600.0	0.0	1.0
 fr	06_coal	1	265	0.0	0.0	0.0
 fr	07_gas	1	265	0.0	0.0	0.0
 fr	08_non-res	1	265	0.0	0.0	0.0
 fr	09_hydro_pump	1	265	0.0	0.0	0.0
-fr	01_solar	1	266	2000.0	1.0	0.0
-fr	02_wind_on	1	266	2000.0	1.0	0.0
-fr	03_wind_off	1	266	2000.0	1.0	0.0
-fr	04_res	1	266	2000.0	1.0	0.0
-fr	05_nuclear	1	266	1700.0	1.0	0.0
+fr	01_solar	1	266	2000.0	0.0	1.0
+fr	02_wind_on	1	266	2000.0	0.0	1.0
+fr	03_wind_off	1	266	2000.0	0.0	1.0
+fr	04_res	1	266	2000.0	0.0	1.0
+fr	05_nuclear	1	266	1700.0	0.0	1.0
 fr	06_coal	1	266	0.0	0.0	0.0
 fr	07_gas	1	266	0.0	0.0	0.0
 fr	08_non-res	1	266	0.0	0.0	0.0
 fr	09_hydro_pump	1	266	0.0	0.0	0.0
-fr	01_solar	1	267	2000.0	1.0	0.0
-fr	02_wind_on	1	267	2000.0	1.0	0.0
-fr	03_wind_off	1	267	2000.0	1.0	0.0
-fr	04_res	1	267	2000.0	1.0	0.0
-fr	05_nuclear	1	267	1800.0	1.0	0.0
+fr	01_solar	1	267	2000.0	0.0	1.0
+fr	02_wind_on	1	267	2000.0	0.0	1.0
+fr	03_wind_off	1	267	2000.0	0.0	1.0
+fr	04_res	1	267	2000.0	0.0	1.0
+fr	05_nuclear	1	267	1800.0	0.0	1.0
 fr	06_coal	1	267	0.0	0.0	0.0
 fr	07_gas	1	267	0.0	0.0	0.0
 fr	08_non-res	1	267	0.0	0.0	0.0
 fr	09_hydro_pump	1	267	0.0	0.0	0.0
-fr	01_solar	1	268	2000.0	1.0	0.0
-fr	02_wind_on	1	268	2000.0	1.0	0.0
-fr	03_wind_off	1	268	2000.0	1.0	0.0
-fr	04_res	1	268	2000.0	1.0	0.0
-fr	05_nuclear	1	268	1900.0	1.0	0.0
+fr	01_solar	1	268	2000.0	0.0	1.0
+fr	02_wind_on	1	268	2000.0	0.0	1.0
+fr	03_wind_off	1	268	2000.0	0.0	1.0
+fr	04_res	1	268	2000.0	0.0	1.0
+fr	05_nuclear	1	268	1900.0	0.0	1.0
 fr	06_coal	1	268	0.0	0.0	0.0
 fr	07_gas	1	268	0.0	0.0	0.0
 fr	08_non-res	1	268	0.0	0.0	0.0
 fr	09_hydro_pump	1	268	0.0	0.0	0.0
-fr	01_solar	1	269	2000.0	1.0	0.0
-fr	02_wind_on	1	269	2000.0	1.0	0.0
-fr	03_wind_off	1	269	2000.0	1.0	0.0
-fr	04_res	1	269	2000.0	1.0	0.0
-fr	05_nuclear	1	269	2000.0	1.0	0.0
+fr	01_solar	1	269	2000.0	0.0	1.0
+fr	02_wind_on	1	269	2000.0	0.0	1.0
+fr	03_wind_off	1	269	2000.0	0.0	1.0
+fr	04_res	1	269	2000.0	0.0	1.0
+fr	05_nuclear	1	269	2000.0	0.0	1.0
 fr	06_coal	1	269	0.0	0.0	0.0
 fr	07_gas	1	269	0.0	0.0	0.0
 fr	08_non-res	1	269	0.0	0.0	0.0
 fr	09_hydro_pump	1	269	0.0	0.0	0.0
-fr	01_solar	1	270	2000.0	1.0	0.0
-fr	02_wind_on	1	270	2000.0	1.0	0.0
-fr	03_wind_off	1	270	2000.0	1.0	0.0
-fr	04_res	1	270	2000.0	1.0	0.0
-fr	05_nuclear	1	270	2000.0	1.0	0.0
-fr	06_coal	1	270	100.0	1.0	0.0
+fr	01_solar	1	270	2000.0	0.0	1.0
+fr	02_wind_on	1	270	2000.0	0.0	1.0
+fr	03_wind_off	1	270	2000.0	0.0	1.0
+fr	04_res	1	270	2000.0	0.0	1.0
+fr	05_nuclear	1	270	2000.0	0.0	1.0
+fr	06_coal	1	270	100.0	0.0	1.0
 fr	07_gas	1	270	0.0	0.0	0.0
 fr	08_non-res	1	270	0.0	0.0	0.0
 fr	09_hydro_pump	1	270	0.0	0.0	0.0
-fr	01_solar	1	271	2000.0	1.0	0.0
-fr	02_wind_on	1	271	2000.0	1.0	0.0
-fr	03_wind_off	1	271	2000.0	1.0	0.0
-fr	04_res	1	271	2000.0	1.0	0.0
-fr	05_nuclear	1	271	2000.0	1.0	0.0
-fr	06_coal	1	271	200.0	1.0	0.0
+fr	01_solar	1	271	2000.0	0.0	1.0
+fr	02_wind_on	1	271	2000.0	0.0	1.0
+fr	03_wind_off	1	271	2000.0	0.0	1.0
+fr	04_res	1	271	2000.0	0.0	1.0
+fr	05_nuclear	1	271	2000.0	0.0	1.0
+fr	06_coal	1	271	200.0	0.0	1.0
 fr	07_gas	1	271	0.0	0.0	0.0
 fr	08_non-res	1	271	0.0	0.0	0.0
 fr	09_hydro_pump	1	271	0.0	0.0	0.0
-fr	01_solar	1	272	2000.0	1.0	0.0
-fr	02_wind_on	1	272	2000.0	1.0	0.0
-fr	03_wind_off	1	272	2000.0	1.0	0.0
-fr	04_res	1	272	2000.0	1.0	0.0
-fr	05_nuclear	1	272	2000.0	1.0	0.0
-fr	06_coal	1	272	300.0	1.0	0.0
+fr	01_solar	1	272	2000.0	0.0	1.0
+fr	02_wind_on	1	272	2000.0	0.0	1.0
+fr	03_wind_off	1	272	2000.0	0.0	1.0
+fr	04_res	1	272	2000.0	0.0	1.0
+fr	05_nuclear	1	272	2000.0	0.0	1.0
+fr	06_coal	1	272	300.0	0.0	1.0
 fr	07_gas	1	272	0.0	0.0	0.0
 fr	08_non-res	1	272	0.0	0.0	0.0
 fr	09_hydro_pump	1	272	0.0	0.0	0.0
-fr	01_solar	1	273	2000.0	1.0	0.0
-fr	02_wind_on	1	273	2000.0	1.0	0.0
-fr	03_wind_off	1	273	2000.0	1.0	0.0
-fr	04_res	1	273	2000.0	1.0	0.0
-fr	05_nuclear	1	273	2000.0	1.0	0.0
-fr	06_coal	1	273	400.0	1.0	0.0
+fr	01_solar	1	273	2000.0	0.0	1.0
+fr	02_wind_on	1	273	2000.0	0.0	1.0
+fr	03_wind_off	1	273	2000.0	0.0	1.0
+fr	04_res	1	273	2000.0	0.0	1.0
+fr	05_nuclear	1	273	2000.0	0.0	1.0
+fr	06_coal	1	273	400.0	0.0	1.0
 fr	07_gas	1	273	0.0	0.0	0.0
 fr	08_non-res	1	273	0.0	0.0	0.0
 fr	09_hydro_pump	1	273	0.0	0.0	0.0
-fr	01_solar	1	274	2000.0	1.0	0.0
-fr	02_wind_on	1	274	2000.0	1.0	0.0
-fr	03_wind_off	1	274	2000.0	1.0	0.0
-fr	04_res	1	274	2000.0	1.0	0.0
-fr	05_nuclear	1	274	2000.0	1.0	0.0
-fr	06_coal	1	274	500.0	1.0	0.0
+fr	01_solar	1	274	2000.0	0.0	1.0
+fr	02_wind_on	1	274	2000.0	0.0	1.0
+fr	03_wind_off	1	274	2000.0	0.0	1.0
+fr	04_res	1	274	2000.0	0.0	1.0
+fr	05_nuclear	1	274	2000.0	0.0	1.0
+fr	06_coal	1	274	500.0	0.0	1.0
 fr	07_gas	1	274	0.0	0.0	0.0
 fr	08_non-res	1	274	0.0	0.0	0.0
 fr	09_hydro_pump	1	274	0.0	0.0	0.0
-fr	01_solar	1	275	2000.0	1.0	0.0
-fr	02_wind_on	1	275	2000.0	1.0	0.0
-fr	03_wind_off	1	275	2000.0	1.0	0.0
-fr	04_res	1	275	2000.0	1.0	0.0
-fr	05_nuclear	1	275	2000.0	1.0	0.0
-fr	06_coal	1	275	600.0	1.0	0.0
+fr	01_solar	1	275	2000.0	0.0	1.0
+fr	02_wind_on	1	275	2000.0	0.0	1.0
+fr	03_wind_off	1	275	2000.0	0.0	1.0
+fr	04_res	1	275	2000.0	0.0	1.0
+fr	05_nuclear	1	275	2000.0	0.0	1.0
+fr	06_coal	1	275	600.0	0.0	1.0
 fr	07_gas	1	275	0.0	0.0	0.0
 fr	08_non-res	1	275	0.0	0.0	0.0
 fr	09_hydro_pump	1	275	0.0	0.0	0.0
-fr	01_solar	1	276	2000.0	1.0	0.0
-fr	02_wind_on	1	276	2000.0	1.0	0.0
-fr	03_wind_off	1	276	2000.0	1.0	0.0
-fr	04_res	1	276	2000.0	1.0	0.0
-fr	05_nuclear	1	276	2000.0	1.0	0.0
-fr	06_coal	1	276	700.0	1.0	0.0
+fr	01_solar	1	276	2000.0	0.0	1.0
+fr	02_wind_on	1	276	2000.0	0.0	1.0
+fr	03_wind_off	1	276	2000.0	0.0	1.0
+fr	04_res	1	276	2000.0	0.0	1.0
+fr	05_nuclear	1	276	2000.0	0.0	1.0
+fr	06_coal	1	276	700.0	0.0	1.0
 fr	07_gas	1	276	0.0	0.0	0.0
 fr	08_non-res	1	276	0.0	0.0	0.0
 fr	09_hydro_pump	1	276	0.0	0.0	0.0
-fr	01_solar	1	277	2000.0	1.0	0.0
-fr	02_wind_on	1	277	2000.0	1.0	0.0
-fr	03_wind_off	1	277	2000.0	1.0	0.0
-fr	04_res	1	277	2000.0	1.0	0.0
-fr	05_nuclear	1	277	2000.0	1.0	0.0
-fr	06_coal	1	277	800.0	1.0	0.0
+fr	01_solar	1	277	2000.0	0.0	1.0
+fr	02_wind_on	1	277	2000.0	0.0	1.0
+fr	03_wind_off	1	277	2000.0	0.0	1.0
+fr	04_res	1	277	2000.0	0.0	1.0
+fr	05_nuclear	1	277	2000.0	0.0	1.0
+fr	06_coal	1	277	800.0	0.0	1.0
 fr	07_gas	1	277	0.0	0.0	0.0
 fr	08_non-res	1	277	0.0	0.0	0.0
 fr	09_hydro_pump	1	277	0.0	0.0	0.0
-fr	01_solar	1	278	2000.0	1.0	0.0
-fr	02_wind_on	1	278	2000.0	1.0	0.0
-fr	03_wind_off	1	278	2000.0	1.0	0.0
-fr	04_res	1	278	2000.0	1.0	0.0
-fr	05_nuclear	1	278	2000.0	1.0	0.0
-fr	06_coal	1	278	900.0	1.0	0.0
+fr	01_solar	1	278	2000.0	0.0	1.0
+fr	02_wind_on	1	278	2000.0	0.0	1.0
+fr	03_wind_off	1	278	2000.0	0.0	1.0
+fr	04_res	1	278	2000.0	0.0	1.0
+fr	05_nuclear	1	278	2000.0	0.0	1.0
+fr	06_coal	1	278	900.0	0.0	1.0
 fr	07_gas	1	278	0.0	0.0	0.0
 fr	08_non-res	1	278	0.0	0.0	0.0
 fr	09_hydro_pump	1	278	0.0	0.0	0.0
-fr	01_solar	1	279	2000.0	1.0	0.0
-fr	02_wind_on	1	279	2000.0	1.0	0.0
-fr	03_wind_off	1	279	2000.0	1.0	0.0
-fr	04_res	1	279	2000.0	1.0	0.0
-fr	05_nuclear	1	279	2000.0	1.0	0.0
-fr	06_coal	1	279	1000.0	1.0	0.0
+fr	01_solar	1	279	2000.0	0.0	1.0
+fr	02_wind_on	1	279	2000.0	0.0	1.0
+fr	03_wind_off	1	279	2000.0	0.0	1.0
+fr	04_res	1	279	2000.0	0.0	1.0
+fr	05_nuclear	1	279	2000.0	0.0	1.0
+fr	06_coal	1	279	1000.0	0.0	1.0
 fr	07_gas	1	279	0.0	0.0	0.0
 fr	08_non-res	1	279	0.0	0.0	0.0
 fr	09_hydro_pump	1	279	0.0	0.0	0.0
-fr	01_solar	1	280	2000.0	1.0	0.0
-fr	02_wind_on	1	280	2000.0	1.0	0.0
-fr	03_wind_off	1	280	2000.0	1.0	0.0
-fr	04_res	1	280	2000.0	1.0	0.0
-fr	05_nuclear	1	280	2000.0	1.0	0.0
-fr	06_coal	1	280	1100.0	1.0	0.0
+fr	01_solar	1	280	2000.0	0.0	1.0
+fr	02_wind_on	1	280	2000.0	0.0	1.0
+fr	03_wind_off	1	280	2000.0	0.0	1.0
+fr	04_res	1	280	2000.0	0.0	1.0
+fr	05_nuclear	1	280	2000.0	0.0	1.0
+fr	06_coal	1	280	1100.0	0.0	1.0
 fr	07_gas	1	280	0.0	0.0	0.0
 fr	08_non-res	1	280	0.0	0.0	0.0
 fr	09_hydro_pump	1	280	0.0	0.0	0.0
-fr	01_solar	1	281	2000.0	1.0	0.0
-fr	02_wind_on	1	281	2000.0	1.0	0.0
-fr	03_wind_off	1	281	2000.0	1.0	0.0
-fr	04_res	1	281	2000.0	1.0	0.0
-fr	05_nuclear	1	281	2000.0	1.0	0.0
-fr	06_coal	1	281	1200.0	1.0	0.0
+fr	01_solar	1	281	2000.0	0.0	1.0
+fr	02_wind_on	1	281	2000.0	0.0	1.0
+fr	03_wind_off	1	281	2000.0	0.0	1.0
+fr	04_res	1	281	2000.0	0.0	1.0
+fr	05_nuclear	1	281	2000.0	0.0	1.0
+fr	06_coal	1	281	1200.0	0.0	1.0
 fr	07_gas	1	281	0.0	0.0	0.0
 fr	08_non-res	1	281	0.0	0.0	0.0
 fr	09_hydro_pump	1	281	0.0	0.0	0.0
-fr	01_solar	1	282	2000.0	1.0	0.0
-fr	02_wind_on	1	282	2000.0	1.0	0.0
-fr	03_wind_off	1	282	2000.0	1.0	0.0
-fr	04_res	1	282	2000.0	1.0	0.0
-fr	05_nuclear	1	282	2000.0	1.0	0.0
-fr	06_coal	1	282	1300.0	1.0	0.0
+fr	01_solar	1	282	2000.0	0.0	1.0
+fr	02_wind_on	1	282	2000.0	0.0	1.0
+fr	03_wind_off	1	282	2000.0	0.0	1.0
+fr	04_res	1	282	2000.0	0.0	1.0
+fr	05_nuclear	1	282	2000.0	0.0	1.0
+fr	06_coal	1	282	1300.0	0.0	1.0
 fr	07_gas	1	282	0.0	0.0	0.0
 fr	08_non-res	1	282	0.0	0.0	0.0
 fr	09_hydro_pump	1	282	0.0	0.0	0.0
-fr	01_solar	1	283	2000.0	1.0	0.0
-fr	02_wind_on	1	283	2000.0	1.0	0.0
-fr	03_wind_off	1	283	2000.0	1.0	0.0
-fr	04_res	1	283	2000.0	1.0	0.0
-fr	05_nuclear	1	283	2000.0	1.0	0.0
-fr	06_coal	1	283	1400.0	1.0	0.0
+fr	01_solar	1	283	2000.0	0.0	1.0
+fr	02_wind_on	1	283	2000.0	0.0	1.0
+fr	03_wind_off	1	283	2000.0	0.0	1.0
+fr	04_res	1	283	2000.0	0.0	1.0
+fr	05_nuclear	1	283	2000.0	0.0	1.0
+fr	06_coal	1	283	1400.0	0.0	1.0
 fr	07_gas	1	283	0.0	0.0	0.0
 fr	08_non-res	1	283	0.0	0.0	0.0
 fr	09_hydro_pump	1	283	0.0	0.0	0.0
-fr	01_solar	1	284	2000.0	1.0	0.0
-fr	02_wind_on	1	284	2000.0	1.0	0.0
-fr	03_wind_off	1	284	2000.0	1.0	0.0
-fr	04_res	1	284	2000.0	1.0	0.0
-fr	05_nuclear	1	284	2000.0	1.0	0.0
-fr	06_coal	1	284	1500.0	1.0	0.0
+fr	01_solar	1	284	2000.0	0.0	1.0
+fr	02_wind_on	1	284	2000.0	0.0	1.0
+fr	03_wind_off	1	284	2000.0	0.0	1.0
+fr	04_res	1	284	2000.0	0.0	1.0
+fr	05_nuclear	1	284	2000.0	0.0	1.0
+fr	06_coal	1	284	1500.0	0.0	1.0
 fr	07_gas	1	284	0.0	0.0	0.0
 fr	08_non-res	1	284	0.0	0.0	0.0
 fr	09_hydro_pump	1	284	0.0	0.0	0.0
-fr	01_solar	1	285	2000.0	1.0	0.0
-fr	02_wind_on	1	285	2000.0	1.0	0.0
-fr	03_wind_off	1	285	2000.0	1.0	0.0
-fr	04_res	1	285	2000.0	1.0	0.0
-fr	05_nuclear	1	285	2000.0	1.0	0.0
-fr	06_coal	1	285	1600.0	1.0	0.0
+fr	01_solar	1	285	2000.0	0.0	1.0
+fr	02_wind_on	1	285	2000.0	0.0	1.0
+fr	03_wind_off	1	285	2000.0	0.0	1.0
+fr	04_res	1	285	2000.0	0.0	1.0
+fr	05_nuclear	1	285	2000.0	0.0	1.0
+fr	06_coal	1	285	1600.0	0.0	1.0
 fr	07_gas	1	285	0.0	0.0	0.0
 fr	08_non-res	1	285	0.0	0.0	0.0
 fr	09_hydro_pump	1	285	0.0	0.0	0.0
-fr	01_solar	1	286	2000.0	1.0	0.0
-fr	02_wind_on	1	286	2000.0	1.0	0.0
-fr	03_wind_off	1	286	2000.0	1.0	0.0
-fr	04_res	1	286	2000.0	1.0	0.0
-fr	05_nuclear	1	286	2000.0	1.0	0.0
-fr	06_coal	1	286	1700.0	1.0	0.0
+fr	01_solar	1	286	2000.0	0.0	1.0
+fr	02_wind_on	1	286	2000.0	0.0	1.0
+fr	03_wind_off	1	286	2000.0	0.0	1.0
+fr	04_res	1	286	2000.0	0.0	1.0
+fr	05_nuclear	1	286	2000.0	0.0	1.0
+fr	06_coal	1	286	1700.0	0.0	1.0
 fr	07_gas	1	286	0.0	0.0	0.0
 fr	08_non-res	1	286	0.0	0.0	0.0
 fr	09_hydro_pump	1	286	0.0	0.0	0.0
-fr	01_solar	1	287	2000.0	1.0	0.0
-fr	02_wind_on	1	287	2000.0	1.0	0.0
-fr	03_wind_off	1	287	2000.0	1.0	0.0
-fr	04_res	1	287	2000.0	1.0	0.0
-fr	05_nuclear	1	287	2000.0	1.0	0.0
-fr	06_coal	1	287	1800.0	1.0	0.0
+fr	01_solar	1	287	2000.0	0.0	1.0
+fr	02_wind_on	1	287	2000.0	0.0	1.0
+fr	03_wind_off	1	287	2000.0	0.0	1.0
+fr	04_res	1	287	2000.0	0.0	1.0
+fr	05_nuclear	1	287	2000.0	0.0	1.0
+fr	06_coal	1	287	1800.0	0.0	1.0
 fr	07_gas	1	287	0.0	0.0	0.0
 fr	08_non-res	1	287	0.0	0.0	0.0
 fr	09_hydro_pump	1	287	0.0	0.0	0.0
-fr	01_solar	1	288	2000.0	1.0	0.0
-fr	02_wind_on	1	288	2000.0	1.0	0.0
-fr	03_wind_off	1	288	2000.0	1.0	0.0
-fr	04_res	1	288	2000.0	1.0	0.0
-fr	05_nuclear	1	288	2000.0	1.0	0.0
-fr	06_coal	1	288	1900.0	1.0	0.0
+fr	01_solar	1	288	2000.0	0.0	1.0
+fr	02_wind_on	1	288	2000.0	0.0	1.0
+fr	03_wind_off	1	288	2000.0	0.0	1.0
+fr	04_res	1	288	2000.0	0.0	1.0
+fr	05_nuclear	1	288	2000.0	0.0	1.0
+fr	06_coal	1	288	1900.0	0.0	1.0
 fr	07_gas	1	288	0.0	0.0	0.0
 fr	08_non-res	1	288	0.0	0.0	0.0
 fr	09_hydro_pump	1	288	0.0	0.0	0.0
-fr	01_solar	1	289	2000.0	1.0	0.0
-fr	02_wind_on	1	289	2000.0	1.0	0.0
-fr	03_wind_off	1	289	2000.0	1.0	0.0
-fr	04_res	1	289	2000.0	1.0	0.0
-fr	05_nuclear	1	289	2000.0	1.0	0.0
-fr	06_coal	1	289	2000.0	1.0	0.0
+fr	01_solar	1	289	2000.0	0.0	1.0
+fr	02_wind_on	1	289	2000.0	0.0	1.0
+fr	03_wind_off	1	289	2000.0	0.0	1.0
+fr	04_res	1	289	2000.0	0.0	1.0
+fr	05_nuclear	1	289	2000.0	0.0	1.0
+fr	06_coal	1	289	2000.0	0.0	1.0
 fr	07_gas	1	289	0.0	0.0	0.0
 fr	08_non-res	1	289	0.0	0.0	0.0
 fr	09_hydro_pump	1	289	0.0	0.0	0.0
-fr	01_solar	1	290	2000.0	1.0	0.0
-fr	02_wind_on	1	290	2000.0	1.0	0.0
-fr	03_wind_off	1	290	2000.0	1.0	0.0
-fr	04_res	1	290	2000.0	1.0	0.0
-fr	05_nuclear	1	290	2000.0	1.0	0.0
-fr	06_coal	1	290	2000.0	1.0	0.0
-fr	07_gas	1	290	100.0	1.0	0.0
+fr	01_solar	1	290	2000.0	0.0	1.0
+fr	02_wind_on	1	290	2000.0	0.0	1.0
+fr	03_wind_off	1	290	2000.0	0.0	1.0
+fr	04_res	1	290	2000.0	0.0	1.0
+fr	05_nuclear	1	290	2000.0	0.0	1.0
+fr	06_coal	1	290	2000.0	0.0	1.0
+fr	07_gas	1	290	100.0	0.0	1.0
 fr	08_non-res	1	290	0.0	0.0	0.0
 fr	09_hydro_pump	1	290	0.0	0.0	0.0
-fr	01_solar	1	291	2000.0	1.0	0.0
-fr	02_wind_on	1	291	2000.0	1.0	0.0
-fr	03_wind_off	1	291	2000.0	1.0	0.0
-fr	04_res	1	291	2000.0	1.0	0.0
-fr	05_nuclear	1	291	2000.0	1.0	0.0
-fr	06_coal	1	291	2000.0	1.0	0.0
-fr	07_gas	1	291	200.0	1.0	0.0
+fr	01_solar	1	291	2000.0	0.0	1.0
+fr	02_wind_on	1	291	2000.0	0.0	1.0
+fr	03_wind_off	1	291	2000.0	0.0	1.0
+fr	04_res	1	291	2000.0	0.0	1.0
+fr	05_nuclear	1	291	2000.0	0.0	1.0
+fr	06_coal	1	291	2000.0	0.0	1.0
+fr	07_gas	1	291	200.0	0.0	1.0
 fr	08_non-res	1	291	0.0	0.0	0.0
 fr	09_hydro_pump	1	291	0.0	0.0	0.0
-fr	01_solar	1	292	2000.0	1.0	0.0
-fr	02_wind_on	1	292	2000.0	1.0	0.0
-fr	03_wind_off	1	292	2000.0	1.0	0.0
-fr	04_res	1	292	2000.0	1.0	0.0
-fr	05_nuclear	1	292	2000.0	1.0	0.0
-fr	06_coal	1	292	2000.0	1.0	0.0
-fr	07_gas	1	292	300.0	1.0	0.0
+fr	01_solar	1	292	2000.0	0.0	1.0
+fr	02_wind_on	1	292	2000.0	0.0	1.0
+fr	03_wind_off	1	292	2000.0	0.0	1.0
+fr	04_res	1	292	2000.0	0.0	1.0
+fr	05_nuclear	1	292	2000.0	0.0	1.0
+fr	06_coal	1	292	2000.0	0.0	1.0
+fr	07_gas	1	292	300.0	0.0	1.0
 fr	08_non-res	1	292	0.0	0.0	0.0
 fr	09_hydro_pump	1	292	0.0	0.0	0.0
-fr	01_solar	1	293	2000.0	1.0	0.0
-fr	02_wind_on	1	293	2000.0	1.0	0.0
-fr	03_wind_off	1	293	2000.0	1.0	0.0
-fr	04_res	1	293	2000.0	1.0	0.0
-fr	05_nuclear	1	293	2000.0	1.0	0.0
-fr	06_coal	1	293	2000.0	1.0	0.0
-fr	07_gas	1	293	400.0	1.0	0.0
+fr	01_solar	1	293	2000.0	0.0	1.0
+fr	02_wind_on	1	293	2000.0	0.0	1.0
+fr	03_wind_off	1	293	2000.0	0.0	1.0
+fr	04_res	1	293	2000.0	0.0	1.0
+fr	05_nuclear	1	293	2000.0	0.0	1.0
+fr	06_coal	1	293	2000.0	0.0	1.0
+fr	07_gas	1	293	400.0	0.0	1.0
 fr	08_non-res	1	293	0.0	0.0	0.0
 fr	09_hydro_pump	1	293	0.0	0.0	0.0
-fr	01_solar	1	294	2000.0	1.0	0.0
-fr	02_wind_on	1	294	2000.0	1.0	0.0
-fr	03_wind_off	1	294	2000.0	1.0	0.0
-fr	04_res	1	294	2000.0	1.0	0.0
-fr	05_nuclear	1	294	2000.0	1.0	0.0
-fr	06_coal	1	294	2000.0	1.0	0.0
-fr	07_gas	1	294	500.0	1.0	0.0
+fr	01_solar	1	294	2000.0	0.0	1.0
+fr	02_wind_on	1	294	2000.0	0.0	1.0
+fr	03_wind_off	1	294	2000.0	0.0	1.0
+fr	04_res	1	294	2000.0	0.0	1.0
+fr	05_nuclear	1	294	2000.0	0.0	1.0
+fr	06_coal	1	294	2000.0	0.0	1.0
+fr	07_gas	1	294	500.0	0.0	1.0
 fr	08_non-res	1	294	0.0	0.0	0.0
 fr	09_hydro_pump	1	294	0.0	0.0	0.0
-fr	01_solar	1	295	2000.0	1.0	0.0
-fr	02_wind_on	1	295	2000.0	1.0	0.0
-fr	03_wind_off	1	295	2000.0	1.0	0.0
-fr	04_res	1	295	2000.0	1.0	0.0
-fr	05_nuclear	1	295	2000.0	1.0	0.0
-fr	06_coal	1	295	2000.0	1.0	0.0
-fr	07_gas	1	295	600.0	1.0	0.0
+fr	01_solar	1	295	2000.0	0.0	1.0
+fr	02_wind_on	1	295	2000.0	0.0	1.0
+fr	03_wind_off	1	295	2000.0	0.0	1.0
+fr	04_res	1	295	2000.0	0.0	1.0
+fr	05_nuclear	1	295	2000.0	0.0	1.0
+fr	06_coal	1	295	2000.0	0.0	1.0
+fr	07_gas	1	295	600.0	0.0	1.0
 fr	08_non-res	1	295	0.0	0.0	0.0
 fr	09_hydro_pump	1	295	0.0	0.0	0.0
-fr	01_solar	1	296	2000.0	1.0	0.0
-fr	02_wind_on	1	296	2000.0	1.0	0.0
-fr	03_wind_off	1	296	2000.0	1.0	0.0
-fr	04_res	1	296	2000.0	1.0	0.0
-fr	05_nuclear	1	296	2000.0	1.0	0.0
-fr	06_coal	1	296	2000.0	1.0	0.0
-fr	07_gas	1	296	700.0	1.0	0.0
+fr	01_solar	1	296	2000.0	0.0	1.0
+fr	02_wind_on	1	296	2000.0	0.0	1.0
+fr	03_wind_off	1	296	2000.0	0.0	1.0
+fr	04_res	1	296	2000.0	0.0	1.0
+fr	05_nuclear	1	296	2000.0	0.0	1.0
+fr	06_coal	1	296	2000.0	0.0	1.0
+fr	07_gas	1	296	700.0	0.0	1.0
 fr	08_non-res	1	296	0.0	0.0	0.0
 fr	09_hydro_pump	1	296	0.0	0.0	0.0
-fr	01_solar	1	297	2000.0	1.0	0.0
-fr	02_wind_on	1	297	2000.0	1.0	0.0
-fr	03_wind_off	1	297	2000.0	1.0	0.0
-fr	04_res	1	297	2000.0	1.0	0.0
-fr	05_nuclear	1	297	2000.0	1.0	0.0
-fr	06_coal	1	297	2000.0	1.0	0.0
-fr	07_gas	1	297	800.0	1.0	0.0
+fr	01_solar	1	297	2000.0	0.0	1.0
+fr	02_wind_on	1	297	2000.0	0.0	1.0
+fr	03_wind_off	1	297	2000.0	0.0	1.0
+fr	04_res	1	297	2000.0	0.0	1.0
+fr	05_nuclear	1	297	2000.0	0.0	1.0
+fr	06_coal	1	297	2000.0	0.0	1.0
+fr	07_gas	1	297	800.0	0.0	1.0
 fr	08_non-res	1	297	0.0	0.0	0.0
 fr	09_hydro_pump	1	297	0.0	0.0	0.0
-fr	01_solar	1	298	2000.0	1.0	0.0
-fr	02_wind_on	1	298	2000.0	1.0	0.0
-fr	03_wind_off	1	298	2000.0	1.0	0.0
-fr	04_res	1	298	2000.0	1.0	0.0
-fr	05_nuclear	1	298	2000.0	1.0	0.0
-fr	06_coal	1	298	2000.0	1.0	0.0
-fr	07_gas	1	298	900.0	1.0	0.0
+fr	01_solar	1	298	2000.0	0.0	1.0
+fr	02_wind_on	1	298	2000.0	0.0	1.0
+fr	03_wind_off	1	298	2000.0	0.0	1.0
+fr	04_res	1	298	2000.0	0.0	1.0
+fr	05_nuclear	1	298	2000.0	0.0	1.0
+fr	06_coal	1	298	2000.0	0.0	1.0
+fr	07_gas	1	298	900.0	0.0	1.0
 fr	08_non-res	1	298	0.0	0.0	0.0
 fr	09_hydro_pump	1	298	0.0	0.0	0.0
-fr	01_solar	1	299	2000.0	1.0	0.0
-fr	02_wind_on	1	299	2000.0	1.0	0.0
-fr	03_wind_off	1	299	2000.0	1.0	0.0
-fr	04_res	1	299	2000.0	1.0	0.0
-fr	05_nuclear	1	299	2000.0	1.0	0.0
-fr	06_coal	1	299	2000.0	1.0	0.0
-fr	07_gas	1	299	1000.0	1.0	0.0
+fr	01_solar	1	299	2000.0	0.0	1.0
+fr	02_wind_on	1	299	2000.0	0.0	1.0
+fr	03_wind_off	1	299	2000.0	0.0	1.0
+fr	04_res	1	299	2000.0	0.0	1.0
+fr	05_nuclear	1	299	2000.0	0.0	1.0
+fr	06_coal	1	299	2000.0	0.0	1.0
+fr	07_gas	1	299	1000.0	0.0	1.0
 fr	08_non-res	1	299	0.0	0.0	0.0
 fr	09_hydro_pump	1	299	0.0	0.0	0.0
-fr	01_solar	1	300	2000.0	1.0	0.0
-fr	02_wind_on	1	300	2000.0	1.0	0.0
-fr	03_wind_off	1	300	2000.0	1.0	0.0
-fr	04_res	1	300	2000.0	1.0	0.0
-fr	05_nuclear	1	300	2000.0	1.0	0.0
-fr	06_coal	1	300	2000.0	1.0	0.0
-fr	07_gas	1	300	1100.0	1.0	0.0
+fr	01_solar	1	300	2000.0	0.0	1.0
+fr	02_wind_on	1	300	2000.0	0.0	1.0
+fr	03_wind_off	1	300	2000.0	0.0	1.0
+fr	04_res	1	300	2000.0	0.0	1.0
+fr	05_nuclear	1	300	2000.0	0.0	1.0
+fr	06_coal	1	300	2000.0	0.0	1.0
+fr	07_gas	1	300	1100.0	0.0	1.0
 fr	08_non-res	1	300	0.0	0.0	0.0
 fr	09_hydro_pump	1	300	0.0	0.0	0.0
-fr	01_solar	1	301	2000.0	1.0	0.0
-fr	02_wind_on	1	301	2000.0	1.0	0.0
-fr	03_wind_off	1	301	2000.0	1.0	0.0
-fr	04_res	1	301	2000.0	1.0	0.0
-fr	05_nuclear	1	301	2000.0	1.0	0.0
-fr	06_coal	1	301	2000.0	1.0	0.0
-fr	07_gas	1	301	1200.0	1.0	0.0
+fr	01_solar	1	301	2000.0	0.0	1.0
+fr	02_wind_on	1	301	2000.0	0.0	1.0
+fr	03_wind_off	1	301	2000.0	0.0	1.0
+fr	04_res	1	301	2000.0	0.0	1.0
+fr	05_nuclear	1	301	2000.0	0.0	1.0
+fr	06_coal	1	301	2000.0	0.0	1.0
+fr	07_gas	1	301	1200.0	0.0	1.0
 fr	08_non-res	1	301	0.0	0.0	0.0
 fr	09_hydro_pump	1	301	0.0	0.0	0.0
-fr	01_solar	1	302	2000.0	1.0	0.0
-fr	02_wind_on	1	302	2000.0	1.0	0.0
-fr	03_wind_off	1	302	2000.0	1.0	0.0
-fr	04_res	1	302	2000.0	1.0	0.0
-fr	05_nuclear	1	302	2000.0	1.0	0.0
-fr	06_coal	1	302	2000.0	1.0	0.0
-fr	07_gas	1	302	1300.0	1.0	0.0
+fr	01_solar	1	302	2000.0	0.0	1.0
+fr	02_wind_on	1	302	2000.0	0.0	1.0
+fr	03_wind_off	1	302	2000.0	0.0	1.0
+fr	04_res	1	302	2000.0	0.0	1.0
+fr	05_nuclear	1	302	2000.0	0.0	1.0
+fr	06_coal	1	302	2000.0	0.0	1.0
+fr	07_gas	1	302	1300.0	0.0	1.0
 fr	08_non-res	1	302	0.0	0.0	0.0
 fr	09_hydro_pump	1	302	0.0	0.0	0.0
-fr	01_solar	1	303	2000.0	1.0	0.0
-fr	02_wind_on	1	303	2000.0	1.0	0.0
-fr	03_wind_off	1	303	2000.0	1.0	0.0
-fr	04_res	1	303	2000.0	1.0	0.0
-fr	05_nuclear	1	303	2000.0	1.0	0.0
-fr	06_coal	1	303	2000.0	1.0	0.0
-fr	07_gas	1	303	1400.0	1.0	0.0
+fr	01_solar	1	303	2000.0	0.0	1.0
+fr	02_wind_on	1	303	2000.0	0.0	1.0
+fr	03_wind_off	1	303	2000.0	0.0	1.0
+fr	04_res	1	303	2000.0	0.0	1.0
+fr	05_nuclear	1	303	2000.0	0.0	1.0
+fr	06_coal	1	303	2000.0	0.0	1.0
+fr	07_gas	1	303	1400.0	0.0	1.0
 fr	08_non-res	1	303	0.0	0.0	0.0
 fr	09_hydro_pump	1	303	0.0	0.0	0.0
-fr	01_solar	1	304	2000.0	1.0	0.0
-fr	02_wind_on	1	304	2000.0	1.0	0.0
-fr	03_wind_off	1	304	2000.0	1.0	0.0
-fr	04_res	1	304	2000.0	1.0	0.0
-fr	05_nuclear	1	304	2000.0	1.0	0.0
-fr	06_coal	1	304	2000.0	1.0	0.0
-fr	07_gas	1	304	1500.0	1.0	0.0
+fr	01_solar	1	304	2000.0	0.0	1.0
+fr	02_wind_on	1	304	2000.0	0.0	1.0
+fr	03_wind_off	1	304	2000.0	0.0	1.0
+fr	04_res	1	304	2000.0	0.0	1.0
+fr	05_nuclear	1	304	2000.0	0.0	1.0
+fr	06_coal	1	304	2000.0	0.0	1.0
+fr	07_gas	1	304	1500.0	0.0	1.0
 fr	08_non-res	1	304	0.0	0.0	0.0
 fr	09_hydro_pump	1	304	0.0	0.0	0.0
-fr	01_solar	1	305	2000.0	1.0	0.0
-fr	02_wind_on	1	305	2000.0	1.0	0.0
-fr	03_wind_off	1	305	2000.0	1.0	0.0
-fr	04_res	1	305	2000.0	1.0	0.0
-fr	05_nuclear	1	305	2000.0	1.0	0.0
-fr	06_coal	1	305	2000.0	1.0	0.0
-fr	07_gas	1	305	1600.0	1.0	0.0
+fr	01_solar	1	305	2000.0	0.0	1.0
+fr	02_wind_on	1	305	2000.0	0.0	1.0
+fr	03_wind_off	1	305	2000.0	0.0	1.0
+fr	04_res	1	305	2000.0	0.0	1.0
+fr	05_nuclear	1	305	2000.0	0.0	1.0
+fr	06_coal	1	305	2000.0	0.0	1.0
+fr	07_gas	1	305	1600.0	0.0	1.0
 fr	08_non-res	1	305	0.0	0.0	0.0
 fr	09_hydro_pump	1	305	0.0	0.0	0.0
-fr	01_solar	1	306	2000.0	1.0	0.0
-fr	02_wind_on	1	306	2000.0	1.0	0.0
-fr	03_wind_off	1	306	2000.0	1.0	0.0
-fr	04_res	1	306	2000.0	1.0	0.0
-fr	05_nuclear	1	306	2000.0	1.0	0.0
-fr	06_coal	1	306	2000.0	1.0	0.0
-fr	07_gas	1	306	1700.0	1.0	0.0
+fr	01_solar	1	306	2000.0	0.0	1.0
+fr	02_wind_on	1	306	2000.0	0.0	1.0
+fr	03_wind_off	1	306	2000.0	0.0	1.0
+fr	04_res	1	306	2000.0	0.0	1.0
+fr	05_nuclear	1	306	2000.0	0.0	1.0
+fr	06_coal	1	306	2000.0	0.0	1.0
+fr	07_gas	1	306	1700.0	0.0	1.0
 fr	08_non-res	1	306	0.0	0.0	0.0
 fr	09_hydro_pump	1	306	0.0	0.0	0.0
-fr	01_solar	1	307	2000.0	1.0	0.0
-fr	02_wind_on	1	307	2000.0	1.0	0.0
-fr	03_wind_off	1	307	2000.0	1.0	0.0
-fr	04_res	1	307	2000.0	1.0	0.0
-fr	05_nuclear	1	307	2000.0	1.0	0.0
-fr	06_coal	1	307	2000.0	1.0	0.0
-fr	07_gas	1	307	1800.0	1.0	0.0
+fr	01_solar	1	307	2000.0	0.0	1.0
+fr	02_wind_on	1	307	2000.0	0.0	1.0
+fr	03_wind_off	1	307	2000.0	0.0	1.0
+fr	04_res	1	307	2000.0	0.0	1.0
+fr	05_nuclear	1	307	2000.0	0.0	1.0
+fr	06_coal	1	307	2000.0	0.0	1.0
+fr	07_gas	1	307	1800.0	0.0	1.0
 fr	08_non-res	1	307	0.0	0.0	0.0
 fr	09_hydro_pump	1	307	0.0	0.0	0.0
-fr	01_solar	1	308	2000.0	1.0	0.0
-fr	02_wind_on	1	308	2000.0	1.0	0.0
-fr	03_wind_off	1	308	2000.0	1.0	0.0
-fr	04_res	1	308	2000.0	1.0	0.0
-fr	05_nuclear	1	308	2000.0	1.0	0.0
-fr	06_coal	1	308	2000.0	1.0	0.0
-fr	07_gas	1	308	1900.0	1.0	0.0
+fr	01_solar	1	308	2000.0	0.0	1.0
+fr	02_wind_on	1	308	2000.0	0.0	1.0
+fr	03_wind_off	1	308	2000.0	0.0	1.0
+fr	04_res	1	308	2000.0	0.0	1.0
+fr	05_nuclear	1	308	2000.0	0.0	1.0
+fr	06_coal	1	308	2000.0	0.0	1.0
+fr	07_gas	1	308	1900.0	0.0	1.0
 fr	08_non-res	1	308	0.0	0.0	0.0
 fr	09_hydro_pump	1	308	0.0	0.0	0.0
-fr	01_solar	1	309	2000.0	1.0	0.0
-fr	02_wind_on	1	309	2000.0	1.0	0.0
-fr	03_wind_off	1	309	2000.0	1.0	0.0
-fr	04_res	1	309	2000.0	1.0	0.0
-fr	05_nuclear	1	309	2000.0	1.0	0.0
-fr	06_coal	1	309	2000.0	1.0	0.0
-fr	07_gas	1	309	2000.0	1.0	0.0
+fr	01_solar	1	309	2000.0	0.0	1.0
+fr	02_wind_on	1	309	2000.0	0.0	1.0
+fr	03_wind_off	1	309	2000.0	0.0	1.0
+fr	04_res	1	309	2000.0	0.0	1.0
+fr	05_nuclear	1	309	2000.0	0.0	1.0
+fr	06_coal	1	309	2000.0	0.0	1.0
+fr	07_gas	1	309	2000.0	0.0	1.0
 fr	08_non-res	1	309	0.0	0.0	0.0
 fr	09_hydro_pump	1	309	0.0	0.0	0.0
-fr	01_solar	1	310	2000.0	1.0	0.0
-fr	02_wind_on	1	310	2000.0	1.0	0.0
-fr	03_wind_off	1	310	2000.0	1.0	0.0
-fr	04_res	1	310	2000.0	1.0	0.0
-fr	05_nuclear	1	310	2000.0	1.0	0.0
-fr	06_coal	1	310	2000.0	1.0	0.0
-fr	07_gas	1	310	2000.0	1.0	0.0
-fr	08_non-res	1	310	100.0	1.0	0.0
+fr	01_solar	1	310	2000.0	0.0	1.0
+fr	02_wind_on	1	310	2000.0	0.0	1.0
+fr	03_wind_off	1	310	2000.0	0.0	1.0
+fr	04_res	1	310	2000.0	0.0	1.0
+fr	05_nuclear	1	310	2000.0	0.0	1.0
+fr	06_coal	1	310	2000.0	0.0	1.0
+fr	07_gas	1	310	2000.0	0.0	1.0
+fr	08_non-res	1	310	100.0	0.0	1.0
 fr	09_hydro_pump	1	310	0.0	0.0	0.0
-fr	01_solar	1	311	2000.0	1.0	0.0
-fr	02_wind_on	1	311	2000.0	1.0	0.0
-fr	03_wind_off	1	311	2000.0	1.0	0.0
-fr	04_res	1	311	2000.0	1.0	0.0
-fr	05_nuclear	1	311	2000.0	1.0	0.0
-fr	06_coal	1	311	2000.0	1.0	0.0
-fr	07_gas	1	311	2000.0	1.0	0.0
-fr	08_non-res	1	311	200.0	1.0	0.0
+fr	01_solar	1	311	2000.0	0.0	1.0
+fr	02_wind_on	1	311	2000.0	0.0	1.0
+fr	03_wind_off	1	311	2000.0	0.0	1.0
+fr	04_res	1	311	2000.0	0.0	1.0
+fr	05_nuclear	1	311	2000.0	0.0	1.0
+fr	06_coal	1	311	2000.0	0.0	1.0
+fr	07_gas	1	311	2000.0	0.0	1.0
+fr	08_non-res	1	311	200.0	0.0	1.0
 fr	09_hydro_pump	1	311	0.0	0.0	0.0
-fr	01_solar	1	312	2000.0	1.0	0.0
-fr	02_wind_on	1	312	2000.0	1.0	0.0
-fr	03_wind_off	1	312	2000.0	1.0	0.0
-fr	04_res	1	312	2000.0	1.0	0.0
-fr	05_nuclear	1	312	2000.0	1.0	0.0
-fr	06_coal	1	312	2000.0	1.0	0.0
-fr	07_gas	1	312	2000.0	1.0	0.0
-fr	08_non-res	1	312	300.0	1.0	0.0
+fr	01_solar	1	312	2000.0	0.0	1.0
+fr	02_wind_on	1	312	2000.0	0.0	1.0
+fr	03_wind_off	1	312	2000.0	0.0	1.0
+fr	04_res	1	312	2000.0	0.0	1.0
+fr	05_nuclear	1	312	2000.0	0.0	1.0
+fr	06_coal	1	312	2000.0	0.0	1.0
+fr	07_gas	1	312	2000.0	0.0	1.0
+fr	08_non-res	1	312	300.0	0.0	1.0
 fr	09_hydro_pump	1	312	0.0	0.0	0.0
-fr	01_solar	1	313	2000.0	1.0	0.0
-fr	02_wind_on	1	313	2000.0	1.0	0.0
-fr	03_wind_off	1	313	2000.0	1.0	0.0
-fr	04_res	1	313	2000.0	1.0	0.0
-fr	05_nuclear	1	313	2000.0	1.0	0.0
-fr	06_coal	1	313	2000.0	1.0	0.0
-fr	07_gas	1	313	2000.0	1.0	0.0
-fr	08_non-res	1	313	400.0	1.0	0.0
+fr	01_solar	1	313	2000.0	0.0	1.0
+fr	02_wind_on	1	313	2000.0	0.0	1.0
+fr	03_wind_off	1	313	2000.0	0.0	1.0
+fr	04_res	1	313	2000.0	0.0	1.0
+fr	05_nuclear	1	313	2000.0	0.0	1.0
+fr	06_coal	1	313	2000.0	0.0	1.0
+fr	07_gas	1	313	2000.0	0.0	1.0
+fr	08_non-res	1	313	400.0	0.0	1.0
 fr	09_hydro_pump	1	313	0.0	0.0	0.0
-fr	01_solar	1	314	2000.0	1.0	0.0
-fr	02_wind_on	1	314	2000.0	1.0	0.0
-fr	03_wind_off	1	314	2000.0	1.0	0.0
-fr	04_res	1	314	2000.0	1.0	0.0
-fr	05_nuclear	1	314	2000.0	1.0	0.0
-fr	06_coal	1	314	2000.0	1.0	0.0
-fr	07_gas	1	314	2000.0	1.0	0.0
-fr	08_non-res	1	314	500.0	1.0	0.0
+fr	01_solar	1	314	2000.0	0.0	1.0
+fr	02_wind_on	1	314	2000.0	0.0	1.0
+fr	03_wind_off	1	314	2000.0	0.0	1.0
+fr	04_res	1	314	2000.0	0.0	1.0
+fr	05_nuclear	1	314	2000.0	0.0	1.0
+fr	06_coal	1	314	2000.0	0.0	1.0
+fr	07_gas	1	314	2000.0	0.0	1.0
+fr	08_non-res	1	314	500.0	0.0	1.0
 fr	09_hydro_pump	1	314	0.0	0.0	0.0
-fr	01_solar	1	315	2000.0	1.0	0.0
-fr	02_wind_on	1	315	2000.0	1.0	0.0
-fr	03_wind_off	1	315	2000.0	1.0	0.0
-fr	04_res	1	315	2000.0	1.0	0.0
-fr	05_nuclear	1	315	2000.0	1.0	0.0
-fr	06_coal	1	315	2000.0	1.0	0.0
-fr	07_gas	1	315	2000.0	1.0	0.0
-fr	08_non-res	1	315	600.0	1.0	0.0
+fr	01_solar	1	315	2000.0	0.0	1.0
+fr	02_wind_on	1	315	2000.0	0.0	1.0
+fr	03_wind_off	1	315	2000.0	0.0	1.0
+fr	04_res	1	315	2000.0	0.0	1.0
+fr	05_nuclear	1	315	2000.0	0.0	1.0
+fr	06_coal	1	315	2000.0	0.0	1.0
+fr	07_gas	1	315	2000.0	0.0	1.0
+fr	08_non-res	1	315	600.0	0.0	1.0
 fr	09_hydro_pump	1	315	0.0	0.0	0.0
-fr	01_solar	1	316	2000.0	1.0	0.0
-fr	02_wind_on	1	316	2000.0	1.0	0.0
-fr	03_wind_off	1	316	2000.0	1.0	0.0
-fr	04_res	1	316	2000.0	1.0	0.0
-fr	05_nuclear	1	316	2000.0	1.0	0.0
-fr	06_coal	1	316	2000.0	1.0	0.0
-fr	07_gas	1	316	2000.0	1.0	0.0
-fr	08_non-res	1	316	700.0	1.0	0.0
+fr	01_solar	1	316	2000.0	0.0	1.0
+fr	02_wind_on	1	316	2000.0	0.0	1.0
+fr	03_wind_off	1	316	2000.0	0.0	1.0
+fr	04_res	1	316	2000.0	0.0	1.0
+fr	05_nuclear	1	316	2000.0	0.0	1.0
+fr	06_coal	1	316	2000.0	0.0	1.0
+fr	07_gas	1	316	2000.0	0.0	1.0
+fr	08_non-res	1	316	700.0	0.0	1.0
 fr	09_hydro_pump	1	316	0.0	0.0	0.0
-fr	01_solar	1	317	2000.0	1.0	0.0
-fr	02_wind_on	1	317	2000.0	1.0	0.0
-fr	03_wind_off	1	317	2000.0	1.0	0.0
-fr	04_res	1	317	2000.0	1.0	0.0
-fr	05_nuclear	1	317	2000.0	1.0	0.0
-fr	06_coal	1	317	2000.0	1.0	0.0
-fr	07_gas	1	317	2000.0	1.0	0.0
-fr	08_non-res	1	317	800.0	1.0	0.0
+fr	01_solar	1	317	2000.0	0.0	1.0
+fr	02_wind_on	1	317	2000.0	0.0	1.0
+fr	03_wind_off	1	317	2000.0	0.0	1.0
+fr	04_res	1	317	2000.0	0.0	1.0
+fr	05_nuclear	1	317	2000.0	0.0	1.0
+fr	06_coal	1	317	2000.0	0.0	1.0
+fr	07_gas	1	317	2000.0	0.0	1.0
+fr	08_non-res	1	317	800.0	0.0	1.0
 fr	09_hydro_pump	1	317	0.0	0.0	0.0
-fr	01_solar	1	318	2000.0	1.0	0.0
-fr	02_wind_on	1	318	2000.0	1.0	0.0
-fr	03_wind_off	1	318	2000.0	1.0	0.0
-fr	04_res	1	318	2000.0	1.0	0.0
-fr	05_nuclear	1	318	2000.0	1.0	0.0
-fr	06_coal	1	318	2000.0	1.0	0.0
-fr	07_gas	1	318	2000.0	1.0	0.0
-fr	08_non-res	1	318	900.0	1.0	0.0
+fr	01_solar	1	318	2000.0	0.0	1.0
+fr	02_wind_on	1	318	2000.0	0.0	1.0
+fr	03_wind_off	1	318	2000.0	0.0	1.0
+fr	04_res	1	318	2000.0	0.0	1.0
+fr	05_nuclear	1	318	2000.0	0.0	1.0
+fr	06_coal	1	318	2000.0	0.0	1.0
+fr	07_gas	1	318	2000.0	0.0	1.0
+fr	08_non-res	1	318	900.0	0.0	1.0
 fr	09_hydro_pump	1	318	0.0	0.0	0.0
-fr	01_solar	1	319	2000.0	1.0	0.0
-fr	02_wind_on	1	319	2000.0	1.0	0.0
-fr	03_wind_off	1	319	2000.0	1.0	0.0
-fr	04_res	1	319	2000.0	1.0	0.0
-fr	05_nuclear	1	319	2000.0	1.0	0.0
-fr	06_coal	1	319	2000.0	1.0	0.0
-fr	07_gas	1	319	2000.0	1.0	0.0
-fr	08_non-res	1	319	1000.0	1.0	0.0
+fr	01_solar	1	319	2000.0	0.0	1.0
+fr	02_wind_on	1	319	2000.0	0.0	1.0
+fr	03_wind_off	1	319	2000.0	0.0	1.0
+fr	04_res	1	319	2000.0	0.0	1.0
+fr	05_nuclear	1	319	2000.0	0.0	1.0
+fr	06_coal	1	319	2000.0	0.0	1.0
+fr	07_gas	1	319	2000.0	0.0	1.0
+fr	08_non-res	1	319	1000.0	0.0	1.0
 fr	09_hydro_pump	1	319	0.0	0.0	0.0
-fr	01_solar	1	320	2000.0	1.0	0.0
-fr	02_wind_on	1	320	2000.0	1.0	0.0
-fr	03_wind_off	1	320	2000.0	1.0	0.0
-fr	04_res	1	320	2000.0	1.0	0.0
-fr	05_nuclear	1	320	2000.0	1.0	0.0
-fr	06_coal	1	320	2000.0	1.0	0.0
-fr	07_gas	1	320	2000.0	1.0	0.0
-fr	08_non-res	1	320	1100.0	1.0	0.0
+fr	01_solar	1	320	2000.0	0.0	1.0
+fr	02_wind_on	1	320	2000.0	0.0	1.0
+fr	03_wind_off	1	320	2000.0	0.0	1.0
+fr	04_res	1	320	2000.0	0.0	1.0
+fr	05_nuclear	1	320	2000.0	0.0	1.0
+fr	06_coal	1	320	2000.0	0.0	1.0
+fr	07_gas	1	320	2000.0	0.0	1.0
+fr	08_non-res	1	320	1100.0	0.0	1.0
 fr	09_hydro_pump	1	320	0.0	0.0	0.0
-fr	01_solar	1	321	2000.0	1.0	0.0
-fr	02_wind_on	1	321	2000.0	1.0	0.0
-fr	03_wind_off	1	321	2000.0	1.0	0.0
-fr	04_res	1	321	2000.0	1.0	0.0
-fr	05_nuclear	1	321	2000.0	1.0	0.0
-fr	06_coal	1	321	2000.0	1.0	0.0
-fr	07_gas	1	321	2000.0	1.0	0.0
-fr	08_non-res	1	321	1200.0	1.0	0.0
+fr	01_solar	1	321	2000.0	0.0	1.0
+fr	02_wind_on	1	321	2000.0	0.0	1.0
+fr	03_wind_off	1	321	2000.0	0.0	1.0
+fr	04_res	1	321	2000.0	0.0	1.0
+fr	05_nuclear	1	321	2000.0	0.0	1.0
+fr	06_coal	1	321	2000.0	0.0	1.0
+fr	07_gas	1	321	2000.0	0.0	1.0
+fr	08_non-res	1	321	1200.0	0.0	1.0
 fr	09_hydro_pump	1	321	0.0	0.0	0.0
-fr	01_solar	1	322	2000.0	1.0	0.0
-fr	02_wind_on	1	322	2000.0	1.0	0.0
-fr	03_wind_off	1	322	2000.0	1.0	0.0
-fr	04_res	1	322	2000.0	1.0	0.0
-fr	05_nuclear	1	322	2000.0	1.0	0.0
-fr	06_coal	1	322	2000.0	1.0	0.0
-fr	07_gas	1	322	2000.0	1.0	0.0
-fr	08_non-res	1	322	1300.0	1.0	0.0
+fr	01_solar	1	322	2000.0	0.0	1.0
+fr	02_wind_on	1	322	2000.0	0.0	1.0
+fr	03_wind_off	1	322	2000.0	0.0	1.0
+fr	04_res	1	322	2000.0	0.0	1.0
+fr	05_nuclear	1	322	2000.0	0.0	1.0
+fr	06_coal	1	322	2000.0	0.0	1.0
+fr	07_gas	1	322	2000.0	0.0	1.0
+fr	08_non-res	1	322	1300.0	0.0	1.0
 fr	09_hydro_pump	1	322	0.0	0.0	0.0
-fr	01_solar	1	323	2000.0	1.0	0.0
-fr	02_wind_on	1	323	2000.0	1.0	0.0
-fr	03_wind_off	1	323	2000.0	1.0	0.0
-fr	04_res	1	323	2000.0	1.0	0.0
-fr	05_nuclear	1	323	2000.0	1.0	0.0
-fr	06_coal	1	323	2000.0	1.0	0.0
-fr	07_gas	1	323	2000.0	1.0	0.0
-fr	08_non-res	1	323	1400.0	1.0	0.0
+fr	01_solar	1	323	2000.0	0.0	1.0
+fr	02_wind_on	1	323	2000.0	0.0	1.0
+fr	03_wind_off	1	323	2000.0	0.0	1.0
+fr	04_res	1	323	2000.0	0.0	1.0
+fr	05_nuclear	1	323	2000.0	0.0	1.0
+fr	06_coal	1	323	2000.0	0.0	1.0
+fr	07_gas	1	323	2000.0	0.0	1.0
+fr	08_non-res	1	323	1400.0	0.0	1.0
 fr	09_hydro_pump	1	323	0.0	0.0	0.0
-fr	01_solar	1	324	2000.0	1.0	0.0
-fr	02_wind_on	1	324	2000.0	1.0	0.0
-fr	03_wind_off	1	324	2000.0	1.0	0.0
-fr	04_res	1	324	2000.0	1.0	0.0
-fr	05_nuclear	1	324	2000.0	1.0	0.0
-fr	06_coal	1	324	2000.0	1.0	0.0
-fr	07_gas	1	324	2000.0	1.0	0.0
-fr	08_non-res	1	324	1500.0	1.0	0.0
+fr	01_solar	1	324	2000.0	0.0	1.0
+fr	02_wind_on	1	324	2000.0	0.0	1.0
+fr	03_wind_off	1	324	2000.0	0.0	1.0
+fr	04_res	1	324	2000.0	0.0	1.0
+fr	05_nuclear	1	324	2000.0	0.0	1.0
+fr	06_coal	1	324	2000.0	0.0	1.0
+fr	07_gas	1	324	2000.0	0.0	1.0
+fr	08_non-res	1	324	1500.0	0.0	1.0
 fr	09_hydro_pump	1	324	0.0	0.0	0.0
-fr	01_solar	1	325	2000.0	1.0	0.0
-fr	02_wind_on	1	325	2000.0	1.0	0.0
-fr	03_wind_off	1	325	2000.0	1.0	0.0
-fr	04_res	1	325	2000.0	1.0	0.0
-fr	05_nuclear	1	325	2000.0	1.0	0.0
-fr	06_coal	1	325	2000.0	1.0	0.0
-fr	07_gas	1	325	2000.0	1.0	0.0
-fr	08_non-res	1	325	1600.0	1.0	0.0
+fr	01_solar	1	325	2000.0	0.0	1.0
+fr	02_wind_on	1	325	2000.0	0.0	1.0
+fr	03_wind_off	1	325	2000.0	0.0	1.0
+fr	04_res	1	325	2000.0	0.0	1.0
+fr	05_nuclear	1	325	2000.0	0.0	1.0
+fr	06_coal	1	325	2000.0	0.0	1.0
+fr	07_gas	1	325	2000.0	0.0	1.0
+fr	08_non-res	1	325	1600.0	0.0	1.0
 fr	09_hydro_pump	1	325	0.0	0.0	0.0
-fr	01_solar	1	326	2000.0	1.0	0.0
-fr	02_wind_on	1	326	2000.0	1.0	0.0
-fr	03_wind_off	1	326	2000.0	1.0	0.0
-fr	04_res	1	326	2000.0	1.0	0.0
-fr	05_nuclear	1	326	2000.0	1.0	0.0
-fr	06_coal	1	326	2000.0	1.0	0.0
-fr	07_gas	1	326	2000.0	1.0	0.0
-fr	08_non-res	1	326	1700.0	1.0	0.0
+fr	01_solar	1	326	2000.0	0.0	1.0
+fr	02_wind_on	1	326	2000.0	0.0	1.0
+fr	03_wind_off	1	326	2000.0	0.0	1.0
+fr	04_res	1	326	2000.0	0.0	1.0
+fr	05_nuclear	1	326	2000.0	0.0	1.0
+fr	06_coal	1	326	2000.0	0.0	1.0
+fr	07_gas	1	326	2000.0	0.0	1.0
+fr	08_non-res	1	326	1700.0	0.0	1.0
 fr	09_hydro_pump	1	326	0.0	0.0	0.0
-fr	01_solar	1	327	2000.0	1.0	0.0
-fr	02_wind_on	1	327	2000.0	1.0	0.0
-fr	03_wind_off	1	327	2000.0	1.0	0.0
-fr	04_res	1	327	2000.0	1.0	0.0
-fr	05_nuclear	1	327	2000.0	1.0	0.0
-fr	06_coal	1	327	2000.0	1.0	0.0
-fr	07_gas	1	327	2000.0	1.0	0.0
-fr	08_non-res	1	327	1800.0	1.0	0.0
+fr	01_solar	1	327	2000.0	0.0	1.0
+fr	02_wind_on	1	327	2000.0	0.0	1.0
+fr	03_wind_off	1	327	2000.0	0.0	1.0
+fr	04_res	1	327	2000.0	0.0	1.0
+fr	05_nuclear	1	327	2000.0	0.0	1.0
+fr	06_coal	1	327	2000.0	0.0	1.0
+fr	07_gas	1	327	2000.0	0.0	1.0
+fr	08_non-res	1	327	1800.0	0.0	1.0
 fr	09_hydro_pump	1	327	0.0	0.0	0.0
-fr	01_solar	1	328	2000.0	1.0	0.0
-fr	02_wind_on	1	328	2000.0	1.0	0.0
-fr	03_wind_off	1	328	2000.0	1.0	0.0
-fr	04_res	1	328	2000.0	1.0	0.0
-fr	05_nuclear	1	328	2000.0	1.0	0.0
-fr	06_coal	1	328	2000.0	1.0	0.0
-fr	07_gas	1	328	2000.0	1.0	0.0
-fr	08_non-res	1	328	1900.0	1.0	0.0
+fr	01_solar	1	328	2000.0	0.0	1.0
+fr	02_wind_on	1	328	2000.0	0.0	1.0
+fr	03_wind_off	1	328	2000.0	0.0	1.0
+fr	04_res	1	328	2000.0	0.0	1.0
+fr	05_nuclear	1	328	2000.0	0.0	1.0
+fr	06_coal	1	328	2000.0	0.0	1.0
+fr	07_gas	1	328	2000.0	0.0	1.0
+fr	08_non-res	1	328	1900.0	0.0	1.0
 fr	09_hydro_pump	1	328	0.0	0.0	0.0
-fr	01_solar	1	329	2000.0	1.0	0.0
-fr	02_wind_on	1	329	2000.0	1.0	0.0
-fr	03_wind_off	1	329	2000.0	1.0	0.0
-fr	04_res	1	329	2000.0	1.0	0.0
-fr	05_nuclear	1	329	2000.0	1.0	0.0
-fr	06_coal	1	329	2000.0	1.0	0.0
-fr	07_gas	1	329	2000.0	1.0	0.0
-fr	08_non-res	1	329	2000.0	1.0	0.0
+fr	01_solar	1	329	2000.0	0.0	1.0
+fr	02_wind_on	1	329	2000.0	0.0	1.0
+fr	03_wind_off	1	329	2000.0	0.0	1.0
+fr	04_res	1	329	2000.0	0.0	1.0
+fr	05_nuclear	1	329	2000.0	0.0	1.0
+fr	06_coal	1	329	2000.0	0.0	1.0
+fr	07_gas	1	329	2000.0	0.0	1.0
+fr	08_non-res	1	329	2000.0	0.0	1.0
 fr	09_hydro_pump	1	329	0.0	0.0	0.0
-fr	01_solar	1	330	2000.0	1.0	0.0
-fr	02_wind_on	1	330	2000.0	1.0	0.0
-fr	03_wind_off	1	330	2000.0	1.0	0.0
-fr	04_res	1	330	2000.0	1.0	0.0
-fr	05_nuclear	1	330	2000.0	1.0	0.0
-fr	06_coal	1	330	2000.0	1.0	0.0
-fr	07_gas	1	330	2000.0	1.0	0.0
-fr	08_non-res	1	330	2000.0	1.0	0.0
-fr	09_hydro_pump	1	330	100.0	1.0	0.0
-fr	01_solar	1	331	2000.0	1.0	0.0
-fr	02_wind_on	1	331	2000.0	1.0	0.0
-fr	03_wind_off	1	331	2000.0	1.0	0.0
-fr	04_res	1	331	2000.0	1.0	0.0
-fr	05_nuclear	1	331	2000.0	1.0	0.0
-fr	06_coal	1	331	2000.0	1.0	0.0
-fr	07_gas	1	331	2000.0	1.0	0.0
-fr	08_non-res	1	331	2000.0	1.0	0.0
-fr	09_hydro_pump	1	331	200.0	1.0	0.0
-fr	01_solar	1	332	2000.0	1.0	0.0
-fr	02_wind_on	1	332	2000.0	1.0	0.0
-fr	03_wind_off	1	332	2000.0	1.0	0.0
-fr	04_res	1	332	2000.0	1.0	0.0
-fr	05_nuclear	1	332	2000.0	1.0	0.0
-fr	06_coal	1	332	2000.0	1.0	0.0
-fr	07_gas	1	332	2000.0	1.0	0.0
-fr	08_non-res	1	332	2000.0	1.0	0.0
-fr	09_hydro_pump	1	332	300.0	1.0	0.0
-fr	01_solar	1	333	2000.0	1.0	0.0
-fr	02_wind_on	1	333	2000.0	1.0	0.0
-fr	03_wind_off	1	333	2000.0	1.0	0.0
-fr	04_res	1	333	2000.0	1.0	0.0
-fr	05_nuclear	1	333	2000.0	1.0	0.0
-fr	06_coal	1	333	2000.0	1.0	0.0
-fr	07_gas	1	333	2000.0	1.0	0.0
-fr	08_non-res	1	333	2000.0	1.0	0.0
-fr	09_hydro_pump	1	333	400.0	1.0	0.0
-fr	01_solar	1	334	2000.0	1.0	0.0
-fr	02_wind_on	1	334	2000.0	1.0	0.0
-fr	03_wind_off	1	334	2000.0	1.0	0.0
-fr	04_res	1	334	2000.0	1.0	0.0
-fr	05_nuclear	1	334	2000.0	1.0	0.0
-fr	06_coal	1	334	2000.0	1.0	0.0
-fr	07_gas	1	334	2000.0	1.0	0.0
-fr	08_non-res	1	334	2000.0	1.0	0.0
-fr	09_hydro_pump	1	334	500.0	1.0	0.0
-fr	01_solar	1	335	2000.0	1.0	0.0
-fr	02_wind_on	1	335	2000.0	1.0	0.0
-fr	03_wind_off	1	335	2000.0	1.0	0.0
-fr	04_res	1	335	2000.0	1.0	0.0
-fr	05_nuclear	1	335	2000.0	1.0	0.0
-fr	06_coal	1	335	2000.0	1.0	0.0
-fr	07_gas	1	335	2000.0	1.0	0.0
-fr	08_non-res	1	335	2000.0	1.0	0.0
-fr	09_hydro_pump	1	335	600.0	1.0	0.0
-fr	01_solar	1	336	2000.0	1.0	0.0
-fr	02_wind_on	1	336	2000.0	1.0	0.0
-fr	03_wind_off	1	336	2000.0	1.0	0.0
-fr	04_res	1	336	2000.0	1.0	0.0
-fr	05_nuclear	1	336	2000.0	1.0	0.0
-fr	06_coal	1	336	2000.0	1.0	0.0
-fr	07_gas	1	336	2000.0	1.0	0.0
-fr	08_non-res	1	336	2000.0	1.0	0.0
-fr	09_hydro_pump	1	336	700.0	1.0	0.0
+fr	01_solar	1	330	2000.0	0.0	1.0
+fr	02_wind_on	1	330	2000.0	0.0	1.0
+fr	03_wind_off	1	330	2000.0	0.0	1.0
+fr	04_res	1	330	2000.0	0.0	1.0
+fr	05_nuclear	1	330	2000.0	0.0	1.0
+fr	06_coal	1	330	2000.0	0.0	1.0
+fr	07_gas	1	330	2000.0	0.0	1.0
+fr	08_non-res	1	330	2000.0	0.0	1.0
+fr	09_hydro_pump	1	330	100.0	0.0	1.0
+fr	01_solar	1	331	2000.0	0.0	1.0
+fr	02_wind_on	1	331	2000.0	0.0	1.0
+fr	03_wind_off	1	331	2000.0	0.0	1.0
+fr	04_res	1	331	2000.0	0.0	1.0
+fr	05_nuclear	1	331	2000.0	0.0	1.0
+fr	06_coal	1	331	2000.0	0.0	1.0
+fr	07_gas	1	331	2000.0	0.0	1.0
+fr	08_non-res	1	331	2000.0	0.0	1.0
+fr	09_hydro_pump	1	331	200.0	0.0	1.0
+fr	01_solar	1	332	2000.0	0.0	1.0
+fr	02_wind_on	1	332	2000.0	0.0	1.0
+fr	03_wind_off	1	332	2000.0	0.0	1.0
+fr	04_res	1	332	2000.0	0.0	1.0
+fr	05_nuclear	1	332	2000.0	0.0	1.0
+fr	06_coal	1	332	2000.0	0.0	1.0
+fr	07_gas	1	332	2000.0	0.0	1.0
+fr	08_non-res	1	332	2000.0	0.0	1.0
+fr	09_hydro_pump	1	332	300.0	0.0	1.0
+fr	01_solar	1	333	2000.0	0.0	1.0
+fr	02_wind_on	1	333	2000.0	0.0	1.0
+fr	03_wind_off	1	333	2000.0	0.0	1.0
+fr	04_res	1	333	2000.0	0.0	1.0
+fr	05_nuclear	1	333	2000.0	0.0	1.0
+fr	06_coal	1	333	2000.0	0.0	1.0
+fr	07_gas	1	333	2000.0	0.0	1.0
+fr	08_non-res	1	333	2000.0	0.0	1.0
+fr	09_hydro_pump	1	333	400.0	0.0	1.0
+fr	01_solar	1	334	2000.0	0.0	1.0
+fr	02_wind_on	1	334	2000.0	0.0	1.0
+fr	03_wind_off	1	334	2000.0	0.0	1.0
+fr	04_res	1	334	2000.0	0.0	1.0
+fr	05_nuclear	1	334	2000.0	0.0	1.0
+fr	06_coal	1	334	2000.0	0.0	1.0
+fr	07_gas	1	334	2000.0	0.0	1.0
+fr	08_non-res	1	334	2000.0	0.0	1.0
+fr	09_hydro_pump	1	334	500.0	0.0	1.0
+fr	01_solar	1	335	2000.0	0.0	1.0
+fr	02_wind_on	1	335	2000.0	0.0	1.0
+fr	03_wind_off	1	335	2000.0	0.0	1.0
+fr	04_res	1	335	2000.0	0.0	1.0
+fr	05_nuclear	1	335	2000.0	0.0	1.0
+fr	06_coal	1	335	2000.0	0.0	1.0
+fr	07_gas	1	335	2000.0	0.0	1.0
+fr	08_non-res	1	335	2000.0	0.0	1.0
+fr	09_hydro_pump	1	335	600.0	0.0	1.0
+fr	01_solar	1	336	2000.0	0.0	1.0
+fr	02_wind_on	1	336	2000.0	0.0	1.0
+fr	03_wind_off	1	336	2000.0	0.0	1.0
+fr	04_res	1	336	2000.0	0.0	1.0
+fr	05_nuclear	1	336	2000.0	0.0	1.0
+fr	06_coal	1	336	2000.0	0.0	1.0
+fr	07_gas	1	336	2000.0	0.0	1.0
+fr	08_non-res	1	336	2000.0	0.0	1.0
+fr	09_hydro_pump	1	336	700.0	0.0	1.0
 it	01_solar	1	1	0.0	0.0	0.0
 it	02_wind_on	1	1	0.0	0.0	0.0
 it	03_wind_off	1	1	0.0	0.0	0.0
@@ -6056,7 +6056,7 @@ it	06_coal	1	1	0.0	0.0	0.0
 it	07_gas	1	1	0.0	0.0	0.0
 it	08_non-res	1	1	0.0	0.0	0.0
 it	09_hydro_pump	1	1	0.0	0.0	0.0
-it	01_solar	1	2	100.0	1.0	0.0
+it	01_solar	1	2	100.0	0.0	1.0
 it	02_wind_on	1	2	0.0	0.0	0.0
 it	03_wind_off	1	2	0.0	0.0	0.0
 it	04_res	1	2	0.0	0.0	0.0
@@ -6065,7 +6065,7 @@ it	06_coal	1	2	0.0	0.0	0.0
 it	07_gas	1	2	0.0	0.0	0.0
 it	08_non-res	1	2	0.0	0.0	0.0
 it	09_hydro_pump	1	2	0.0	0.0	0.0
-it	01_solar	1	3	200.0	1.0	0.0
+it	01_solar	1	3	200.0	0.0	1.0
 it	02_wind_on	1	3	0.0	0.0	0.0
 it	03_wind_off	1	3	0.0	0.0	0.0
 it	04_res	1	3	0.0	0.0	0.0
@@ -6074,7 +6074,7 @@ it	06_coal	1	3	0.0	0.0	0.0
 it	07_gas	1	3	0.0	0.0	0.0
 it	08_non-res	1	3	0.0	0.0	0.0
 it	09_hydro_pump	1	3	0.0	0.0	0.0
-it	01_solar	1	4	300.0	1.0	0.0
+it	01_solar	1	4	300.0	0.0	1.0
 it	02_wind_on	1	4	0.0	0.0	0.0
 it	03_wind_off	1	4	0.0	0.0	0.0
 it	04_res	1	4	0.0	0.0	0.0
@@ -6083,7 +6083,7 @@ it	06_coal	1	4	0.0	0.0	0.0
 it	07_gas	1	4	0.0	0.0	0.0
 it	08_non-res	1	4	0.0	0.0	0.0
 it	09_hydro_pump	1	4	0.0	0.0	0.0
-it	01_solar	1	5	400.0	1.0	0.0
+it	01_solar	1	5	400.0	0.0	1.0
 it	02_wind_on	1	5	0.0	0.0	0.0
 it	03_wind_off	1	5	0.0	0.0	0.0
 it	04_res	1	5	0.0	0.0	0.0
@@ -6092,7 +6092,7 @@ it	06_coal	1	5	0.0	0.0	0.0
 it	07_gas	1	5	0.0	0.0	0.0
 it	08_non-res	1	5	0.0	0.0	0.0
 it	09_hydro_pump	1	5	0.0	0.0	0.0
-it	01_solar	1	6	500.0	1.0	0.0
+it	01_solar	1	6	500.0	0.0	1.0
 it	02_wind_on	1	6	0.0	0.0	0.0
 it	03_wind_off	1	6	0.0	0.0	0.0
 it	04_res	1	6	0.0	0.0	0.0
@@ -6101,7 +6101,7 @@ it	06_coal	1	6	0.0	0.0	0.0
 it	07_gas	1	6	0.0	0.0	0.0
 it	08_non-res	1	6	0.0	0.0	0.0
 it	09_hydro_pump	1	6	0.0	0.0	0.0
-it	01_solar	1	7	600.0	1.0	0.0
+it	01_solar	1	7	600.0	0.0	1.0
 it	02_wind_on	1	7	0.0	0.0	0.0
 it	03_wind_off	1	7	0.0	0.0	0.0
 it	04_res	1	7	0.0	0.0	0.0
@@ -6110,7 +6110,7 @@ it	06_coal	1	7	0.0	0.0	0.0
 it	07_gas	1	7	0.0	0.0	0.0
 it	08_non-res	1	7	0.0	0.0	0.0
 it	09_hydro_pump	1	7	0.0	0.0	0.0
-it	01_solar	1	8	700.0	1.0	0.0
+it	01_solar	1	8	700.0	0.0	1.0
 it	02_wind_on	1	8	0.0	0.0	0.0
 it	03_wind_off	1	8	0.0	0.0	0.0
 it	04_res	1	8	0.0	0.0	0.0
@@ -6119,7 +6119,7 @@ it	06_coal	1	8	0.0	0.0	0.0
 it	07_gas	1	8	0.0	0.0	0.0
 it	08_non-res	1	8	0.0	0.0	0.0
 it	09_hydro_pump	1	8	0.0	0.0	0.0
-it	01_solar	1	9	800.0	1.0	0.0
+it	01_solar	1	9	800.0	0.0	1.0
 it	02_wind_on	1	9	0.0	0.0	0.0
 it	03_wind_off	1	9	0.0	0.0	0.0
 it	04_res	1	9	0.0	0.0	0.0
@@ -6128,7 +6128,7 @@ it	06_coal	1	9	0.0	0.0	0.0
 it	07_gas	1	9	0.0	0.0	0.0
 it	08_non-res	1	9	0.0	0.0	0.0
 it	09_hydro_pump	1	9	0.0	0.0	0.0
-it	01_solar	1	10	900.0	1.0	0.0
+it	01_solar	1	10	900.0	0.0	1.0
 it	02_wind_on	1	10	0.0	0.0	0.0
 it	03_wind_off	1	10	0.0	0.0	0.0
 it	04_res	1	10	0.0	0.0	0.0
@@ -6137,7 +6137,7 @@ it	06_coal	1	10	0.0	0.0	0.0
 it	07_gas	1	10	0.0	0.0	0.0
 it	08_non-res	1	10	0.0	0.0	0.0
 it	09_hydro_pump	1	10	0.0	0.0	0.0
-it	01_solar	1	11	1000.0	1.0	0.0
+it	01_solar	1	11	1000.0	0.0	1.0
 it	02_wind_on	1	11	0.0	0.0	0.0
 it	03_wind_off	1	11	0.0	0.0	0.0
 it	04_res	1	11	0.0	0.0	0.0
@@ -6146,7 +6146,7 @@ it	06_coal	1	11	0.0	0.0	0.0
 it	07_gas	1	11	0.0	0.0	0.0
 it	08_non-res	1	11	0.0	0.0	0.0
 it	09_hydro_pump	1	11	0.0	0.0	0.0
-it	01_solar	1	12	1100.0	1.0	0.0
+it	01_solar	1	12	1100.0	0.0	1.0
 it	02_wind_on	1	12	0.0	0.0	0.0
 it	03_wind_off	1	12	0.0	0.0	0.0
 it	04_res	1	12	0.0	0.0	0.0
@@ -6155,7 +6155,7 @@ it	06_coal	1	12	0.0	0.0	0.0
 it	07_gas	1	12	0.0	0.0	0.0
 it	08_non-res	1	12	0.0	0.0	0.0
 it	09_hydro_pump	1	12	0.0	0.0	0.0
-it	01_solar	1	13	1200.0	1.0	0.0
+it	01_solar	1	13	1200.0	0.0	1.0
 it	02_wind_on	1	13	0.0	0.0	0.0
 it	03_wind_off	1	13	0.0	0.0	0.0
 it	04_res	1	13	0.0	0.0	0.0
@@ -6164,7 +6164,7 @@ it	06_coal	1	13	0.0	0.0	0.0
 it	07_gas	1	13	0.0	0.0	0.0
 it	08_non-res	1	13	0.0	0.0	0.0
 it	09_hydro_pump	1	13	0.0	0.0	0.0
-it	01_solar	1	14	1300.0	1.0	0.0
+it	01_solar	1	14	1300.0	0.0	1.0
 it	02_wind_on	1	14	0.0	0.0	0.0
 it	03_wind_off	1	14	0.0	0.0	0.0
 it	04_res	1	14	0.0	0.0	0.0
@@ -6173,7 +6173,7 @@ it	06_coal	1	14	0.0	0.0	0.0
 it	07_gas	1	14	0.0	0.0	0.0
 it	08_non-res	1	14	0.0	0.0	0.0
 it	09_hydro_pump	1	14	0.0	0.0	0.0
-it	01_solar	1	15	1400.0	1.0	0.0
+it	01_solar	1	15	1400.0	0.0	1.0
 it	02_wind_on	1	15	0.0	0.0	0.0
 it	03_wind_off	1	15	0.0	0.0	0.0
 it	04_res	1	15	0.0	0.0	0.0
@@ -6182,7 +6182,7 @@ it	06_coal	1	15	0.0	0.0	0.0
 it	07_gas	1	15	0.0	0.0	0.0
 it	08_non-res	1	15	0.0	0.0	0.0
 it	09_hydro_pump	1	15	0.0	0.0	0.0
-it	01_solar	1	16	1500.0	1.0	0.0
+it	01_solar	1	16	1500.0	0.0	1.0
 it	02_wind_on	1	16	0.0	0.0	0.0
 it	03_wind_off	1	16	0.0	0.0	0.0
 it	04_res	1	16	0.0	0.0	0.0
@@ -6191,7 +6191,7 @@ it	06_coal	1	16	0.0	0.0	0.0
 it	07_gas	1	16	0.0	0.0	0.0
 it	08_non-res	1	16	0.0	0.0	0.0
 it	09_hydro_pump	1	16	0.0	0.0	0.0
-it	01_solar	1	17	1600.0	1.0	0.0
+it	01_solar	1	17	1600.0	0.0	1.0
 it	02_wind_on	1	17	0.0	0.0	0.0
 it	03_wind_off	1	17	0.0	0.0	0.0
 it	04_res	1	17	0.0	0.0	0.0
@@ -6200,7 +6200,7 @@ it	06_coal	1	17	0.0	0.0	0.0
 it	07_gas	1	17	0.0	0.0	0.0
 it	08_non-res	1	17	0.0	0.0	0.0
 it	09_hydro_pump	1	17	0.0	0.0	0.0
-it	01_solar	1	18	1700.0	1.0	0.0
+it	01_solar	1	18	1700.0	0.0	1.0
 it	02_wind_on	1	18	0.0	0.0	0.0
 it	03_wind_off	1	18	0.0	0.0	0.0
 it	04_res	1	18	0.0	0.0	0.0
@@ -6209,7 +6209,7 @@ it	06_coal	1	18	0.0	0.0	0.0
 it	07_gas	1	18	0.0	0.0	0.0
 it	08_non-res	1	18	0.0	0.0	0.0
 it	09_hydro_pump	1	18	0.0	0.0	0.0
-it	01_solar	1	19	1800.0	1.0	0.0
+it	01_solar	1	19	1800.0	0.0	1.0
 it	02_wind_on	1	19	0.0	0.0	0.0
 it	03_wind_off	1	19	0.0	0.0	0.0
 it	04_res	1	19	0.0	0.0	0.0
@@ -6218,7 +6218,7 @@ it	06_coal	1	19	0.0	0.0	0.0
 it	07_gas	1	19	0.0	0.0	0.0
 it	08_non-res	1	19	0.0	0.0	0.0
 it	09_hydro_pump	1	19	0.0	0.0	0.0
-it	01_solar	1	20	1900.0	1.0	0.0
+it	01_solar	1	20	1900.0	0.0	1.0
 it	02_wind_on	1	20	0.0	0.0	0.0
 it	03_wind_off	1	20	0.0	0.0	0.0
 it	04_res	1	20	0.0	0.0	0.0
@@ -6227,7 +6227,7 @@ it	06_coal	1	20	0.0	0.0	0.0
 it	07_gas	1	20	0.0	0.0	0.0
 it	08_non-res	1	20	0.0	0.0	0.0
 it	09_hydro_pump	1	20	0.0	0.0	0.0
-it	01_solar	1	21	2000.0	1.0	0.0
+it	01_solar	1	21	2000.0	0.0	1.0
 it	02_wind_on	1	21	0.0	0.0	0.0
 it	03_wind_off	1	21	0.0	0.0	0.0
 it	04_res	1	21	0.0	0.0	0.0
@@ -6236,8 +6236,8 @@ it	06_coal	1	21	0.0	0.0	0.0
 it	07_gas	1	21	0.0	0.0	0.0
 it	08_non-res	1	21	0.0	0.0	0.0
 it	09_hydro_pump	1	21	0.0	0.0	0.0
-it	01_solar	1	22	2000.0	1.0	0.0
-it	02_wind_on	1	22	100.0	1.0	0.0
+it	01_solar	1	22	2000.0	0.0	1.0
+it	02_wind_on	1	22	100.0	0.0	1.0
 it	03_wind_off	1	22	0.0	0.0	0.0
 it	04_res	1	22	0.0	0.0	0.0
 it	05_nuclear	1	22	0.0	0.0	0.0
@@ -6245,8 +6245,8 @@ it	06_coal	1	22	0.0	0.0	0.0
 it	07_gas	1	22	0.0	0.0	0.0
 it	08_non-res	1	22	0.0	0.0	0.0
 it	09_hydro_pump	1	22	0.0	0.0	0.0
-it	01_solar	1	23	2000.0	1.0	0.0
-it	02_wind_on	1	23	200.0	1.0	0.0
+it	01_solar	1	23	2000.0	0.0	1.0
+it	02_wind_on	1	23	200.0	0.0	1.0
 it	03_wind_off	1	23	0.0	0.0	0.0
 it	04_res	1	23	0.0	0.0	0.0
 it	05_nuclear	1	23	0.0	0.0	0.0
@@ -6254,8 +6254,8 @@ it	06_coal	1	23	0.0	0.0	0.0
 it	07_gas	1	23	0.0	0.0	0.0
 it	08_non-res	1	23	0.0	0.0	0.0
 it	09_hydro_pump	1	23	0.0	0.0	0.0
-it	01_solar	1	24	2000.0	1.0	0.0
-it	02_wind_on	1	24	300.0	1.0	0.0
+it	01_solar	1	24	2000.0	0.0	1.0
+it	02_wind_on	1	24	300.0	0.0	1.0
 it	03_wind_off	1	24	0.0	0.0	0.0
 it	04_res	1	24	0.0	0.0	0.0
 it	05_nuclear	1	24	0.0	0.0	0.0
@@ -6263,8 +6263,8 @@ it	06_coal	1	24	0.0	0.0	0.0
 it	07_gas	1	24	0.0	0.0	0.0
 it	08_non-res	1	24	0.0	0.0	0.0
 it	09_hydro_pump	1	24	0.0	0.0	0.0
-it	01_solar	1	25	2000.0	1.0	0.0
-it	02_wind_on	1	25	400.0	1.0	0.0
+it	01_solar	1	25	2000.0	0.0	1.0
+it	02_wind_on	1	25	400.0	0.0	1.0
 it	03_wind_off	1	25	0.0	0.0	0.0
 it	04_res	1	25	0.0	0.0	0.0
 it	05_nuclear	1	25	0.0	0.0	0.0
@@ -6272,8 +6272,8 @@ it	06_coal	1	25	0.0	0.0	0.0
 it	07_gas	1	25	0.0	0.0	0.0
 it	08_non-res	1	25	0.0	0.0	0.0
 it	09_hydro_pump	1	25	0.0	0.0	0.0
-it	01_solar	1	26	2000.0	1.0	0.0
-it	02_wind_on	1	26	500.0	1.0	0.0
+it	01_solar	1	26	2000.0	0.0	1.0
+it	02_wind_on	1	26	500.0	0.0	1.0
 it	03_wind_off	1	26	0.0	0.0	0.0
 it	04_res	1	26	0.0	0.0	0.0
 it	05_nuclear	1	26	0.0	0.0	0.0
@@ -6281,8 +6281,8 @@ it	06_coal	1	26	0.0	0.0	0.0
 it	07_gas	1	26	0.0	0.0	0.0
 it	08_non-res	1	26	0.0	0.0	0.0
 it	09_hydro_pump	1	26	0.0	0.0	0.0
-it	01_solar	1	27	2000.0	1.0	0.0
-it	02_wind_on	1	27	600.0	1.0	0.0
+it	01_solar	1	27	2000.0	0.0	1.0
+it	02_wind_on	1	27	600.0	0.0	1.0
 it	03_wind_off	1	27	0.0	0.0	0.0
 it	04_res	1	27	0.0	0.0	0.0
 it	05_nuclear	1	27	0.0	0.0	0.0
@@ -6290,8 +6290,8 @@ it	06_coal	1	27	0.0	0.0	0.0
 it	07_gas	1	27	0.0	0.0	0.0
 it	08_non-res	1	27	0.0	0.0	0.0
 it	09_hydro_pump	1	27	0.0	0.0	0.0
-it	01_solar	1	28	2000.0	1.0	0.0
-it	02_wind_on	1	28	700.0	1.0	0.0
+it	01_solar	1	28	2000.0	0.0	1.0
+it	02_wind_on	1	28	700.0	0.0	1.0
 it	03_wind_off	1	28	0.0	0.0	0.0
 it	04_res	1	28	0.0	0.0	0.0
 it	05_nuclear	1	28	0.0	0.0	0.0
@@ -6299,8 +6299,8 @@ it	06_coal	1	28	0.0	0.0	0.0
 it	07_gas	1	28	0.0	0.0	0.0
 it	08_non-res	1	28	0.0	0.0	0.0
 it	09_hydro_pump	1	28	0.0	0.0	0.0
-it	01_solar	1	29	2000.0	1.0	0.0
-it	02_wind_on	1	29	800.0	1.0	0.0
+it	01_solar	1	29	2000.0	0.0	1.0
+it	02_wind_on	1	29	800.0	0.0	1.0
 it	03_wind_off	1	29	0.0	0.0	0.0
 it	04_res	1	29	0.0	0.0	0.0
 it	05_nuclear	1	29	0.0	0.0	0.0
@@ -6308,8 +6308,8 @@ it	06_coal	1	29	0.0	0.0	0.0
 it	07_gas	1	29	0.0	0.0	0.0
 it	08_non-res	1	29	0.0	0.0	0.0
 it	09_hydro_pump	1	29	0.0	0.0	0.0
-it	01_solar	1	30	2000.0	1.0	0.0
-it	02_wind_on	1	30	900.0	1.0	0.0
+it	01_solar	1	30	2000.0	0.0	1.0
+it	02_wind_on	1	30	900.0	0.0	1.0
 it	03_wind_off	1	30	0.0	0.0	0.0
 it	04_res	1	30	0.0	0.0	0.0
 it	05_nuclear	1	30	0.0	0.0	0.0
@@ -6317,8 +6317,8 @@ it	06_coal	1	30	0.0	0.0	0.0
 it	07_gas	1	30	0.0	0.0	0.0
 it	08_non-res	1	30	0.0	0.0	0.0
 it	09_hydro_pump	1	30	0.0	0.0	0.0
-it	01_solar	1	31	2000.0	1.0	0.0
-it	02_wind_on	1	31	1000.0	1.0	0.0
+it	01_solar	1	31	2000.0	0.0	1.0
+it	02_wind_on	1	31	1000.0	0.0	1.0
 it	03_wind_off	1	31	0.0	0.0	0.0
 it	04_res	1	31	0.0	0.0	0.0
 it	05_nuclear	1	31	0.0	0.0	0.0
@@ -6326,8 +6326,8 @@ it	06_coal	1	31	0.0	0.0	0.0
 it	07_gas	1	31	0.0	0.0	0.0
 it	08_non-res	1	31	0.0	0.0	0.0
 it	09_hydro_pump	1	31	0.0	0.0	0.0
-it	01_solar	1	32	2000.0	1.0	0.0
-it	02_wind_on	1	32	1100.0	1.0	0.0
+it	01_solar	1	32	2000.0	0.0	1.0
+it	02_wind_on	1	32	1100.0	0.0	1.0
 it	03_wind_off	1	32	0.0	0.0	0.0
 it	04_res	1	32	0.0	0.0	0.0
 it	05_nuclear	1	32	0.0	0.0	0.0
@@ -6335,8 +6335,8 @@ it	06_coal	1	32	0.0	0.0	0.0
 it	07_gas	1	32	0.0	0.0	0.0
 it	08_non-res	1	32	0.0	0.0	0.0
 it	09_hydro_pump	1	32	0.0	0.0	0.0
-it	01_solar	1	33	2000.0	1.0	0.0
-it	02_wind_on	1	33	1200.0	1.0	0.0
+it	01_solar	1	33	2000.0	0.0	1.0
+it	02_wind_on	1	33	1200.0	0.0	1.0
 it	03_wind_off	1	33	0.0	0.0	0.0
 it	04_res	1	33	0.0	0.0	0.0
 it	05_nuclear	1	33	0.0	0.0	0.0
@@ -6344,8 +6344,8 @@ it	06_coal	1	33	0.0	0.0	0.0
 it	07_gas	1	33	0.0	0.0	0.0
 it	08_non-res	1	33	0.0	0.0	0.0
 it	09_hydro_pump	1	33	0.0	0.0	0.0
-it	01_solar	1	34	2000.0	1.0	0.0
-it	02_wind_on	1	34	1300.0	1.0	0.0
+it	01_solar	1	34	2000.0	0.0	1.0
+it	02_wind_on	1	34	1300.0	0.0	1.0
 it	03_wind_off	1	34	0.0	0.0	0.0
 it	04_res	1	34	0.0	0.0	0.0
 it	05_nuclear	1	34	0.0	0.0	0.0
@@ -6353,8 +6353,8 @@ it	06_coal	1	34	0.0	0.0	0.0
 it	07_gas	1	34	0.0	0.0	0.0
 it	08_non-res	1	34	0.0	0.0	0.0
 it	09_hydro_pump	1	34	0.0	0.0	0.0
-it	01_solar	1	35	2000.0	1.0	0.0
-it	02_wind_on	1	35	1400.0	1.0	0.0
+it	01_solar	1	35	2000.0	0.0	1.0
+it	02_wind_on	1	35	1400.0	0.0	1.0
 it	03_wind_off	1	35	0.0	0.0	0.0
 it	04_res	1	35	0.0	0.0	0.0
 it	05_nuclear	1	35	0.0	0.0	0.0
@@ -6362,8 +6362,8 @@ it	06_coal	1	35	0.0	0.0	0.0
 it	07_gas	1	35	0.0	0.0	0.0
 it	08_non-res	1	35	0.0	0.0	0.0
 it	09_hydro_pump	1	35	0.0	0.0	0.0
-it	01_solar	1	36	2000.0	1.0	0.0
-it	02_wind_on	1	36	1500.0	1.0	0.0
+it	01_solar	1	36	2000.0	0.0	1.0
+it	02_wind_on	1	36	1500.0	0.0	1.0
 it	03_wind_off	1	36	0.0	0.0	0.0
 it	04_res	1	36	0.0	0.0	0.0
 it	05_nuclear	1	36	0.0	0.0	0.0
@@ -6371,8 +6371,8 @@ it	06_coal	1	36	0.0	0.0	0.0
 it	07_gas	1	36	0.0	0.0	0.0
 it	08_non-res	1	36	0.0	0.0	0.0
 it	09_hydro_pump	1	36	0.0	0.0	0.0
-it	01_solar	1	37	2000.0	1.0	0.0
-it	02_wind_on	1	37	1600.0	1.0	0.0
+it	01_solar	1	37	2000.0	0.0	1.0
+it	02_wind_on	1	37	1600.0	0.0	1.0
 it	03_wind_off	1	37	0.0	0.0	0.0
 it	04_res	1	37	0.0	0.0	0.0
 it	05_nuclear	1	37	0.0	0.0	0.0
@@ -6380,8 +6380,8 @@ it	06_coal	1	37	0.0	0.0	0.0
 it	07_gas	1	37	0.0	0.0	0.0
 it	08_non-res	1	37	0.0	0.0	0.0
 it	09_hydro_pump	1	37	0.0	0.0	0.0
-it	01_solar	1	38	2000.0	1.0	0.0
-it	02_wind_on	1	38	1700.0	1.0	0.0
+it	01_solar	1	38	2000.0	0.0	1.0
+it	02_wind_on	1	38	1700.0	0.0	1.0
 it	03_wind_off	1	38	0.0	0.0	0.0
 it	04_res	1	38	0.0	0.0	0.0
 it	05_nuclear	1	38	0.0	0.0	0.0
@@ -6389,8 +6389,8 @@ it	06_coal	1	38	0.0	0.0	0.0
 it	07_gas	1	38	0.0	0.0	0.0
 it	08_non-res	1	38	0.0	0.0	0.0
 it	09_hydro_pump	1	38	0.0	0.0	0.0
-it	01_solar	1	39	2000.0	1.0	0.0
-it	02_wind_on	1	39	1800.0	1.0	0.0
+it	01_solar	1	39	2000.0	0.0	1.0
+it	02_wind_on	1	39	1800.0	0.0	1.0
 it	03_wind_off	1	39	0.0	0.0	0.0
 it	04_res	1	39	0.0	0.0	0.0
 it	05_nuclear	1	39	0.0	0.0	0.0
@@ -6398,8 +6398,8 @@ it	06_coal	1	39	0.0	0.0	0.0
 it	07_gas	1	39	0.0	0.0	0.0
 it	08_non-res	1	39	0.0	0.0	0.0
 it	09_hydro_pump	1	39	0.0	0.0	0.0
-it	01_solar	1	40	2000.0	1.0	0.0
-it	02_wind_on	1	40	1900.0	1.0	0.0
+it	01_solar	1	40	2000.0	0.0	1.0
+it	02_wind_on	1	40	1900.0	0.0	1.0
 it	03_wind_off	1	40	0.0	0.0	0.0
 it	04_res	1	40	0.0	0.0	0.0
 it	05_nuclear	1	40	0.0	0.0	0.0
@@ -6407,8 +6407,8 @@ it	06_coal	1	40	0.0	0.0	0.0
 it	07_gas	1	40	0.0	0.0	0.0
 it	08_non-res	1	40	0.0	0.0	0.0
 it	09_hydro_pump	1	40	0.0	0.0	0.0
-it	01_solar	1	41	2000.0	1.0	0.0
-it	02_wind_on	1	41	2000.0	1.0	0.0
+it	01_solar	1	41	2000.0	0.0	1.0
+it	02_wind_on	1	41	2000.0	0.0	1.0
 it	03_wind_off	1	41	0.0	0.0	0.0
 it	04_res	1	41	0.0	0.0	0.0
 it	05_nuclear	1	41	0.0	0.0	0.0
@@ -6416,1149 +6416,1149 @@ it	06_coal	1	41	0.0	0.0	0.0
 it	07_gas	1	41	0.0	0.0	0.0
 it	08_non-res	1	41	0.0	0.0	0.0
 it	09_hydro_pump	1	41	0.0	0.0	0.0
-it	01_solar	1	42	2000.0	1.0	0.0
-it	02_wind_on	1	42	2000.0	1.0	0.0
-it	03_wind_off	1	42	100.0	1.0	0.0
+it	01_solar	1	42	2000.0	0.0	1.0
+it	02_wind_on	1	42	2000.0	0.0	1.0
+it	03_wind_off	1	42	100.0	0.0	1.0
 it	04_res	1	42	0.0	0.0	0.0
 it	05_nuclear	1	42	0.0	0.0	0.0
 it	06_coal	1	42	0.0	0.0	0.0
 it	07_gas	1	42	0.0	0.0	0.0
 it	08_non-res	1	42	0.0	0.0	0.0
 it	09_hydro_pump	1	42	0.0	0.0	0.0
-it	01_solar	1	43	2000.0	1.0	0.0
-it	02_wind_on	1	43	2000.0	1.0	0.0
-it	03_wind_off	1	43	200.0	1.0	0.0
+it	01_solar	1	43	2000.0	0.0	1.0
+it	02_wind_on	1	43	2000.0	0.0	1.0
+it	03_wind_off	1	43	200.0	0.0	1.0
 it	04_res	1	43	0.0	0.0	0.0
 it	05_nuclear	1	43	0.0	0.0	0.0
 it	06_coal	1	43	0.0	0.0	0.0
 it	07_gas	1	43	0.0	0.0	0.0
 it	08_non-res	1	43	0.0	0.0	0.0
 it	09_hydro_pump	1	43	0.0	0.0	0.0
-it	01_solar	1	44	2000.0	1.0	0.0
-it	02_wind_on	1	44	2000.0	1.0	0.0
-it	03_wind_off	1	44	300.0	1.0	0.0
+it	01_solar	1	44	2000.0	0.0	1.0
+it	02_wind_on	1	44	2000.0	0.0	1.0
+it	03_wind_off	1	44	300.0	0.0	1.0
 it	04_res	1	44	0.0	0.0	0.0
 it	05_nuclear	1	44	0.0	0.0	0.0
 it	06_coal	1	44	0.0	0.0	0.0
 it	07_gas	1	44	0.0	0.0	0.0
 it	08_non-res	1	44	0.0	0.0	0.0
 it	09_hydro_pump	1	44	0.0	0.0	0.0
-it	01_solar	1	45	2000.0	1.0	0.0
-it	02_wind_on	1	45	2000.0	1.0	0.0
-it	03_wind_off	1	45	400.0	1.0	0.0
+it	01_solar	1	45	2000.0	0.0	1.0
+it	02_wind_on	1	45	2000.0	0.0	1.0
+it	03_wind_off	1	45	400.0	0.0	1.0
 it	04_res	1	45	0.0	0.0	0.0
 it	05_nuclear	1	45	0.0	0.0	0.0
 it	06_coal	1	45	0.0	0.0	0.0
 it	07_gas	1	45	0.0	0.0	0.0
 it	08_non-res	1	45	0.0	0.0	0.0
 it	09_hydro_pump	1	45	0.0	0.0	0.0
-it	01_solar	1	46	2000.0	1.0	0.0
-it	02_wind_on	1	46	2000.0	1.0	0.0
-it	03_wind_off	1	46	500.0	1.0	0.0
+it	01_solar	1	46	2000.0	0.0	1.0
+it	02_wind_on	1	46	2000.0	0.0	1.0
+it	03_wind_off	1	46	500.0	0.0	1.0
 it	04_res	1	46	0.0	0.0	0.0
 it	05_nuclear	1	46	0.0	0.0	0.0
 it	06_coal	1	46	0.0	0.0	0.0
 it	07_gas	1	46	0.0	0.0	0.0
 it	08_non-res	1	46	0.0	0.0	0.0
 it	09_hydro_pump	1	46	0.0	0.0	0.0
-it	01_solar	1	47	2000.0	1.0	0.0
-it	02_wind_on	1	47	2000.0	1.0	0.0
-it	03_wind_off	1	47	600.0	1.0	0.0
+it	01_solar	1	47	2000.0	0.0	1.0
+it	02_wind_on	1	47	2000.0	0.0	1.0
+it	03_wind_off	1	47	600.0	0.0	1.0
 it	04_res	1	47	0.0	0.0	0.0
 it	05_nuclear	1	47	0.0	0.0	0.0
 it	06_coal	1	47	0.0	0.0	0.0
 it	07_gas	1	47	0.0	0.0	0.0
 it	08_non-res	1	47	0.0	0.0	0.0
 it	09_hydro_pump	1	47	0.0	0.0	0.0
-it	01_solar	1	48	2000.0	1.0	0.0
-it	02_wind_on	1	48	2000.0	1.0	0.0
-it	03_wind_off	1	48	700.0	1.0	0.0
+it	01_solar	1	48	2000.0	0.0	1.0
+it	02_wind_on	1	48	2000.0	0.0	1.0
+it	03_wind_off	1	48	700.0	0.0	1.0
 it	04_res	1	48	0.0	0.0	0.0
 it	05_nuclear	1	48	0.0	0.0	0.0
 it	06_coal	1	48	0.0	0.0	0.0
 it	07_gas	1	48	0.0	0.0	0.0
 it	08_non-res	1	48	0.0	0.0	0.0
 it	09_hydro_pump	1	48	0.0	0.0	0.0
-it	01_solar	1	49	2000.0	1.0	0.0
-it	02_wind_on	1	49	2000.0	1.0	0.0
-it	03_wind_off	1	49	800.0	1.0	0.0
+it	01_solar	1	49	2000.0	0.0	1.0
+it	02_wind_on	1	49	2000.0	0.0	1.0
+it	03_wind_off	1	49	800.0	0.0	1.0
 it	04_res	1	49	0.0	0.0	0.0
 it	05_nuclear	1	49	0.0	0.0	0.0
 it	06_coal	1	49	0.0	0.0	0.0
 it	07_gas	1	49	0.0	0.0	0.0
 it	08_non-res	1	49	0.0	0.0	0.0
 it	09_hydro_pump	1	49	0.0	0.0	0.0
-it	01_solar	1	50	2000.0	1.0	0.0
-it	02_wind_on	1	50	2000.0	1.0	0.0
-it	03_wind_off	1	50	900.0	1.0	0.0
+it	01_solar	1	50	2000.0	0.0	1.0
+it	02_wind_on	1	50	2000.0	0.0	1.0
+it	03_wind_off	1	50	900.0	0.0	1.0
 it	04_res	1	50	0.0	0.0	0.0
 it	05_nuclear	1	50	0.0	0.0	0.0
 it	06_coal	1	50	0.0	0.0	0.0
 it	07_gas	1	50	0.0	0.0	0.0
 it	08_non-res	1	50	0.0	0.0	0.0
 it	09_hydro_pump	1	50	0.0	0.0	0.0
-it	01_solar	1	51	2000.0	1.0	0.0
-it	02_wind_on	1	51	2000.0	1.0	0.0
-it	03_wind_off	1	51	1000.0	1.0	0.0
+it	01_solar	1	51	2000.0	0.0	1.0
+it	02_wind_on	1	51	2000.0	0.0	1.0
+it	03_wind_off	1	51	1000.0	0.0	1.0
 it	04_res	1	51	0.0	0.0	0.0
 it	05_nuclear	1	51	0.0	0.0	0.0
 it	06_coal	1	51	0.0	0.0	0.0
 it	07_gas	1	51	0.0	0.0	0.0
 it	08_non-res	1	51	0.0	0.0	0.0
 it	09_hydro_pump	1	51	0.0	0.0	0.0
-it	01_solar	1	52	2000.0	1.0	0.0
-it	02_wind_on	1	52	2000.0	1.0	0.0
-it	03_wind_off	1	52	1100.0	1.0	0.0
+it	01_solar	1	52	2000.0	0.0	1.0
+it	02_wind_on	1	52	2000.0	0.0	1.0
+it	03_wind_off	1	52	1100.0	0.0	1.0
 it	04_res	1	52	0.0	0.0	0.0
 it	05_nuclear	1	52	0.0	0.0	0.0
 it	06_coal	1	52	0.0	0.0	0.0
 it	07_gas	1	52	0.0	0.0	0.0
 it	08_non-res	1	52	0.0	0.0	0.0
 it	09_hydro_pump	1	52	0.0	0.0	0.0
-it	01_solar	1	53	2000.0	1.0	0.0
-it	02_wind_on	1	53	2000.0	1.0	0.0
-it	03_wind_off	1	53	1200.0	1.0	0.0
+it	01_solar	1	53	2000.0	0.0	1.0
+it	02_wind_on	1	53	2000.0	0.0	1.0
+it	03_wind_off	1	53	1200.0	0.0	1.0
 it	04_res	1	53	0.0	0.0	0.0
 it	05_nuclear	1	53	0.0	0.0	0.0
 it	06_coal	1	53	0.0	0.0	0.0
 it	07_gas	1	53	0.0	0.0	0.0
 it	08_non-res	1	53	0.0	0.0	0.0
 it	09_hydro_pump	1	53	0.0	0.0	0.0
-it	01_solar	1	54	2000.0	1.0	0.0
-it	02_wind_on	1	54	2000.0	1.0	0.0
-it	03_wind_off	1	54	1300.0	1.0	0.0
+it	01_solar	1	54	2000.0	0.0	1.0
+it	02_wind_on	1	54	2000.0	0.0	1.0
+it	03_wind_off	1	54	1300.0	0.0	1.0
 it	04_res	1	54	0.0	0.0	0.0
 it	05_nuclear	1	54	0.0	0.0	0.0
 it	06_coal	1	54	0.0	0.0	0.0
 it	07_gas	1	54	0.0	0.0	0.0
 it	08_non-res	1	54	0.0	0.0	0.0
 it	09_hydro_pump	1	54	0.0	0.0	0.0
-it	01_solar	1	55	2000.0	1.0	0.0
-it	02_wind_on	1	55	2000.0	1.0	0.0
-it	03_wind_off	1	55	1400.0	1.0	0.0
+it	01_solar	1	55	2000.0	0.0	1.0
+it	02_wind_on	1	55	2000.0	0.0	1.0
+it	03_wind_off	1	55	1400.0	0.0	1.0
 it	04_res	1	55	0.0	0.0	0.0
 it	05_nuclear	1	55	0.0	0.0	0.0
 it	06_coal	1	55	0.0	0.0	0.0
 it	07_gas	1	55	0.0	0.0	0.0
 it	08_non-res	1	55	0.0	0.0	0.0
 it	09_hydro_pump	1	55	0.0	0.0	0.0
-it	01_solar	1	56	2000.0	1.0	0.0
-it	02_wind_on	1	56	2000.0	1.0	0.0
-it	03_wind_off	1	56	1500.0	1.0	0.0
+it	01_solar	1	56	2000.0	0.0	1.0
+it	02_wind_on	1	56	2000.0	0.0	1.0
+it	03_wind_off	1	56	1500.0	0.0	1.0
 it	04_res	1	56	0.0	0.0	0.0
 it	05_nuclear	1	56	0.0	0.0	0.0
 it	06_coal	1	56	0.0	0.0	0.0
 it	07_gas	1	56	0.0	0.0	0.0
 it	08_non-res	1	56	0.0	0.0	0.0
 it	09_hydro_pump	1	56	0.0	0.0	0.0
-it	01_solar	1	57	2000.0	1.0	0.0
-it	02_wind_on	1	57	2000.0	1.0	0.0
-it	03_wind_off	1	57	1600.0	1.0	0.0
+it	01_solar	1	57	2000.0	0.0	1.0
+it	02_wind_on	1	57	2000.0	0.0	1.0
+it	03_wind_off	1	57	1600.0	0.0	1.0
 it	04_res	1	57	0.0	0.0	0.0
 it	05_nuclear	1	57	0.0	0.0	0.0
 it	06_coal	1	57	0.0	0.0	0.0
 it	07_gas	1	57	0.0	0.0	0.0
 it	08_non-res	1	57	0.0	0.0	0.0
 it	09_hydro_pump	1	57	0.0	0.0	0.0
-it	01_solar	1	58	2000.0	1.0	0.0
-it	02_wind_on	1	58	2000.0	1.0	0.0
-it	03_wind_off	1	58	1700.0	1.0	0.0
+it	01_solar	1	58	2000.0	0.0	1.0
+it	02_wind_on	1	58	2000.0	0.0	1.0
+it	03_wind_off	1	58	1700.0	0.0	1.0
 it	04_res	1	58	0.0	0.0	0.0
 it	05_nuclear	1	58	0.0	0.0	0.0
 it	06_coal	1	58	0.0	0.0	0.0
 it	07_gas	1	58	0.0	0.0	0.0
 it	08_non-res	1	58	0.0	0.0	0.0
 it	09_hydro_pump	1	58	0.0	0.0	0.0
-it	01_solar	1	59	2000.0	1.0	0.0
-it	02_wind_on	1	59	2000.0	1.0	0.0
-it	03_wind_off	1	59	1800.0	1.0	0.0
+it	01_solar	1	59	2000.0	0.0	1.0
+it	02_wind_on	1	59	2000.0	0.0	1.0
+it	03_wind_off	1	59	1800.0	0.0	1.0
 it	04_res	1	59	0.0	0.0	0.0
 it	05_nuclear	1	59	0.0	0.0	0.0
 it	06_coal	1	59	0.0	0.0	0.0
 it	07_gas	1	59	0.0	0.0	0.0
 it	08_non-res	1	59	0.0	0.0	0.0
 it	09_hydro_pump	1	59	0.0	0.0	0.0
-it	01_solar	1	60	2000.0	1.0	0.0
-it	02_wind_on	1	60	2000.0	1.0	0.0
-it	03_wind_off	1	60	1900.0	1.0	0.0
+it	01_solar	1	60	2000.0	0.0	1.0
+it	02_wind_on	1	60	2000.0	0.0	1.0
+it	03_wind_off	1	60	1900.0	0.0	1.0
 it	04_res	1	60	0.0	0.0	0.0
 it	05_nuclear	1	60	0.0	0.0	0.0
 it	06_coal	1	60	0.0	0.0	0.0
 it	07_gas	1	60	0.0	0.0	0.0
 it	08_non-res	1	60	0.0	0.0	0.0
 it	09_hydro_pump	1	60	0.0	0.0	0.0
-it	01_solar	1	61	2000.0	1.0	0.0
-it	02_wind_on	1	61	2000.0	1.0	0.0
-it	03_wind_off	1	61	2000.0	1.0	0.0
+it	01_solar	1	61	2000.0	0.0	1.0
+it	02_wind_on	1	61	2000.0	0.0	1.0
+it	03_wind_off	1	61	2000.0	0.0	1.0
 it	04_res	1	61	0.0	0.0	0.0
 it	05_nuclear	1	61	0.0	0.0	0.0
 it	06_coal	1	61	0.0	0.0	0.0
 it	07_gas	1	61	0.0	0.0	0.0
 it	08_non-res	1	61	0.0	0.0	0.0
 it	09_hydro_pump	1	61	0.0	0.0	0.0
-it	01_solar	1	62	2000.0	1.0	0.0
-it	02_wind_on	1	62	2000.0	1.0	0.0
-it	03_wind_off	1	62	2000.0	1.0	0.0
-it	04_res	1	62	100.0	1.0	0.0
+it	01_solar	1	62	2000.0	0.0	1.0
+it	02_wind_on	1	62	2000.0	0.0	1.0
+it	03_wind_off	1	62	2000.0	0.0	1.0
+it	04_res	1	62	100.0	0.0	1.0
 it	05_nuclear	1	62	0.0	0.0	0.0
 it	06_coal	1	62	0.0	0.0	0.0
 it	07_gas	1	62	0.0	0.0	0.0
 it	08_non-res	1	62	0.0	0.0	0.0
 it	09_hydro_pump	1	62	0.0	0.0	0.0
-it	01_solar	1	63	2000.0	1.0	0.0
-it	02_wind_on	1	63	2000.0	1.0	0.0
-it	03_wind_off	1	63	2000.0	1.0	0.0
-it	04_res	1	63	200.0	1.0	0.0
+it	01_solar	1	63	2000.0	0.0	1.0
+it	02_wind_on	1	63	2000.0	0.0	1.0
+it	03_wind_off	1	63	2000.0	0.0	1.0
+it	04_res	1	63	200.0	0.0	1.0
 it	05_nuclear	1	63	0.0	0.0	0.0
 it	06_coal	1	63	0.0	0.0	0.0
 it	07_gas	1	63	0.0	0.0	0.0
 it	08_non-res	1	63	0.0	0.0	0.0
 it	09_hydro_pump	1	63	0.0	0.0	0.0
-it	01_solar	1	64	2000.0	1.0	0.0
-it	02_wind_on	1	64	2000.0	1.0	0.0
-it	03_wind_off	1	64	2000.0	1.0	0.0
-it	04_res	1	64	300.0	1.0	0.0
+it	01_solar	1	64	2000.0	0.0	1.0
+it	02_wind_on	1	64	2000.0	0.0	1.0
+it	03_wind_off	1	64	2000.0	0.0	1.0
+it	04_res	1	64	300.0	0.0	1.0
 it	05_nuclear	1	64	0.0	0.0	0.0
 it	06_coal	1	64	0.0	0.0	0.0
 it	07_gas	1	64	0.0	0.0	0.0
 it	08_non-res	1	64	0.0	0.0	0.0
 it	09_hydro_pump	1	64	0.0	0.0	0.0
-it	01_solar	1	65	2000.0	1.0	0.0
-it	02_wind_on	1	65	2000.0	1.0	0.0
-it	03_wind_off	1	65	2000.0	1.0	0.0
-it	04_res	1	65	400.0	1.0	0.0
+it	01_solar	1	65	2000.0	0.0	1.0
+it	02_wind_on	1	65	2000.0	0.0	1.0
+it	03_wind_off	1	65	2000.0	0.0	1.0
+it	04_res	1	65	400.0	0.0	1.0
 it	05_nuclear	1	65	0.0	0.0	0.0
 it	06_coal	1	65	0.0	0.0	0.0
 it	07_gas	1	65	0.0	0.0	0.0
 it	08_non-res	1	65	0.0	0.0	0.0
 it	09_hydro_pump	1	65	0.0	0.0	0.0
-it	01_solar	1	66	2000.0	1.0	0.0
-it	02_wind_on	1	66	2000.0	1.0	0.0
-it	03_wind_off	1	66	2000.0	1.0	0.0
-it	04_res	1	66	500.0	1.0	0.0
+it	01_solar	1	66	2000.0	0.0	1.0
+it	02_wind_on	1	66	2000.0	0.0	1.0
+it	03_wind_off	1	66	2000.0	0.0	1.0
+it	04_res	1	66	500.0	0.0	1.0
 it	05_nuclear	1	66	0.0	0.0	0.0
 it	06_coal	1	66	0.0	0.0	0.0
 it	07_gas	1	66	0.0	0.0	0.0
 it	08_non-res	1	66	0.0	0.0	0.0
 it	09_hydro_pump	1	66	0.0	0.0	0.0
-it	01_solar	1	67	2000.0	1.0	0.0
-it	02_wind_on	1	67	2000.0	1.0	0.0
-it	03_wind_off	1	67	2000.0	1.0	0.0
-it	04_res	1	67	600.0	1.0	0.0
+it	01_solar	1	67	2000.0	0.0	1.0
+it	02_wind_on	1	67	2000.0	0.0	1.0
+it	03_wind_off	1	67	2000.0	0.0	1.0
+it	04_res	1	67	600.0	0.0	1.0
 it	05_nuclear	1	67	0.0	0.0	0.0
 it	06_coal	1	67	0.0	0.0	0.0
 it	07_gas	1	67	0.0	0.0	0.0
 it	08_non-res	1	67	0.0	0.0	0.0
 it	09_hydro_pump	1	67	0.0	0.0	0.0
-it	01_solar	1	68	2000.0	1.0	0.0
-it	02_wind_on	1	68	2000.0	1.0	0.0
-it	03_wind_off	1	68	2000.0	1.0	0.0
-it	04_res	1	68	700.0	1.0	0.0
+it	01_solar	1	68	2000.0	0.0	1.0
+it	02_wind_on	1	68	2000.0	0.0	1.0
+it	03_wind_off	1	68	2000.0	0.0	1.0
+it	04_res	1	68	700.0	0.0	1.0
 it	05_nuclear	1	68	0.0	0.0	0.0
 it	06_coal	1	68	0.0	0.0	0.0
 it	07_gas	1	68	0.0	0.0	0.0
 it	08_non-res	1	68	0.0	0.0	0.0
 it	09_hydro_pump	1	68	0.0	0.0	0.0
-it	01_solar	1	69	2000.0	1.0	0.0
-it	02_wind_on	1	69	2000.0	1.0	0.0
-it	03_wind_off	1	69	2000.0	1.0	0.0
-it	04_res	1	69	800.0	1.0	0.0
+it	01_solar	1	69	2000.0	0.0	1.0
+it	02_wind_on	1	69	2000.0	0.0	1.0
+it	03_wind_off	1	69	2000.0	0.0	1.0
+it	04_res	1	69	800.0	0.0	1.0
 it	05_nuclear	1	69	0.0	0.0	0.0
 it	06_coal	1	69	0.0	0.0	0.0
 it	07_gas	1	69	0.0	0.0	0.0
 it	08_non-res	1	69	0.0	0.0	0.0
 it	09_hydro_pump	1	69	0.0	0.0	0.0
-it	01_solar	1	70	2000.0	1.0	0.0
-it	02_wind_on	1	70	2000.0	1.0	0.0
-it	03_wind_off	1	70	2000.0	1.0	0.0
-it	04_res	1	70	900.0	1.0	0.0
+it	01_solar	1	70	2000.0	0.0	1.0
+it	02_wind_on	1	70	2000.0	0.0	1.0
+it	03_wind_off	1	70	2000.0	0.0	1.0
+it	04_res	1	70	900.0	0.0	1.0
 it	05_nuclear	1	70	0.0	0.0	0.0
 it	06_coal	1	70	0.0	0.0	0.0
 it	07_gas	1	70	0.0	0.0	0.0
 it	08_non-res	1	70	0.0	0.0	0.0
 it	09_hydro_pump	1	70	0.0	0.0	0.0
-it	01_solar	1	71	2000.0	1.0	0.0
-it	02_wind_on	1	71	2000.0	1.0	0.0
-it	03_wind_off	1	71	2000.0	1.0	0.0
-it	04_res	1	71	1000.0	1.0	0.0
+it	01_solar	1	71	2000.0	0.0	1.0
+it	02_wind_on	1	71	2000.0	0.0	1.0
+it	03_wind_off	1	71	2000.0	0.0	1.0
+it	04_res	1	71	1000.0	0.0	1.0
 it	05_nuclear	1	71	0.0	0.0	0.0
 it	06_coal	1	71	0.0	0.0	0.0
 it	07_gas	1	71	0.0	0.0	0.0
 it	08_non-res	1	71	0.0	0.0	0.0
 it	09_hydro_pump	1	71	0.0	0.0	0.0
-it	01_solar	1	72	2000.0	1.0	0.0
-it	02_wind_on	1	72	2000.0	1.0	0.0
-it	03_wind_off	1	72	2000.0	1.0	0.0
-it	04_res	1	72	1100.0	1.0	0.0
+it	01_solar	1	72	2000.0	0.0	1.0
+it	02_wind_on	1	72	2000.0	0.0	1.0
+it	03_wind_off	1	72	2000.0	0.0	1.0
+it	04_res	1	72	1100.0	0.0	1.0
 it	05_nuclear	1	72	0.0	0.0	0.0
 it	06_coal	1	72	0.0	0.0	0.0
 it	07_gas	1	72	0.0	0.0	0.0
 it	08_non-res	1	72	0.0	0.0	0.0
 it	09_hydro_pump	1	72	0.0	0.0	0.0
-it	01_solar	1	73	2000.0	1.0	0.0
-it	02_wind_on	1	73	2000.0	1.0	0.0
-it	03_wind_off	1	73	2000.0	1.0	0.0
-it	04_res	1	73	1200.0	1.0	0.0
+it	01_solar	1	73	2000.0	0.0	1.0
+it	02_wind_on	1	73	2000.0	0.0	1.0
+it	03_wind_off	1	73	2000.0	0.0	1.0
+it	04_res	1	73	1200.0	0.0	1.0
 it	05_nuclear	1	73	0.0	0.0	0.0
 it	06_coal	1	73	0.0	0.0	0.0
 it	07_gas	1	73	0.0	0.0	0.0
 it	08_non-res	1	73	0.0	0.0	0.0
 it	09_hydro_pump	1	73	0.0	0.0	0.0
-it	01_solar	1	74	2000.0	1.0	0.0
-it	02_wind_on	1	74	2000.0	1.0	0.0
-it	03_wind_off	1	74	2000.0	1.0	0.0
-it	04_res	1	74	1300.0	1.0	0.0
+it	01_solar	1	74	2000.0	0.0	1.0
+it	02_wind_on	1	74	2000.0	0.0	1.0
+it	03_wind_off	1	74	2000.0	0.0	1.0
+it	04_res	1	74	1300.0	0.0	1.0
 it	05_nuclear	1	74	0.0	0.0	0.0
 it	06_coal	1	74	0.0	0.0	0.0
 it	07_gas	1	74	0.0	0.0	0.0
 it	08_non-res	1	74	0.0	0.0	0.0
 it	09_hydro_pump	1	74	0.0	0.0	0.0
-it	01_solar	1	75	2000.0	1.0	0.0
-it	02_wind_on	1	75	2000.0	1.0	0.0
-it	03_wind_off	1	75	2000.0	1.0	0.0
-it	04_res	1	75	1400.0	1.0	0.0
+it	01_solar	1	75	2000.0	0.0	1.0
+it	02_wind_on	1	75	2000.0	0.0	1.0
+it	03_wind_off	1	75	2000.0	0.0	1.0
+it	04_res	1	75	1400.0	0.0	1.0
 it	05_nuclear	1	75	0.0	0.0	0.0
 it	06_coal	1	75	0.0	0.0	0.0
 it	07_gas	1	75	0.0	0.0	0.0
 it	08_non-res	1	75	0.0	0.0	0.0
 it	09_hydro_pump	1	75	0.0	0.0	0.0
-it	01_solar	1	76	2000.0	1.0	0.0
-it	02_wind_on	1	76	2000.0	1.0	0.0
-it	03_wind_off	1	76	2000.0	1.0	0.0
-it	04_res	1	76	1500.0	1.0	0.0
+it	01_solar	1	76	2000.0	0.0	1.0
+it	02_wind_on	1	76	2000.0	0.0	1.0
+it	03_wind_off	1	76	2000.0	0.0	1.0
+it	04_res	1	76	1500.0	0.0	1.0
 it	05_nuclear	1	76	0.0	0.0	0.0
 it	06_coal	1	76	0.0	0.0	0.0
 it	07_gas	1	76	0.0	0.0	0.0
 it	08_non-res	1	76	0.0	0.0	0.0
 it	09_hydro_pump	1	76	0.0	0.0	0.0
-it	01_solar	1	77	2000.0	1.0	0.0
-it	02_wind_on	1	77	2000.0	1.0	0.0
-it	03_wind_off	1	77	2000.0	1.0	0.0
-it	04_res	1	77	1600.0	1.0	0.0
+it	01_solar	1	77	2000.0	0.0	1.0
+it	02_wind_on	1	77	2000.0	0.0	1.0
+it	03_wind_off	1	77	2000.0	0.0	1.0
+it	04_res	1	77	1600.0	0.0	1.0
 it	05_nuclear	1	77	0.0	0.0	0.0
 it	06_coal	1	77	0.0	0.0	0.0
 it	07_gas	1	77	0.0	0.0	0.0
 it	08_non-res	1	77	0.0	0.0	0.0
 it	09_hydro_pump	1	77	0.0	0.0	0.0
-it	01_solar	1	78	2000.0	1.0	0.0
-it	02_wind_on	1	78	2000.0	1.0	0.0
-it	03_wind_off	1	78	2000.0	1.0	0.0
-it	04_res	1	78	1700.0	1.0	0.0
+it	01_solar	1	78	2000.0	0.0	1.0
+it	02_wind_on	1	78	2000.0	0.0	1.0
+it	03_wind_off	1	78	2000.0	0.0	1.0
+it	04_res	1	78	1700.0	0.0	1.0
 it	05_nuclear	1	78	0.0	0.0	0.0
 it	06_coal	1	78	0.0	0.0	0.0
 it	07_gas	1	78	0.0	0.0	0.0
 it	08_non-res	1	78	0.0	0.0	0.0
 it	09_hydro_pump	1	78	0.0	0.0	0.0
-it	01_solar	1	79	2000.0	1.0	0.0
-it	02_wind_on	1	79	2000.0	1.0	0.0
-it	03_wind_off	1	79	2000.0	1.0	0.0
-it	04_res	1	79	1800.0	1.0	0.0
+it	01_solar	1	79	2000.0	0.0	1.0
+it	02_wind_on	1	79	2000.0	0.0	1.0
+it	03_wind_off	1	79	2000.0	0.0	1.0
+it	04_res	1	79	1800.0	0.0	1.0
 it	05_nuclear	1	79	0.0	0.0	0.0
 it	06_coal	1	79	0.0	0.0	0.0
 it	07_gas	1	79	0.0	0.0	0.0
 it	08_non-res	1	79	0.0	0.0	0.0
 it	09_hydro_pump	1	79	0.0	0.0	0.0
-it	01_solar	1	80	2000.0	1.0	0.0
-it	02_wind_on	1	80	2000.0	1.0	0.0
-it	03_wind_off	1	80	2000.0	1.0	0.0
-it	04_res	1	80	1900.0	1.0	0.0
+it	01_solar	1	80	2000.0	0.0	1.0
+it	02_wind_on	1	80	2000.0	0.0	1.0
+it	03_wind_off	1	80	2000.0	0.0	1.0
+it	04_res	1	80	1900.0	0.0	1.0
 it	05_nuclear	1	80	0.0	0.0	0.0
 it	06_coal	1	80	0.0	0.0	0.0
 it	07_gas	1	80	0.0	0.0	0.0
 it	08_non-res	1	80	0.0	0.0	0.0
 it	09_hydro_pump	1	80	0.0	0.0	0.0
-it	01_solar	1	81	2000.0	1.0	0.0
-it	02_wind_on	1	81	2000.0	1.0	0.0
-it	03_wind_off	1	81	2000.0	1.0	0.0
-it	04_res	1	81	2000.0	1.0	0.0
+it	01_solar	1	81	2000.0	0.0	1.0
+it	02_wind_on	1	81	2000.0	0.0	1.0
+it	03_wind_off	1	81	2000.0	0.0	1.0
+it	04_res	1	81	2000.0	0.0	1.0
 it	05_nuclear	1	81	0.0	0.0	0.0
 it	06_coal	1	81	0.0	0.0	0.0
 it	07_gas	1	81	0.0	0.0	0.0
 it	08_non-res	1	81	0.0	0.0	0.0
 it	09_hydro_pump	1	81	0.0	0.0	0.0
-it	01_solar	1	82	2000.0	1.0	0.0
-it	02_wind_on	1	82	2000.0	1.0	0.0
-it	03_wind_off	1	82	2000.0	1.0	0.0
-it	04_res	1	82	2000.0	1.0	0.0
-it	05_nuclear	1	82	100.0	1.0	0.0
+it	01_solar	1	82	2000.0	0.0	1.0
+it	02_wind_on	1	82	2000.0	0.0	1.0
+it	03_wind_off	1	82	2000.0	0.0	1.0
+it	04_res	1	82	2000.0	0.0	1.0
+it	05_nuclear	1	82	100.0	0.0	1.0
 it	06_coal	1	82	0.0	0.0	0.0
 it	07_gas	1	82	0.0	0.0	0.0
 it	08_non-res	1	82	0.0	0.0	0.0
 it	09_hydro_pump	1	82	0.0	0.0	0.0
-it	01_solar	1	83	2000.0	1.0	0.0
-it	02_wind_on	1	83	2000.0	1.0	0.0
-it	03_wind_off	1	83	2000.0	1.0	0.0
-it	04_res	1	83	2000.0	1.0	0.0
-it	05_nuclear	1	83	200.0	1.0	0.0
+it	01_solar	1	83	2000.0	0.0	1.0
+it	02_wind_on	1	83	2000.0	0.0	1.0
+it	03_wind_off	1	83	2000.0	0.0	1.0
+it	04_res	1	83	2000.0	0.0	1.0
+it	05_nuclear	1	83	200.0	0.0	1.0
 it	06_coal	1	83	0.0	0.0	0.0
 it	07_gas	1	83	0.0	0.0	0.0
 it	08_non-res	1	83	0.0	0.0	0.0
 it	09_hydro_pump	1	83	0.0	0.0	0.0
-it	01_solar	1	84	2000.0	1.0	0.0
-it	02_wind_on	1	84	2000.0	1.0	0.0
-it	03_wind_off	1	84	2000.0	1.0	0.0
-it	04_res	1	84	2000.0	1.0	0.0
-it	05_nuclear	1	84	300.0	1.0	0.0
+it	01_solar	1	84	2000.0	0.0	1.0
+it	02_wind_on	1	84	2000.0	0.0	1.0
+it	03_wind_off	1	84	2000.0	0.0	1.0
+it	04_res	1	84	2000.0	0.0	1.0
+it	05_nuclear	1	84	300.0	0.0	1.0
 it	06_coal	1	84	0.0	0.0	0.0
 it	07_gas	1	84	0.0	0.0	0.0
 it	08_non-res	1	84	0.0	0.0	0.0
 it	09_hydro_pump	1	84	0.0	0.0	0.0
-it	01_solar	1	85	2000.0	1.0	0.0
-it	02_wind_on	1	85	2000.0	1.0	0.0
-it	03_wind_off	1	85	2000.0	1.0	0.0
-it	04_res	1	85	2000.0	1.0	0.0
-it	05_nuclear	1	85	400.0	1.0	0.0
+it	01_solar	1	85	2000.0	0.0	1.0
+it	02_wind_on	1	85	2000.0	0.0	1.0
+it	03_wind_off	1	85	2000.0	0.0	1.0
+it	04_res	1	85	2000.0	0.0	1.0
+it	05_nuclear	1	85	400.0	0.0	1.0
 it	06_coal	1	85	0.0	0.0	0.0
 it	07_gas	1	85	0.0	0.0	0.0
 it	08_non-res	1	85	0.0	0.0	0.0
 it	09_hydro_pump	1	85	0.0	0.0	0.0
-it	01_solar	1	86	2000.0	1.0	0.0
-it	02_wind_on	1	86	2000.0	1.0	0.0
-it	03_wind_off	1	86	2000.0	1.0	0.0
-it	04_res	1	86	2000.0	1.0	0.0
-it	05_nuclear	1	86	500.0	1.0	0.0
+it	01_solar	1	86	2000.0	0.0	1.0
+it	02_wind_on	1	86	2000.0	0.0	1.0
+it	03_wind_off	1	86	2000.0	0.0	1.0
+it	04_res	1	86	2000.0	0.0	1.0
+it	05_nuclear	1	86	500.0	0.0	1.0
 it	06_coal	1	86	0.0	0.0	0.0
 it	07_gas	1	86	0.0	0.0	0.0
 it	08_non-res	1	86	0.0	0.0	0.0
 it	09_hydro_pump	1	86	0.0	0.0	0.0
-it	01_solar	1	87	2000.0	1.0	0.0
-it	02_wind_on	1	87	2000.0	1.0	0.0
-it	03_wind_off	1	87	2000.0	1.0	0.0
-it	04_res	1	87	2000.0	1.0	0.0
-it	05_nuclear	1	87	600.0	1.0	0.0
+it	01_solar	1	87	2000.0	0.0	1.0
+it	02_wind_on	1	87	2000.0	0.0	1.0
+it	03_wind_off	1	87	2000.0	0.0	1.0
+it	04_res	1	87	2000.0	0.0	1.0
+it	05_nuclear	1	87	600.0	0.0	1.0
 it	06_coal	1	87	0.0	0.0	0.0
 it	07_gas	1	87	0.0	0.0	0.0
 it	08_non-res	1	87	0.0	0.0	0.0
 it	09_hydro_pump	1	87	0.0	0.0	0.0
-it	01_solar	1	88	2000.0	1.0	0.0
-it	02_wind_on	1	88	2000.0	1.0	0.0
-it	03_wind_off	1	88	2000.0	1.0	0.0
-it	04_res	1	88	2000.0	1.0	0.0
-it	05_nuclear	1	88	700.0	1.0	0.0
+it	01_solar	1	88	2000.0	0.0	1.0
+it	02_wind_on	1	88	2000.0	0.0	1.0
+it	03_wind_off	1	88	2000.0	0.0	1.0
+it	04_res	1	88	2000.0	0.0	1.0
+it	05_nuclear	1	88	700.0	0.0	1.0
 it	06_coal	1	88	0.0	0.0	0.0
 it	07_gas	1	88	0.0	0.0	0.0
 it	08_non-res	1	88	0.0	0.0	0.0
 it	09_hydro_pump	1	88	0.0	0.0	0.0
-it	01_solar	1	89	2000.0	1.0	0.0
-it	02_wind_on	1	89	2000.0	1.0	0.0
-it	03_wind_off	1	89	2000.0	1.0	0.0
-it	04_res	1	89	2000.0	1.0	0.0
-it	05_nuclear	1	89	800.0	1.0	0.0
+it	01_solar	1	89	2000.0	0.0	1.0
+it	02_wind_on	1	89	2000.0	0.0	1.0
+it	03_wind_off	1	89	2000.0	0.0	1.0
+it	04_res	1	89	2000.0	0.0	1.0
+it	05_nuclear	1	89	800.0	0.0	1.0
 it	06_coal	1	89	0.0	0.0	0.0
 it	07_gas	1	89	0.0	0.0	0.0
 it	08_non-res	1	89	0.0	0.0	0.0
 it	09_hydro_pump	1	89	0.0	0.0	0.0
-it	01_solar	1	90	2000.0	1.0	0.0
-it	02_wind_on	1	90	2000.0	1.0	0.0
-it	03_wind_off	1	90	2000.0	1.0	0.0
-it	04_res	1	90	2000.0	1.0	0.0
-it	05_nuclear	1	90	900.0	1.0	0.0
+it	01_solar	1	90	2000.0	0.0	1.0
+it	02_wind_on	1	90	2000.0	0.0	1.0
+it	03_wind_off	1	90	2000.0	0.0	1.0
+it	04_res	1	90	2000.0	0.0	1.0
+it	05_nuclear	1	90	900.0	0.0	1.0
 it	06_coal	1	90	0.0	0.0	0.0
 it	07_gas	1	90	0.0	0.0	0.0
 it	08_non-res	1	90	0.0	0.0	0.0
 it	09_hydro_pump	1	90	0.0	0.0	0.0
-it	01_solar	1	91	2000.0	1.0	0.0
-it	02_wind_on	1	91	2000.0	1.0	0.0
-it	03_wind_off	1	91	2000.0	1.0	0.0
-it	04_res	1	91	2000.0	1.0	0.0
-it	05_nuclear	1	91	1000.0	1.0	0.0
+it	01_solar	1	91	2000.0	0.0	1.0
+it	02_wind_on	1	91	2000.0	0.0	1.0
+it	03_wind_off	1	91	2000.0	0.0	1.0
+it	04_res	1	91	2000.0	0.0	1.0
+it	05_nuclear	1	91	1000.0	0.0	1.0
 it	06_coal	1	91	0.0	0.0	0.0
 it	07_gas	1	91	0.0	0.0	0.0
 it	08_non-res	1	91	0.0	0.0	0.0
 it	09_hydro_pump	1	91	0.0	0.0	0.0
-it	01_solar	1	92	2000.0	1.0	0.0
-it	02_wind_on	1	92	2000.0	1.0	0.0
-it	03_wind_off	1	92	2000.0	1.0	0.0
-it	04_res	1	92	2000.0	1.0	0.0
-it	05_nuclear	1	92	1100.0	1.0	0.0
+it	01_solar	1	92	2000.0	0.0	1.0
+it	02_wind_on	1	92	2000.0	0.0	1.0
+it	03_wind_off	1	92	2000.0	0.0	1.0
+it	04_res	1	92	2000.0	0.0	1.0
+it	05_nuclear	1	92	1100.0	0.0	1.0
 it	06_coal	1	92	0.0	0.0	0.0
 it	07_gas	1	92	0.0	0.0	0.0
 it	08_non-res	1	92	0.0	0.0	0.0
 it	09_hydro_pump	1	92	0.0	0.0	0.0
-it	01_solar	1	93	2000.0	1.0	0.0
-it	02_wind_on	1	93	2000.0	1.0	0.0
-it	03_wind_off	1	93	2000.0	1.0	0.0
-it	04_res	1	93	2000.0	1.0	0.0
-it	05_nuclear	1	93	1200.0	1.0	0.0
+it	01_solar	1	93	2000.0	0.0	1.0
+it	02_wind_on	1	93	2000.0	0.0	1.0
+it	03_wind_off	1	93	2000.0	0.0	1.0
+it	04_res	1	93	2000.0	0.0	1.0
+it	05_nuclear	1	93	1200.0	0.0	1.0
 it	06_coal	1	93	0.0	0.0	0.0
 it	07_gas	1	93	0.0	0.0	0.0
 it	08_non-res	1	93	0.0	0.0	0.0
 it	09_hydro_pump	1	93	0.0	0.0	0.0
-it	01_solar	1	94	2000.0	1.0	0.0
-it	02_wind_on	1	94	2000.0	1.0	0.0
-it	03_wind_off	1	94	2000.0	1.0	0.0
-it	04_res	1	94	2000.0	1.0	0.0
-it	05_nuclear	1	94	1300.0	1.0	0.0
+it	01_solar	1	94	2000.0	0.0	1.0
+it	02_wind_on	1	94	2000.0	0.0	1.0
+it	03_wind_off	1	94	2000.0	0.0	1.0
+it	04_res	1	94	2000.0	0.0	1.0
+it	05_nuclear	1	94	1300.0	0.0	1.0
 it	06_coal	1	94	0.0	0.0	0.0
 it	07_gas	1	94	0.0	0.0	0.0
 it	08_non-res	1	94	0.0	0.0	0.0
 it	09_hydro_pump	1	94	0.0	0.0	0.0
-it	01_solar	1	95	2000.0	1.0	0.0
-it	02_wind_on	1	95	2000.0	1.0	0.0
-it	03_wind_off	1	95	2000.0	1.0	0.0
-it	04_res	1	95	2000.0	1.0	0.0
-it	05_nuclear	1	95	1400.0	1.0	0.0
+it	01_solar	1	95	2000.0	0.0	1.0
+it	02_wind_on	1	95	2000.0	0.0	1.0
+it	03_wind_off	1	95	2000.0	0.0	1.0
+it	04_res	1	95	2000.0	0.0	1.0
+it	05_nuclear	1	95	1400.0	0.0	1.0
 it	06_coal	1	95	0.0	0.0	0.0
 it	07_gas	1	95	0.0	0.0	0.0
 it	08_non-res	1	95	0.0	0.0	0.0
 it	09_hydro_pump	1	95	0.0	0.0	0.0
-it	01_solar	1	96	2000.0	1.0	0.0
-it	02_wind_on	1	96	2000.0	1.0	0.0
-it	03_wind_off	1	96	2000.0	1.0	0.0
-it	04_res	1	96	2000.0	1.0	0.0
-it	05_nuclear	1	96	1500.0	1.0	0.0
+it	01_solar	1	96	2000.0	0.0	1.0
+it	02_wind_on	1	96	2000.0	0.0	1.0
+it	03_wind_off	1	96	2000.0	0.0	1.0
+it	04_res	1	96	2000.0	0.0	1.0
+it	05_nuclear	1	96	1500.0	0.0	1.0
 it	06_coal	1	96	0.0	0.0	0.0
 it	07_gas	1	96	0.0	0.0	0.0
 it	08_non-res	1	96	0.0	0.0	0.0
 it	09_hydro_pump	1	96	0.0	0.0	0.0
-it	01_solar	1	97	2000.0	1.0	0.0
-it	02_wind_on	1	97	2000.0	1.0	0.0
-it	03_wind_off	1	97	2000.0	1.0	0.0
-it	04_res	1	97	2000.0	1.0	0.0
-it	05_nuclear	1	97	1600.0	1.0	0.0
+it	01_solar	1	97	2000.0	0.0	1.0
+it	02_wind_on	1	97	2000.0	0.0	1.0
+it	03_wind_off	1	97	2000.0	0.0	1.0
+it	04_res	1	97	2000.0	0.0	1.0
+it	05_nuclear	1	97	1600.0	0.0	1.0
 it	06_coal	1	97	0.0	0.0	0.0
 it	07_gas	1	97	0.0	0.0	0.0
 it	08_non-res	1	97	0.0	0.0	0.0
 it	09_hydro_pump	1	97	0.0	0.0	0.0
-it	01_solar	1	98	2000.0	1.0	0.0
-it	02_wind_on	1	98	2000.0	1.0	0.0
-it	03_wind_off	1	98	2000.0	1.0	0.0
-it	04_res	1	98	2000.0	1.0	0.0
-it	05_nuclear	1	98	1700.0	1.0	0.0
+it	01_solar	1	98	2000.0	0.0	1.0
+it	02_wind_on	1	98	2000.0	0.0	1.0
+it	03_wind_off	1	98	2000.0	0.0	1.0
+it	04_res	1	98	2000.0	0.0	1.0
+it	05_nuclear	1	98	1700.0	0.0	1.0
 it	06_coal	1	98	0.0	0.0	0.0
 it	07_gas	1	98	0.0	0.0	0.0
 it	08_non-res	1	98	0.0	0.0	0.0
 it	09_hydro_pump	1	98	0.0	0.0	0.0
-it	01_solar	1	99	2000.0	1.0	0.0
-it	02_wind_on	1	99	2000.0	1.0	0.0
-it	03_wind_off	1	99	2000.0	1.0	0.0
-it	04_res	1	99	2000.0	1.0	0.0
-it	05_nuclear	1	99	1800.0	1.0	0.0
+it	01_solar	1	99	2000.0	0.0	1.0
+it	02_wind_on	1	99	2000.0	0.0	1.0
+it	03_wind_off	1	99	2000.0	0.0	1.0
+it	04_res	1	99	2000.0	0.0	1.0
+it	05_nuclear	1	99	1800.0	0.0	1.0
 it	06_coal	1	99	0.0	0.0	0.0
 it	07_gas	1	99	0.0	0.0	0.0
 it	08_non-res	1	99	0.0	0.0	0.0
 it	09_hydro_pump	1	99	0.0	0.0	0.0
-it	01_solar	1	100	2000.0	1.0	0.0
-it	02_wind_on	1	100	2000.0	1.0	0.0
-it	03_wind_off	1	100	2000.0	1.0	0.0
-it	04_res	1	100	2000.0	1.0	0.0
-it	05_nuclear	1	100	1900.0	1.0	0.0
+it	01_solar	1	100	2000.0	0.0	1.0
+it	02_wind_on	1	100	2000.0	0.0	1.0
+it	03_wind_off	1	100	2000.0	0.0	1.0
+it	04_res	1	100	2000.0	0.0	1.0
+it	05_nuclear	1	100	1900.0	0.0	1.0
 it	06_coal	1	100	0.0	0.0	0.0
 it	07_gas	1	100	0.0	0.0	0.0
 it	08_non-res	1	100	0.0	0.0	0.0
 it	09_hydro_pump	1	100	0.0	0.0	0.0
-it	01_solar	1	101	2000.0	1.0	0.0
-it	02_wind_on	1	101	2000.0	1.0	0.0
-it	03_wind_off	1	101	2000.0	1.0	0.0
-it	04_res	1	101	2000.0	1.0	0.0
-it	05_nuclear	1	101	2000.0	1.0	0.0
+it	01_solar	1	101	2000.0	0.0	1.0
+it	02_wind_on	1	101	2000.0	0.0	1.0
+it	03_wind_off	1	101	2000.0	0.0	1.0
+it	04_res	1	101	2000.0	0.0	1.0
+it	05_nuclear	1	101	2000.0	0.0	1.0
 it	06_coal	1	101	0.0	0.0	0.0
 it	07_gas	1	101	0.0	0.0	0.0
 it	08_non-res	1	101	0.0	0.0	0.0
 it	09_hydro_pump	1	101	0.0	0.0	0.0
-it	01_solar	1	102	2000.0	1.0	0.0
-it	02_wind_on	1	102	2000.0	1.0	0.0
-it	03_wind_off	1	102	2000.0	1.0	0.0
-it	04_res	1	102	2000.0	1.0	0.0
-it	05_nuclear	1	102	2000.0	1.0	0.0
-it	06_coal	1	102	100.0	1.0	0.0
+it	01_solar	1	102	2000.0	0.0	1.0
+it	02_wind_on	1	102	2000.0	0.0	1.0
+it	03_wind_off	1	102	2000.0	0.0	1.0
+it	04_res	1	102	2000.0	0.0	1.0
+it	05_nuclear	1	102	2000.0	0.0	1.0
+it	06_coal	1	102	100.0	0.0	1.0
 it	07_gas	1	102	0.0	0.0	0.0
 it	08_non-res	1	102	0.0	0.0	0.0
 it	09_hydro_pump	1	102	0.0	0.0	0.0
-it	01_solar	1	103	2000.0	1.0	0.0
-it	02_wind_on	1	103	2000.0	1.0	0.0
-it	03_wind_off	1	103	2000.0	1.0	0.0
-it	04_res	1	103	2000.0	1.0	0.0
-it	05_nuclear	1	103	2000.0	1.0	0.0
-it	06_coal	1	103	200.0	1.0	0.0
+it	01_solar	1	103	2000.0	0.0	1.0
+it	02_wind_on	1	103	2000.0	0.0	1.0
+it	03_wind_off	1	103	2000.0	0.0	1.0
+it	04_res	1	103	2000.0	0.0	1.0
+it	05_nuclear	1	103	2000.0	0.0	1.0
+it	06_coal	1	103	200.0	0.0	1.0
 it	07_gas	1	103	0.0	0.0	0.0
 it	08_non-res	1	103	0.0	0.0	0.0
 it	09_hydro_pump	1	103	0.0	0.0	0.0
-it	01_solar	1	104	2000.0	1.0	0.0
-it	02_wind_on	1	104	2000.0	1.0	0.0
-it	03_wind_off	1	104	2000.0	1.0	0.0
-it	04_res	1	104	2000.0	1.0	0.0
-it	05_nuclear	1	104	2000.0	1.0	0.0
-it	06_coal	1	104	300.0	1.0	0.0
+it	01_solar	1	104	2000.0	0.0	1.0
+it	02_wind_on	1	104	2000.0	0.0	1.0
+it	03_wind_off	1	104	2000.0	0.0	1.0
+it	04_res	1	104	2000.0	0.0	1.0
+it	05_nuclear	1	104	2000.0	0.0	1.0
+it	06_coal	1	104	300.0	0.0	1.0
 it	07_gas	1	104	0.0	0.0	0.0
 it	08_non-res	1	104	0.0	0.0	0.0
 it	09_hydro_pump	1	104	0.0	0.0	0.0
-it	01_solar	1	105	2000.0	1.0	0.0
-it	02_wind_on	1	105	2000.0	1.0	0.0
-it	03_wind_off	1	105	2000.0	1.0	0.0
-it	04_res	1	105	2000.0	1.0	0.0
-it	05_nuclear	1	105	2000.0	1.0	0.0
-it	06_coal	1	105	400.0	1.0	0.0
+it	01_solar	1	105	2000.0	0.0	1.0
+it	02_wind_on	1	105	2000.0	0.0	1.0
+it	03_wind_off	1	105	2000.0	0.0	1.0
+it	04_res	1	105	2000.0	0.0	1.0
+it	05_nuclear	1	105	2000.0	0.0	1.0
+it	06_coal	1	105	400.0	0.0	1.0
 it	07_gas	1	105	0.0	0.0	0.0
 it	08_non-res	1	105	0.0	0.0	0.0
 it	09_hydro_pump	1	105	0.0	0.0	0.0
-it	01_solar	1	106	2000.0	1.0	0.0
-it	02_wind_on	1	106	2000.0	1.0	0.0
-it	03_wind_off	1	106	2000.0	1.0	0.0
-it	04_res	1	106	2000.0	1.0	0.0
-it	05_nuclear	1	106	2000.0	1.0	0.0
-it	06_coal	1	106	500.0	1.0	0.0
+it	01_solar	1	106	2000.0	0.0	1.0
+it	02_wind_on	1	106	2000.0	0.0	1.0
+it	03_wind_off	1	106	2000.0	0.0	1.0
+it	04_res	1	106	2000.0	0.0	1.0
+it	05_nuclear	1	106	2000.0	0.0	1.0
+it	06_coal	1	106	500.0	0.0	1.0
 it	07_gas	1	106	0.0	0.0	0.0
 it	08_non-res	1	106	0.0	0.0	0.0
 it	09_hydro_pump	1	106	0.0	0.0	0.0
-it	01_solar	1	107	2000.0	1.0	0.0
-it	02_wind_on	1	107	2000.0	1.0	0.0
-it	03_wind_off	1	107	2000.0	1.0	0.0
-it	04_res	1	107	2000.0	1.0	0.0
-it	05_nuclear	1	107	2000.0	1.0	0.0
-it	06_coal	1	107	600.0	1.0	0.0
+it	01_solar	1	107	2000.0	0.0	1.0
+it	02_wind_on	1	107	2000.0	0.0	1.0
+it	03_wind_off	1	107	2000.0	0.0	1.0
+it	04_res	1	107	2000.0	0.0	1.0
+it	05_nuclear	1	107	2000.0	0.0	1.0
+it	06_coal	1	107	600.0	0.0	1.0
 it	07_gas	1	107	0.0	0.0	0.0
 it	08_non-res	1	107	0.0	0.0	0.0
 it	09_hydro_pump	1	107	0.0	0.0	0.0
-it	01_solar	1	108	2000.0	1.0	0.0
-it	02_wind_on	1	108	2000.0	1.0	0.0
-it	03_wind_off	1	108	2000.0	1.0	0.0
-it	04_res	1	108	2000.0	1.0	0.0
-it	05_nuclear	1	108	2000.0	1.0	0.0
-it	06_coal	1	108	700.0	1.0	0.0
+it	01_solar	1	108	2000.0	0.0	1.0
+it	02_wind_on	1	108	2000.0	0.0	1.0
+it	03_wind_off	1	108	2000.0	0.0	1.0
+it	04_res	1	108	2000.0	0.0	1.0
+it	05_nuclear	1	108	2000.0	0.0	1.0
+it	06_coal	1	108	700.0	0.0	1.0
 it	07_gas	1	108	0.0	0.0	0.0
 it	08_non-res	1	108	0.0	0.0	0.0
 it	09_hydro_pump	1	108	0.0	0.0	0.0
-it	01_solar	1	109	2000.0	1.0	0.0
-it	02_wind_on	1	109	2000.0	1.0	0.0
-it	03_wind_off	1	109	2000.0	1.0	0.0
-it	04_res	1	109	2000.0	1.0	0.0
-it	05_nuclear	1	109	2000.0	1.0	0.0
-it	06_coal	1	109	800.0	1.0	0.0
+it	01_solar	1	109	2000.0	0.0	1.0
+it	02_wind_on	1	109	2000.0	0.0	1.0
+it	03_wind_off	1	109	2000.0	0.0	1.0
+it	04_res	1	109	2000.0	0.0	1.0
+it	05_nuclear	1	109	2000.0	0.0	1.0
+it	06_coal	1	109	800.0	0.0	1.0
 it	07_gas	1	109	0.0	0.0	0.0
 it	08_non-res	1	109	0.0	0.0	0.0
 it	09_hydro_pump	1	109	0.0	0.0	0.0
-it	01_solar	1	110	2000.0	1.0	0.0
-it	02_wind_on	1	110	2000.0	1.0	0.0
-it	03_wind_off	1	110	2000.0	1.0	0.0
-it	04_res	1	110	2000.0	1.0	0.0
-it	05_nuclear	1	110	2000.0	1.0	0.0
-it	06_coal	1	110	900.0	1.0	0.0
+it	01_solar	1	110	2000.0	0.0	1.0
+it	02_wind_on	1	110	2000.0	0.0	1.0
+it	03_wind_off	1	110	2000.0	0.0	1.0
+it	04_res	1	110	2000.0	0.0	1.0
+it	05_nuclear	1	110	2000.0	0.0	1.0
+it	06_coal	1	110	900.0	0.0	1.0
 it	07_gas	1	110	0.0	0.0	0.0
 it	08_non-res	1	110	0.0	0.0	0.0
 it	09_hydro_pump	1	110	0.0	0.0	0.0
-it	01_solar	1	111	2000.0	1.0	0.0
-it	02_wind_on	1	111	2000.0	1.0	0.0
-it	03_wind_off	1	111	2000.0	1.0	0.0
-it	04_res	1	111	2000.0	1.0	0.0
-it	05_nuclear	1	111	2000.0	1.0	0.0
-it	06_coal	1	111	1000.0	1.0	0.0
+it	01_solar	1	111	2000.0	0.0	1.0
+it	02_wind_on	1	111	2000.0	0.0	1.0
+it	03_wind_off	1	111	2000.0	0.0	1.0
+it	04_res	1	111	2000.0	0.0	1.0
+it	05_nuclear	1	111	2000.0	0.0	1.0
+it	06_coal	1	111	1000.0	0.0	1.0
 it	07_gas	1	111	0.0	0.0	0.0
 it	08_non-res	1	111	0.0	0.0	0.0
 it	09_hydro_pump	1	111	0.0	0.0	0.0
-it	01_solar	1	112	2000.0	1.0	0.0
-it	02_wind_on	1	112	2000.0	1.0	0.0
-it	03_wind_off	1	112	2000.0	1.0	0.0
-it	04_res	1	112	2000.0	1.0	0.0
-it	05_nuclear	1	112	2000.0	1.0	0.0
-it	06_coal	1	112	1100.0	1.0	0.0
+it	01_solar	1	112	2000.0	0.0	1.0
+it	02_wind_on	1	112	2000.0	0.0	1.0
+it	03_wind_off	1	112	2000.0	0.0	1.0
+it	04_res	1	112	2000.0	0.0	1.0
+it	05_nuclear	1	112	2000.0	0.0	1.0
+it	06_coal	1	112	1100.0	0.0	1.0
 it	07_gas	1	112	0.0	0.0	0.0
 it	08_non-res	1	112	0.0	0.0	0.0
 it	09_hydro_pump	1	112	0.0	0.0	0.0
-it	01_solar	1	113	2000.0	1.0	0.0
-it	02_wind_on	1	113	2000.0	1.0	0.0
-it	03_wind_off	1	113	2000.0	1.0	0.0
-it	04_res	1	113	2000.0	1.0	0.0
-it	05_nuclear	1	113	2000.0	1.0	0.0
-it	06_coal	1	113	1200.0	1.0	0.0
+it	01_solar	1	113	2000.0	0.0	1.0
+it	02_wind_on	1	113	2000.0	0.0	1.0
+it	03_wind_off	1	113	2000.0	0.0	1.0
+it	04_res	1	113	2000.0	0.0	1.0
+it	05_nuclear	1	113	2000.0	0.0	1.0
+it	06_coal	1	113	1200.0	0.0	1.0
 it	07_gas	1	113	0.0	0.0	0.0
 it	08_non-res	1	113	0.0	0.0	0.0
 it	09_hydro_pump	1	113	0.0	0.0	0.0
-it	01_solar	1	114	2000.0	1.0	0.0
-it	02_wind_on	1	114	2000.0	1.0	0.0
-it	03_wind_off	1	114	2000.0	1.0	0.0
-it	04_res	1	114	2000.0	1.0	0.0
-it	05_nuclear	1	114	2000.0	1.0	0.0
-it	06_coal	1	114	1300.0	1.0	0.0
+it	01_solar	1	114	2000.0	0.0	1.0
+it	02_wind_on	1	114	2000.0	0.0	1.0
+it	03_wind_off	1	114	2000.0	0.0	1.0
+it	04_res	1	114	2000.0	0.0	1.0
+it	05_nuclear	1	114	2000.0	0.0	1.0
+it	06_coal	1	114	1300.0	0.0	1.0
 it	07_gas	1	114	0.0	0.0	0.0
 it	08_non-res	1	114	0.0	0.0	0.0
 it	09_hydro_pump	1	114	0.0	0.0	0.0
-it	01_solar	1	115	2000.0	1.0	0.0
-it	02_wind_on	1	115	2000.0	1.0	0.0
-it	03_wind_off	1	115	2000.0	1.0	0.0
-it	04_res	1	115	2000.0	1.0	0.0
-it	05_nuclear	1	115	2000.0	1.0	0.0
-it	06_coal	1	115	1400.0	1.0	0.0
+it	01_solar	1	115	2000.0	0.0	1.0
+it	02_wind_on	1	115	2000.0	0.0	1.0
+it	03_wind_off	1	115	2000.0	0.0	1.0
+it	04_res	1	115	2000.0	0.0	1.0
+it	05_nuclear	1	115	2000.0	0.0	1.0
+it	06_coal	1	115	1400.0	0.0	1.0
 it	07_gas	1	115	0.0	0.0	0.0
 it	08_non-res	1	115	0.0	0.0	0.0
 it	09_hydro_pump	1	115	0.0	0.0	0.0
-it	01_solar	1	116	2000.0	1.0	0.0
-it	02_wind_on	1	116	2000.0	1.0	0.0
-it	03_wind_off	1	116	2000.0	1.0	0.0
-it	04_res	1	116	2000.0	1.0	0.0
-it	05_nuclear	1	116	2000.0	1.0	0.0
-it	06_coal	1	116	1500.0	1.0	0.0
+it	01_solar	1	116	2000.0	0.0	1.0
+it	02_wind_on	1	116	2000.0	0.0	1.0
+it	03_wind_off	1	116	2000.0	0.0	1.0
+it	04_res	1	116	2000.0	0.0	1.0
+it	05_nuclear	1	116	2000.0	0.0	1.0
+it	06_coal	1	116	1500.0	0.0	1.0
 it	07_gas	1	116	0.0	0.0	0.0
 it	08_non-res	1	116	0.0	0.0	0.0
 it	09_hydro_pump	1	116	0.0	0.0	0.0
-it	01_solar	1	117	2000.0	1.0	0.0
-it	02_wind_on	1	117	2000.0	1.0	0.0
-it	03_wind_off	1	117	2000.0	1.0	0.0
-it	04_res	1	117	2000.0	1.0	0.0
-it	05_nuclear	1	117	2000.0	1.0	0.0
-it	06_coal	1	117	1600.0	1.0	0.0
+it	01_solar	1	117	2000.0	0.0	1.0
+it	02_wind_on	1	117	2000.0	0.0	1.0
+it	03_wind_off	1	117	2000.0	0.0	1.0
+it	04_res	1	117	2000.0	0.0	1.0
+it	05_nuclear	1	117	2000.0	0.0	1.0
+it	06_coal	1	117	1600.0	0.0	1.0
 it	07_gas	1	117	0.0	0.0	0.0
 it	08_non-res	1	117	0.0	0.0	0.0
 it	09_hydro_pump	1	117	0.0	0.0	0.0
-it	01_solar	1	118	2000.0	1.0	0.0
-it	02_wind_on	1	118	2000.0	1.0	0.0
-it	03_wind_off	1	118	2000.0	1.0	0.0
-it	04_res	1	118	2000.0	1.0	0.0
-it	05_nuclear	1	118	2000.0	1.0	0.0
-it	06_coal	1	118	1700.0	1.0	0.0
+it	01_solar	1	118	2000.0	0.0	1.0
+it	02_wind_on	1	118	2000.0	0.0	1.0
+it	03_wind_off	1	118	2000.0	0.0	1.0
+it	04_res	1	118	2000.0	0.0	1.0
+it	05_nuclear	1	118	2000.0	0.0	1.0
+it	06_coal	1	118	1700.0	0.0	1.0
 it	07_gas	1	118	0.0	0.0	0.0
 it	08_non-res	1	118	0.0	0.0	0.0
 it	09_hydro_pump	1	118	0.0	0.0	0.0
-it	01_solar	1	119	2000.0	1.0	0.0
-it	02_wind_on	1	119	2000.0	1.0	0.0
-it	03_wind_off	1	119	2000.0	1.0	0.0
-it	04_res	1	119	2000.0	1.0	0.0
-it	05_nuclear	1	119	2000.0	1.0	0.0
-it	06_coal	1	119	1800.0	1.0	0.0
+it	01_solar	1	119	2000.0	0.0	1.0
+it	02_wind_on	1	119	2000.0	0.0	1.0
+it	03_wind_off	1	119	2000.0	0.0	1.0
+it	04_res	1	119	2000.0	0.0	1.0
+it	05_nuclear	1	119	2000.0	0.0	1.0
+it	06_coal	1	119	1800.0	0.0	1.0
 it	07_gas	1	119	0.0	0.0	0.0
 it	08_non-res	1	119	0.0	0.0	0.0
 it	09_hydro_pump	1	119	0.0	0.0	0.0
-it	01_solar	1	120	2000.0	1.0	0.0
-it	02_wind_on	1	120	2000.0	1.0	0.0
-it	03_wind_off	1	120	2000.0	1.0	0.0
-it	04_res	1	120	2000.0	1.0	0.0
-it	05_nuclear	1	120	2000.0	1.0	0.0
-it	06_coal	1	120	1900.0	1.0	0.0
+it	01_solar	1	120	2000.0	0.0	1.0
+it	02_wind_on	1	120	2000.0	0.0	1.0
+it	03_wind_off	1	120	2000.0	0.0	1.0
+it	04_res	1	120	2000.0	0.0	1.0
+it	05_nuclear	1	120	2000.0	0.0	1.0
+it	06_coal	1	120	1900.0	0.0	1.0
 it	07_gas	1	120	0.0	0.0	0.0
 it	08_non-res	1	120	0.0	0.0	0.0
 it	09_hydro_pump	1	120	0.0	0.0	0.0
-it	01_solar	1	121	2000.0	1.0	0.0
-it	02_wind_on	1	121	2000.0	1.0	0.0
-it	03_wind_off	1	121	2000.0	1.0	0.0
-it	04_res	1	121	2000.0	1.0	0.0
-it	05_nuclear	1	121	2000.0	1.0	0.0
-it	06_coal	1	121	2000.0	1.0	0.0
+it	01_solar	1	121	2000.0	0.0	1.0
+it	02_wind_on	1	121	2000.0	0.0	1.0
+it	03_wind_off	1	121	2000.0	0.0	1.0
+it	04_res	1	121	2000.0	0.0	1.0
+it	05_nuclear	1	121	2000.0	0.0	1.0
+it	06_coal	1	121	2000.0	0.0	1.0
 it	07_gas	1	121	0.0	0.0	0.0
 it	08_non-res	1	121	0.0	0.0	0.0
 it	09_hydro_pump	1	121	0.0	0.0	0.0
-it	01_solar	1	122	2000.0	1.0	0.0
-it	02_wind_on	1	122	2000.0	1.0	0.0
-it	03_wind_off	1	122	2000.0	1.0	0.0
-it	04_res	1	122	2000.0	1.0	0.0
-it	05_nuclear	1	122	2000.0	1.0	0.0
-it	06_coal	1	122	2000.0	1.0	0.0
-it	07_gas	1	122	100.0	1.0	0.0
+it	01_solar	1	122	2000.0	0.0	1.0
+it	02_wind_on	1	122	2000.0	0.0	1.0
+it	03_wind_off	1	122	2000.0	0.0	1.0
+it	04_res	1	122	2000.0	0.0	1.0
+it	05_nuclear	1	122	2000.0	0.0	1.0
+it	06_coal	1	122	2000.0	0.0	1.0
+it	07_gas	1	122	100.0	0.0	1.0
 it	08_non-res	1	122	0.0	0.0	0.0
 it	09_hydro_pump	1	122	0.0	0.0	0.0
-it	01_solar	1	123	2000.0	1.0	0.0
-it	02_wind_on	1	123	2000.0	1.0	0.0
-it	03_wind_off	1	123	2000.0	1.0	0.0
-it	04_res	1	123	2000.0	1.0	0.0
-it	05_nuclear	1	123	2000.0	1.0	0.0
-it	06_coal	1	123	2000.0	1.0	0.0
-it	07_gas	1	123	200.0	1.0	0.0
+it	01_solar	1	123	2000.0	0.0	1.0
+it	02_wind_on	1	123	2000.0	0.0	1.0
+it	03_wind_off	1	123	2000.0	0.0	1.0
+it	04_res	1	123	2000.0	0.0	1.0
+it	05_nuclear	1	123	2000.0	0.0	1.0
+it	06_coal	1	123	2000.0	0.0	1.0
+it	07_gas	1	123	200.0	0.0	1.0
 it	08_non-res	1	123	0.0	0.0	0.0
 it	09_hydro_pump	1	123	0.0	0.0	0.0
-it	01_solar	1	124	2000.0	1.0	0.0
-it	02_wind_on	1	124	2000.0	1.0	0.0
-it	03_wind_off	1	124	2000.0	1.0	0.0
-it	04_res	1	124	2000.0	1.0	0.0
-it	05_nuclear	1	124	2000.0	1.0	0.0
-it	06_coal	1	124	2000.0	1.0	0.0
-it	07_gas	1	124	300.0	1.0	0.0
+it	01_solar	1	124	2000.0	0.0	1.0
+it	02_wind_on	1	124	2000.0	0.0	1.0
+it	03_wind_off	1	124	2000.0	0.0	1.0
+it	04_res	1	124	2000.0	0.0	1.0
+it	05_nuclear	1	124	2000.0	0.0	1.0
+it	06_coal	1	124	2000.0	0.0	1.0
+it	07_gas	1	124	300.0	0.0	1.0
 it	08_non-res	1	124	0.0	0.0	0.0
 it	09_hydro_pump	1	124	0.0	0.0	0.0
-it	01_solar	1	125	2000.0	1.0	0.0
-it	02_wind_on	1	125	2000.0	1.0	0.0
-it	03_wind_off	1	125	2000.0	1.0	0.0
-it	04_res	1	125	2000.0	1.0	0.0
-it	05_nuclear	1	125	2000.0	1.0	0.0
-it	06_coal	1	125	2000.0	1.0	0.0
-it	07_gas	1	125	400.0	1.0	0.0
+it	01_solar	1	125	2000.0	0.0	1.0
+it	02_wind_on	1	125	2000.0	0.0	1.0
+it	03_wind_off	1	125	2000.0	0.0	1.0
+it	04_res	1	125	2000.0	0.0	1.0
+it	05_nuclear	1	125	2000.0	0.0	1.0
+it	06_coal	1	125	2000.0	0.0	1.0
+it	07_gas	1	125	400.0	0.0	1.0
 it	08_non-res	1	125	0.0	0.0	0.0
 it	09_hydro_pump	1	125	0.0	0.0	0.0
-it	01_solar	1	126	2000.0	1.0	0.0
-it	02_wind_on	1	126	2000.0	1.0	0.0
-it	03_wind_off	1	126	2000.0	1.0	0.0
-it	04_res	1	126	2000.0	1.0	0.0
-it	05_nuclear	1	126	2000.0	1.0	0.0
-it	06_coal	1	126	2000.0	1.0	0.0
-it	07_gas	1	126	500.0	1.0	0.0
+it	01_solar	1	126	2000.0	0.0	1.0
+it	02_wind_on	1	126	2000.0	0.0	1.0
+it	03_wind_off	1	126	2000.0	0.0	1.0
+it	04_res	1	126	2000.0	0.0	1.0
+it	05_nuclear	1	126	2000.0	0.0	1.0
+it	06_coal	1	126	2000.0	0.0	1.0
+it	07_gas	1	126	500.0	0.0	1.0
 it	08_non-res	1	126	0.0	0.0	0.0
 it	09_hydro_pump	1	126	0.0	0.0	0.0
-it	01_solar	1	127	2000.0	1.0	0.0
-it	02_wind_on	1	127	2000.0	1.0	0.0
-it	03_wind_off	1	127	2000.0	1.0	0.0
-it	04_res	1	127	2000.0	1.0	0.0
-it	05_nuclear	1	127	2000.0	1.0	0.0
-it	06_coal	1	127	2000.0	1.0	0.0
-it	07_gas	1	127	600.0	1.0	0.0
+it	01_solar	1	127	2000.0	0.0	1.0
+it	02_wind_on	1	127	2000.0	0.0	1.0
+it	03_wind_off	1	127	2000.0	0.0	1.0
+it	04_res	1	127	2000.0	0.0	1.0
+it	05_nuclear	1	127	2000.0	0.0	1.0
+it	06_coal	1	127	2000.0	0.0	1.0
+it	07_gas	1	127	600.0	0.0	1.0
 it	08_non-res	1	127	0.0	0.0	0.0
 it	09_hydro_pump	1	127	0.0	0.0	0.0
-it	01_solar	1	128	2000.0	1.0	0.0
-it	02_wind_on	1	128	2000.0	1.0	0.0
-it	03_wind_off	1	128	2000.0	1.0	0.0
-it	04_res	1	128	2000.0	1.0	0.0
-it	05_nuclear	1	128	2000.0	1.0	0.0
-it	06_coal	1	128	2000.0	1.0	0.0
-it	07_gas	1	128	700.0	1.0	0.0
+it	01_solar	1	128	2000.0	0.0	1.0
+it	02_wind_on	1	128	2000.0	0.0	1.0
+it	03_wind_off	1	128	2000.0	0.0	1.0
+it	04_res	1	128	2000.0	0.0	1.0
+it	05_nuclear	1	128	2000.0	0.0	1.0
+it	06_coal	1	128	2000.0	0.0	1.0
+it	07_gas	1	128	700.0	0.0	1.0
 it	08_non-res	1	128	0.0	0.0	0.0
 it	09_hydro_pump	1	128	0.0	0.0	0.0
-it	01_solar	1	129	2000.0	1.0	0.0
-it	02_wind_on	1	129	2000.0	1.0	0.0
-it	03_wind_off	1	129	2000.0	1.0	0.0
-it	04_res	1	129	2000.0	1.0	0.0
-it	05_nuclear	1	129	2000.0	1.0	0.0
-it	06_coal	1	129	2000.0	1.0	0.0
-it	07_gas	1	129	800.0	1.0	0.0
+it	01_solar	1	129	2000.0	0.0	1.0
+it	02_wind_on	1	129	2000.0	0.0	1.0
+it	03_wind_off	1	129	2000.0	0.0	1.0
+it	04_res	1	129	2000.0	0.0	1.0
+it	05_nuclear	1	129	2000.0	0.0	1.0
+it	06_coal	1	129	2000.0	0.0	1.0
+it	07_gas	1	129	800.0	0.0	1.0
 it	08_non-res	1	129	0.0	0.0	0.0
 it	09_hydro_pump	1	129	0.0	0.0	0.0
-it	01_solar	1	130	2000.0	1.0	0.0
-it	02_wind_on	1	130	2000.0	1.0	0.0
-it	03_wind_off	1	130	2000.0	1.0	0.0
-it	04_res	1	130	2000.0	1.0	0.0
-it	05_nuclear	1	130	2000.0	1.0	0.0
-it	06_coal	1	130	2000.0	1.0	0.0
-it	07_gas	1	130	900.0	1.0	0.0
+it	01_solar	1	130	2000.0	0.0	1.0
+it	02_wind_on	1	130	2000.0	0.0	1.0
+it	03_wind_off	1	130	2000.0	0.0	1.0
+it	04_res	1	130	2000.0	0.0	1.0
+it	05_nuclear	1	130	2000.0	0.0	1.0
+it	06_coal	1	130	2000.0	0.0	1.0
+it	07_gas	1	130	900.0	0.0	1.0
 it	08_non-res	1	130	0.0	0.0	0.0
 it	09_hydro_pump	1	130	0.0	0.0	0.0
-it	01_solar	1	131	2000.0	1.0	0.0
-it	02_wind_on	1	131	2000.0	1.0	0.0
-it	03_wind_off	1	131	2000.0	1.0	0.0
-it	04_res	1	131	2000.0	1.0	0.0
-it	05_nuclear	1	131	2000.0	1.0	0.0
-it	06_coal	1	131	2000.0	1.0	0.0
-it	07_gas	1	131	1000.0	1.0	0.0
+it	01_solar	1	131	2000.0	0.0	1.0
+it	02_wind_on	1	131	2000.0	0.0	1.0
+it	03_wind_off	1	131	2000.0	0.0	1.0
+it	04_res	1	131	2000.0	0.0	1.0
+it	05_nuclear	1	131	2000.0	0.0	1.0
+it	06_coal	1	131	2000.0	0.0	1.0
+it	07_gas	1	131	1000.0	0.0	1.0
 it	08_non-res	1	131	0.0	0.0	0.0
 it	09_hydro_pump	1	131	0.0	0.0	0.0
-it	01_solar	1	132	2000.0	1.0	0.0
-it	02_wind_on	1	132	2000.0	1.0	0.0
-it	03_wind_off	1	132	2000.0	1.0	0.0
-it	04_res	1	132	2000.0	1.0	0.0
-it	05_nuclear	1	132	2000.0	1.0	0.0
-it	06_coal	1	132	2000.0	1.0	0.0
-it	07_gas	1	132	1100.0	1.0	0.0
+it	01_solar	1	132	2000.0	0.0	1.0
+it	02_wind_on	1	132	2000.0	0.0	1.0
+it	03_wind_off	1	132	2000.0	0.0	1.0
+it	04_res	1	132	2000.0	0.0	1.0
+it	05_nuclear	1	132	2000.0	0.0	1.0
+it	06_coal	1	132	2000.0	0.0	1.0
+it	07_gas	1	132	1100.0	0.0	1.0
 it	08_non-res	1	132	0.0	0.0	0.0
 it	09_hydro_pump	1	132	0.0	0.0	0.0
-it	01_solar	1	133	2000.0	1.0	0.0
-it	02_wind_on	1	133	2000.0	1.0	0.0
-it	03_wind_off	1	133	2000.0	1.0	0.0
-it	04_res	1	133	2000.0	1.0	0.0
-it	05_nuclear	1	133	2000.0	1.0	0.0
-it	06_coal	1	133	2000.0	1.0	0.0
-it	07_gas	1	133	1200.0	1.0	0.0
+it	01_solar	1	133	2000.0	0.0	1.0
+it	02_wind_on	1	133	2000.0	0.0	1.0
+it	03_wind_off	1	133	2000.0	0.0	1.0
+it	04_res	1	133	2000.0	0.0	1.0
+it	05_nuclear	1	133	2000.0	0.0	1.0
+it	06_coal	1	133	2000.0	0.0	1.0
+it	07_gas	1	133	1200.0	0.0	1.0
 it	08_non-res	1	133	0.0	0.0	0.0
 it	09_hydro_pump	1	133	0.0	0.0	0.0
-it	01_solar	1	134	2000.0	1.0	0.0
-it	02_wind_on	1	134	2000.0	1.0	0.0
-it	03_wind_off	1	134	2000.0	1.0	0.0
-it	04_res	1	134	2000.0	1.0	0.0
-it	05_nuclear	1	134	2000.0	1.0	0.0
-it	06_coal	1	134	2000.0	1.0	0.0
-it	07_gas	1	134	1300.0	1.0	0.0
+it	01_solar	1	134	2000.0	0.0	1.0
+it	02_wind_on	1	134	2000.0	0.0	1.0
+it	03_wind_off	1	134	2000.0	0.0	1.0
+it	04_res	1	134	2000.0	0.0	1.0
+it	05_nuclear	1	134	2000.0	0.0	1.0
+it	06_coal	1	134	2000.0	0.0	1.0
+it	07_gas	1	134	1300.0	0.0	1.0
 it	08_non-res	1	134	0.0	0.0	0.0
 it	09_hydro_pump	1	134	0.0	0.0	0.0
-it	01_solar	1	135	2000.0	1.0	0.0
-it	02_wind_on	1	135	2000.0	1.0	0.0
-it	03_wind_off	1	135	2000.0	1.0	0.0
-it	04_res	1	135	2000.0	1.0	0.0
-it	05_nuclear	1	135	2000.0	1.0	0.0
-it	06_coal	1	135	2000.0	1.0	0.0
-it	07_gas	1	135	1400.0	1.0	0.0
+it	01_solar	1	135	2000.0	0.0	1.0
+it	02_wind_on	1	135	2000.0	0.0	1.0
+it	03_wind_off	1	135	2000.0	0.0	1.0
+it	04_res	1	135	2000.0	0.0	1.0
+it	05_nuclear	1	135	2000.0	0.0	1.0
+it	06_coal	1	135	2000.0	0.0	1.0
+it	07_gas	1	135	1400.0	0.0	1.0
 it	08_non-res	1	135	0.0	0.0	0.0
 it	09_hydro_pump	1	135	0.0	0.0	0.0
-it	01_solar	1	136	2000.0	1.0	0.0
-it	02_wind_on	1	136	2000.0	1.0	0.0
-it	03_wind_off	1	136	2000.0	1.0	0.0
-it	04_res	1	136	2000.0	1.0	0.0
-it	05_nuclear	1	136	2000.0	1.0	0.0
-it	06_coal	1	136	2000.0	1.0	0.0
-it	07_gas	1	136	1500.0	1.0	0.0
+it	01_solar	1	136	2000.0	0.0	1.0
+it	02_wind_on	1	136	2000.0	0.0	1.0
+it	03_wind_off	1	136	2000.0	0.0	1.0
+it	04_res	1	136	2000.0	0.0	1.0
+it	05_nuclear	1	136	2000.0	0.0	1.0
+it	06_coal	1	136	2000.0	0.0	1.0
+it	07_gas	1	136	1500.0	0.0	1.0
 it	08_non-res	1	136	0.0	0.0	0.0
 it	09_hydro_pump	1	136	0.0	0.0	0.0
-it	01_solar	1	137	2000.0	1.0	0.0
-it	02_wind_on	1	137	2000.0	1.0	0.0
-it	03_wind_off	1	137	2000.0	1.0	0.0
-it	04_res	1	137	2000.0	1.0	0.0
-it	05_nuclear	1	137	2000.0	1.0	0.0
-it	06_coal	1	137	2000.0	1.0	0.0
-it	07_gas	1	137	1600.0	1.0	0.0
+it	01_solar	1	137	2000.0	0.0	1.0
+it	02_wind_on	1	137	2000.0	0.0	1.0
+it	03_wind_off	1	137	2000.0	0.0	1.0
+it	04_res	1	137	2000.0	0.0	1.0
+it	05_nuclear	1	137	2000.0	0.0	1.0
+it	06_coal	1	137	2000.0	0.0	1.0
+it	07_gas	1	137	1600.0	0.0	1.0
 it	08_non-res	1	137	0.0	0.0	0.0
 it	09_hydro_pump	1	137	0.0	0.0	0.0
-it	01_solar	1	138	2000.0	1.0	0.0
-it	02_wind_on	1	138	2000.0	1.0	0.0
-it	03_wind_off	1	138	2000.0	1.0	0.0
-it	04_res	1	138	2000.0	1.0	0.0
-it	05_nuclear	1	138	2000.0	1.0	0.0
-it	06_coal	1	138	2000.0	1.0	0.0
-it	07_gas	1	138	1700.0	1.0	0.0
+it	01_solar	1	138	2000.0	0.0	1.0
+it	02_wind_on	1	138	2000.0	0.0	1.0
+it	03_wind_off	1	138	2000.0	0.0	1.0
+it	04_res	1	138	2000.0	0.0	1.0
+it	05_nuclear	1	138	2000.0	0.0	1.0
+it	06_coal	1	138	2000.0	0.0	1.0
+it	07_gas	1	138	1700.0	0.0	1.0
 it	08_non-res	1	138	0.0	0.0	0.0
 it	09_hydro_pump	1	138	0.0	0.0	0.0
-it	01_solar	1	139	2000.0	1.0	0.0
-it	02_wind_on	1	139	2000.0	1.0	0.0
-it	03_wind_off	1	139	2000.0	1.0	0.0
-it	04_res	1	139	2000.0	1.0	0.0
-it	05_nuclear	1	139	2000.0	1.0	0.0
-it	06_coal	1	139	2000.0	1.0	0.0
-it	07_gas	1	139	1800.0	1.0	0.0
+it	01_solar	1	139	2000.0	0.0	1.0
+it	02_wind_on	1	139	2000.0	0.0	1.0
+it	03_wind_off	1	139	2000.0	0.0	1.0
+it	04_res	1	139	2000.0	0.0	1.0
+it	05_nuclear	1	139	2000.0	0.0	1.0
+it	06_coal	1	139	2000.0	0.0	1.0
+it	07_gas	1	139	1800.0	0.0	1.0
 it	08_non-res	1	139	0.0	0.0	0.0
 it	09_hydro_pump	1	139	0.0	0.0	0.0
-it	01_solar	1	140	2000.0	1.0	0.0
-it	02_wind_on	1	140	2000.0	1.0	0.0
-it	03_wind_off	1	140	2000.0	1.0	0.0
-it	04_res	1	140	2000.0	1.0	0.0
-it	05_nuclear	1	140	2000.0	1.0	0.0
-it	06_coal	1	140	2000.0	1.0	0.0
-it	07_gas	1	140	1900.0	1.0	0.0
+it	01_solar	1	140	2000.0	0.0	1.0
+it	02_wind_on	1	140	2000.0	0.0	1.0
+it	03_wind_off	1	140	2000.0	0.0	1.0
+it	04_res	1	140	2000.0	0.0	1.0
+it	05_nuclear	1	140	2000.0	0.0	1.0
+it	06_coal	1	140	2000.0	0.0	1.0
+it	07_gas	1	140	1900.0	0.0	1.0
 it	08_non-res	1	140	0.0	0.0	0.0
 it	09_hydro_pump	1	140	0.0	0.0	0.0
-it	01_solar	1	141	2000.0	1.0	0.0
-it	02_wind_on	1	141	2000.0	1.0	0.0
-it	03_wind_off	1	141	2000.0	1.0	0.0
-it	04_res	1	141	2000.0	1.0	0.0
-it	05_nuclear	1	141	2000.0	1.0	0.0
-it	06_coal	1	141	2000.0	1.0	0.0
-it	07_gas	1	141	2000.0	1.0	0.0
+it	01_solar	1	141	2000.0	0.0	1.0
+it	02_wind_on	1	141	2000.0	0.0	1.0
+it	03_wind_off	1	141	2000.0	0.0	1.0
+it	04_res	1	141	2000.0	0.0	1.0
+it	05_nuclear	1	141	2000.0	0.0	1.0
+it	06_coal	1	141	2000.0	0.0	1.0
+it	07_gas	1	141	2000.0	0.0	1.0
 it	08_non-res	1	141	0.0	0.0	0.0
 it	09_hydro_pump	1	141	0.0	0.0	0.0
-it	01_solar	1	142	2000.0	1.0	0.0
-it	02_wind_on	1	142	2000.0	1.0	0.0
-it	03_wind_off	1	142	2000.0	1.0	0.0
-it	04_res	1	142	2000.0	1.0	0.0
-it	05_nuclear	1	142	2000.0	1.0	0.0
-it	06_coal	1	142	2000.0	1.0	0.0
-it	07_gas	1	142	2000.0	1.0	0.0
-it	08_non-res	1	142	100.0	1.0	0.0
+it	01_solar	1	142	2000.0	0.0	1.0
+it	02_wind_on	1	142	2000.0	0.0	1.0
+it	03_wind_off	1	142	2000.0	0.0	1.0
+it	04_res	1	142	2000.0	0.0	1.0
+it	05_nuclear	1	142	2000.0	0.0	1.0
+it	06_coal	1	142	2000.0	0.0	1.0
+it	07_gas	1	142	2000.0	0.0	1.0
+it	08_non-res	1	142	100.0	0.0	1.0
 it	09_hydro_pump	1	142	0.0	0.0	0.0
-it	01_solar	1	143	2000.0	1.0	0.0
-it	02_wind_on	1	143	2000.0	1.0	0.0
-it	03_wind_off	1	143	2000.0	1.0	0.0
-it	04_res	1	143	2000.0	1.0	0.0
-it	05_nuclear	1	143	2000.0	1.0	0.0
-it	06_coal	1	143	2000.0	1.0	0.0
-it	07_gas	1	143	2000.0	1.0	0.0
-it	08_non-res	1	143	200.0	1.0	0.0
+it	01_solar	1	143	2000.0	0.0	1.0
+it	02_wind_on	1	143	2000.0	0.0	1.0
+it	03_wind_off	1	143	2000.0	0.0	1.0
+it	04_res	1	143	2000.0	0.0	1.0
+it	05_nuclear	1	143	2000.0	0.0	1.0
+it	06_coal	1	143	2000.0	0.0	1.0
+it	07_gas	1	143	2000.0	0.0	1.0
+it	08_non-res	1	143	200.0	0.0	1.0
 it	09_hydro_pump	1	143	0.0	0.0	0.0
-it	01_solar	1	144	2000.0	1.0	0.0
-it	02_wind_on	1	144	2000.0	1.0	0.0
-it	03_wind_off	1	144	2000.0	1.0	0.0
-it	04_res	1	144	2000.0	1.0	0.0
-it	05_nuclear	1	144	2000.0	1.0	0.0
-it	06_coal	1	144	2000.0	1.0	0.0
-it	07_gas	1	144	2000.0	1.0	0.0
-it	08_non-res	1	144	300.0	1.0	0.0
+it	01_solar	1	144	2000.0	0.0	1.0
+it	02_wind_on	1	144	2000.0	0.0	1.0
+it	03_wind_off	1	144	2000.0	0.0	1.0
+it	04_res	1	144	2000.0	0.0	1.0
+it	05_nuclear	1	144	2000.0	0.0	1.0
+it	06_coal	1	144	2000.0	0.0	1.0
+it	07_gas	1	144	2000.0	0.0	1.0
+it	08_non-res	1	144	300.0	0.0	1.0
 it	09_hydro_pump	1	144	0.0	0.0	0.0
-it	01_solar	1	145	2000.0	1.0	0.0
-it	02_wind_on	1	145	2000.0	1.0	0.0
-it	03_wind_off	1	145	2000.0	1.0	0.0
-it	04_res	1	145	2000.0	1.0	0.0
-it	05_nuclear	1	145	2000.0	1.0	0.0
-it	06_coal	1	145	2000.0	1.0	0.0
-it	07_gas	1	145	2000.0	1.0	0.0
-it	08_non-res	1	145	400.0	1.0	0.0
+it	01_solar	1	145	2000.0	0.0	1.0
+it	02_wind_on	1	145	2000.0	0.0	1.0
+it	03_wind_off	1	145	2000.0	0.0	1.0
+it	04_res	1	145	2000.0	0.0	1.0
+it	05_nuclear	1	145	2000.0	0.0	1.0
+it	06_coal	1	145	2000.0	0.0	1.0
+it	07_gas	1	145	2000.0	0.0	1.0
+it	08_non-res	1	145	400.0	0.0	1.0
 it	09_hydro_pump	1	145	0.0	0.0	0.0
-it	01_solar	1	146	2000.0	1.0	0.0
-it	02_wind_on	1	146	2000.0	1.0	0.0
-it	03_wind_off	1	146	2000.0	1.0	0.0
-it	04_res	1	146	2000.0	1.0	0.0
-it	05_nuclear	1	146	2000.0	1.0	0.0
-it	06_coal	1	146	2000.0	1.0	0.0
-it	07_gas	1	146	2000.0	1.0	0.0
-it	08_non-res	1	146	500.0	1.0	0.0
+it	01_solar	1	146	2000.0	0.0	1.0
+it	02_wind_on	1	146	2000.0	0.0	1.0
+it	03_wind_off	1	146	2000.0	0.0	1.0
+it	04_res	1	146	2000.0	0.0	1.0
+it	05_nuclear	1	146	2000.0	0.0	1.0
+it	06_coal	1	146	2000.0	0.0	1.0
+it	07_gas	1	146	2000.0	0.0	1.0
+it	08_non-res	1	146	500.0	0.0	1.0
 it	09_hydro_pump	1	146	0.0	0.0	0.0
-it	01_solar	1	147	2000.0	1.0	0.0
-it	02_wind_on	1	147	2000.0	1.0	0.0
-it	03_wind_off	1	147	2000.0	1.0	0.0
-it	04_res	1	147	2000.0	1.0	0.0
-it	05_nuclear	1	147	2000.0	1.0	0.0
-it	06_coal	1	147	2000.0	1.0	0.0
-it	07_gas	1	147	2000.0	1.0	0.0
-it	08_non-res	1	147	600.0	1.0	0.0
+it	01_solar	1	147	2000.0	0.0	1.0
+it	02_wind_on	1	147	2000.0	0.0	1.0
+it	03_wind_off	1	147	2000.0	0.0	1.0
+it	04_res	1	147	2000.0	0.0	1.0
+it	05_nuclear	1	147	2000.0	0.0	1.0
+it	06_coal	1	147	2000.0	0.0	1.0
+it	07_gas	1	147	2000.0	0.0	1.0
+it	08_non-res	1	147	600.0	0.0	1.0
 it	09_hydro_pump	1	147	0.0	0.0	0.0
-it	01_solar	1	148	2000.0	1.0	0.0
-it	02_wind_on	1	148	2000.0	1.0	0.0
-it	03_wind_off	1	148	2000.0	1.0	0.0
-it	04_res	1	148	2000.0	1.0	0.0
-it	05_nuclear	1	148	2000.0	1.0	0.0
-it	06_coal	1	148	2000.0	1.0	0.0
-it	07_gas	1	148	2000.0	1.0	0.0
-it	08_non-res	1	148	700.0	1.0	0.0
+it	01_solar	1	148	2000.0	0.0	1.0
+it	02_wind_on	1	148	2000.0	0.0	1.0
+it	03_wind_off	1	148	2000.0	0.0	1.0
+it	04_res	1	148	2000.0	0.0	1.0
+it	05_nuclear	1	148	2000.0	0.0	1.0
+it	06_coal	1	148	2000.0	0.0	1.0
+it	07_gas	1	148	2000.0	0.0	1.0
+it	08_non-res	1	148	700.0	0.0	1.0
 it	09_hydro_pump	1	148	0.0	0.0	0.0
-it	01_solar	1	149	2000.0	1.0	0.0
-it	02_wind_on	1	149	2000.0	1.0	0.0
-it	03_wind_off	1	149	2000.0	1.0	0.0
-it	04_res	1	149	2000.0	1.0	0.0
-it	05_nuclear	1	149	2000.0	1.0	0.0
-it	06_coal	1	149	2000.0	1.0	0.0
-it	07_gas	1	149	2000.0	1.0	0.0
-it	08_non-res	1	149	800.0	1.0	0.0
+it	01_solar	1	149	2000.0	0.0	1.0
+it	02_wind_on	1	149	2000.0	0.0	1.0
+it	03_wind_off	1	149	2000.0	0.0	1.0
+it	04_res	1	149	2000.0	0.0	1.0
+it	05_nuclear	1	149	2000.0	0.0	1.0
+it	06_coal	1	149	2000.0	0.0	1.0
+it	07_gas	1	149	2000.0	0.0	1.0
+it	08_non-res	1	149	800.0	0.0	1.0
 it	09_hydro_pump	1	149	0.0	0.0	0.0
-it	01_solar	1	150	2000.0	1.0	0.0
-it	02_wind_on	1	150	2000.0	1.0	0.0
-it	03_wind_off	1	150	2000.0	1.0	0.0
-it	04_res	1	150	2000.0	1.0	0.0
-it	05_nuclear	1	150	2000.0	1.0	0.0
-it	06_coal	1	150	2000.0	1.0	0.0
-it	07_gas	1	150	2000.0	1.0	0.0
-it	08_non-res	1	150	900.0	1.0	0.0
+it	01_solar	1	150	2000.0	0.0	1.0
+it	02_wind_on	1	150	2000.0	0.0	1.0
+it	03_wind_off	1	150	2000.0	0.0	1.0
+it	04_res	1	150	2000.0	0.0	1.0
+it	05_nuclear	1	150	2000.0	0.0	1.0
+it	06_coal	1	150	2000.0	0.0	1.0
+it	07_gas	1	150	2000.0	0.0	1.0
+it	08_non-res	1	150	900.0	0.0	1.0
 it	09_hydro_pump	1	150	0.0	0.0	0.0
-it	01_solar	1	151	2000.0	1.0	0.0
-it	02_wind_on	1	151	2000.0	1.0	0.0
-it	03_wind_off	1	151	2000.0	1.0	0.0
-it	04_res	1	151	2000.0	1.0	0.0
-it	05_nuclear	1	151	2000.0	1.0	0.0
-it	06_coal	1	151	2000.0	1.0	0.0
-it	07_gas	1	151	2000.0	1.0	0.0
-it	08_non-res	1	151	1000.0	1.0	0.0
+it	01_solar	1	151	2000.0	0.0	1.0
+it	02_wind_on	1	151	2000.0	0.0	1.0
+it	03_wind_off	1	151	2000.0	0.0	1.0
+it	04_res	1	151	2000.0	0.0	1.0
+it	05_nuclear	1	151	2000.0	0.0	1.0
+it	06_coal	1	151	2000.0	0.0	1.0
+it	07_gas	1	151	2000.0	0.0	1.0
+it	08_non-res	1	151	1000.0	0.0	1.0
 it	09_hydro_pump	1	151	0.0	0.0	0.0
-it	01_solar	1	152	2000.0	1.0	0.0
-it	02_wind_on	1	152	2000.0	1.0	0.0
-it	03_wind_off	1	152	2000.0	1.0	0.0
-it	04_res	1	152	2000.0	1.0	0.0
-it	05_nuclear	1	152	2000.0	1.0	0.0
-it	06_coal	1	152	2000.0	1.0	0.0
-it	07_gas	1	152	2000.0	1.0	0.0
-it	08_non-res	1	152	1100.0	1.0	0.0
+it	01_solar	1	152	2000.0	0.0	1.0
+it	02_wind_on	1	152	2000.0	0.0	1.0
+it	03_wind_off	1	152	2000.0	0.0	1.0
+it	04_res	1	152	2000.0	0.0	1.0
+it	05_nuclear	1	152	2000.0	0.0	1.0
+it	06_coal	1	152	2000.0	0.0	1.0
+it	07_gas	1	152	2000.0	0.0	1.0
+it	08_non-res	1	152	1100.0	0.0	1.0
 it	09_hydro_pump	1	152	0.0	0.0	0.0
-it	01_solar	1	153	2000.0	1.0	0.0
-it	02_wind_on	1	153	2000.0	1.0	0.0
-it	03_wind_off	1	153	2000.0	1.0	0.0
-it	04_res	1	153	2000.0	1.0	0.0
-it	05_nuclear	1	153	2000.0	1.0	0.0
-it	06_coal	1	153	2000.0	1.0	0.0
-it	07_gas	1	153	2000.0	1.0	0.0
-it	08_non-res	1	153	1200.0	1.0	0.0
+it	01_solar	1	153	2000.0	0.0	1.0
+it	02_wind_on	1	153	2000.0	0.0	1.0
+it	03_wind_off	1	153	2000.0	0.0	1.0
+it	04_res	1	153	2000.0	0.0	1.0
+it	05_nuclear	1	153	2000.0	0.0	1.0
+it	06_coal	1	153	2000.0	0.0	1.0
+it	07_gas	1	153	2000.0	0.0	1.0
+it	08_non-res	1	153	1200.0	0.0	1.0
 it	09_hydro_pump	1	153	0.0	0.0	0.0
-it	01_solar	1	154	2000.0	1.0	0.0
-it	02_wind_on	1	154	2000.0	1.0	0.0
-it	03_wind_off	1	154	2000.0	1.0	0.0
-it	04_res	1	154	2000.0	1.0	0.0
-it	05_nuclear	1	154	2000.0	1.0	0.0
-it	06_coal	1	154	2000.0	1.0	0.0
-it	07_gas	1	154	2000.0	1.0	0.0
-it	08_non-res	1	154	1300.0	1.0	0.0
+it	01_solar	1	154	2000.0	0.0	1.0
+it	02_wind_on	1	154	2000.0	0.0	1.0
+it	03_wind_off	1	154	2000.0	0.0	1.0
+it	04_res	1	154	2000.0	0.0	1.0
+it	05_nuclear	1	154	2000.0	0.0	1.0
+it	06_coal	1	154	2000.0	0.0	1.0
+it	07_gas	1	154	2000.0	0.0	1.0
+it	08_non-res	1	154	1300.0	0.0	1.0
 it	09_hydro_pump	1	154	0.0	0.0	0.0
-it	01_solar	1	155	2000.0	1.0	0.0
-it	02_wind_on	1	155	2000.0	1.0	0.0
-it	03_wind_off	1	155	2000.0	1.0	0.0
-it	04_res	1	155	2000.0	1.0	0.0
-it	05_nuclear	1	155	2000.0	1.0	0.0
-it	06_coal	1	155	2000.0	1.0	0.0
-it	07_gas	1	155	2000.0	1.0	0.0
-it	08_non-res	1	155	1400.0	1.0	0.0
+it	01_solar	1	155	2000.0	0.0	1.0
+it	02_wind_on	1	155	2000.0	0.0	1.0
+it	03_wind_off	1	155	2000.0	0.0	1.0
+it	04_res	1	155	2000.0	0.0	1.0
+it	05_nuclear	1	155	2000.0	0.0	1.0
+it	06_coal	1	155	2000.0	0.0	1.0
+it	07_gas	1	155	2000.0	0.0	1.0
+it	08_non-res	1	155	1400.0	0.0	1.0
 it	09_hydro_pump	1	155	0.0	0.0	0.0
-it	01_solar	1	156	2000.0	1.0	0.0
-it	02_wind_on	1	156	2000.0	1.0	0.0
-it	03_wind_off	1	156	2000.0	1.0	0.0
-it	04_res	1	156	2000.0	1.0	0.0
-it	05_nuclear	1	156	2000.0	1.0	0.0
-it	06_coal	1	156	2000.0	1.0	0.0
-it	07_gas	1	156	2000.0	1.0	0.0
-it	08_non-res	1	156	1500.0	1.0	0.0
+it	01_solar	1	156	2000.0	0.0	1.0
+it	02_wind_on	1	156	2000.0	0.0	1.0
+it	03_wind_off	1	156	2000.0	0.0	1.0
+it	04_res	1	156	2000.0	0.0	1.0
+it	05_nuclear	1	156	2000.0	0.0	1.0
+it	06_coal	1	156	2000.0	0.0	1.0
+it	07_gas	1	156	2000.0	0.0	1.0
+it	08_non-res	1	156	1500.0	0.0	1.0
 it	09_hydro_pump	1	156	0.0	0.0	0.0
-it	01_solar	1	157	2000.0	1.0	0.0
-it	02_wind_on	1	157	2000.0	1.0	0.0
-it	03_wind_off	1	157	2000.0	1.0	0.0
-it	04_res	1	157	2000.0	1.0	0.0
-it	05_nuclear	1	157	2000.0	1.0	0.0
-it	06_coal	1	157	2000.0	1.0	0.0
-it	07_gas	1	157	2000.0	1.0	0.0
-it	08_non-res	1	157	1600.0	1.0	0.0
+it	01_solar	1	157	2000.0	0.0	1.0
+it	02_wind_on	1	157	2000.0	0.0	1.0
+it	03_wind_off	1	157	2000.0	0.0	1.0
+it	04_res	1	157	2000.0	0.0	1.0
+it	05_nuclear	1	157	2000.0	0.0	1.0
+it	06_coal	1	157	2000.0	0.0	1.0
+it	07_gas	1	157	2000.0	0.0	1.0
+it	08_non-res	1	157	1600.0	0.0	1.0
 it	09_hydro_pump	1	157	0.0	0.0	0.0
-it	01_solar	1	158	2000.0	1.0	0.0
-it	02_wind_on	1	158	2000.0	1.0	0.0
-it	03_wind_off	1	158	2000.0	1.0	0.0
-it	04_res	1	158	2000.0	1.0	0.0
-it	05_nuclear	1	158	2000.0	1.0	0.0
-it	06_coal	1	158	2000.0	1.0	0.0
-it	07_gas	1	158	2000.0	1.0	0.0
-it	08_non-res	1	158	1700.0	1.0	0.0
+it	01_solar	1	158	2000.0	0.0	1.0
+it	02_wind_on	1	158	2000.0	0.0	1.0
+it	03_wind_off	1	158	2000.0	0.0	1.0
+it	04_res	1	158	2000.0	0.0	1.0
+it	05_nuclear	1	158	2000.0	0.0	1.0
+it	06_coal	1	158	2000.0	0.0	1.0
+it	07_gas	1	158	2000.0	0.0	1.0
+it	08_non-res	1	158	1700.0	0.0	1.0
 it	09_hydro_pump	1	158	0.0	0.0	0.0
-it	01_solar	1	159	2000.0	1.0	0.0
-it	02_wind_on	1	159	2000.0	1.0	0.0
-it	03_wind_off	1	159	2000.0	1.0	0.0
-it	04_res	1	159	2000.0	1.0	0.0
-it	05_nuclear	1	159	2000.0	1.0	0.0
-it	06_coal	1	159	2000.0	1.0	0.0
-it	07_gas	1	159	2000.0	1.0	0.0
-it	08_non-res	1	159	1800.0	1.0	0.0
+it	01_solar	1	159	2000.0	0.0	1.0
+it	02_wind_on	1	159	2000.0	0.0	1.0
+it	03_wind_off	1	159	2000.0	0.0	1.0
+it	04_res	1	159	2000.0	0.0	1.0
+it	05_nuclear	1	159	2000.0	0.0	1.0
+it	06_coal	1	159	2000.0	0.0	1.0
+it	07_gas	1	159	2000.0	0.0	1.0
+it	08_non-res	1	159	1800.0	0.0	1.0
 it	09_hydro_pump	1	159	0.0	0.0	0.0
-it	01_solar	1	160	2000.0	1.0	0.0
-it	02_wind_on	1	160	2000.0	1.0	0.0
-it	03_wind_off	1	160	2000.0	1.0	0.0
-it	04_res	1	160	2000.0	1.0	0.0
-it	05_nuclear	1	160	2000.0	1.0	0.0
-it	06_coal	1	160	2000.0	1.0	0.0
-it	07_gas	1	160	2000.0	1.0	0.0
-it	08_non-res	1	160	1900.0	1.0	0.0
+it	01_solar	1	160	2000.0	0.0	1.0
+it	02_wind_on	1	160	2000.0	0.0	1.0
+it	03_wind_off	1	160	2000.0	0.0	1.0
+it	04_res	1	160	2000.0	0.0	1.0
+it	05_nuclear	1	160	2000.0	0.0	1.0
+it	06_coal	1	160	2000.0	0.0	1.0
+it	07_gas	1	160	2000.0	0.0	1.0
+it	08_non-res	1	160	1900.0	0.0	1.0
 it	09_hydro_pump	1	160	0.0	0.0	0.0
-it	01_solar	1	161	2000.0	1.0	0.0
-it	02_wind_on	1	161	2000.0	1.0	0.0
-it	03_wind_off	1	161	2000.0	1.0	0.0
-it	04_res	1	161	2000.0	1.0	0.0
-it	05_nuclear	1	161	2000.0	1.0	0.0
-it	06_coal	1	161	2000.0	1.0	0.0
-it	07_gas	1	161	2000.0	1.0	0.0
-it	08_non-res	1	161	2000.0	1.0	0.0
+it	01_solar	1	161	2000.0	0.0	1.0
+it	02_wind_on	1	161	2000.0	0.0	1.0
+it	03_wind_off	1	161	2000.0	0.0	1.0
+it	04_res	1	161	2000.0	0.0	1.0
+it	05_nuclear	1	161	2000.0	0.0	1.0
+it	06_coal	1	161	2000.0	0.0	1.0
+it	07_gas	1	161	2000.0	0.0	1.0
+it	08_non-res	1	161	2000.0	0.0	1.0
 it	09_hydro_pump	1	161	0.0	0.0	0.0
-it	01_solar	1	162	2000.0	1.0	0.0
-it	02_wind_on	1	162	2000.0	1.0	0.0
-it	03_wind_off	1	162	2000.0	1.0	0.0
-it	04_res	1	162	2000.0	1.0	0.0
-it	05_nuclear	1	162	2000.0	1.0	0.0
-it	06_coal	1	162	2000.0	1.0	0.0
-it	07_gas	1	162	2000.0	1.0	0.0
-it	08_non-res	1	162	2000.0	1.0	0.0
-it	09_hydro_pump	1	162	100.0	1.0	0.0
-it	01_solar	1	163	2000.0	1.0	0.0
-it	02_wind_on	1	163	2000.0	1.0	0.0
-it	03_wind_off	1	163	2000.0	1.0	0.0
-it	04_res	1	163	2000.0	1.0	0.0
-it	05_nuclear	1	163	2000.0	1.0	0.0
-it	06_coal	1	163	2000.0	1.0	0.0
-it	07_gas	1	163	2000.0	1.0	0.0
-it	08_non-res	1	163	2000.0	1.0	0.0
-it	09_hydro_pump	1	163	200.0	1.0	0.0
-it	01_solar	1	164	2000.0	1.0	0.0
-it	02_wind_on	1	164	2000.0	1.0	0.0
-it	03_wind_off	1	164	2000.0	1.0	0.0
-it	04_res	1	164	2000.0	1.0	0.0
-it	05_nuclear	1	164	2000.0	1.0	0.0
-it	06_coal	1	164	2000.0	1.0	0.0
-it	07_gas	1	164	2000.0	1.0	0.0
-it	08_non-res	1	164	2000.0	1.0	0.0
-it	09_hydro_pump	1	164	300.0	1.0	0.0
-it	01_solar	1	165	2000.0	1.0	0.0
-it	02_wind_on	1	165	2000.0	1.0	0.0
-it	03_wind_off	1	165	2000.0	1.0	0.0
-it	04_res	1	165	2000.0	1.0	0.0
-it	05_nuclear	1	165	2000.0	1.0	0.0
-it	06_coal	1	165	2000.0	1.0	0.0
-it	07_gas	1	165	2000.0	1.0	0.0
-it	08_non-res	1	165	2000.0	1.0	0.0
-it	09_hydro_pump	1	165	400.0	1.0	0.0
-it	01_solar	1	166	2000.0	1.0	0.0
-it	02_wind_on	1	166	2000.0	1.0	0.0
-it	03_wind_off	1	166	2000.0	1.0	0.0
-it	04_res	1	166	2000.0	1.0	0.0
-it	05_nuclear	1	166	2000.0	1.0	0.0
-it	06_coal	1	166	2000.0	1.0	0.0
-it	07_gas	1	166	2000.0	1.0	0.0
-it	08_non-res	1	166	2000.0	1.0	0.0
-it	09_hydro_pump	1	166	500.0	1.0	0.0
-it	01_solar	1	167	2000.0	1.0	0.0
-it	02_wind_on	1	167	2000.0	1.0	0.0
-it	03_wind_off	1	167	2000.0	1.0	0.0
-it	04_res	1	167	2000.0	1.0	0.0
-it	05_nuclear	1	167	2000.0	1.0	0.0
-it	06_coal	1	167	2000.0	1.0	0.0
-it	07_gas	1	167	2000.0	1.0	0.0
-it	08_non-res	1	167	2000.0	1.0	0.0
-it	09_hydro_pump	1	167	600.0	1.0	0.0
-it	01_solar	1	168	2000.0	1.0	0.0
-it	02_wind_on	1	168	2000.0	1.0	0.0
-it	03_wind_off	1	168	2000.0	1.0	0.0
-it	04_res	1	168	2000.0	1.0	0.0
-it	05_nuclear	1	168	2000.0	1.0	0.0
-it	06_coal	1	168	2000.0	1.0	0.0
-it	07_gas	1	168	2000.0	1.0	0.0
-it	08_non-res	1	168	2000.0	1.0	0.0
-it	09_hydro_pump	1	168	700.0	1.0	0.0
+it	01_solar	1	162	2000.0	0.0	1.0
+it	02_wind_on	1	162	2000.0	0.0	1.0
+it	03_wind_off	1	162	2000.0	0.0	1.0
+it	04_res	1	162	2000.0	0.0	1.0
+it	05_nuclear	1	162	2000.0	0.0	1.0
+it	06_coal	1	162	2000.0	0.0	1.0
+it	07_gas	1	162	2000.0	0.0	1.0
+it	08_non-res	1	162	2000.0	0.0	1.0
+it	09_hydro_pump	1	162	100.0	0.0	1.0
+it	01_solar	1	163	2000.0	0.0	1.0
+it	02_wind_on	1	163	2000.0	0.0	1.0
+it	03_wind_off	1	163	2000.0	0.0	1.0
+it	04_res	1	163	2000.0	0.0	1.0
+it	05_nuclear	1	163	2000.0	0.0	1.0
+it	06_coal	1	163	2000.0	0.0	1.0
+it	07_gas	1	163	2000.0	0.0	1.0
+it	08_non-res	1	163	2000.0	0.0	1.0
+it	09_hydro_pump	1	163	200.0	0.0	1.0
+it	01_solar	1	164	2000.0	0.0	1.0
+it	02_wind_on	1	164	2000.0	0.0	1.0
+it	03_wind_off	1	164	2000.0	0.0	1.0
+it	04_res	1	164	2000.0	0.0	1.0
+it	05_nuclear	1	164	2000.0	0.0	1.0
+it	06_coal	1	164	2000.0	0.0	1.0
+it	07_gas	1	164	2000.0	0.0	1.0
+it	08_non-res	1	164	2000.0	0.0	1.0
+it	09_hydro_pump	1	164	300.0	0.0	1.0
+it	01_solar	1	165	2000.0	0.0	1.0
+it	02_wind_on	1	165	2000.0	0.0	1.0
+it	03_wind_off	1	165	2000.0	0.0	1.0
+it	04_res	1	165	2000.0	0.0	1.0
+it	05_nuclear	1	165	2000.0	0.0	1.0
+it	06_coal	1	165	2000.0	0.0	1.0
+it	07_gas	1	165	2000.0	0.0	1.0
+it	08_non-res	1	165	2000.0	0.0	1.0
+it	09_hydro_pump	1	165	400.0	0.0	1.0
+it	01_solar	1	166	2000.0	0.0	1.0
+it	02_wind_on	1	166	2000.0	0.0	1.0
+it	03_wind_off	1	166	2000.0	0.0	1.0
+it	04_res	1	166	2000.0	0.0	1.0
+it	05_nuclear	1	166	2000.0	0.0	1.0
+it	06_coal	1	166	2000.0	0.0	1.0
+it	07_gas	1	166	2000.0	0.0	1.0
+it	08_non-res	1	166	2000.0	0.0	1.0
+it	09_hydro_pump	1	166	500.0	0.0	1.0
+it	01_solar	1	167	2000.0	0.0	1.0
+it	02_wind_on	1	167	2000.0	0.0	1.0
+it	03_wind_off	1	167	2000.0	0.0	1.0
+it	04_res	1	167	2000.0	0.0	1.0
+it	05_nuclear	1	167	2000.0	0.0	1.0
+it	06_coal	1	167	2000.0	0.0	1.0
+it	07_gas	1	167	2000.0	0.0	1.0
+it	08_non-res	1	167	2000.0	0.0	1.0
+it	09_hydro_pump	1	167	600.0	0.0	1.0
+it	01_solar	1	168	2000.0	0.0	1.0
+it	02_wind_on	1	168	2000.0	0.0	1.0
+it	03_wind_off	1	168	2000.0	0.0	1.0
+it	04_res	1	168	2000.0	0.0	1.0
+it	05_nuclear	1	168	2000.0	0.0	1.0
+it	06_coal	1	168	2000.0	0.0	1.0
+it	07_gas	1	168	2000.0	0.0	1.0
+it	08_non-res	1	168	2000.0	0.0	1.0
+it	09_hydro_pump	1	168	700.0	0.0	1.0
 it	01_solar	1	169	0.0	0.0	0.0
 it	02_wind_on	1	169	0.0	0.0	0.0
 it	03_wind_off	1	169	0.0	0.0	0.0
@@ -7568,7 +7568,7 @@ it	06_coal	1	169	0.0	0.0	0.0
 it	07_gas	1	169	0.0	0.0	0.0
 it	08_non-res	1	169	0.0	0.0	0.0
 it	09_hydro_pump	1	169	0.0	0.0	0.0
-it	01_solar	1	170	100.0	1.0	0.0
+it	01_solar	1	170	100.0	0.0	1.0
 it	02_wind_on	1	170	0.0	0.0	0.0
 it	03_wind_off	1	170	0.0	0.0	0.0
 it	04_res	1	170	0.0	0.0	0.0
@@ -7577,7 +7577,7 @@ it	06_coal	1	170	0.0	0.0	0.0
 it	07_gas	1	170	0.0	0.0	0.0
 it	08_non-res	1	170	0.0	0.0	0.0
 it	09_hydro_pump	1	170	0.0	0.0	0.0
-it	01_solar	1	171	200.0	1.0	0.0
+it	01_solar	1	171	200.0	0.0	1.0
 it	02_wind_on	1	171	0.0	0.0	0.0
 it	03_wind_off	1	171	0.0	0.0	0.0
 it	04_res	1	171	0.0	0.0	0.0
@@ -7586,7 +7586,7 @@ it	06_coal	1	171	0.0	0.0	0.0
 it	07_gas	1	171	0.0	0.0	0.0
 it	08_non-res	1	171	0.0	0.0	0.0
 it	09_hydro_pump	1	171	0.0	0.0	0.0
-it	01_solar	1	172	300.0	1.0	0.0
+it	01_solar	1	172	300.0	0.0	1.0
 it	02_wind_on	1	172	0.0	0.0	0.0
 it	03_wind_off	1	172	0.0	0.0	0.0
 it	04_res	1	172	0.0	0.0	0.0
@@ -7595,7 +7595,7 @@ it	06_coal	1	172	0.0	0.0	0.0
 it	07_gas	1	172	0.0	0.0	0.0
 it	08_non-res	1	172	0.0	0.0	0.0
 it	09_hydro_pump	1	172	0.0	0.0	0.0
-it	01_solar	1	173	400.0	1.0	0.0
+it	01_solar	1	173	400.0	0.0	1.0
 it	02_wind_on	1	173	0.0	0.0	0.0
 it	03_wind_off	1	173	0.0	0.0	0.0
 it	04_res	1	173	0.0	0.0	0.0
@@ -7604,7 +7604,7 @@ it	06_coal	1	173	0.0	0.0	0.0
 it	07_gas	1	173	0.0	0.0	0.0
 it	08_non-res	1	173	0.0	0.0	0.0
 it	09_hydro_pump	1	173	0.0	0.0	0.0
-it	01_solar	1	174	500.0	1.0	0.0
+it	01_solar	1	174	500.0	0.0	1.0
 it	02_wind_on	1	174	0.0	0.0	0.0
 it	03_wind_off	1	174	0.0	0.0	0.0
 it	04_res	1	174	0.0	0.0	0.0
@@ -7613,7 +7613,7 @@ it	06_coal	1	174	0.0	0.0	0.0
 it	07_gas	1	174	0.0	0.0	0.0
 it	08_non-res	1	174	0.0	0.0	0.0
 it	09_hydro_pump	1	174	0.0	0.0	0.0
-it	01_solar	1	175	600.0	1.0	0.0
+it	01_solar	1	175	600.0	0.0	1.0
 it	02_wind_on	1	175	0.0	0.0	0.0
 it	03_wind_off	1	175	0.0	0.0	0.0
 it	04_res	1	175	0.0	0.0	0.0
@@ -7622,7 +7622,7 @@ it	06_coal	1	175	0.0	0.0	0.0
 it	07_gas	1	175	0.0	0.0	0.0
 it	08_non-res	1	175	0.0	0.0	0.0
 it	09_hydro_pump	1	175	0.0	0.0	0.0
-it	01_solar	1	176	700.0	1.0	0.0
+it	01_solar	1	176	700.0	0.0	1.0
 it	02_wind_on	1	176	0.0	0.0	0.0
 it	03_wind_off	1	176	0.0	0.0	0.0
 it	04_res	1	176	0.0	0.0	0.0
@@ -7631,7 +7631,7 @@ it	06_coal	1	176	0.0	0.0	0.0
 it	07_gas	1	176	0.0	0.0	0.0
 it	08_non-res	1	176	0.0	0.0	0.0
 it	09_hydro_pump	1	176	0.0	0.0	0.0
-it	01_solar	1	177	800.0	1.0	0.0
+it	01_solar	1	177	800.0	0.0	1.0
 it	02_wind_on	1	177	0.0	0.0	0.0
 it	03_wind_off	1	177	0.0	0.0	0.0
 it	04_res	1	177	0.0	0.0	0.0
@@ -7640,7 +7640,7 @@ it	06_coal	1	177	0.0	0.0	0.0
 it	07_gas	1	177	0.0	0.0	0.0
 it	08_non-res	1	177	0.0	0.0	0.0
 it	09_hydro_pump	1	177	0.0	0.0	0.0
-it	01_solar	1	178	900.0	1.0	0.0
+it	01_solar	1	178	900.0	0.0	1.0
 it	02_wind_on	1	178	0.0	0.0	0.0
 it	03_wind_off	1	178	0.0	0.0	0.0
 it	04_res	1	178	0.0	0.0	0.0
@@ -7649,7 +7649,7 @@ it	06_coal	1	178	0.0	0.0	0.0
 it	07_gas	1	178	0.0	0.0	0.0
 it	08_non-res	1	178	0.0	0.0	0.0
 it	09_hydro_pump	1	178	0.0	0.0	0.0
-it	01_solar	1	179	1000.0	1.0	0.0
+it	01_solar	1	179	1000.0	0.0	1.0
 it	02_wind_on	1	179	0.0	0.0	0.0
 it	03_wind_off	1	179	0.0	0.0	0.0
 it	04_res	1	179	0.0	0.0	0.0
@@ -7658,7 +7658,7 @@ it	06_coal	1	179	0.0	0.0	0.0
 it	07_gas	1	179	0.0	0.0	0.0
 it	08_non-res	1	179	0.0	0.0	0.0
 it	09_hydro_pump	1	179	0.0	0.0	0.0
-it	01_solar	1	180	1100.0	1.0	0.0
+it	01_solar	1	180	1100.0	0.0	1.0
 it	02_wind_on	1	180	0.0	0.0	0.0
 it	03_wind_off	1	180	0.0	0.0	0.0
 it	04_res	1	180	0.0	0.0	0.0
@@ -7667,7 +7667,7 @@ it	06_coal	1	180	0.0	0.0	0.0
 it	07_gas	1	180	0.0	0.0	0.0
 it	08_non-res	1	180	0.0	0.0	0.0
 it	09_hydro_pump	1	180	0.0	0.0	0.0
-it	01_solar	1	181	1200.0	1.0	0.0
+it	01_solar	1	181	1200.0	0.0	1.0
 it	02_wind_on	1	181	0.0	0.0	0.0
 it	03_wind_off	1	181	0.0	0.0	0.0
 it	04_res	1	181	0.0	0.0	0.0
@@ -7676,7 +7676,7 @@ it	06_coal	1	181	0.0	0.0	0.0
 it	07_gas	1	181	0.0	0.0	0.0
 it	08_non-res	1	181	0.0	0.0	0.0
 it	09_hydro_pump	1	181	0.0	0.0	0.0
-it	01_solar	1	182	1300.0	1.0	0.0
+it	01_solar	1	182	1300.0	0.0	1.0
 it	02_wind_on	1	182	0.0	0.0	0.0
 it	03_wind_off	1	182	0.0	0.0	0.0
 it	04_res	1	182	0.0	0.0	0.0
@@ -7685,7 +7685,7 @@ it	06_coal	1	182	0.0	0.0	0.0
 it	07_gas	1	182	0.0	0.0	0.0
 it	08_non-res	1	182	0.0	0.0	0.0
 it	09_hydro_pump	1	182	0.0	0.0	0.0
-it	01_solar	1	183	1400.0	1.0	0.0
+it	01_solar	1	183	1400.0	0.0	1.0
 it	02_wind_on	1	183	0.0	0.0	0.0
 it	03_wind_off	1	183	0.0	0.0	0.0
 it	04_res	1	183	0.0	0.0	0.0
@@ -7694,7 +7694,7 @@ it	06_coal	1	183	0.0	0.0	0.0
 it	07_gas	1	183	0.0	0.0	0.0
 it	08_non-res	1	183	0.0	0.0	0.0
 it	09_hydro_pump	1	183	0.0	0.0	0.0
-it	01_solar	1	184	1500.0	1.0	0.0
+it	01_solar	1	184	1500.0	0.0	1.0
 it	02_wind_on	1	184	0.0	0.0	0.0
 it	03_wind_off	1	184	0.0	0.0	0.0
 it	04_res	1	184	0.0	0.0	0.0
@@ -7703,7 +7703,7 @@ it	06_coal	1	184	0.0	0.0	0.0
 it	07_gas	1	184	0.0	0.0	0.0
 it	08_non-res	1	184	0.0	0.0	0.0
 it	09_hydro_pump	1	184	0.0	0.0	0.0
-it	01_solar	1	185	1600.0	1.0	0.0
+it	01_solar	1	185	1600.0	0.0	1.0
 it	02_wind_on	1	185	0.0	0.0	0.0
 it	03_wind_off	1	185	0.0	0.0	0.0
 it	04_res	1	185	0.0	0.0	0.0
@@ -7712,7 +7712,7 @@ it	06_coal	1	185	0.0	0.0	0.0
 it	07_gas	1	185	0.0	0.0	0.0
 it	08_non-res	1	185	0.0	0.0	0.0
 it	09_hydro_pump	1	185	0.0	0.0	0.0
-it	01_solar	1	186	1700.0	1.0	0.0
+it	01_solar	1	186	1700.0	0.0	1.0
 it	02_wind_on	1	186	0.0	0.0	0.0
 it	03_wind_off	1	186	0.0	0.0	0.0
 it	04_res	1	186	0.0	0.0	0.0
@@ -7721,7 +7721,7 @@ it	06_coal	1	186	0.0	0.0	0.0
 it	07_gas	1	186	0.0	0.0	0.0
 it	08_non-res	1	186	0.0	0.0	0.0
 it	09_hydro_pump	1	186	0.0	0.0	0.0
-it	01_solar	1	187	1800.0	1.0	0.0
+it	01_solar	1	187	1800.0	0.0	1.0
 it	02_wind_on	1	187	0.0	0.0	0.0
 it	03_wind_off	1	187	0.0	0.0	0.0
 it	04_res	1	187	0.0	0.0	0.0
@@ -7730,7 +7730,7 @@ it	06_coal	1	187	0.0	0.0	0.0
 it	07_gas	1	187	0.0	0.0	0.0
 it	08_non-res	1	187	0.0	0.0	0.0
 it	09_hydro_pump	1	187	0.0	0.0	0.0
-it	01_solar	1	188	1900.0	1.0	0.0
+it	01_solar	1	188	1900.0	0.0	1.0
 it	02_wind_on	1	188	0.0	0.0	0.0
 it	03_wind_off	1	188	0.0	0.0	0.0
 it	04_res	1	188	0.0	0.0	0.0
@@ -7739,7 +7739,7 @@ it	06_coal	1	188	0.0	0.0	0.0
 it	07_gas	1	188	0.0	0.0	0.0
 it	08_non-res	1	188	0.0	0.0	0.0
 it	09_hydro_pump	1	188	0.0	0.0	0.0
-it	01_solar	1	189	2000.0	1.0	0.0
+it	01_solar	1	189	2000.0	0.0	1.0
 it	02_wind_on	1	189	0.0	0.0	0.0
 it	03_wind_off	1	189	0.0	0.0	0.0
 it	04_res	1	189	0.0	0.0	0.0
@@ -7748,8 +7748,8 @@ it	06_coal	1	189	0.0	0.0	0.0
 it	07_gas	1	189	0.0	0.0	0.0
 it	08_non-res	1	189	0.0	0.0	0.0
 it	09_hydro_pump	1	189	0.0	0.0	0.0
-it	01_solar	1	190	2000.0	1.0	0.0
-it	02_wind_on	1	190	100.0	1.0	0.0
+it	01_solar	1	190	2000.0	0.0	1.0
+it	02_wind_on	1	190	100.0	0.0	1.0
 it	03_wind_off	1	190	0.0	0.0	0.0
 it	04_res	1	190	0.0	0.0	0.0
 it	05_nuclear	1	190	0.0	0.0	0.0
@@ -7757,8 +7757,8 @@ it	06_coal	1	190	0.0	0.0	0.0
 it	07_gas	1	190	0.0	0.0	0.0
 it	08_non-res	1	190	0.0	0.0	0.0
 it	09_hydro_pump	1	190	0.0	0.0	0.0
-it	01_solar	1	191	2000.0	1.0	0.0
-it	02_wind_on	1	191	200.0	1.0	0.0
+it	01_solar	1	191	2000.0	0.0	1.0
+it	02_wind_on	1	191	200.0	0.0	1.0
 it	03_wind_off	1	191	0.0	0.0	0.0
 it	04_res	1	191	0.0	0.0	0.0
 it	05_nuclear	1	191	0.0	0.0	0.0
@@ -7766,8 +7766,8 @@ it	06_coal	1	191	0.0	0.0	0.0
 it	07_gas	1	191	0.0	0.0	0.0
 it	08_non-res	1	191	0.0	0.0	0.0
 it	09_hydro_pump	1	191	0.0	0.0	0.0
-it	01_solar	1	192	2000.0	1.0	0.0
-it	02_wind_on	1	192	300.0	1.0	0.0
+it	01_solar	1	192	2000.0	0.0	1.0
+it	02_wind_on	1	192	300.0	0.0	1.0
 it	03_wind_off	1	192	0.0	0.0	0.0
 it	04_res	1	192	0.0	0.0	0.0
 it	05_nuclear	1	192	0.0	0.0	0.0
@@ -7775,8 +7775,8 @@ it	06_coal	1	192	0.0	0.0	0.0
 it	07_gas	1	192	0.0	0.0	0.0
 it	08_non-res	1	192	0.0	0.0	0.0
 it	09_hydro_pump	1	192	0.0	0.0	0.0
-it	01_solar	1	193	2000.0	1.0	0.0
-it	02_wind_on	1	193	400.0	1.0	0.0
+it	01_solar	1	193	2000.0	0.0	1.0
+it	02_wind_on	1	193	400.0	0.0	1.0
 it	03_wind_off	1	193	0.0	0.0	0.0
 it	04_res	1	193	0.0	0.0	0.0
 it	05_nuclear	1	193	0.0	0.0	0.0
@@ -7784,8 +7784,8 @@ it	06_coal	1	193	0.0	0.0	0.0
 it	07_gas	1	193	0.0	0.0	0.0
 it	08_non-res	1	193	0.0	0.0	0.0
 it	09_hydro_pump	1	193	0.0	0.0	0.0
-it	01_solar	1	194	2000.0	1.0	0.0
-it	02_wind_on	1	194	500.0	1.0	0.0
+it	01_solar	1	194	2000.0	0.0	1.0
+it	02_wind_on	1	194	500.0	0.0	1.0
 it	03_wind_off	1	194	0.0	0.0	0.0
 it	04_res	1	194	0.0	0.0	0.0
 it	05_nuclear	1	194	0.0	0.0	0.0
@@ -7793,8 +7793,8 @@ it	06_coal	1	194	0.0	0.0	0.0
 it	07_gas	1	194	0.0	0.0	0.0
 it	08_non-res	1	194	0.0	0.0	0.0
 it	09_hydro_pump	1	194	0.0	0.0	0.0
-it	01_solar	1	195	2000.0	1.0	0.0
-it	02_wind_on	1	195	600.0	1.0	0.0
+it	01_solar	1	195	2000.0	0.0	1.0
+it	02_wind_on	1	195	600.0	0.0	1.0
 it	03_wind_off	1	195	0.0	0.0	0.0
 it	04_res	1	195	0.0	0.0	0.0
 it	05_nuclear	1	195	0.0	0.0	0.0
@@ -7802,8 +7802,8 @@ it	06_coal	1	195	0.0	0.0	0.0
 it	07_gas	1	195	0.0	0.0	0.0
 it	08_non-res	1	195	0.0	0.0	0.0
 it	09_hydro_pump	1	195	0.0	0.0	0.0
-it	01_solar	1	196	2000.0	1.0	0.0
-it	02_wind_on	1	196	700.0	1.0	0.0
+it	01_solar	1	196	2000.0	0.0	1.0
+it	02_wind_on	1	196	700.0	0.0	1.0
 it	03_wind_off	1	196	0.0	0.0	0.0
 it	04_res	1	196	0.0	0.0	0.0
 it	05_nuclear	1	196	0.0	0.0	0.0
@@ -7811,8 +7811,8 @@ it	06_coal	1	196	0.0	0.0	0.0
 it	07_gas	1	196	0.0	0.0	0.0
 it	08_non-res	1	196	0.0	0.0	0.0
 it	09_hydro_pump	1	196	0.0	0.0	0.0
-it	01_solar	1	197	2000.0	1.0	0.0
-it	02_wind_on	1	197	800.0	1.0	0.0
+it	01_solar	1	197	2000.0	0.0	1.0
+it	02_wind_on	1	197	800.0	0.0	1.0
 it	03_wind_off	1	197	0.0	0.0	0.0
 it	04_res	1	197	0.0	0.0	0.0
 it	05_nuclear	1	197	0.0	0.0	0.0
@@ -7820,8 +7820,8 @@ it	06_coal	1	197	0.0	0.0	0.0
 it	07_gas	1	197	0.0	0.0	0.0
 it	08_non-res	1	197	0.0	0.0	0.0
 it	09_hydro_pump	1	197	0.0	0.0	0.0
-it	01_solar	1	198	2000.0	1.0	0.0
-it	02_wind_on	1	198	900.0	1.0	0.0
+it	01_solar	1	198	2000.0	0.0	1.0
+it	02_wind_on	1	198	900.0	0.0	1.0
 it	03_wind_off	1	198	0.0	0.0	0.0
 it	04_res	1	198	0.0	0.0	0.0
 it	05_nuclear	1	198	0.0	0.0	0.0
@@ -7829,8 +7829,8 @@ it	06_coal	1	198	0.0	0.0	0.0
 it	07_gas	1	198	0.0	0.0	0.0
 it	08_non-res	1	198	0.0	0.0	0.0
 it	09_hydro_pump	1	198	0.0	0.0	0.0
-it	01_solar	1	199	2000.0	1.0	0.0
-it	02_wind_on	1	199	1000.0	1.0	0.0
+it	01_solar	1	199	2000.0	0.0	1.0
+it	02_wind_on	1	199	1000.0	0.0	1.0
 it	03_wind_off	1	199	0.0	0.0	0.0
 it	04_res	1	199	0.0	0.0	0.0
 it	05_nuclear	1	199	0.0	0.0	0.0
@@ -7838,8 +7838,8 @@ it	06_coal	1	199	0.0	0.0	0.0
 it	07_gas	1	199	0.0	0.0	0.0
 it	08_non-res	1	199	0.0	0.0	0.0
 it	09_hydro_pump	1	199	0.0	0.0	0.0
-it	01_solar	1	200	2000.0	1.0	0.0
-it	02_wind_on	1	200	1100.0	1.0	0.0
+it	01_solar	1	200	2000.0	0.0	1.0
+it	02_wind_on	1	200	1100.0	0.0	1.0
 it	03_wind_off	1	200	0.0	0.0	0.0
 it	04_res	1	200	0.0	0.0	0.0
 it	05_nuclear	1	200	0.0	0.0	0.0
@@ -7847,8 +7847,8 @@ it	06_coal	1	200	0.0	0.0	0.0
 it	07_gas	1	200	0.0	0.0	0.0
 it	08_non-res	1	200	0.0	0.0	0.0
 it	09_hydro_pump	1	200	0.0	0.0	0.0
-it	01_solar	1	201	2000.0	1.0	0.0
-it	02_wind_on	1	201	1200.0	1.0	0.0
+it	01_solar	1	201	2000.0	0.0	1.0
+it	02_wind_on	1	201	1200.0	0.0	1.0
 it	03_wind_off	1	201	0.0	0.0	0.0
 it	04_res	1	201	0.0	0.0	0.0
 it	05_nuclear	1	201	0.0	0.0	0.0
@@ -7856,8 +7856,8 @@ it	06_coal	1	201	0.0	0.0	0.0
 it	07_gas	1	201	0.0	0.0	0.0
 it	08_non-res	1	201	0.0	0.0	0.0
 it	09_hydro_pump	1	201	0.0	0.0	0.0
-it	01_solar	1	202	2000.0	1.0	0.0
-it	02_wind_on	1	202	1300.0	1.0	0.0
+it	01_solar	1	202	2000.0	0.0	1.0
+it	02_wind_on	1	202	1300.0	0.0	1.0
 it	03_wind_off	1	202	0.0	0.0	0.0
 it	04_res	1	202	0.0	0.0	0.0
 it	05_nuclear	1	202	0.0	0.0	0.0
@@ -7865,8 +7865,8 @@ it	06_coal	1	202	0.0	0.0	0.0
 it	07_gas	1	202	0.0	0.0	0.0
 it	08_non-res	1	202	0.0	0.0	0.0
 it	09_hydro_pump	1	202	0.0	0.0	0.0
-it	01_solar	1	203	2000.0	1.0	0.0
-it	02_wind_on	1	203	1400.0	1.0	0.0
+it	01_solar	1	203	2000.0	0.0	1.0
+it	02_wind_on	1	203	1400.0	0.0	1.0
 it	03_wind_off	1	203	0.0	0.0	0.0
 it	04_res	1	203	0.0	0.0	0.0
 it	05_nuclear	1	203	0.0	0.0	0.0
@@ -7874,8 +7874,8 @@ it	06_coal	1	203	0.0	0.0	0.0
 it	07_gas	1	203	0.0	0.0	0.0
 it	08_non-res	1	203	0.0	0.0	0.0
 it	09_hydro_pump	1	203	0.0	0.0	0.0
-it	01_solar	1	204	2000.0	1.0	0.0
-it	02_wind_on	1	204	1500.0	1.0	0.0
+it	01_solar	1	204	2000.0	0.0	1.0
+it	02_wind_on	1	204	1500.0	0.0	1.0
 it	03_wind_off	1	204	0.0	0.0	0.0
 it	04_res	1	204	0.0	0.0	0.0
 it	05_nuclear	1	204	0.0	0.0	0.0
@@ -7883,8 +7883,8 @@ it	06_coal	1	204	0.0	0.0	0.0
 it	07_gas	1	204	0.0	0.0	0.0
 it	08_non-res	1	204	0.0	0.0	0.0
 it	09_hydro_pump	1	204	0.0	0.0	0.0
-it	01_solar	1	205	2000.0	1.0	0.0
-it	02_wind_on	1	205	1600.0	1.0	0.0
+it	01_solar	1	205	2000.0	0.0	1.0
+it	02_wind_on	1	205	1600.0	0.0	1.0
 it	03_wind_off	1	205	0.0	0.0	0.0
 it	04_res	1	205	0.0	0.0	0.0
 it	05_nuclear	1	205	0.0	0.0	0.0
@@ -7892,8 +7892,8 @@ it	06_coal	1	205	0.0	0.0	0.0
 it	07_gas	1	205	0.0	0.0	0.0
 it	08_non-res	1	205	0.0	0.0	0.0
 it	09_hydro_pump	1	205	0.0	0.0	0.0
-it	01_solar	1	206	2000.0	1.0	0.0
-it	02_wind_on	1	206	1700.0	1.0	0.0
+it	01_solar	1	206	2000.0	0.0	1.0
+it	02_wind_on	1	206	1700.0	0.0	1.0
 it	03_wind_off	1	206	0.0	0.0	0.0
 it	04_res	1	206	0.0	0.0	0.0
 it	05_nuclear	1	206	0.0	0.0	0.0
@@ -7901,8 +7901,8 @@ it	06_coal	1	206	0.0	0.0	0.0
 it	07_gas	1	206	0.0	0.0	0.0
 it	08_non-res	1	206	0.0	0.0	0.0
 it	09_hydro_pump	1	206	0.0	0.0	0.0
-it	01_solar	1	207	2000.0	1.0	0.0
-it	02_wind_on	1	207	1800.0	1.0	0.0
+it	01_solar	1	207	2000.0	0.0	1.0
+it	02_wind_on	1	207	1800.0	0.0	1.0
 it	03_wind_off	1	207	0.0	0.0	0.0
 it	04_res	1	207	0.0	0.0	0.0
 it	05_nuclear	1	207	0.0	0.0	0.0
@@ -7910,8 +7910,8 @@ it	06_coal	1	207	0.0	0.0	0.0
 it	07_gas	1	207	0.0	0.0	0.0
 it	08_non-res	1	207	0.0	0.0	0.0
 it	09_hydro_pump	1	207	0.0	0.0	0.0
-it	01_solar	1	208	2000.0	1.0	0.0
-it	02_wind_on	1	208	1900.0	1.0	0.0
+it	01_solar	1	208	2000.0	0.0	1.0
+it	02_wind_on	1	208	1900.0	0.0	1.0
 it	03_wind_off	1	208	0.0	0.0	0.0
 it	04_res	1	208	0.0	0.0	0.0
 it	05_nuclear	1	208	0.0	0.0	0.0
@@ -7919,8 +7919,8 @@ it	06_coal	1	208	0.0	0.0	0.0
 it	07_gas	1	208	0.0	0.0	0.0
 it	08_non-res	1	208	0.0	0.0	0.0
 it	09_hydro_pump	1	208	0.0	0.0	0.0
-it	01_solar	1	209	2000.0	1.0	0.0
-it	02_wind_on	1	209	2000.0	1.0	0.0
+it	01_solar	1	209	2000.0	0.0	1.0
+it	02_wind_on	1	209	2000.0	0.0	1.0
 it	03_wind_off	1	209	0.0	0.0	0.0
 it	04_res	1	209	0.0	0.0	0.0
 it	05_nuclear	1	209	0.0	0.0	0.0
@@ -7928,1146 +7928,1146 @@ it	06_coal	1	209	0.0	0.0	0.0
 it	07_gas	1	209	0.0	0.0	0.0
 it	08_non-res	1	209	0.0	0.0	0.0
 it	09_hydro_pump	1	209	0.0	0.0	0.0
-it	01_solar	1	210	2000.0	1.0	0.0
-it	02_wind_on	1	210	2000.0	1.0	0.0
-it	03_wind_off	1	210	100.0	1.0	0.0
+it	01_solar	1	210	2000.0	0.0	1.0
+it	02_wind_on	1	210	2000.0	0.0	1.0
+it	03_wind_off	1	210	100.0	0.0	1.0
 it	04_res	1	210	0.0	0.0	0.0
 it	05_nuclear	1	210	0.0	0.0	0.0
 it	06_coal	1	210	0.0	0.0	0.0
 it	07_gas	1	210	0.0	0.0	0.0
 it	08_non-res	1	210	0.0	0.0	0.0
 it	09_hydro_pump	1	210	0.0	0.0	0.0
-it	01_solar	1	211	2000.0	1.0	0.0
-it	02_wind_on	1	211	2000.0	1.0	0.0
-it	03_wind_off	1	211	200.0	1.0	0.0
+it	01_solar	1	211	2000.0	0.0	1.0
+it	02_wind_on	1	211	2000.0	0.0	1.0
+it	03_wind_off	1	211	200.0	0.0	1.0
 it	04_res	1	211	0.0	0.0	0.0
 it	05_nuclear	1	211	0.0	0.0	0.0
 it	06_coal	1	211	0.0	0.0	0.0
 it	07_gas	1	211	0.0	0.0	0.0
 it	08_non-res	1	211	0.0	0.0	0.0
 it	09_hydro_pump	1	211	0.0	0.0	0.0
-it	01_solar	1	212	2000.0	1.0	0.0
-it	02_wind_on	1	212	2000.0	1.0	0.0
-it	03_wind_off	1	212	300.0	1.0	0.0
+it	01_solar	1	212	2000.0	0.0	1.0
+it	02_wind_on	1	212	2000.0	0.0	1.0
+it	03_wind_off	1	212	300.0	0.0	1.0
 it	04_res	1	212	0.0	0.0	0.0
 it	05_nuclear	1	212	0.0	0.0	0.0
 it	06_coal	1	212	0.0	0.0	0.0
 it	07_gas	1	212	0.0	0.0	0.0
 it	08_non-res	1	212	0.0	0.0	0.0
 it	09_hydro_pump	1	212	0.0	0.0	0.0
-it	01_solar	1	213	2000.0	1.0	0.0
-it	02_wind_on	1	213	2000.0	1.0	0.0
-it	03_wind_off	1	213	400.0	1.0	0.0
+it	01_solar	1	213	2000.0	0.0	1.0
+it	02_wind_on	1	213	2000.0	0.0	1.0
+it	03_wind_off	1	213	400.0	0.0	1.0
 it	04_res	1	213	0.0	0.0	0.0
 it	05_nuclear	1	213	0.0	0.0	0.0
 it	06_coal	1	213	0.0	0.0	0.0
 it	07_gas	1	213	0.0	0.0	0.0
 it	08_non-res	1	213	0.0	0.0	0.0
 it	09_hydro_pump	1	213	0.0	0.0	0.0
-it	01_solar	1	214	2000.0	1.0	0.0
-it	02_wind_on	1	214	2000.0	1.0	0.0
-it	03_wind_off	1	214	500.0	1.0	0.0
+it	01_solar	1	214	2000.0	0.0	1.0
+it	02_wind_on	1	214	2000.0	0.0	1.0
+it	03_wind_off	1	214	500.0	0.0	1.0
 it	04_res	1	214	0.0	0.0	0.0
 it	05_nuclear	1	214	0.0	0.0	0.0
 it	06_coal	1	214	0.0	0.0	0.0
 it	07_gas	1	214	0.0	0.0	0.0
 it	08_non-res	1	214	0.0	0.0	0.0
 it	09_hydro_pump	1	214	0.0	0.0	0.0
-it	01_solar	1	215	2000.0	1.0	0.0
-it	02_wind_on	1	215	2000.0	1.0	0.0
-it	03_wind_off	1	215	600.0	1.0	0.0
+it	01_solar	1	215	2000.0	0.0	1.0
+it	02_wind_on	1	215	2000.0	0.0	1.0
+it	03_wind_off	1	215	600.0	0.0	1.0
 it	04_res	1	215	0.0	0.0	0.0
 it	05_nuclear	1	215	0.0	0.0	0.0
 it	06_coal	1	215	0.0	0.0	0.0
 it	07_gas	1	215	0.0	0.0	0.0
 it	08_non-res	1	215	0.0	0.0	0.0
 it	09_hydro_pump	1	215	0.0	0.0	0.0
-it	01_solar	1	216	2000.0	1.0	0.0
-it	02_wind_on	1	216	2000.0	1.0	0.0
-it	03_wind_off	1	216	700.0	1.0	0.0
+it	01_solar	1	216	2000.0	0.0	1.0
+it	02_wind_on	1	216	2000.0	0.0	1.0
+it	03_wind_off	1	216	700.0	0.0	1.0
 it	04_res	1	216	0.0	0.0	0.0
 it	05_nuclear	1	216	0.0	0.0	0.0
 it	06_coal	1	216	0.0	0.0	0.0
 it	07_gas	1	216	0.0	0.0	0.0
 it	08_non-res	1	216	0.0	0.0	0.0
 it	09_hydro_pump	1	216	0.0	0.0	0.0
-it	01_solar	1	217	2000.0	1.0	0.0
-it	02_wind_on	1	217	2000.0	1.0	0.0
-it	03_wind_off	1	217	800.0	1.0	0.0
+it	01_solar	1	217	2000.0	0.0	1.0
+it	02_wind_on	1	217	2000.0	0.0	1.0
+it	03_wind_off	1	217	800.0	0.0	1.0
 it	04_res	1	217	0.0	0.0	0.0
 it	05_nuclear	1	217	0.0	0.0	0.0
 it	06_coal	1	217	0.0	0.0	0.0
 it	07_gas	1	217	0.0	0.0	0.0
 it	08_non-res	1	217	0.0	0.0	0.0
 it	09_hydro_pump	1	217	0.0	0.0	0.0
-it	01_solar	1	218	2000.0	1.0	0.0
-it	02_wind_on	1	218	2000.0	1.0	0.0
-it	03_wind_off	1	218	900.0	1.0	0.0
+it	01_solar	1	218	2000.0	0.0	1.0
+it	02_wind_on	1	218	2000.0	0.0	1.0
+it	03_wind_off	1	218	900.0	0.0	1.0
 it	04_res	1	218	0.0	0.0	0.0
 it	05_nuclear	1	218	0.0	0.0	0.0
 it	06_coal	1	218	0.0	0.0	0.0
 it	07_gas	1	218	0.0	0.0	0.0
 it	08_non-res	1	218	0.0	0.0	0.0
 it	09_hydro_pump	1	218	0.0	0.0	0.0
-it	01_solar	1	219	2000.0	1.0	0.0
-it	02_wind_on	1	219	2000.0	1.0	0.0
-it	03_wind_off	1	219	1000.0	1.0	0.0
+it	01_solar	1	219	2000.0	0.0	1.0
+it	02_wind_on	1	219	2000.0	0.0	1.0
+it	03_wind_off	1	219	1000.0	0.0	1.0
 it	04_res	1	219	0.0	0.0	0.0
 it	05_nuclear	1	219	0.0	0.0	0.0
 it	06_coal	1	219	0.0	0.0	0.0
 it	07_gas	1	219	0.0	0.0	0.0
 it	08_non-res	1	219	0.0	0.0	0.0
 it	09_hydro_pump	1	219	0.0	0.0	0.0
-it	01_solar	1	220	2000.0	1.0	0.0
-it	02_wind_on	1	220	2000.0	1.0	0.0
-it	03_wind_off	1	220	1100.0	1.0	0.0
+it	01_solar	1	220	2000.0	0.0	1.0
+it	02_wind_on	1	220	2000.0	0.0	1.0
+it	03_wind_off	1	220	1100.0	0.0	1.0
 it	04_res	1	220	0.0	0.0	0.0
 it	05_nuclear	1	220	0.0	0.0	0.0
 it	06_coal	1	220	0.0	0.0	0.0
 it	07_gas	1	220	0.0	0.0	0.0
 it	08_non-res	1	220	0.0	0.0	0.0
 it	09_hydro_pump	1	220	0.0	0.0	0.0
-it	01_solar	1	221	2000.0	1.0	0.0
-it	02_wind_on	1	221	2000.0	1.0	0.0
-it	03_wind_off	1	221	1200.0	1.0	0.0
+it	01_solar	1	221	2000.0	0.0	1.0
+it	02_wind_on	1	221	2000.0	0.0	1.0
+it	03_wind_off	1	221	1200.0	0.0	1.0
 it	04_res	1	221	0.0	0.0	0.0
 it	05_nuclear	1	221	0.0	0.0	0.0
 it	06_coal	1	221	0.0	0.0	0.0
 it	07_gas	1	221	0.0	0.0	0.0
 it	08_non-res	1	221	0.0	0.0	0.0
 it	09_hydro_pump	1	221	0.0	0.0	0.0
-it	01_solar	1	222	2000.0	1.0	0.0
-it	02_wind_on	1	222	2000.0	1.0	0.0
-it	03_wind_off	1	222	1300.0	1.0	0.0
+it	01_solar	1	222	2000.0	0.0	1.0
+it	02_wind_on	1	222	2000.0	0.0	1.0
+it	03_wind_off	1	222	1300.0	0.0	1.0
 it	04_res	1	222	0.0	0.0	0.0
 it	05_nuclear	1	222	0.0	0.0	0.0
 it	06_coal	1	222	0.0	0.0	0.0
 it	07_gas	1	222	0.0	0.0	0.0
 it	08_non-res	1	222	0.0	0.0	0.0
 it	09_hydro_pump	1	222	0.0	0.0	0.0
-it	01_solar	1	223	2000.0	1.0	0.0
-it	02_wind_on	1	223	2000.0	1.0	0.0
-it	03_wind_off	1	223	1400.0	1.0	0.0
+it	01_solar	1	223	2000.0	0.0	1.0
+it	02_wind_on	1	223	2000.0	0.0	1.0
+it	03_wind_off	1	223	1400.0	0.0	1.0
 it	04_res	1	223	0.0	0.0	0.0
 it	05_nuclear	1	223	0.0	0.0	0.0
 it	06_coal	1	223	0.0	0.0	0.0
 it	07_gas	1	223	0.0	0.0	0.0
 it	08_non-res	1	223	0.0	0.0	0.0
 it	09_hydro_pump	1	223	0.0	0.0	0.0
-it	01_solar	1	224	2000.0	1.0	0.0
-it	02_wind_on	1	224	2000.0	1.0	0.0
-it	03_wind_off	1	224	1500.0	1.0	0.0
+it	01_solar	1	224	2000.0	0.0	1.0
+it	02_wind_on	1	224	2000.0	0.0	1.0
+it	03_wind_off	1	224	1500.0	0.0	1.0
 it	04_res	1	224	0.0	0.0	0.0
 it	05_nuclear	1	224	0.0	0.0	0.0
 it	06_coal	1	224	0.0	0.0	0.0
 it	07_gas	1	224	0.0	0.0	0.0
 it	08_non-res	1	224	0.0	0.0	0.0
 it	09_hydro_pump	1	224	0.0	0.0	0.0
-it	01_solar	1	225	2000.0	1.0	0.0
-it	02_wind_on	1	225	2000.0	1.0	0.0
-it	03_wind_off	1	225	1600.0	1.0	0.0
+it	01_solar	1	225	2000.0	0.0	1.0
+it	02_wind_on	1	225	2000.0	0.0	1.0
+it	03_wind_off	1	225	1600.0	0.0	1.0
 it	04_res	1	225	0.0	0.0	0.0
 it	05_nuclear	1	225	0.0	0.0	0.0
 it	06_coal	1	225	0.0	0.0	0.0
 it	07_gas	1	225	0.0	0.0	0.0
 it	08_non-res	1	225	0.0	0.0	0.0
 it	09_hydro_pump	1	225	0.0	0.0	0.0
-it	01_solar	1	226	2000.0	1.0	0.0
-it	02_wind_on	1	226	2000.0	1.0	0.0
-it	03_wind_off	1	226	1700.0	1.0	0.0
+it	01_solar	1	226	2000.0	0.0	1.0
+it	02_wind_on	1	226	2000.0	0.0	1.0
+it	03_wind_off	1	226	1700.0	0.0	1.0
 it	04_res	1	226	0.0	0.0	0.0
 it	05_nuclear	1	226	0.0	0.0	0.0
 it	06_coal	1	226	0.0	0.0	0.0
 it	07_gas	1	226	0.0	0.0	0.0
 it	08_non-res	1	226	0.0	0.0	0.0
 it	09_hydro_pump	1	226	0.0	0.0	0.0
-it	01_solar	1	227	2000.0	1.0	0.0
-it	02_wind_on	1	227	2000.0	1.0	0.0
-it	03_wind_off	1	227	1800.0	1.0	0.0
+it	01_solar	1	227	2000.0	0.0	1.0
+it	02_wind_on	1	227	2000.0	0.0	1.0
+it	03_wind_off	1	227	1800.0	0.0	1.0
 it	04_res	1	227	0.0	0.0	0.0
 it	05_nuclear	1	227	0.0	0.0	0.0
 it	06_coal	1	227	0.0	0.0	0.0
 it	07_gas	1	227	0.0	0.0	0.0
 it	08_non-res	1	227	0.0	0.0	0.0
 it	09_hydro_pump	1	227	0.0	0.0	0.0
-it	01_solar	1	228	2000.0	1.0	0.0
-it	02_wind_on	1	228	2000.0	1.0	0.0
-it	03_wind_off	1	228	1900.0	1.0	0.0
+it	01_solar	1	228	2000.0	0.0	1.0
+it	02_wind_on	1	228	2000.0	0.0	1.0
+it	03_wind_off	1	228	1900.0	0.0	1.0
 it	04_res	1	228	0.0	0.0	0.0
 it	05_nuclear	1	228	0.0	0.0	0.0
 it	06_coal	1	228	0.0	0.0	0.0
 it	07_gas	1	228	0.0	0.0	0.0
 it	08_non-res	1	228	0.0	0.0	0.0
 it	09_hydro_pump	1	228	0.0	0.0	0.0
-it	01_solar	1	229	2000.0	1.0	0.0
-it	02_wind_on	1	229	2000.0	1.0	0.0
-it	03_wind_off	1	229	2000.0	1.0	0.0
+it	01_solar	1	229	2000.0	0.0	1.0
+it	02_wind_on	1	229	2000.0	0.0	1.0
+it	03_wind_off	1	229	2000.0	0.0	1.0
 it	04_res	1	229	0.0	0.0	0.0
 it	05_nuclear	1	229	0.0	0.0	0.0
 it	06_coal	1	229	0.0	0.0	0.0
 it	07_gas	1	229	0.0	0.0	0.0
 it	08_non-res	1	229	0.0	0.0	0.0
 it	09_hydro_pump	1	229	0.0	0.0	0.0
-it	01_solar	1	230	2000.0	1.0	0.0
-it	02_wind_on	1	230	2000.0	1.0	0.0
-it	03_wind_off	1	230	2000.0	1.0	0.0
-it	04_res	1	230	100.0	1.0	0.0
+it	01_solar	1	230	2000.0	0.0	1.0
+it	02_wind_on	1	230	2000.0	0.0	1.0
+it	03_wind_off	1	230	2000.0	0.0	1.0
+it	04_res	1	230	100.0	0.0	1.0
 it	05_nuclear	1	230	0.0	0.0	0.0
 it	06_coal	1	230	0.0	0.0	0.0
 it	07_gas	1	230	0.0	0.0	0.0
 it	08_non-res	1	230	0.0	0.0	0.0
 it	09_hydro_pump	1	230	0.0	0.0	0.0
-it	01_solar	1	231	2000.0	1.0	0.0
-it	02_wind_on	1	231	2000.0	1.0	0.0
-it	03_wind_off	1	231	2000.0	1.0	0.0
-it	04_res	1	231	200.0	1.0	0.0
+it	01_solar	1	231	2000.0	0.0	1.0
+it	02_wind_on	1	231	2000.0	0.0	1.0
+it	03_wind_off	1	231	2000.0	0.0	1.0
+it	04_res	1	231	200.0	0.0	1.0
 it	05_nuclear	1	231	0.0	0.0	0.0
 it	06_coal	1	231	0.0	0.0	0.0
 it	07_gas	1	231	0.0	0.0	0.0
 it	08_non-res	1	231	0.0	0.0	0.0
 it	09_hydro_pump	1	231	0.0	0.0	0.0
-it	01_solar	1	232	2000.0	1.0	0.0
-it	02_wind_on	1	232	2000.0	1.0	0.0
-it	03_wind_off	1	232	2000.0	1.0	0.0
-it	04_res	1	232	300.0	1.0	0.0
+it	01_solar	1	232	2000.0	0.0	1.0
+it	02_wind_on	1	232	2000.0	0.0	1.0
+it	03_wind_off	1	232	2000.0	0.0	1.0
+it	04_res	1	232	300.0	0.0	1.0
 it	05_nuclear	1	232	0.0	0.0	0.0
 it	06_coal	1	232	0.0	0.0	0.0
 it	07_gas	1	232	0.0	0.0	0.0
 it	08_non-res	1	232	0.0	0.0	0.0
 it	09_hydro_pump	1	232	0.0	0.0	0.0
-it	01_solar	1	233	2000.0	1.0	0.0
-it	02_wind_on	1	233	2000.0	1.0	0.0
-it	03_wind_off	1	233	2000.0	1.0	0.0
-it	04_res	1	233	400.0	1.0	0.0
+it	01_solar	1	233	2000.0	0.0	1.0
+it	02_wind_on	1	233	2000.0	0.0	1.0
+it	03_wind_off	1	233	2000.0	0.0	1.0
+it	04_res	1	233	400.0	0.0	1.0
 it	05_nuclear	1	233	0.0	0.0	0.0
 it	06_coal	1	233	0.0	0.0	0.0
 it	07_gas	1	233	0.0	0.0	0.0
 it	08_non-res	1	233	0.0	0.0	0.0
 it	09_hydro_pump	1	233	0.0	0.0	0.0
-it	01_solar	1	234	2000.0	1.0	0.0
-it	02_wind_on	1	234	2000.0	1.0	0.0
-it	03_wind_off	1	234	2000.0	1.0	0.0
-it	04_res	1	234	500.0	1.0	0.0
+it	01_solar	1	234	2000.0	0.0	1.0
+it	02_wind_on	1	234	2000.0	0.0	1.0
+it	03_wind_off	1	234	2000.0	0.0	1.0
+it	04_res	1	234	500.0	0.0	1.0
 it	05_nuclear	1	234	0.0	0.0	0.0
 it	06_coal	1	234	0.0	0.0	0.0
 it	07_gas	1	234	0.0	0.0	0.0
 it	08_non-res	1	234	0.0	0.0	0.0
 it	09_hydro_pump	1	234	0.0	0.0	0.0
-it	01_solar	1	235	2000.0	1.0	0.0
-it	02_wind_on	1	235	2000.0	1.0	0.0
-it	03_wind_off	1	235	2000.0	1.0	0.0
-it	04_res	1	235	600.0	1.0	0.0
+it	01_solar	1	235	2000.0	0.0	1.0
+it	02_wind_on	1	235	2000.0	0.0	1.0
+it	03_wind_off	1	235	2000.0	0.0	1.0
+it	04_res	1	235	600.0	0.0	1.0
 it	05_nuclear	1	235	0.0	0.0	0.0
 it	06_coal	1	235	0.0	0.0	0.0
 it	07_gas	1	235	0.0	0.0	0.0
 it	08_non-res	1	235	0.0	0.0	0.0
 it	09_hydro_pump	1	235	0.0	0.0	0.0
-it	01_solar	1	236	2000.0	1.0	0.0
-it	02_wind_on	1	236	2000.0	1.0	0.0
-it	03_wind_off	1	236	2000.0	1.0	0.0
-it	04_res	1	236	700.0	1.0	0.0
+it	01_solar	1	236	2000.0	0.0	1.0
+it	02_wind_on	1	236	2000.0	0.0	1.0
+it	03_wind_off	1	236	2000.0	0.0	1.0
+it	04_res	1	236	700.0	0.0	1.0
 it	05_nuclear	1	236	0.0	0.0	0.0
 it	06_coal	1	236	0.0	0.0	0.0
 it	07_gas	1	236	0.0	0.0	0.0
 it	08_non-res	1	236	0.0	0.0	0.0
 it	09_hydro_pump	1	236	0.0	0.0	0.0
-it	01_solar	1	237	2000.0	1.0	0.0
-it	02_wind_on	1	237	2000.0	1.0	0.0
-it	03_wind_off	1	237	2000.0	1.0	0.0
-it	04_res	1	237	800.0	1.0	0.0
+it	01_solar	1	237	2000.0	0.0	1.0
+it	02_wind_on	1	237	2000.0	0.0	1.0
+it	03_wind_off	1	237	2000.0	0.0	1.0
+it	04_res	1	237	800.0	0.0	1.0
 it	05_nuclear	1	237	0.0	0.0	0.0
 it	06_coal	1	237	0.0	0.0	0.0
 it	07_gas	1	237	0.0	0.0	0.0
 it	08_non-res	1	237	0.0	0.0	0.0
 it	09_hydro_pump	1	237	0.0	0.0	0.0
-it	01_solar	1	238	2000.0	1.0	0.0
-it	02_wind_on	1	238	2000.0	1.0	0.0
-it	03_wind_off	1	238	2000.0	1.0	0.0
-it	04_res	1	238	900.0	1.0	0.0
+it	01_solar	1	238	2000.0	0.0	1.0
+it	02_wind_on	1	238	2000.0	0.0	1.0
+it	03_wind_off	1	238	2000.0	0.0	1.0
+it	04_res	1	238	900.0	0.0	1.0
 it	05_nuclear	1	238	0.0	0.0	0.0
 it	06_coal	1	238	0.0	0.0	0.0
 it	07_gas	1	238	0.0	0.0	0.0
 it	08_non-res	1	238	0.0	0.0	0.0
 it	09_hydro_pump	1	238	0.0	0.0	0.0
-it	01_solar	1	239	2000.0	1.0	0.0
-it	02_wind_on	1	239	2000.0	1.0	0.0
-it	03_wind_off	1	239	2000.0	1.0	0.0
-it	04_res	1	239	1000.0	1.0	0.0
+it	01_solar	1	239	2000.0	0.0	1.0
+it	02_wind_on	1	239	2000.0	0.0	1.0
+it	03_wind_off	1	239	2000.0	0.0	1.0
+it	04_res	1	239	1000.0	0.0	1.0
 it	05_nuclear	1	239	0.0	0.0	0.0
 it	06_coal	1	239	0.0	0.0	0.0
 it	07_gas	1	239	0.0	0.0	0.0
 it	08_non-res	1	239	0.0	0.0	0.0
 it	09_hydro_pump	1	239	0.0	0.0	0.0
-it	01_solar	1	240	2000.0	1.0	0.0
-it	02_wind_on	1	240	2000.0	1.0	0.0
-it	03_wind_off	1	240	2000.0	1.0	0.0
-it	04_res	1	240	1100.0	1.0	0.0
+it	01_solar	1	240	2000.0	0.0	1.0
+it	02_wind_on	1	240	2000.0	0.0	1.0
+it	03_wind_off	1	240	2000.0	0.0	1.0
+it	04_res	1	240	1100.0	0.0	1.0
 it	05_nuclear	1	240	0.0	0.0	0.0
 it	06_coal	1	240	0.0	0.0	0.0
 it	07_gas	1	240	0.0	0.0	0.0
 it	08_non-res	1	240	0.0	0.0	0.0
 it	09_hydro_pump	1	240	0.0	0.0	0.0
-it	01_solar	1	241	2000.0	1.0	0.0
-it	02_wind_on	1	241	2000.0	1.0	0.0
-it	03_wind_off	1	241	2000.0	1.0	0.0
-it	04_res	1	241	1200.0	1.0	0.0
+it	01_solar	1	241	2000.0	0.0	1.0
+it	02_wind_on	1	241	2000.0	0.0	1.0
+it	03_wind_off	1	241	2000.0	0.0	1.0
+it	04_res	1	241	1200.0	0.0	1.0
 it	05_nuclear	1	241	0.0	0.0	0.0
 it	06_coal	1	241	0.0	0.0	0.0
 it	07_gas	1	241	0.0	0.0	0.0
 it	08_non-res	1	241	0.0	0.0	0.0
 it	09_hydro_pump	1	241	0.0	0.0	0.0
-it	01_solar	1	242	2000.0	1.0	0.0
-it	02_wind_on	1	242	2000.0	1.0	0.0
-it	03_wind_off	1	242	2000.0	1.0	0.0
-it	04_res	1	242	1300.0	1.0	0.0
+it	01_solar	1	242	2000.0	0.0	1.0
+it	02_wind_on	1	242	2000.0	0.0	1.0
+it	03_wind_off	1	242	2000.0	0.0	1.0
+it	04_res	1	242	1300.0	0.0	1.0
 it	05_nuclear	1	242	0.0	0.0	0.0
 it	06_coal	1	242	0.0	0.0	0.0
 it	07_gas	1	242	0.0	0.0	0.0
 it	08_non-res	1	242	0.0	0.0	0.0
 it	09_hydro_pump	1	242	0.0	0.0	0.0
-it	01_solar	1	243	2000.0	1.0	0.0
-it	02_wind_on	1	243	2000.0	1.0	0.0
-it	03_wind_off	1	243	2000.0	1.0	0.0
-it	04_res	1	243	1400.0	1.0	0.0
+it	01_solar	1	243	2000.0	0.0	1.0
+it	02_wind_on	1	243	2000.0	0.0	1.0
+it	03_wind_off	1	243	2000.0	0.0	1.0
+it	04_res	1	243	1400.0	0.0	1.0
 it	05_nuclear	1	243	0.0	0.0	0.0
 it	06_coal	1	243	0.0	0.0	0.0
 it	07_gas	1	243	0.0	0.0	0.0
 it	08_non-res	1	243	0.0	0.0	0.0
 it	09_hydro_pump	1	243	0.0	0.0	0.0
-it	01_solar	1	244	2000.0	1.0	0.0
-it	02_wind_on	1	244	2000.0	1.0	0.0
-it	03_wind_off	1	244	2000.0	1.0	0.0
-it	04_res	1	244	1500.0	1.0	0.0
+it	01_solar	1	244	2000.0	0.0	1.0
+it	02_wind_on	1	244	2000.0	0.0	1.0
+it	03_wind_off	1	244	2000.0	0.0	1.0
+it	04_res	1	244	1500.0	0.0	1.0
 it	05_nuclear	1	244	0.0	0.0	0.0
 it	06_coal	1	244	0.0	0.0	0.0
 it	07_gas	1	244	0.0	0.0	0.0
 it	08_non-res	1	244	0.0	0.0	0.0
 it	09_hydro_pump	1	244	0.0	0.0	0.0
-it	01_solar	1	245	2000.0	1.0	0.0
-it	02_wind_on	1	245	2000.0	1.0	0.0
-it	03_wind_off	1	245	2000.0	1.0	0.0
-it	04_res	1	245	1600.0	1.0	0.0
+it	01_solar	1	245	2000.0	0.0	1.0
+it	02_wind_on	1	245	2000.0	0.0	1.0
+it	03_wind_off	1	245	2000.0	0.0	1.0
+it	04_res	1	245	1600.0	0.0	1.0
 it	05_nuclear	1	245	0.0	0.0	0.0
 it	06_coal	1	245	0.0	0.0	0.0
 it	07_gas	1	245	0.0	0.0	0.0
 it	08_non-res	1	245	0.0	0.0	0.0
 it	09_hydro_pump	1	245	0.0	0.0	0.0
-it	01_solar	1	246	2000.0	1.0	0.0
-it	02_wind_on	1	246	2000.0	1.0	0.0
-it	03_wind_off	1	246	2000.0	1.0	0.0
-it	04_res	1	246	1700.0	1.0	0.0
+it	01_solar	1	246	2000.0	0.0	1.0
+it	02_wind_on	1	246	2000.0	0.0	1.0
+it	03_wind_off	1	246	2000.0	0.0	1.0
+it	04_res	1	246	1700.0	0.0	1.0
 it	05_nuclear	1	246	0.0	0.0	0.0
 it	06_coal	1	246	0.0	0.0	0.0
 it	07_gas	1	246	0.0	0.0	0.0
 it	08_non-res	1	246	0.0	0.0	0.0
 it	09_hydro_pump	1	246	0.0	0.0	0.0
-it	01_solar	1	247	2000.0	1.0	0.0
-it	02_wind_on	1	247	2000.0	1.0	0.0
-it	03_wind_off	1	247	2000.0	1.0	0.0
-it	04_res	1	247	1800.0	1.0	0.0
+it	01_solar	1	247	2000.0	0.0	1.0
+it	02_wind_on	1	247	2000.0	0.0	1.0
+it	03_wind_off	1	247	2000.0	0.0	1.0
+it	04_res	1	247	1800.0	0.0	1.0
 it	05_nuclear	1	247	0.0	0.0	0.0
 it	06_coal	1	247	0.0	0.0	0.0
 it	07_gas	1	247	0.0	0.0	0.0
 it	08_non-res	1	247	0.0	0.0	0.0
 it	09_hydro_pump	1	247	0.0	0.0	0.0
-it	01_solar	1	248	2000.0	1.0	0.0
-it	02_wind_on	1	248	2000.0	1.0	0.0
-it	03_wind_off	1	248	2000.0	1.0	0.0
-it	04_res	1	248	1900.0	1.0	0.0
+it	01_solar	1	248	2000.0	0.0	1.0
+it	02_wind_on	1	248	2000.0	0.0	1.0
+it	03_wind_off	1	248	2000.0	0.0	1.0
+it	04_res	1	248	1900.0	0.0	1.0
 it	05_nuclear	1	248	0.0	0.0	0.0
 it	06_coal	1	248	0.0	0.0	0.0
 it	07_gas	1	248	0.0	0.0	0.0
 it	08_non-res	1	248	0.0	0.0	0.0
 it	09_hydro_pump	1	248	0.0	0.0	0.0
-it	01_solar	1	249	2000.0	1.0	0.0
-it	02_wind_on	1	249	2000.0	1.0	0.0
-it	03_wind_off	1	249	2000.0	1.0	0.0
-it	04_res	1	249	2000.0	1.0	0.0
+it	01_solar	1	249	2000.0	0.0	1.0
+it	02_wind_on	1	249	2000.0	0.0	1.0
+it	03_wind_off	1	249	2000.0	0.0	1.0
+it	04_res	1	249	2000.0	0.0	1.0
 it	05_nuclear	1	249	0.0	0.0	0.0
 it	06_coal	1	249	0.0	0.0	0.0
 it	07_gas	1	249	0.0	0.0	0.0
 it	08_non-res	1	249	0.0	0.0	0.0
 it	09_hydro_pump	1	249	0.0	0.0	0.0
-it	01_solar	1	250	2000.0	1.0	0.0
-it	02_wind_on	1	250	2000.0	1.0	0.0
-it	03_wind_off	1	250	2000.0	1.0	0.0
-it	04_res	1	250	2000.0	1.0	0.0
-it	05_nuclear	1	250	100.0	1.0	0.0
+it	01_solar	1	250	2000.0	0.0	1.0
+it	02_wind_on	1	250	2000.0	0.0	1.0
+it	03_wind_off	1	250	2000.0	0.0	1.0
+it	04_res	1	250	2000.0	0.0	1.0
+it	05_nuclear	1	250	100.0	0.0	1.0
 it	06_coal	1	250	0.0	0.0	0.0
 it	07_gas	1	250	0.0	0.0	0.0
 it	08_non-res	1	250	0.0	0.0	0.0
 it	09_hydro_pump	1	250	0.0	0.0	0.0
-it	01_solar	1	251	2000.0	1.0	0.0
-it	02_wind_on	1	251	2000.0	1.0	0.0
-it	03_wind_off	1	251	2000.0	1.0	0.0
-it	04_res	1	251	2000.0	1.0	0.0
-it	05_nuclear	1	251	200.0	1.0	0.0
+it	01_solar	1	251	2000.0	0.0	1.0
+it	02_wind_on	1	251	2000.0	0.0	1.0
+it	03_wind_off	1	251	2000.0	0.0	1.0
+it	04_res	1	251	2000.0	0.0	1.0
+it	05_nuclear	1	251	200.0	0.0	1.0
 it	06_coal	1	251	0.0	0.0	0.0
 it	07_gas	1	251	0.0	0.0	0.0
 it	08_non-res	1	251	0.0	0.0	0.0
 it	09_hydro_pump	1	251	0.0	0.0	0.0
-it	01_solar	1	252	2000.0	1.0	0.0
-it	02_wind_on	1	252	2000.0	1.0	0.0
-it	03_wind_off	1	252	2000.0	1.0	0.0
-it	04_res	1	252	2000.0	1.0	0.0
-it	05_nuclear	1	252	300.0	1.0	0.0
+it	01_solar	1	252	2000.0	0.0	1.0
+it	02_wind_on	1	252	2000.0	0.0	1.0
+it	03_wind_off	1	252	2000.0	0.0	1.0
+it	04_res	1	252	2000.0	0.0	1.0
+it	05_nuclear	1	252	300.0	0.0	1.0
 it	06_coal	1	252	0.0	0.0	0.0
 it	07_gas	1	252	0.0	0.0	0.0
 it	08_non-res	1	252	0.0	0.0	0.0
 it	09_hydro_pump	1	252	0.0	0.0	0.0
-it	01_solar	1	253	2000.0	1.0	0.0
-it	02_wind_on	1	253	2000.0	1.0	0.0
-it	03_wind_off	1	253	2000.0	1.0	0.0
-it	04_res	1	253	2000.0	1.0	0.0
-it	05_nuclear	1	253	400.0	1.0	0.0
+it	01_solar	1	253	2000.0	0.0	1.0
+it	02_wind_on	1	253	2000.0	0.0	1.0
+it	03_wind_off	1	253	2000.0	0.0	1.0
+it	04_res	1	253	2000.0	0.0	1.0
+it	05_nuclear	1	253	400.0	0.0	1.0
 it	06_coal	1	253	0.0	0.0	0.0
 it	07_gas	1	253	0.0	0.0	0.0
 it	08_non-res	1	253	0.0	0.0	0.0
 it	09_hydro_pump	1	253	0.0	0.0	0.0
-it	01_solar	1	254	2000.0	1.0	0.0
-it	02_wind_on	1	254	2000.0	1.0	0.0
-it	03_wind_off	1	254	2000.0	1.0	0.0
-it	04_res	1	254	2000.0	1.0	0.0
-it	05_nuclear	1	254	500.0	1.0	0.0
+it	01_solar	1	254	2000.0	0.0	1.0
+it	02_wind_on	1	254	2000.0	0.0	1.0
+it	03_wind_off	1	254	2000.0	0.0	1.0
+it	04_res	1	254	2000.0	0.0	1.0
+it	05_nuclear	1	254	500.0	0.0	1.0
 it	06_coal	1	254	0.0	0.0	0.0
 it	07_gas	1	254	0.0	0.0	0.0
 it	08_non-res	1	254	0.0	0.0	0.0
 it	09_hydro_pump	1	254	0.0	0.0	0.0
-it	01_solar	1	255	2000.0	1.0	0.0
-it	02_wind_on	1	255	2000.0	1.0	0.0
-it	03_wind_off	1	255	2000.0	1.0	0.0
-it	04_res	1	255	2000.0	1.0	0.0
-it	05_nuclear	1	255	600.0	1.0	0.0
+it	01_solar	1	255	2000.0	0.0	1.0
+it	02_wind_on	1	255	2000.0	0.0	1.0
+it	03_wind_off	1	255	2000.0	0.0	1.0
+it	04_res	1	255	2000.0	0.0	1.0
+it	05_nuclear	1	255	600.0	0.0	1.0
 it	06_coal	1	255	0.0	0.0	0.0
 it	07_gas	1	255	0.0	0.0	0.0
 it	08_non-res	1	255	0.0	0.0	0.0
 it	09_hydro_pump	1	255	0.0	0.0	0.0
-it	01_solar	1	256	2000.0	1.0	0.0
-it	02_wind_on	1	256	2000.0	1.0	0.0
-it	03_wind_off	1	256	2000.0	1.0	0.0
-it	04_res	1	256	2000.0	1.0	0.0
-it	05_nuclear	1	256	700.0	1.0	0.0
+it	01_solar	1	256	2000.0	0.0	1.0
+it	02_wind_on	1	256	2000.0	0.0	1.0
+it	03_wind_off	1	256	2000.0	0.0	1.0
+it	04_res	1	256	2000.0	0.0	1.0
+it	05_nuclear	1	256	700.0	0.0	1.0
 it	06_coal	1	256	0.0	0.0	0.0
 it	07_gas	1	256	0.0	0.0	0.0
 it	08_non-res	1	256	0.0	0.0	0.0
 it	09_hydro_pump	1	256	0.0	0.0	0.0
-it	01_solar	1	257	2000.0	1.0	0.0
-it	02_wind_on	1	257	2000.0	1.0	0.0
-it	03_wind_off	1	257	2000.0	1.0	0.0
-it	04_res	1	257	2000.0	1.0	0.0
-it	05_nuclear	1	257	800.0	1.0	0.0
+it	01_solar	1	257	2000.0	0.0	1.0
+it	02_wind_on	1	257	2000.0	0.0	1.0
+it	03_wind_off	1	257	2000.0	0.0	1.0
+it	04_res	1	257	2000.0	0.0	1.0
+it	05_nuclear	1	257	800.0	0.0	1.0
 it	06_coal	1	257	0.0	0.0	0.0
 it	07_gas	1	257	0.0	0.0	0.0
 it	08_non-res	1	257	0.0	0.0	0.0
 it	09_hydro_pump	1	257	0.0	0.0	0.0
-it	01_solar	1	258	2000.0	1.0	0.0
-it	02_wind_on	1	258	2000.0	1.0	0.0
-it	03_wind_off	1	258	2000.0	1.0	0.0
-it	04_res	1	258	2000.0	1.0	0.0
-it	05_nuclear	1	258	900.0	1.0	0.0
+it	01_solar	1	258	2000.0	0.0	1.0
+it	02_wind_on	1	258	2000.0	0.0	1.0
+it	03_wind_off	1	258	2000.0	0.0	1.0
+it	04_res	1	258	2000.0	0.0	1.0
+it	05_nuclear	1	258	900.0	0.0	1.0
 it	06_coal	1	258	0.0	0.0	0.0
 it	07_gas	1	258	0.0	0.0	0.0
 it	08_non-res	1	258	0.0	0.0	0.0
 it	09_hydro_pump	1	258	0.0	0.0	0.0
-it	01_solar	1	259	2000.0	1.0	0.0
-it	02_wind_on	1	259	2000.0	1.0	0.0
-it	03_wind_off	1	259	2000.0	1.0	0.0
-it	04_res	1	259	2000.0	1.0	0.0
-it	05_nuclear	1	259	1000.0	1.0	0.0
+it	01_solar	1	259	2000.0	0.0	1.0
+it	02_wind_on	1	259	2000.0	0.0	1.0
+it	03_wind_off	1	259	2000.0	0.0	1.0
+it	04_res	1	259	2000.0	0.0	1.0
+it	05_nuclear	1	259	1000.0	0.0	1.0
 it	06_coal	1	259	0.0	0.0	0.0
 it	07_gas	1	259	0.0	0.0	0.0
 it	08_non-res	1	259	0.0	0.0	0.0
 it	09_hydro_pump	1	259	0.0	0.0	0.0
-it	01_solar	1	260	2000.0	1.0	0.0
-it	02_wind_on	1	260	2000.0	1.0	0.0
-it	03_wind_off	1	260	2000.0	1.0	0.0
-it	04_res	1	260	2000.0	1.0	0.0
-it	05_nuclear	1	260	1100.0	1.0	0.0
+it	01_solar	1	260	2000.0	0.0	1.0
+it	02_wind_on	1	260	2000.0	0.0	1.0
+it	03_wind_off	1	260	2000.0	0.0	1.0
+it	04_res	1	260	2000.0	0.0	1.0
+it	05_nuclear	1	260	1100.0	0.0	1.0
 it	06_coal	1	260	0.0	0.0	0.0
 it	07_gas	1	260	0.0	0.0	0.0
 it	08_non-res	1	260	0.0	0.0	0.0
 it	09_hydro_pump	1	260	0.0	0.0	0.0
-it	01_solar	1	261	2000.0	1.0	0.0
-it	02_wind_on	1	261	2000.0	1.0	0.0
-it	03_wind_off	1	261	2000.0	1.0	0.0
-it	04_res	1	261	2000.0	1.0	0.0
-it	05_nuclear	1	261	1200.0	1.0	0.0
+it	01_solar	1	261	2000.0	0.0	1.0
+it	02_wind_on	1	261	2000.0	0.0	1.0
+it	03_wind_off	1	261	2000.0	0.0	1.0
+it	04_res	1	261	2000.0	0.0	1.0
+it	05_nuclear	1	261	1200.0	0.0	1.0
 it	06_coal	1	261	0.0	0.0	0.0
 it	07_gas	1	261	0.0	0.0	0.0
 it	08_non-res	1	261	0.0	0.0	0.0
 it	09_hydro_pump	1	261	0.0	0.0	0.0
-it	01_solar	1	262	2000.0	1.0	0.0
-it	02_wind_on	1	262	2000.0	1.0	0.0
-it	03_wind_off	1	262	2000.0	1.0	0.0
-it	04_res	1	262	2000.0	1.0	0.0
-it	05_nuclear	1	262	1300.0	1.0	0.0
+it	01_solar	1	262	2000.0	0.0	1.0
+it	02_wind_on	1	262	2000.0	0.0	1.0
+it	03_wind_off	1	262	2000.0	0.0	1.0
+it	04_res	1	262	2000.0	0.0	1.0
+it	05_nuclear	1	262	1300.0	0.0	1.0
 it	06_coal	1	262	0.0	0.0	0.0
 it	07_gas	1	262	0.0	0.0	0.0
 it	08_non-res	1	262	0.0	0.0	0.0
 it	09_hydro_pump	1	262	0.0	0.0	0.0
-it	01_solar	1	263	2000.0	1.0	0.0
-it	02_wind_on	1	263	2000.0	1.0	0.0
-it	03_wind_off	1	263	2000.0	1.0	0.0
-it	04_res	1	263	2000.0	1.0	0.0
-it	05_nuclear	1	263	1400.0	1.0	0.0
+it	01_solar	1	263	2000.0	0.0	1.0
+it	02_wind_on	1	263	2000.0	0.0	1.0
+it	03_wind_off	1	263	2000.0	0.0	1.0
+it	04_res	1	263	2000.0	0.0	1.0
+it	05_nuclear	1	263	1400.0	0.0	1.0
 it	06_coal	1	263	0.0	0.0	0.0
 it	07_gas	1	263	0.0	0.0	0.0
 it	08_non-res	1	263	0.0	0.0	0.0
 it	09_hydro_pump	1	263	0.0	0.0	0.0
-it	01_solar	1	264	2000.0	1.0	0.0
-it	02_wind_on	1	264	2000.0	1.0	0.0
-it	03_wind_off	1	264	2000.0	1.0	0.0
-it	04_res	1	264	2000.0	1.0	0.0
-it	05_nuclear	1	264	1500.0	1.0	0.0
+it	01_solar	1	264	2000.0	0.0	1.0
+it	02_wind_on	1	264	2000.0	0.0	1.0
+it	03_wind_off	1	264	2000.0	0.0	1.0
+it	04_res	1	264	2000.0	0.0	1.0
+it	05_nuclear	1	264	1500.0	0.0	1.0
 it	06_coal	1	264	0.0	0.0	0.0
 it	07_gas	1	264	0.0	0.0	0.0
 it	08_non-res	1	264	0.0	0.0	0.0
 it	09_hydro_pump	1	264	0.0	0.0	0.0
-it	01_solar	1	265	2000.0	1.0	0.0
-it	02_wind_on	1	265	2000.0	1.0	0.0
-it	03_wind_off	1	265	2000.0	1.0	0.0
-it	04_res	1	265	2000.0	1.0	0.0
-it	05_nuclear	1	265	1600.0	1.0	0.0
+it	01_solar	1	265	2000.0	0.0	1.0
+it	02_wind_on	1	265	2000.0	0.0	1.0
+it	03_wind_off	1	265	2000.0	0.0	1.0
+it	04_res	1	265	2000.0	0.0	1.0
+it	05_nuclear	1	265	1600.0	0.0	1.0
 it	06_coal	1	265	0.0	0.0	0.0
 it	07_gas	1	265	0.0	0.0	0.0
 it	08_non-res	1	265	0.0	0.0	0.0
 it	09_hydro_pump	1	265	0.0	0.0	0.0
-it	01_solar	1	266	2000.0	1.0	0.0
-it	02_wind_on	1	266	2000.0	1.0	0.0
-it	03_wind_off	1	266	2000.0	1.0	0.0
-it	04_res	1	266	2000.0	1.0	0.0
-it	05_nuclear	1	266	1700.0	1.0	0.0
+it	01_solar	1	266	2000.0	0.0	1.0
+it	02_wind_on	1	266	2000.0	0.0	1.0
+it	03_wind_off	1	266	2000.0	0.0	1.0
+it	04_res	1	266	2000.0	0.0	1.0
+it	05_nuclear	1	266	1700.0	0.0	1.0
 it	06_coal	1	266	0.0	0.0	0.0
 it	07_gas	1	266	0.0	0.0	0.0
 it	08_non-res	1	266	0.0	0.0	0.0
 it	09_hydro_pump	1	266	0.0	0.0	0.0
-it	01_solar	1	267	2000.0	1.0	0.0
-it	02_wind_on	1	267	2000.0	1.0	0.0
-it	03_wind_off	1	267	2000.0	1.0	0.0
-it	04_res	1	267	2000.0	1.0	0.0
-it	05_nuclear	1	267	1800.0	1.0	0.0
+it	01_solar	1	267	2000.0	0.0	1.0
+it	02_wind_on	1	267	2000.0	0.0	1.0
+it	03_wind_off	1	267	2000.0	0.0	1.0
+it	04_res	1	267	2000.0	0.0	1.0
+it	05_nuclear	1	267	1800.0	0.0	1.0
 it	06_coal	1	267	0.0	0.0	0.0
 it	07_gas	1	267	0.0	0.0	0.0
 it	08_non-res	1	267	0.0	0.0	0.0
 it	09_hydro_pump	1	267	0.0	0.0	0.0
-it	01_solar	1	268	2000.0	1.0	0.0
-it	02_wind_on	1	268	2000.0	1.0	0.0
-it	03_wind_off	1	268	2000.0	1.0	0.0
-it	04_res	1	268	2000.0	1.0	0.0
-it	05_nuclear	1	268	1900.0	1.0	0.0
+it	01_solar	1	268	2000.0	0.0	1.0
+it	02_wind_on	1	268	2000.0	0.0	1.0
+it	03_wind_off	1	268	2000.0	0.0	1.0
+it	04_res	1	268	2000.0	0.0	1.0
+it	05_nuclear	1	268	1900.0	0.0	1.0
 it	06_coal	1	268	0.0	0.0	0.0
 it	07_gas	1	268	0.0	0.0	0.0
 it	08_non-res	1	268	0.0	0.0	0.0
 it	09_hydro_pump	1	268	0.0	0.0	0.0
-it	01_solar	1	269	2000.0	1.0	0.0
-it	02_wind_on	1	269	2000.0	1.0	0.0
-it	03_wind_off	1	269	2000.0	1.0	0.0
-it	04_res	1	269	2000.0	1.0	0.0
-it	05_nuclear	1	269	2000.0	1.0	0.0
+it	01_solar	1	269	2000.0	0.0	1.0
+it	02_wind_on	1	269	2000.0	0.0	1.0
+it	03_wind_off	1	269	2000.0	0.0	1.0
+it	04_res	1	269	2000.0	0.0	1.0
+it	05_nuclear	1	269	2000.0	0.0	1.0
 it	06_coal	1	269	0.0	0.0	0.0
 it	07_gas	1	269	0.0	0.0	0.0
 it	08_non-res	1	269	0.0	0.0	0.0
 it	09_hydro_pump	1	269	0.0	0.0	0.0
-it	01_solar	1	270	2000.0	1.0	0.0
-it	02_wind_on	1	270	2000.0	1.0	0.0
-it	03_wind_off	1	270	2000.0	1.0	0.0
-it	04_res	1	270	2000.0	1.0	0.0
-it	05_nuclear	1	270	2000.0	1.0	0.0
-it	06_coal	1	270	100.0	1.0	0.0
+it	01_solar	1	270	2000.0	0.0	1.0
+it	02_wind_on	1	270	2000.0	0.0	1.0
+it	03_wind_off	1	270	2000.0	0.0	1.0
+it	04_res	1	270	2000.0	0.0	1.0
+it	05_nuclear	1	270	2000.0	0.0	1.0
+it	06_coal	1	270	100.0	0.0	1.0
 it	07_gas	1	270	0.0	0.0	0.0
 it	08_non-res	1	270	0.0	0.0	0.0
 it	09_hydro_pump	1	270	0.0	0.0	0.0
-it	01_solar	1	271	2000.0	1.0	0.0
-it	02_wind_on	1	271	2000.0	1.0	0.0
-it	03_wind_off	1	271	2000.0	1.0	0.0
-it	04_res	1	271	2000.0	1.0	0.0
-it	05_nuclear	1	271	2000.0	1.0	0.0
-it	06_coal	1	271	200.0	1.0	0.0
+it	01_solar	1	271	2000.0	0.0	1.0
+it	02_wind_on	1	271	2000.0	0.0	1.0
+it	03_wind_off	1	271	2000.0	0.0	1.0
+it	04_res	1	271	2000.0	0.0	1.0
+it	05_nuclear	1	271	2000.0	0.0	1.0
+it	06_coal	1	271	200.0	0.0	1.0
 it	07_gas	1	271	0.0	0.0	0.0
 it	08_non-res	1	271	0.0	0.0	0.0
 it	09_hydro_pump	1	271	0.0	0.0	0.0
-it	01_solar	1	272	2000.0	1.0	0.0
-it	02_wind_on	1	272	2000.0	1.0	0.0
-it	03_wind_off	1	272	2000.0	1.0	0.0
-it	04_res	1	272	2000.0	1.0	0.0
-it	05_nuclear	1	272	2000.0	1.0	0.0
-it	06_coal	1	272	300.0	1.0	0.0
+it	01_solar	1	272	2000.0	0.0	1.0
+it	02_wind_on	1	272	2000.0	0.0	1.0
+it	03_wind_off	1	272	2000.0	0.0	1.0
+it	04_res	1	272	2000.0	0.0	1.0
+it	05_nuclear	1	272	2000.0	0.0	1.0
+it	06_coal	1	272	300.0	0.0	1.0
 it	07_gas	1	272	0.0	0.0	0.0
 it	08_non-res	1	272	0.0	0.0	0.0
 it	09_hydro_pump	1	272	0.0	0.0	0.0
-it	01_solar	1	273	2000.0	1.0	0.0
-it	02_wind_on	1	273	2000.0	1.0	0.0
-it	03_wind_off	1	273	2000.0	1.0	0.0
-it	04_res	1	273	2000.0	1.0	0.0
-it	05_nuclear	1	273	2000.0	1.0	0.0
-it	06_coal	1	273	400.0	1.0	0.0
+it	01_solar	1	273	2000.0	0.0	1.0
+it	02_wind_on	1	273	2000.0	0.0	1.0
+it	03_wind_off	1	273	2000.0	0.0	1.0
+it	04_res	1	273	2000.0	0.0	1.0
+it	05_nuclear	1	273	2000.0	0.0	1.0
+it	06_coal	1	273	400.0	0.0	1.0
 it	07_gas	1	273	0.0	0.0	0.0
 it	08_non-res	1	273	0.0	0.0	0.0
 it	09_hydro_pump	1	273	0.0	0.0	0.0
-it	01_solar	1	274	2000.0	1.0	0.0
-it	02_wind_on	1	274	2000.0	1.0	0.0
-it	03_wind_off	1	274	2000.0	1.0	0.0
-it	04_res	1	274	2000.0	1.0	0.0
-it	05_nuclear	1	274	2000.0	1.0	0.0
-it	06_coal	1	274	500.0	1.0	0.0
+it	01_solar	1	274	2000.0	0.0	1.0
+it	02_wind_on	1	274	2000.0	0.0	1.0
+it	03_wind_off	1	274	2000.0	0.0	1.0
+it	04_res	1	274	2000.0	0.0	1.0
+it	05_nuclear	1	274	2000.0	0.0	1.0
+it	06_coal	1	274	500.0	0.0	1.0
 it	07_gas	1	274	0.0	0.0	0.0
 it	08_non-res	1	274	0.0	0.0	0.0
 it	09_hydro_pump	1	274	0.0	0.0	0.0
-it	01_solar	1	275	2000.0	1.0	0.0
-it	02_wind_on	1	275	2000.0	1.0	0.0
-it	03_wind_off	1	275	2000.0	1.0	0.0
-it	04_res	1	275	2000.0	1.0	0.0
-it	05_nuclear	1	275	2000.0	1.0	0.0
-it	06_coal	1	275	600.0	1.0	0.0
+it	01_solar	1	275	2000.0	0.0	1.0
+it	02_wind_on	1	275	2000.0	0.0	1.0
+it	03_wind_off	1	275	2000.0	0.0	1.0
+it	04_res	1	275	2000.0	0.0	1.0
+it	05_nuclear	1	275	2000.0	0.0	1.0
+it	06_coal	1	275	600.0	0.0	1.0
 it	07_gas	1	275	0.0	0.0	0.0
 it	08_non-res	1	275	0.0	0.0	0.0
 it	09_hydro_pump	1	275	0.0	0.0	0.0
-it	01_solar	1	276	2000.0	1.0	0.0
-it	02_wind_on	1	276	2000.0	1.0	0.0
-it	03_wind_off	1	276	2000.0	1.0	0.0
-it	04_res	1	276	2000.0	1.0	0.0
-it	05_nuclear	1	276	2000.0	1.0	0.0
-it	06_coal	1	276	700.0	1.0	0.0
+it	01_solar	1	276	2000.0	0.0	1.0
+it	02_wind_on	1	276	2000.0	0.0	1.0
+it	03_wind_off	1	276	2000.0	0.0	1.0
+it	04_res	1	276	2000.0	0.0	1.0
+it	05_nuclear	1	276	2000.0	0.0	1.0
+it	06_coal	1	276	700.0	0.0	1.0
 it	07_gas	1	276	0.0	0.0	0.0
 it	08_non-res	1	276	0.0	0.0	0.0
 it	09_hydro_pump	1	276	0.0	0.0	0.0
-it	01_solar	1	277	2000.0	1.0	0.0
-it	02_wind_on	1	277	2000.0	1.0	0.0
-it	03_wind_off	1	277	2000.0	1.0	0.0
-it	04_res	1	277	2000.0	1.0	0.0
-it	05_nuclear	1	277	2000.0	1.0	0.0
-it	06_coal	1	277	800.0	1.0	0.0
+it	01_solar	1	277	2000.0	0.0	1.0
+it	02_wind_on	1	277	2000.0	0.0	1.0
+it	03_wind_off	1	277	2000.0	0.0	1.0
+it	04_res	1	277	2000.0	0.0	1.0
+it	05_nuclear	1	277	2000.0	0.0	1.0
+it	06_coal	1	277	800.0	0.0	1.0
 it	07_gas	1	277	0.0	0.0	0.0
 it	08_non-res	1	277	0.0	0.0	0.0
 it	09_hydro_pump	1	277	0.0	0.0	0.0
-it	01_solar	1	278	2000.0	1.0	0.0
-it	02_wind_on	1	278	2000.0	1.0	0.0
-it	03_wind_off	1	278	2000.0	1.0	0.0
-it	04_res	1	278	2000.0	1.0	0.0
-it	05_nuclear	1	278	2000.0	1.0	0.0
-it	06_coal	1	278	900.0	1.0	0.0
+it	01_solar	1	278	2000.0	0.0	1.0
+it	02_wind_on	1	278	2000.0	0.0	1.0
+it	03_wind_off	1	278	2000.0	0.0	1.0
+it	04_res	1	278	2000.0	0.0	1.0
+it	05_nuclear	1	278	2000.0	0.0	1.0
+it	06_coal	1	278	900.0	0.0	1.0
 it	07_gas	1	278	0.0	0.0	0.0
 it	08_non-res	1	278	0.0	0.0	0.0
 it	09_hydro_pump	1	278	0.0	0.0	0.0
-it	01_solar	1	279	2000.0	1.0	0.0
-it	02_wind_on	1	279	2000.0	1.0	0.0
-it	03_wind_off	1	279	2000.0	1.0	0.0
-it	04_res	1	279	2000.0	1.0	0.0
-it	05_nuclear	1	279	2000.0	1.0	0.0
-it	06_coal	1	279	1000.0	1.0	0.0
+it	01_solar	1	279	2000.0	0.0	1.0
+it	02_wind_on	1	279	2000.0	0.0	1.0
+it	03_wind_off	1	279	2000.0	0.0	1.0
+it	04_res	1	279	2000.0	0.0	1.0
+it	05_nuclear	1	279	2000.0	0.0	1.0
+it	06_coal	1	279	1000.0	0.0	1.0
 it	07_gas	1	279	0.0	0.0	0.0
 it	08_non-res	1	279	0.0	0.0	0.0
 it	09_hydro_pump	1	279	0.0	0.0	0.0
-it	01_solar	1	280	2000.0	1.0	0.0
-it	02_wind_on	1	280	2000.0	1.0	0.0
-it	03_wind_off	1	280	2000.0	1.0	0.0
-it	04_res	1	280	2000.0	1.0	0.0
-it	05_nuclear	1	280	2000.0	1.0	0.0
-it	06_coal	1	280	1100.0	1.0	0.0
+it	01_solar	1	280	2000.0	0.0	1.0
+it	02_wind_on	1	280	2000.0	0.0	1.0
+it	03_wind_off	1	280	2000.0	0.0	1.0
+it	04_res	1	280	2000.0	0.0	1.0
+it	05_nuclear	1	280	2000.0	0.0	1.0
+it	06_coal	1	280	1100.0	0.0	1.0
 it	07_gas	1	280	0.0	0.0	0.0
 it	08_non-res	1	280	0.0	0.0	0.0
 it	09_hydro_pump	1	280	0.0	0.0	0.0
-it	01_solar	1	281	2000.0	1.0	0.0
-it	02_wind_on	1	281	2000.0	1.0	0.0
-it	03_wind_off	1	281	2000.0	1.0	0.0
-it	04_res	1	281	2000.0	1.0	0.0
-it	05_nuclear	1	281	2000.0	1.0	0.0
-it	06_coal	1	281	1200.0	1.0	0.0
+it	01_solar	1	281	2000.0	0.0	1.0
+it	02_wind_on	1	281	2000.0	0.0	1.0
+it	03_wind_off	1	281	2000.0	0.0	1.0
+it	04_res	1	281	2000.0	0.0	1.0
+it	05_nuclear	1	281	2000.0	0.0	1.0
+it	06_coal	1	281	1200.0	0.0	1.0
 it	07_gas	1	281	0.0	0.0	0.0
 it	08_non-res	1	281	0.0	0.0	0.0
 it	09_hydro_pump	1	281	0.0	0.0	0.0
-it	01_solar	1	282	2000.0	1.0	0.0
-it	02_wind_on	1	282	2000.0	1.0	0.0
-it	03_wind_off	1	282	2000.0	1.0	0.0
-it	04_res	1	282	2000.0	1.0	0.0
-it	05_nuclear	1	282	2000.0	1.0	0.0
-it	06_coal	1	282	1300.0	1.0	0.0
+it	01_solar	1	282	2000.0	0.0	1.0
+it	02_wind_on	1	282	2000.0	0.0	1.0
+it	03_wind_off	1	282	2000.0	0.0	1.0
+it	04_res	1	282	2000.0	0.0	1.0
+it	05_nuclear	1	282	2000.0	0.0	1.0
+it	06_coal	1	282	1300.0	0.0	1.0
 it	07_gas	1	282	0.0	0.0	0.0
 it	08_non-res	1	282	0.0	0.0	0.0
 it	09_hydro_pump	1	282	0.0	0.0	0.0
-it	01_solar	1	283	2000.0	1.0	0.0
-it	02_wind_on	1	283	2000.0	1.0	0.0
-it	03_wind_off	1	283	2000.0	1.0	0.0
-it	04_res	1	283	2000.0	1.0	0.0
-it	05_nuclear	1	283	2000.0	1.0	0.0
-it	06_coal	1	283	1400.0	1.0	0.0
+it	01_solar	1	283	2000.0	0.0	1.0
+it	02_wind_on	1	283	2000.0	0.0	1.0
+it	03_wind_off	1	283	2000.0	0.0	1.0
+it	04_res	1	283	2000.0	0.0	1.0
+it	05_nuclear	1	283	2000.0	0.0	1.0
+it	06_coal	1	283	1400.0	0.0	1.0
 it	07_gas	1	283	0.0	0.0	0.0
 it	08_non-res	1	283	0.0	0.0	0.0
 it	09_hydro_pump	1	283	0.0	0.0	0.0
-it	01_solar	1	284	2000.0	1.0	0.0
-it	02_wind_on	1	284	2000.0	1.0	0.0
-it	03_wind_off	1	284	2000.0	1.0	0.0
-it	04_res	1	284	2000.0	1.0	0.0
-it	05_nuclear	1	284	2000.0	1.0	0.0
-it	06_coal	1	284	1500.0	1.0	0.0
+it	01_solar	1	284	2000.0	0.0	1.0
+it	02_wind_on	1	284	2000.0	0.0	1.0
+it	03_wind_off	1	284	2000.0	0.0	1.0
+it	04_res	1	284	2000.0	0.0	1.0
+it	05_nuclear	1	284	2000.0	0.0	1.0
+it	06_coal	1	284	1500.0	0.0	1.0
 it	07_gas	1	284	0.0	0.0	0.0
 it	08_non-res	1	284	0.0	0.0	0.0
 it	09_hydro_pump	1	284	0.0	0.0	0.0
-it	01_solar	1	285	2000.0	1.0	0.0
-it	02_wind_on	1	285	2000.0	1.0	0.0
-it	03_wind_off	1	285	2000.0	1.0	0.0
-it	04_res	1	285	2000.0	1.0	0.0
-it	05_nuclear	1	285	2000.0	1.0	0.0
-it	06_coal	1	285	1600.0	1.0	0.0
+it	01_solar	1	285	2000.0	0.0	1.0
+it	02_wind_on	1	285	2000.0	0.0	1.0
+it	03_wind_off	1	285	2000.0	0.0	1.0
+it	04_res	1	285	2000.0	0.0	1.0
+it	05_nuclear	1	285	2000.0	0.0	1.0
+it	06_coal	1	285	1600.0	0.0	1.0
 it	07_gas	1	285	0.0	0.0	0.0
 it	08_non-res	1	285	0.0	0.0	0.0
 it	09_hydro_pump	1	285	0.0	0.0	0.0
-it	01_solar	1	286	2000.0	1.0	0.0
-it	02_wind_on	1	286	2000.0	1.0	0.0
-it	03_wind_off	1	286	2000.0	1.0	0.0
-it	04_res	1	286	2000.0	1.0	0.0
-it	05_nuclear	1	286	2000.0	1.0	0.0
-it	06_coal	1	286	1700.0	1.0	0.0
+it	01_solar	1	286	2000.0	0.0	1.0
+it	02_wind_on	1	286	2000.0	0.0	1.0
+it	03_wind_off	1	286	2000.0	0.0	1.0
+it	04_res	1	286	2000.0	0.0	1.0
+it	05_nuclear	1	286	2000.0	0.0	1.0
+it	06_coal	1	286	1700.0	0.0	1.0
 it	07_gas	1	286	0.0	0.0	0.0
 it	08_non-res	1	286	0.0	0.0	0.0
 it	09_hydro_pump	1	286	0.0	0.0	0.0
-it	01_solar	1	287	2000.0	1.0	0.0
-it	02_wind_on	1	287	2000.0	1.0	0.0
-it	03_wind_off	1	287	2000.0	1.0	0.0
-it	04_res	1	287	2000.0	1.0	0.0
-it	05_nuclear	1	287	2000.0	1.0	0.0
-it	06_coal	1	287	1800.0	1.0	0.0
+it	01_solar	1	287	2000.0	0.0	1.0
+it	02_wind_on	1	287	2000.0	0.0	1.0
+it	03_wind_off	1	287	2000.0	0.0	1.0
+it	04_res	1	287	2000.0	0.0	1.0
+it	05_nuclear	1	287	2000.0	0.0	1.0
+it	06_coal	1	287	1800.0	0.0	1.0
 it	07_gas	1	287	0.0	0.0	0.0
 it	08_non-res	1	287	0.0	0.0	0.0
 it	09_hydro_pump	1	287	0.0	0.0	0.0
-it	01_solar	1	288	2000.0	1.0	0.0
-it	02_wind_on	1	288	2000.0	1.0	0.0
-it	03_wind_off	1	288	2000.0	1.0	0.0
-it	04_res	1	288	2000.0	1.0	0.0
-it	05_nuclear	1	288	2000.0	1.0	0.0
-it	06_coal	1	288	1900.0	1.0	0.0
+it	01_solar	1	288	2000.0	0.0	1.0
+it	02_wind_on	1	288	2000.0	0.0	1.0
+it	03_wind_off	1	288	2000.0	0.0	1.0
+it	04_res	1	288	2000.0	0.0	1.0
+it	05_nuclear	1	288	2000.0	0.0	1.0
+it	06_coal	1	288	1900.0	0.0	1.0
 it	07_gas	1	288	0.0	0.0	0.0
 it	08_non-res	1	288	0.0	0.0	0.0
 it	09_hydro_pump	1	288	0.0	0.0	0.0
-it	01_solar	1	289	2000.0	1.0	0.0
-it	02_wind_on	1	289	2000.0	1.0	0.0
-it	03_wind_off	1	289	2000.0	1.0	0.0
-it	04_res	1	289	2000.0	1.0	0.0
-it	05_nuclear	1	289	2000.0	1.0	0.0
-it	06_coal	1	289	2000.0	1.0	0.0
+it	01_solar	1	289	2000.0	0.0	1.0
+it	02_wind_on	1	289	2000.0	0.0	1.0
+it	03_wind_off	1	289	2000.0	0.0	1.0
+it	04_res	1	289	2000.0	0.0	1.0
+it	05_nuclear	1	289	2000.0	0.0	1.0
+it	06_coal	1	289	2000.0	0.0	1.0
 it	07_gas	1	289	0.0	0.0	0.0
 it	08_non-res	1	289	0.0	0.0	0.0
 it	09_hydro_pump	1	289	0.0	0.0	0.0
-it	01_solar	1	290	2000.0	1.0	0.0
-it	02_wind_on	1	290	2000.0	1.0	0.0
-it	03_wind_off	1	290	2000.0	1.0	0.0
-it	04_res	1	290	2000.0	1.0	0.0
-it	05_nuclear	1	290	2000.0	1.0	0.0
-it	06_coal	1	290	2000.0	1.0	0.0
-it	07_gas	1	290	100.0	1.0	0.0
+it	01_solar	1	290	2000.0	0.0	1.0
+it	02_wind_on	1	290	2000.0	0.0	1.0
+it	03_wind_off	1	290	2000.0	0.0	1.0
+it	04_res	1	290	2000.0	0.0	1.0
+it	05_nuclear	1	290	2000.0	0.0	1.0
+it	06_coal	1	290	2000.0	0.0	1.0
+it	07_gas	1	290	100.0	0.0	1.0
 it	08_non-res	1	290	0.0	0.0	0.0
 it	09_hydro_pump	1	290	0.0	0.0	0.0
-it	01_solar	1	291	2000.0	1.0	0.0
-it	02_wind_on	1	291	2000.0	1.0	0.0
-it	03_wind_off	1	291	2000.0	1.0	0.0
-it	04_res	1	291	2000.0	1.0	0.0
-it	05_nuclear	1	291	2000.0	1.0	0.0
-it	06_coal	1	291	2000.0	1.0	0.0
-it	07_gas	1	291	200.0	1.0	0.0
+it	01_solar	1	291	2000.0	0.0	1.0
+it	02_wind_on	1	291	2000.0	0.0	1.0
+it	03_wind_off	1	291	2000.0	0.0	1.0
+it	04_res	1	291	2000.0	0.0	1.0
+it	05_nuclear	1	291	2000.0	0.0	1.0
+it	06_coal	1	291	2000.0	0.0	1.0
+it	07_gas	1	291	200.0	0.0	1.0
 it	08_non-res	1	291	0.0	0.0	0.0
 it	09_hydro_pump	1	291	0.0	0.0	0.0
-it	01_solar	1	292	2000.0	1.0	0.0
-it	02_wind_on	1	292	2000.0	1.0	0.0
-it	03_wind_off	1	292	2000.0	1.0	0.0
-it	04_res	1	292	2000.0	1.0	0.0
-it	05_nuclear	1	292	2000.0	1.0	0.0
-it	06_coal	1	292	2000.0	1.0	0.0
-it	07_gas	1	292	300.0	1.0	0.0
+it	01_solar	1	292	2000.0	0.0	1.0
+it	02_wind_on	1	292	2000.0	0.0	1.0
+it	03_wind_off	1	292	2000.0	0.0	1.0
+it	04_res	1	292	2000.0	0.0	1.0
+it	05_nuclear	1	292	2000.0	0.0	1.0
+it	06_coal	1	292	2000.0	0.0	1.0
+it	07_gas	1	292	300.0	0.0	1.0
 it	08_non-res	1	292	0.0	0.0	0.0
 it	09_hydro_pump	1	292	0.0	0.0	0.0
-it	01_solar	1	293	2000.0	1.0	0.0
-it	02_wind_on	1	293	2000.0	1.0	0.0
-it	03_wind_off	1	293	2000.0	1.0	0.0
-it	04_res	1	293	2000.0	1.0	0.0
-it	05_nuclear	1	293	2000.0	1.0	0.0
-it	06_coal	1	293	2000.0	1.0	0.0
-it	07_gas	1	293	400.0	1.0	0.0
+it	01_solar	1	293	2000.0	0.0	1.0
+it	02_wind_on	1	293	2000.0	0.0	1.0
+it	03_wind_off	1	293	2000.0	0.0	1.0
+it	04_res	1	293	2000.0	0.0	1.0
+it	05_nuclear	1	293	2000.0	0.0	1.0
+it	06_coal	1	293	2000.0	0.0	1.0
+it	07_gas	1	293	400.0	0.0	1.0
 it	08_non-res	1	293	0.0	0.0	0.0
 it	09_hydro_pump	1	293	0.0	0.0	0.0
-it	01_solar	1	294	2000.0	1.0	0.0
-it	02_wind_on	1	294	2000.0	1.0	0.0
-it	03_wind_off	1	294	2000.0	1.0	0.0
-it	04_res	1	294	2000.0	1.0	0.0
-it	05_nuclear	1	294	2000.0	1.0	0.0
-it	06_coal	1	294	2000.0	1.0	0.0
-it	07_gas	1	294	500.0	1.0	0.0
+it	01_solar	1	294	2000.0	0.0	1.0
+it	02_wind_on	1	294	2000.0	0.0	1.0
+it	03_wind_off	1	294	2000.0	0.0	1.0
+it	04_res	1	294	2000.0	0.0	1.0
+it	05_nuclear	1	294	2000.0	0.0	1.0
+it	06_coal	1	294	2000.0	0.0	1.0
+it	07_gas	1	294	500.0	0.0	1.0
 it	08_non-res	1	294	0.0	0.0	0.0
 it	09_hydro_pump	1	294	0.0	0.0	0.0
-it	01_solar	1	295	2000.0	1.0	0.0
-it	02_wind_on	1	295	2000.0	1.0	0.0
-it	03_wind_off	1	295	2000.0	1.0	0.0
-it	04_res	1	295	2000.0	1.0	0.0
-it	05_nuclear	1	295	2000.0	1.0	0.0
-it	06_coal	1	295	2000.0	1.0	0.0
-it	07_gas	1	295	600.0	1.0	0.0
+it	01_solar	1	295	2000.0	0.0	1.0
+it	02_wind_on	1	295	2000.0	0.0	1.0
+it	03_wind_off	1	295	2000.0	0.0	1.0
+it	04_res	1	295	2000.0	0.0	1.0
+it	05_nuclear	1	295	2000.0	0.0	1.0
+it	06_coal	1	295	2000.0	0.0	1.0
+it	07_gas	1	295	600.0	0.0	1.0
 it	08_non-res	1	295	0.0	0.0	0.0
 it	09_hydro_pump	1	295	0.0	0.0	0.0
-it	01_solar	1	296	2000.0	1.0	0.0
-it	02_wind_on	1	296	2000.0	1.0	0.0
-it	03_wind_off	1	296	2000.0	1.0	0.0
-it	04_res	1	296	2000.0	1.0	0.0
-it	05_nuclear	1	296	2000.0	1.0	0.0
-it	06_coal	1	296	2000.0	1.0	0.0
-it	07_gas	1	296	700.0	1.0	0.0
+it	01_solar	1	296	2000.0	0.0	1.0
+it	02_wind_on	1	296	2000.0	0.0	1.0
+it	03_wind_off	1	296	2000.0	0.0	1.0
+it	04_res	1	296	2000.0	0.0	1.0
+it	05_nuclear	1	296	2000.0	0.0	1.0
+it	06_coal	1	296	2000.0	0.0	1.0
+it	07_gas	1	296	700.0	0.0	1.0
 it	08_non-res	1	296	0.0	0.0	0.0
 it	09_hydro_pump	1	296	0.0	0.0	0.0
-it	01_solar	1	297	2000.0	1.0	0.0
-it	02_wind_on	1	297	2000.0	1.0	0.0
-it	03_wind_off	1	297	2000.0	1.0	0.0
-it	04_res	1	297	2000.0	1.0	0.0
-it	05_nuclear	1	297	2000.0	1.0	0.0
-it	06_coal	1	297	2000.0	1.0	0.0
-it	07_gas	1	297	800.0	1.0	0.0
+it	01_solar	1	297	2000.0	0.0	1.0
+it	02_wind_on	1	297	2000.0	0.0	1.0
+it	03_wind_off	1	297	2000.0	0.0	1.0
+it	04_res	1	297	2000.0	0.0	1.0
+it	05_nuclear	1	297	2000.0	0.0	1.0
+it	06_coal	1	297	2000.0	0.0	1.0
+it	07_gas	1	297	800.0	0.0	1.0
 it	08_non-res	1	297	0.0	0.0	0.0
 it	09_hydro_pump	1	297	0.0	0.0	0.0
-it	01_solar	1	298	2000.0	1.0	0.0
-it	02_wind_on	1	298	2000.0	1.0	0.0
-it	03_wind_off	1	298	2000.0	1.0	0.0
-it	04_res	1	298	2000.0	1.0	0.0
-it	05_nuclear	1	298	2000.0	1.0	0.0
-it	06_coal	1	298	2000.0	1.0	0.0
-it	07_gas	1	298	900.0	1.0	0.0
+it	01_solar	1	298	2000.0	0.0	1.0
+it	02_wind_on	1	298	2000.0	0.0	1.0
+it	03_wind_off	1	298	2000.0	0.0	1.0
+it	04_res	1	298	2000.0	0.0	1.0
+it	05_nuclear	1	298	2000.0	0.0	1.0
+it	06_coal	1	298	2000.0	0.0	1.0
+it	07_gas	1	298	900.0	0.0	1.0
 it	08_non-res	1	298	0.0	0.0	0.0
 it	09_hydro_pump	1	298	0.0	0.0	0.0
-it	01_solar	1	299	2000.0	1.0	0.0
-it	02_wind_on	1	299	2000.0	1.0	0.0
-it	03_wind_off	1	299	2000.0	1.0	0.0
-it	04_res	1	299	2000.0	1.0	0.0
-it	05_nuclear	1	299	2000.0	1.0	0.0
-it	06_coal	1	299	2000.0	1.0	0.0
-it	07_gas	1	299	1000.0	1.0	0.0
+it	01_solar	1	299	2000.0	0.0	1.0
+it	02_wind_on	1	299	2000.0	0.0	1.0
+it	03_wind_off	1	299	2000.0	0.0	1.0
+it	04_res	1	299	2000.0	0.0	1.0
+it	05_nuclear	1	299	2000.0	0.0	1.0
+it	06_coal	1	299	2000.0	0.0	1.0
+it	07_gas	1	299	1000.0	0.0	1.0
 it	08_non-res	1	299	0.0	0.0	0.0
 it	09_hydro_pump	1	299	0.0	0.0	0.0
-it	01_solar	1	300	2000.0	1.0	0.0
-it	02_wind_on	1	300	2000.0	1.0	0.0
-it	03_wind_off	1	300	2000.0	1.0	0.0
-it	04_res	1	300	2000.0	1.0	0.0
-it	05_nuclear	1	300	2000.0	1.0	0.0
-it	06_coal	1	300	2000.0	1.0	0.0
-it	07_gas	1	300	1100.0	1.0	0.0
+it	01_solar	1	300	2000.0	0.0	1.0
+it	02_wind_on	1	300	2000.0	0.0	1.0
+it	03_wind_off	1	300	2000.0	0.0	1.0
+it	04_res	1	300	2000.0	0.0	1.0
+it	05_nuclear	1	300	2000.0	0.0	1.0
+it	06_coal	1	300	2000.0	0.0	1.0
+it	07_gas	1	300	1100.0	0.0	1.0
 it	08_non-res	1	300	0.0	0.0	0.0
 it	09_hydro_pump	1	300	0.0	0.0	0.0
-it	01_solar	1	301	2000.0	1.0	0.0
-it	02_wind_on	1	301	2000.0	1.0	0.0
-it	03_wind_off	1	301	2000.0	1.0	0.0
-it	04_res	1	301	2000.0	1.0	0.0
-it	05_nuclear	1	301	2000.0	1.0	0.0
-it	06_coal	1	301	2000.0	1.0	0.0
-it	07_gas	1	301	1200.0	1.0	0.0
+it	01_solar	1	301	2000.0	0.0	1.0
+it	02_wind_on	1	301	2000.0	0.0	1.0
+it	03_wind_off	1	301	2000.0	0.0	1.0
+it	04_res	1	301	2000.0	0.0	1.0
+it	05_nuclear	1	301	2000.0	0.0	1.0
+it	06_coal	1	301	2000.0	0.0	1.0
+it	07_gas	1	301	1200.0	0.0	1.0
 it	08_non-res	1	301	0.0	0.0	0.0
 it	09_hydro_pump	1	301	0.0	0.0	0.0
-it	01_solar	1	302	2000.0	1.0	0.0
-it	02_wind_on	1	302	2000.0	1.0	0.0
-it	03_wind_off	1	302	2000.0	1.0	0.0
-it	04_res	1	302	2000.0	1.0	0.0
-it	05_nuclear	1	302	2000.0	1.0	0.0
-it	06_coal	1	302	2000.0	1.0	0.0
-it	07_gas	1	302	1300.0	1.0	0.0
+it	01_solar	1	302	2000.0	0.0	1.0
+it	02_wind_on	1	302	2000.0	0.0	1.0
+it	03_wind_off	1	302	2000.0	0.0	1.0
+it	04_res	1	302	2000.0	0.0	1.0
+it	05_nuclear	1	302	2000.0	0.0	1.0
+it	06_coal	1	302	2000.0	0.0	1.0
+it	07_gas	1	302	1300.0	0.0	1.0
 it	08_non-res	1	302	0.0	0.0	0.0
 it	09_hydro_pump	1	302	0.0	0.0	0.0
-it	01_solar	1	303	2000.0	1.0	0.0
-it	02_wind_on	1	303	2000.0	1.0	0.0
-it	03_wind_off	1	303	2000.0	1.0	0.0
-it	04_res	1	303	2000.0	1.0	0.0
-it	05_nuclear	1	303	2000.0	1.0	0.0
-it	06_coal	1	303	2000.0	1.0	0.0
-it	07_gas	1	303	1400.0	1.0	0.0
+it	01_solar	1	303	2000.0	0.0	1.0
+it	02_wind_on	1	303	2000.0	0.0	1.0
+it	03_wind_off	1	303	2000.0	0.0	1.0
+it	04_res	1	303	2000.0	0.0	1.0
+it	05_nuclear	1	303	2000.0	0.0	1.0
+it	06_coal	1	303	2000.0	0.0	1.0
+it	07_gas	1	303	1400.0	0.0	1.0
 it	08_non-res	1	303	0.0	0.0	0.0
 it	09_hydro_pump	1	303	0.0	0.0	0.0
-it	01_solar	1	304	2000.0	1.0	0.0
-it	02_wind_on	1	304	2000.0	1.0	0.0
-it	03_wind_off	1	304	2000.0	1.0	0.0
-it	04_res	1	304	2000.0	1.0	0.0
-it	05_nuclear	1	304	2000.0	1.0	0.0
-it	06_coal	1	304	2000.0	1.0	0.0
-it	07_gas	1	304	1500.0	1.0	0.0
+it	01_solar	1	304	2000.0	0.0	1.0
+it	02_wind_on	1	304	2000.0	0.0	1.0
+it	03_wind_off	1	304	2000.0	0.0	1.0
+it	04_res	1	304	2000.0	0.0	1.0
+it	05_nuclear	1	304	2000.0	0.0	1.0
+it	06_coal	1	304	2000.0	0.0	1.0
+it	07_gas	1	304	1500.0	0.0	1.0
 it	08_non-res	1	304	0.0	0.0	0.0
 it	09_hydro_pump	1	304	0.0	0.0	0.0
-it	01_solar	1	305	2000.0	1.0	0.0
-it	02_wind_on	1	305	2000.0	1.0	0.0
-it	03_wind_off	1	305	2000.0	1.0	0.0
-it	04_res	1	305	2000.0	1.0	0.0
-it	05_nuclear	1	305	2000.0	1.0	0.0
-it	06_coal	1	305	2000.0	1.0	0.0
-it	07_gas	1	305	1600.0	1.0	0.0
+it	01_solar	1	305	2000.0	0.0	1.0
+it	02_wind_on	1	305	2000.0	0.0	1.0
+it	03_wind_off	1	305	2000.0	0.0	1.0
+it	04_res	1	305	2000.0	0.0	1.0
+it	05_nuclear	1	305	2000.0	0.0	1.0
+it	06_coal	1	305	2000.0	0.0	1.0
+it	07_gas	1	305	1600.0	0.0	1.0
 it	08_non-res	1	305	0.0	0.0	0.0
 it	09_hydro_pump	1	305	0.0	0.0	0.0
-it	01_solar	1	306	2000.0	1.0	0.0
-it	02_wind_on	1	306	2000.0	1.0	0.0
-it	03_wind_off	1	306	2000.0	1.0	0.0
-it	04_res	1	306	2000.0	1.0	0.0
-it	05_nuclear	1	306	2000.0	1.0	0.0
-it	06_coal	1	306	2000.0	1.0	0.0
-it	07_gas	1	306	1700.0	1.0	0.0
+it	01_solar	1	306	2000.0	0.0	1.0
+it	02_wind_on	1	306	2000.0	0.0	1.0
+it	03_wind_off	1	306	2000.0	0.0	1.0
+it	04_res	1	306	2000.0	0.0	1.0
+it	05_nuclear	1	306	2000.0	0.0	1.0
+it	06_coal	1	306	2000.0	0.0	1.0
+it	07_gas	1	306	1700.0	0.0	1.0
 it	08_non-res	1	306	0.0	0.0	0.0
 it	09_hydro_pump	1	306	0.0	0.0	0.0
-it	01_solar	1	307	2000.0	1.0	0.0
-it	02_wind_on	1	307	2000.0	1.0	0.0
-it	03_wind_off	1	307	2000.0	1.0	0.0
-it	04_res	1	307	2000.0	1.0	0.0
-it	05_nuclear	1	307	2000.0	1.0	0.0
-it	06_coal	1	307	2000.0	1.0	0.0
-it	07_gas	1	307	1800.0	1.0	0.0
+it	01_solar	1	307	2000.0	0.0	1.0
+it	02_wind_on	1	307	2000.0	0.0	1.0
+it	03_wind_off	1	307	2000.0	0.0	1.0
+it	04_res	1	307	2000.0	0.0	1.0
+it	05_nuclear	1	307	2000.0	0.0	1.0
+it	06_coal	1	307	2000.0	0.0	1.0
+it	07_gas	1	307	1800.0	0.0	1.0
 it	08_non-res	1	307	0.0	0.0	0.0
 it	09_hydro_pump	1	307	0.0	0.0	0.0
-it	01_solar	1	308	2000.0	1.0	0.0
-it	02_wind_on	1	308	2000.0	1.0	0.0
-it	03_wind_off	1	308	2000.0	1.0	0.0
-it	04_res	1	308	2000.0	1.0	0.0
-it	05_nuclear	1	308	2000.0	1.0	0.0
-it	06_coal	1	308	2000.0	1.0	0.0
-it	07_gas	1	308	1900.0	1.0	0.0
+it	01_solar	1	308	2000.0	0.0	1.0
+it	02_wind_on	1	308	2000.0	0.0	1.0
+it	03_wind_off	1	308	2000.0	0.0	1.0
+it	04_res	1	308	2000.0	0.0	1.0
+it	05_nuclear	1	308	2000.0	0.0	1.0
+it	06_coal	1	308	2000.0	0.0	1.0
+it	07_gas	1	308	1900.0	0.0	1.0
 it	08_non-res	1	308	0.0	0.0	0.0
 it	09_hydro_pump	1	308	0.0	0.0	0.0
-it	01_solar	1	309	2000.0	1.0	0.0
-it	02_wind_on	1	309	2000.0	1.0	0.0
-it	03_wind_off	1	309	2000.0	1.0	0.0
-it	04_res	1	309	2000.0	1.0	0.0
-it	05_nuclear	1	309	2000.0	1.0	0.0
-it	06_coal	1	309	2000.0	1.0	0.0
-it	07_gas	1	309	2000.0	1.0	0.0
+it	01_solar	1	309	2000.0	0.0	1.0
+it	02_wind_on	1	309	2000.0	0.0	1.0
+it	03_wind_off	1	309	2000.0	0.0	1.0
+it	04_res	1	309	2000.0	0.0	1.0
+it	05_nuclear	1	309	2000.0	0.0	1.0
+it	06_coal	1	309	2000.0	0.0	1.0
+it	07_gas	1	309	2000.0	0.0	1.0
 it	08_non-res	1	309	0.0	0.0	0.0
 it	09_hydro_pump	1	309	0.0	0.0	0.0
-it	01_solar	1	310	2000.0	1.0	0.0
-it	02_wind_on	1	310	2000.0	1.0	0.0
-it	03_wind_off	1	310	2000.0	1.0	0.0
-it	04_res	1	310	2000.0	1.0	0.0
-it	05_nuclear	1	310	2000.0	1.0	0.0
-it	06_coal	1	310	2000.0	1.0	0.0
-it	07_gas	1	310	2000.0	1.0	0.0
-it	08_non-res	1	310	100.0	1.0	0.0
+it	01_solar	1	310	2000.0	0.0	1.0
+it	02_wind_on	1	310	2000.0	0.0	1.0
+it	03_wind_off	1	310	2000.0	0.0	1.0
+it	04_res	1	310	2000.0	0.0	1.0
+it	05_nuclear	1	310	2000.0	0.0	1.0
+it	06_coal	1	310	2000.0	0.0	1.0
+it	07_gas	1	310	2000.0	0.0	1.0
+it	08_non-res	1	310	100.0	0.0	1.0
 it	09_hydro_pump	1	310	0.0	0.0	0.0
-it	01_solar	1	311	2000.0	1.0	0.0
-it	02_wind_on	1	311	2000.0	1.0	0.0
-it	03_wind_off	1	311	2000.0	1.0	0.0
-it	04_res	1	311	2000.0	1.0	0.0
-it	05_nuclear	1	311	2000.0	1.0	0.0
-it	06_coal	1	311	2000.0	1.0	0.0
-it	07_gas	1	311	2000.0	1.0	0.0
-it	08_non-res	1	311	200.0	1.0	0.0
+it	01_solar	1	311	2000.0	0.0	1.0
+it	02_wind_on	1	311	2000.0	0.0	1.0
+it	03_wind_off	1	311	2000.0	0.0	1.0
+it	04_res	1	311	2000.0	0.0	1.0
+it	05_nuclear	1	311	2000.0	0.0	1.0
+it	06_coal	1	311	2000.0	0.0	1.0
+it	07_gas	1	311	2000.0	0.0	1.0
+it	08_non-res	1	311	200.0	0.0	1.0
 it	09_hydro_pump	1	311	0.0	0.0	0.0
-it	01_solar	1	312	2000.0	1.0	0.0
-it	02_wind_on	1	312	2000.0	1.0	0.0
-it	03_wind_off	1	312	2000.0	1.0	0.0
-it	04_res	1	312	2000.0	1.0	0.0
-it	05_nuclear	1	312	2000.0	1.0	0.0
-it	06_coal	1	312	2000.0	1.0	0.0
-it	07_gas	1	312	2000.0	1.0	0.0
-it	08_non-res	1	312	300.0	1.0	0.0
+it	01_solar	1	312	2000.0	0.0	1.0
+it	02_wind_on	1	312	2000.0	0.0	1.0
+it	03_wind_off	1	312	2000.0	0.0	1.0
+it	04_res	1	312	2000.0	0.0	1.0
+it	05_nuclear	1	312	2000.0	0.0	1.0
+it	06_coal	1	312	2000.0	0.0	1.0
+it	07_gas	1	312	2000.0	0.0	1.0
+it	08_non-res	1	312	300.0	0.0	1.0
 it	09_hydro_pump	1	312	0.0	0.0	0.0
-it	01_solar	1	313	2000.0	1.0	0.0
-it	02_wind_on	1	313	2000.0	1.0	0.0
-it	03_wind_off	1	313	2000.0	1.0	0.0
-it	04_res	1	313	2000.0	1.0	0.0
-it	05_nuclear	1	313	2000.0	1.0	0.0
-it	06_coal	1	313	2000.0	1.0	0.0
-it	07_gas	1	313	2000.0	1.0	0.0
-it	08_non-res	1	313	400.0	1.0	0.0
+it	01_solar	1	313	2000.0	0.0	1.0
+it	02_wind_on	1	313	2000.0	0.0	1.0
+it	03_wind_off	1	313	2000.0	0.0	1.0
+it	04_res	1	313	2000.0	0.0	1.0
+it	05_nuclear	1	313	2000.0	0.0	1.0
+it	06_coal	1	313	2000.0	0.0	1.0
+it	07_gas	1	313	2000.0	0.0	1.0
+it	08_non-res	1	313	400.0	0.0	1.0
 it	09_hydro_pump	1	313	0.0	0.0	0.0
-it	01_solar	1	314	2000.0	1.0	0.0
-it	02_wind_on	1	314	2000.0	1.0	0.0
-it	03_wind_off	1	314	2000.0	1.0	0.0
-it	04_res	1	314	2000.0	1.0	0.0
-it	05_nuclear	1	314	2000.0	1.0	0.0
-it	06_coal	1	314	2000.0	1.0	0.0
-it	07_gas	1	314	2000.0	1.0	0.0
-it	08_non-res	1	314	500.0	1.0	0.0
+it	01_solar	1	314	2000.0	0.0	1.0
+it	02_wind_on	1	314	2000.0	0.0	1.0
+it	03_wind_off	1	314	2000.0	0.0	1.0
+it	04_res	1	314	2000.0	0.0	1.0
+it	05_nuclear	1	314	2000.0	0.0	1.0
+it	06_coal	1	314	2000.0	0.0	1.0
+it	07_gas	1	314	2000.0	0.0	1.0
+it	08_non-res	1	314	500.0	0.0	1.0
 it	09_hydro_pump	1	314	0.0	0.0	0.0
-it	01_solar	1	315	2000.0	1.0	0.0
-it	02_wind_on	1	315	2000.0	1.0	0.0
-it	03_wind_off	1	315	2000.0	1.0	0.0
-it	04_res	1	315	2000.0	1.0	0.0
-it	05_nuclear	1	315	2000.0	1.0	0.0
-it	06_coal	1	315	2000.0	1.0	0.0
-it	07_gas	1	315	2000.0	1.0	0.0
-it	08_non-res	1	315	600.0	1.0	0.0
+it	01_solar	1	315	2000.0	0.0	1.0
+it	02_wind_on	1	315	2000.0	0.0	1.0
+it	03_wind_off	1	315	2000.0	0.0	1.0
+it	04_res	1	315	2000.0	0.0	1.0
+it	05_nuclear	1	315	2000.0	0.0	1.0
+it	06_coal	1	315	2000.0	0.0	1.0
+it	07_gas	1	315	2000.0	0.0	1.0
+it	08_non-res	1	315	600.0	0.0	1.0
 it	09_hydro_pump	1	315	0.0	0.0	0.0
-it	01_solar	1	316	2000.0	1.0	0.0
-it	02_wind_on	1	316	2000.0	1.0	0.0
-it	03_wind_off	1	316	2000.0	1.0	0.0
-it	04_res	1	316	2000.0	1.0	0.0
-it	05_nuclear	1	316	2000.0	1.0	0.0
-it	06_coal	1	316	2000.0	1.0	0.0
-it	07_gas	1	316	2000.0	1.0	0.0
-it	08_non-res	1	316	700.0	1.0	0.0
+it	01_solar	1	316	2000.0	0.0	1.0
+it	02_wind_on	1	316	2000.0	0.0	1.0
+it	03_wind_off	1	316	2000.0	0.0	1.0
+it	04_res	1	316	2000.0	0.0	1.0
+it	05_nuclear	1	316	2000.0	0.0	1.0
+it	06_coal	1	316	2000.0	0.0	1.0
+it	07_gas	1	316	2000.0	0.0	1.0
+it	08_non-res	1	316	700.0	0.0	1.0
 it	09_hydro_pump	1	316	0.0	0.0	0.0
-it	01_solar	1	317	2000.0	1.0	0.0
-it	02_wind_on	1	317	2000.0	1.0	0.0
-it	03_wind_off	1	317	2000.0	1.0	0.0
-it	04_res	1	317	2000.0	1.0	0.0
-it	05_nuclear	1	317	2000.0	1.0	0.0
-it	06_coal	1	317	2000.0	1.0	0.0
-it	07_gas	1	317	2000.0	1.0	0.0
-it	08_non-res	1	317	800.0	1.0	0.0
+it	01_solar	1	317	2000.0	0.0	1.0
+it	02_wind_on	1	317	2000.0	0.0	1.0
+it	03_wind_off	1	317	2000.0	0.0	1.0
+it	04_res	1	317	2000.0	0.0	1.0
+it	05_nuclear	1	317	2000.0	0.0	1.0
+it	06_coal	1	317	2000.0	0.0	1.0
+it	07_gas	1	317	2000.0	0.0	1.0
+it	08_non-res	1	317	800.0	0.0	1.0
 it	09_hydro_pump	1	317	0.0	0.0	0.0
-it	01_solar	1	318	2000.0	1.0	0.0
-it	02_wind_on	1	318	2000.0	1.0	0.0
-it	03_wind_off	1	318	2000.0	1.0	0.0
-it	04_res	1	318	2000.0	1.0	0.0
-it	05_nuclear	1	318	2000.0	1.0	0.0
-it	06_coal	1	318	2000.0	1.0	0.0
-it	07_gas	1	318	2000.0	1.0	0.0
-it	08_non-res	1	318	900.0	1.0	0.0
+it	01_solar	1	318	2000.0	0.0	1.0
+it	02_wind_on	1	318	2000.0	0.0	1.0
+it	03_wind_off	1	318	2000.0	0.0	1.0
+it	04_res	1	318	2000.0	0.0	1.0
+it	05_nuclear	1	318	2000.0	0.0	1.0
+it	06_coal	1	318	2000.0	0.0	1.0
+it	07_gas	1	318	2000.0	0.0	1.0
+it	08_non-res	1	318	900.0	0.0	1.0
 it	09_hydro_pump	1	318	0.0	0.0	0.0
-it	01_solar	1	319	2000.0	1.0	0.0
-it	02_wind_on	1	319	2000.0	1.0	0.0
-it	03_wind_off	1	319	2000.0	1.0	0.0
-it	04_res	1	319	2000.0	1.0	0.0
-it	05_nuclear	1	319	2000.0	1.0	0.0
-it	06_coal	1	319	2000.0	1.0	0.0
-it	07_gas	1	319	2000.0	1.0	0.0
-it	08_non-res	1	319	1000.0	1.0	0.0
+it	01_solar	1	319	2000.0	0.0	1.0
+it	02_wind_on	1	319	2000.0	0.0	1.0
+it	03_wind_off	1	319	2000.0	0.0	1.0
+it	04_res	1	319	2000.0	0.0	1.0
+it	05_nuclear	1	319	2000.0	0.0	1.0
+it	06_coal	1	319	2000.0	0.0	1.0
+it	07_gas	1	319	2000.0	0.0	1.0
+it	08_non-res	1	319	1000.0	0.0	1.0
 it	09_hydro_pump	1	319	0.0	0.0	0.0
-it	01_solar	1	320	2000.0	1.0	0.0
-it	02_wind_on	1	320	2000.0	1.0	0.0
-it	03_wind_off	1	320	2000.0	1.0	0.0
-it	04_res	1	320	2000.0	1.0	0.0
-it	05_nuclear	1	320	2000.0	1.0	0.0
-it	06_coal	1	320	2000.0	1.0	0.0
-it	07_gas	1	320	2000.0	1.0	0.0
-it	08_non-res	1	320	1100.0	1.0	0.0
+it	01_solar	1	320	2000.0	0.0	1.0
+it	02_wind_on	1	320	2000.0	0.0	1.0
+it	03_wind_off	1	320	2000.0	0.0	1.0
+it	04_res	1	320	2000.0	0.0	1.0
+it	05_nuclear	1	320	2000.0	0.0	1.0
+it	06_coal	1	320	2000.0	0.0	1.0
+it	07_gas	1	320	2000.0	0.0	1.0
+it	08_non-res	1	320	1100.0	0.0	1.0
 it	09_hydro_pump	1	320	0.0	0.0	0.0
-it	01_solar	1	321	2000.0	1.0	0.0
-it	02_wind_on	1	321	2000.0	1.0	0.0
-it	03_wind_off	1	321	2000.0	1.0	0.0
-it	04_res	1	321	2000.0	1.0	0.0
-it	05_nuclear	1	321	2000.0	1.0	0.0
-it	06_coal	1	321	2000.0	1.0	0.0
-it	07_gas	1	321	2000.0	1.0	0.0
-it	08_non-res	1	321	1200.0	1.0	0.0
+it	01_solar	1	321	2000.0	0.0	1.0
+it	02_wind_on	1	321	2000.0	0.0	1.0
+it	03_wind_off	1	321	2000.0	0.0	1.0
+it	04_res	1	321	2000.0	0.0	1.0
+it	05_nuclear	1	321	2000.0	0.0	1.0
+it	06_coal	1	321	2000.0	0.0	1.0
+it	07_gas	1	321	2000.0	0.0	1.0
+it	08_non-res	1	321	1200.0	0.0	1.0
 it	09_hydro_pump	1	321	0.0	0.0	0.0
-it	01_solar	1	322	2000.0	1.0	0.0
-it	02_wind_on	1	322	2000.0	1.0	0.0
-it	03_wind_off	1	322	2000.0	1.0	0.0
-it	04_res	1	322	2000.0	1.0	0.0
-it	05_nuclear	1	322	2000.0	1.0	0.0
-it	06_coal	1	322	2000.0	1.0	0.0
-it	07_gas	1	322	2000.0	1.0	0.0
-it	08_non-res	1	322	1300.0	1.0	0.0
+it	01_solar	1	322	2000.0	0.0	1.0
+it	02_wind_on	1	322	2000.0	0.0	1.0
+it	03_wind_off	1	322	2000.0	0.0	1.0
+it	04_res	1	322	2000.0	0.0	1.0
+it	05_nuclear	1	322	2000.0	0.0	1.0
+it	06_coal	1	322	2000.0	0.0	1.0
+it	07_gas	1	322	2000.0	0.0	1.0
+it	08_non-res	1	322	1300.0	0.0	1.0
 it	09_hydro_pump	1	322	0.0	0.0	0.0
-it	01_solar	1	323	2000.0	1.0	0.0
-it	02_wind_on	1	323	2000.0	1.0	0.0
-it	03_wind_off	1	323	2000.0	1.0	0.0
-it	04_res	1	323	2000.0	1.0	0.0
-it	05_nuclear	1	323	2000.0	1.0	0.0
-it	06_coal	1	323	2000.0	1.0	0.0
-it	07_gas	1	323	2000.0	1.0	0.0
-it	08_non-res	1	323	1400.0	1.0	0.0
+it	01_solar	1	323	2000.0	0.0	1.0
+it	02_wind_on	1	323	2000.0	0.0	1.0
+it	03_wind_off	1	323	2000.0	0.0	1.0
+it	04_res	1	323	2000.0	0.0	1.0
+it	05_nuclear	1	323	2000.0	0.0	1.0
+it	06_coal	1	323	2000.0	0.0	1.0
+it	07_gas	1	323	2000.0	0.0	1.0
+it	08_non-res	1	323	1400.0	0.0	1.0
 it	09_hydro_pump	1	323	0.0	0.0	0.0
-it	01_solar	1	324	2000.0	1.0	0.0
-it	02_wind_on	1	324	2000.0	1.0	0.0
-it	03_wind_off	1	324	2000.0	1.0	0.0
-it	04_res	1	324	2000.0	1.0	0.0
-it	05_nuclear	1	324	2000.0	1.0	0.0
-it	06_coal	1	324	2000.0	1.0	0.0
-it	07_gas	1	324	2000.0	1.0	0.0
-it	08_non-res	1	324	1500.0	1.0	0.0
+it	01_solar	1	324	2000.0	0.0	1.0
+it	02_wind_on	1	324	2000.0	0.0	1.0
+it	03_wind_off	1	324	2000.0	0.0	1.0
+it	04_res	1	324	2000.0	0.0	1.0
+it	05_nuclear	1	324	2000.0	0.0	1.0
+it	06_coal	1	324	2000.0	0.0	1.0
+it	07_gas	1	324	2000.0	0.0	1.0
+it	08_non-res	1	324	1500.0	0.0	1.0
 it	09_hydro_pump	1	324	0.0	0.0	0.0
-it	01_solar	1	325	2000.0	1.0	0.0
-it	02_wind_on	1	325	2000.0	1.0	0.0
-it	03_wind_off	1	325	2000.0	1.0	0.0
-it	04_res	1	325	2000.0	1.0	0.0
-it	05_nuclear	1	325	2000.0	1.0	0.0
-it	06_coal	1	325	2000.0	1.0	0.0
-it	07_gas	1	325	2000.0	1.0	0.0
-it	08_non-res	1	325	1600.0	1.0	0.0
+it	01_solar	1	325	2000.0	0.0	1.0
+it	02_wind_on	1	325	2000.0	0.0	1.0
+it	03_wind_off	1	325	2000.0	0.0	1.0
+it	04_res	1	325	2000.0	0.0	1.0
+it	05_nuclear	1	325	2000.0	0.0	1.0
+it	06_coal	1	325	2000.0	0.0	1.0
+it	07_gas	1	325	2000.0	0.0	1.0
+it	08_non-res	1	325	1600.0	0.0	1.0
 it	09_hydro_pump	1	325	0.0	0.0	0.0
-it	01_solar	1	326	2000.0	1.0	0.0
-it	02_wind_on	1	326	2000.0	1.0	0.0
-it	03_wind_off	1	326	2000.0	1.0	0.0
-it	04_res	1	326	2000.0	1.0	0.0
-it	05_nuclear	1	326	2000.0	1.0	0.0
-it	06_coal	1	326	2000.0	1.0	0.0
-it	07_gas	1	326	2000.0	1.0	0.0
-it	08_non-res	1	326	1700.0	1.0	0.0
+it	01_solar	1	326	2000.0	0.0	1.0
+it	02_wind_on	1	326	2000.0	0.0	1.0
+it	03_wind_off	1	326	2000.0	0.0	1.0
+it	04_res	1	326	2000.0	0.0	1.0
+it	05_nuclear	1	326	2000.0	0.0	1.0
+it	06_coal	1	326	2000.0	0.0	1.0
+it	07_gas	1	326	2000.0	0.0	1.0
+it	08_non-res	1	326	1700.0	0.0	1.0
 it	09_hydro_pump	1	326	0.0	0.0	0.0
-it	01_solar	1	327	2000.0	1.0	0.0
-it	02_wind_on	1	327	2000.0	1.0	0.0
-it	03_wind_off	1	327	2000.0	1.0	0.0
-it	04_res	1	327	2000.0	1.0	0.0
-it	05_nuclear	1	327	2000.0	1.0	0.0
-it	06_coal	1	327	2000.0	1.0	0.0
-it	07_gas	1	327	2000.0	1.0	0.0
-it	08_non-res	1	327	1800.0	1.0	0.0
+it	01_solar	1	327	2000.0	0.0	1.0
+it	02_wind_on	1	327	2000.0	0.0	1.0
+it	03_wind_off	1	327	2000.0	0.0	1.0
+it	04_res	1	327	2000.0	0.0	1.0
+it	05_nuclear	1	327	2000.0	0.0	1.0
+it	06_coal	1	327	2000.0	0.0	1.0
+it	07_gas	1	327	2000.0	0.0	1.0
+it	08_non-res	1	327	1800.0	0.0	1.0
 it	09_hydro_pump	1	327	0.0	0.0	0.0
-it	01_solar	1	328	2000.0	1.0	0.0
-it	02_wind_on	1	328	2000.0	1.0	0.0
-it	03_wind_off	1	328	2000.0	1.0	0.0
-it	04_res	1	328	2000.0	1.0	0.0
-it	05_nuclear	1	328	2000.0	1.0	0.0
-it	06_coal	1	328	2000.0	1.0	0.0
-it	07_gas	1	328	2000.0	1.0	0.0
-it	08_non-res	1	328	1900.0	1.0	0.0
+it	01_solar	1	328	2000.0	0.0	1.0
+it	02_wind_on	1	328	2000.0	0.0	1.0
+it	03_wind_off	1	328	2000.0	0.0	1.0
+it	04_res	1	328	2000.0	0.0	1.0
+it	05_nuclear	1	328	2000.0	0.0	1.0
+it	06_coal	1	328	2000.0	0.0	1.0
+it	07_gas	1	328	2000.0	0.0	1.0
+it	08_non-res	1	328	1900.0	0.0	1.0
 it	09_hydro_pump	1	328	0.0	0.0	0.0
-it	01_solar	1	329	2000.0	1.0	0.0
-it	02_wind_on	1	329	2000.0	1.0	0.0
-it	03_wind_off	1	329	2000.0	1.0	0.0
-it	04_res	1	329	2000.0	1.0	0.0
-it	05_nuclear	1	329	2000.0	1.0	0.0
-it	06_coal	1	329	2000.0	1.0	0.0
-it	07_gas	1	329	2000.0	1.0	0.0
-it	08_non-res	1	329	2000.0	1.0	0.0
+it	01_solar	1	329	2000.0	0.0	1.0
+it	02_wind_on	1	329	2000.0	0.0	1.0
+it	03_wind_off	1	329	2000.0	0.0	1.0
+it	04_res	1	329	2000.0	0.0	1.0
+it	05_nuclear	1	329	2000.0	0.0	1.0
+it	06_coal	1	329	2000.0	0.0	1.0
+it	07_gas	1	329	2000.0	0.0	1.0
+it	08_non-res	1	329	2000.0	0.0	1.0
 it	09_hydro_pump	1	329	0.0	0.0	0.0
-it	01_solar	1	330	2000.0	1.0	0.0
-it	02_wind_on	1	330	2000.0	1.0	0.0
-it	03_wind_off	1	330	2000.0	1.0	0.0
-it	04_res	1	330	2000.0	1.0	0.0
-it	05_nuclear	1	330	2000.0	1.0	0.0
-it	06_coal	1	330	2000.0	1.0	0.0
-it	07_gas	1	330	2000.0	1.0	0.0
-it	08_non-res	1	330	2000.0	1.0	0.0
-it	09_hydro_pump	1	330	100.0	1.0	0.0
-it	01_solar	1	331	2000.0	1.0	0.0
-it	02_wind_on	1	331	2000.0	1.0	0.0
-it	03_wind_off	1	331	2000.0	1.0	0.0
-it	04_res	1	331	2000.0	1.0	0.0
-it	05_nuclear	1	331	2000.0	1.0	0.0
-it	06_coal	1	331	2000.0	1.0	0.0
-it	07_gas	1	331	2000.0	1.0	0.0
-it	08_non-res	1	331	2000.0	1.0	0.0
-it	09_hydro_pump	1	331	200.0	1.0	0.0
-it	01_solar	1	332	2000.0	1.0	0.0
-it	02_wind_on	1	332	2000.0	1.0	0.0
-it	03_wind_off	1	332	2000.0	1.0	0.0
-it	04_res	1	332	2000.0	1.0	0.0
-it	05_nuclear	1	332	2000.0	1.0	0.0
-it	06_coal	1	332	2000.0	1.0	0.0
-it	07_gas	1	332	2000.0	1.0	0.0
-it	08_non-res	1	332	2000.0	1.0	0.0
-it	09_hydro_pump	1	332	300.0	1.0	0.0
-it	01_solar	1	333	2000.0	1.0	0.0
-it	02_wind_on	1	333	2000.0	1.0	0.0
-it	03_wind_off	1	333	2000.0	1.0	0.0
-it	04_res	1	333	2000.0	1.0	0.0
-it	05_nuclear	1	333	2000.0	1.0	0.0
-it	06_coal	1	333	2000.0	1.0	0.0
-it	07_gas	1	333	2000.0	1.0	0.0
-it	08_non-res	1	333	2000.0	1.0	0.0
-it	09_hydro_pump	1	333	400.0	1.0	0.0
-it	01_solar	1	334	2000.0	1.0	0.0
-it	02_wind_on	1	334	2000.0	1.0	0.0
-it	03_wind_off	1	334	2000.0	1.0	0.0
-it	04_res	1	334	2000.0	1.0	0.0
-it	05_nuclear	1	334	2000.0	1.0	0.0
-it	06_coal	1	334	2000.0	1.0	0.0
-it	07_gas	1	334	2000.0	1.0	0.0
-it	08_non-res	1	334	2000.0	1.0	0.0
-it	09_hydro_pump	1	334	500.0	1.0	0.0
-it	01_solar	1	335	2000.0	1.0	0.0
-it	02_wind_on	1	335	2000.0	1.0	0.0
-it	03_wind_off	1	335	2000.0	1.0	0.0
-it	04_res	1	335	2000.0	1.0	0.0
-it	05_nuclear	1	335	2000.0	1.0	0.0
-it	06_coal	1	335	2000.0	1.0	0.0
-it	07_gas	1	335	2000.0	1.0	0.0
-it	08_non-res	1	335	2000.0	1.0	0.0
-it	09_hydro_pump	1	335	600.0	1.0	0.0
-it	01_solar	1	336	2000.0	1.0	0.0
-it	02_wind_on	1	336	2000.0	1.0	0.0
-it	03_wind_off	1	336	2000.0	1.0	0.0
-it	04_res	1	336	2000.0	1.0	0.0
-it	05_nuclear	1	336	2000.0	1.0	0.0
-it	06_coal	1	336	2000.0	1.0	0.0
-it	07_gas	1	336	2000.0	1.0	0.0
-it	08_non-res	1	336	2000.0	1.0	0.0
-it	09_hydro_pump	1	336	700.0	1.0	0.0
+it	01_solar	1	330	2000.0	0.0	1.0
+it	02_wind_on	1	330	2000.0	0.0	1.0
+it	03_wind_off	1	330	2000.0	0.0	1.0
+it	04_res	1	330	2000.0	0.0	1.0
+it	05_nuclear	1	330	2000.0	0.0	1.0
+it	06_coal	1	330	2000.0	0.0	1.0
+it	07_gas	1	330	2000.0	0.0	1.0
+it	08_non-res	1	330	2000.0	0.0	1.0
+it	09_hydro_pump	1	330	100.0	0.0	1.0
+it	01_solar	1	331	2000.0	0.0	1.0
+it	02_wind_on	1	331	2000.0	0.0	1.0
+it	03_wind_off	1	331	2000.0	0.0	1.0
+it	04_res	1	331	2000.0	0.0	1.0
+it	05_nuclear	1	331	2000.0	0.0	1.0
+it	06_coal	1	331	2000.0	0.0	1.0
+it	07_gas	1	331	2000.0	0.0	1.0
+it	08_non-res	1	331	2000.0	0.0	1.0
+it	09_hydro_pump	1	331	200.0	0.0	1.0
+it	01_solar	1	332	2000.0	0.0	1.0
+it	02_wind_on	1	332	2000.0	0.0	1.0
+it	03_wind_off	1	332	2000.0	0.0	1.0
+it	04_res	1	332	2000.0	0.0	1.0
+it	05_nuclear	1	332	2000.0	0.0	1.0
+it	06_coal	1	332	2000.0	0.0	1.0
+it	07_gas	1	332	2000.0	0.0	1.0
+it	08_non-res	1	332	2000.0	0.0	1.0
+it	09_hydro_pump	1	332	300.0	0.0	1.0
+it	01_solar	1	333	2000.0	0.0	1.0
+it	02_wind_on	1	333	2000.0	0.0	1.0
+it	03_wind_off	1	333	2000.0	0.0	1.0
+it	04_res	1	333	2000.0	0.0	1.0
+it	05_nuclear	1	333	2000.0	0.0	1.0
+it	06_coal	1	333	2000.0	0.0	1.0
+it	07_gas	1	333	2000.0	0.0	1.0
+it	08_non-res	1	333	2000.0	0.0	1.0
+it	09_hydro_pump	1	333	400.0	0.0	1.0
+it	01_solar	1	334	2000.0	0.0	1.0
+it	02_wind_on	1	334	2000.0	0.0	1.0
+it	03_wind_off	1	334	2000.0	0.0	1.0
+it	04_res	1	334	2000.0	0.0	1.0
+it	05_nuclear	1	334	2000.0	0.0	1.0
+it	06_coal	1	334	2000.0	0.0	1.0
+it	07_gas	1	334	2000.0	0.0	1.0
+it	08_non-res	1	334	2000.0	0.0	1.0
+it	09_hydro_pump	1	334	500.0	0.0	1.0
+it	01_solar	1	335	2000.0	0.0	1.0
+it	02_wind_on	1	335	2000.0	0.0	1.0
+it	03_wind_off	1	335	2000.0	0.0	1.0
+it	04_res	1	335	2000.0	0.0	1.0
+it	05_nuclear	1	335	2000.0	0.0	1.0
+it	06_coal	1	335	2000.0	0.0	1.0
+it	07_gas	1	335	2000.0	0.0	1.0
+it	08_non-res	1	335	2000.0	0.0	1.0
+it	09_hydro_pump	1	335	600.0	0.0	1.0
+it	01_solar	1	336	2000.0	0.0	1.0
+it	02_wind_on	1	336	2000.0	0.0	1.0
+it	03_wind_off	1	336	2000.0	0.0	1.0
+it	04_res	1	336	2000.0	0.0	1.0
+it	05_nuclear	1	336	2000.0	0.0	1.0
+it	06_coal	1	336	2000.0	0.0	1.0
+it	07_gas	1	336	2000.0	0.0	1.0
+it	08_non-res	1	336	2000.0	0.0	1.0
+it	09_hydro_pump	1	336	700.0	0.0	1.0
diff --git a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-07.result.tsv b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-07.result.tsv
index fef638b5b9..587ee1ee46 100644
--- a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-07.result.tsv
+++ b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-07.result.tsv
@@ -1,4 +1,4 @@
-area	cluster	mcYear	timeId	NODU	NP Cost - Euro
+area	cluster	mcYear	timeId	NP Cost	NODU
 de	01_solar	1	1	0.0	0.0
 de	02_wind_on	1	1	0.0	0.0
 de	03_wind_off	1	1	0.0	0.0
@@ -8,7 +8,7 @@ de	06_coal	1	1	0.0	0.0
 de	07_gas	1	1	0.0	0.0
 de	08_non-res	1	1	0.0	0.0
 de	09_hydro_pump	1	1	0.0	0.0
-de	01_solar	1	2	1.0	0.0
+de	01_solar	1	2	0.0	1.0
 de	02_wind_on	1	2	0.0	0.0
 de	03_wind_off	1	2	0.0	0.0
 de	04_res	1	2	0.0	0.0
@@ -17,7 +17,7 @@ de	06_coal	1	2	0.0	0.0
 de	07_gas	1	2	0.0	0.0
 de	08_non-res	1	2	0.0	0.0
 de	09_hydro_pump	1	2	0.0	0.0
-de	01_solar	1	3	1.0	0.0
+de	01_solar	1	3	0.0	1.0
 de	02_wind_on	1	3	0.0	0.0
 de	03_wind_off	1	3	0.0	0.0
 de	04_res	1	3	0.0	0.0
@@ -26,7 +26,7 @@ de	06_coal	1	3	0.0	0.0
 de	07_gas	1	3	0.0	0.0
 de	08_non-res	1	3	0.0	0.0
 de	09_hydro_pump	1	3	0.0	0.0
-de	01_solar	1	4	1.0	0.0
+de	01_solar	1	4	0.0	1.0
 de	02_wind_on	1	4	0.0	0.0
 de	03_wind_off	1	4	0.0	0.0
 de	04_res	1	4	0.0	0.0
@@ -35,7 +35,7 @@ de	06_coal	1	4	0.0	0.0
 de	07_gas	1	4	0.0	0.0
 de	08_non-res	1	4	0.0	0.0
 de	09_hydro_pump	1	4	0.0	0.0
-de	01_solar	1	5	1.0	0.0
+de	01_solar	1	5	0.0	1.0
 de	02_wind_on	1	5	0.0	0.0
 de	03_wind_off	1	5	0.0	0.0
 de	04_res	1	5	0.0	0.0
@@ -44,7 +44,7 @@ de	06_coal	1	5	0.0	0.0
 de	07_gas	1	5	0.0	0.0
 de	08_non-res	1	5	0.0	0.0
 de	09_hydro_pump	1	5	0.0	0.0
-de	01_solar	1	6	1.0	0.0
+de	01_solar	1	6	0.0	1.0
 de	02_wind_on	1	6	0.0	0.0
 de	03_wind_off	1	6	0.0	0.0
 de	04_res	1	6	0.0	0.0
@@ -53,7 +53,7 @@ de	06_coal	1	6	0.0	0.0
 de	07_gas	1	6	0.0	0.0
 de	08_non-res	1	6	0.0	0.0
 de	09_hydro_pump	1	6	0.0	0.0
-de	01_solar	1	7	1.0	0.0
+de	01_solar	1	7	0.0	1.0
 de	02_wind_on	1	7	0.0	0.0
 de	03_wind_off	1	7	0.0	0.0
 de	04_res	1	7	0.0	0.0
@@ -62,7 +62,7 @@ de	06_coal	1	7	0.0	0.0
 de	07_gas	1	7	0.0	0.0
 de	08_non-res	1	7	0.0	0.0
 de	09_hydro_pump	1	7	0.0	0.0
-de	01_solar	1	8	1.0	0.0
+de	01_solar	1	8	0.0	1.0
 de	02_wind_on	1	8	0.0	0.0
 de	03_wind_off	1	8	0.0	0.0
 de	04_res	1	8	0.0	0.0
@@ -71,7 +71,7 @@ de	06_coal	1	8	0.0	0.0
 de	07_gas	1	8	0.0	0.0
 de	08_non-res	1	8	0.0	0.0
 de	09_hydro_pump	1	8	0.0	0.0
-de	01_solar	1	9	1.0	0.0
+de	01_solar	1	9	0.0	1.0
 de	02_wind_on	1	9	0.0	0.0
 de	03_wind_off	1	9	0.0	0.0
 de	04_res	1	9	0.0	0.0
@@ -80,7 +80,7 @@ de	06_coal	1	9	0.0	0.0
 de	07_gas	1	9	0.0	0.0
 de	08_non-res	1	9	0.0	0.0
 de	09_hydro_pump	1	9	0.0	0.0
-de	01_solar	1	10	1.0	0.0
+de	01_solar	1	10	0.0	1.0
 de	02_wind_on	1	10	0.0	0.0
 de	03_wind_off	1	10	0.0	0.0
 de	04_res	1	10	0.0	0.0
@@ -89,7 +89,7 @@ de	06_coal	1	10	0.0	0.0
 de	07_gas	1	10	0.0	0.0
 de	08_non-res	1	10	0.0	0.0
 de	09_hydro_pump	1	10	0.0	0.0
-de	01_solar	1	11	1.0	0.0
+de	01_solar	1	11	0.0	1.0
 de	02_wind_on	1	11	0.0	0.0
 de	03_wind_off	1	11	0.0	0.0
 de	04_res	1	11	0.0	0.0
@@ -98,7 +98,7 @@ de	06_coal	1	11	0.0	0.0
 de	07_gas	1	11	0.0	0.0
 de	08_non-res	1	11	0.0	0.0
 de	09_hydro_pump	1	11	0.0	0.0
-de	01_solar	1	12	1.0	0.0
+de	01_solar	1	12	0.0	1.0
 de	02_wind_on	1	12	0.0	0.0
 de	03_wind_off	1	12	0.0	0.0
 de	04_res	1	12	0.0	0.0
@@ -107,7 +107,7 @@ de	06_coal	1	12	0.0	0.0
 de	07_gas	1	12	0.0	0.0
 de	08_non-res	1	12	0.0	0.0
 de	09_hydro_pump	1	12	0.0	0.0
-de	01_solar	1	13	1.0	0.0
+de	01_solar	1	13	0.0	1.0
 de	02_wind_on	1	13	0.0	0.0
 de	03_wind_off	1	13	0.0	0.0
 de	04_res	1	13	0.0	0.0
@@ -116,7 +116,7 @@ de	06_coal	1	13	0.0	0.0
 de	07_gas	1	13	0.0	0.0
 de	08_non-res	1	13	0.0	0.0
 de	09_hydro_pump	1	13	0.0	0.0
-de	01_solar	1	14	1.0	0.0
+de	01_solar	1	14	0.0	1.0
 de	02_wind_on	1	14	0.0	0.0
 de	03_wind_off	1	14	0.0	0.0
 de	04_res	1	14	0.0	0.0
@@ -125,7 +125,7 @@ de	06_coal	1	14	0.0	0.0
 de	07_gas	1	14	0.0	0.0
 de	08_non-res	1	14	0.0	0.0
 de	09_hydro_pump	1	14	0.0	0.0
-de	01_solar	1	15	1.0	0.0
+de	01_solar	1	15	0.0	1.0
 de	02_wind_on	1	15	0.0	0.0
 de	03_wind_off	1	15	0.0	0.0
 de	04_res	1	15	0.0	0.0
@@ -134,7 +134,7 @@ de	06_coal	1	15	0.0	0.0
 de	07_gas	1	15	0.0	0.0
 de	08_non-res	1	15	0.0	0.0
 de	09_hydro_pump	1	15	0.0	0.0
-de	01_solar	1	16	1.0	0.0
+de	01_solar	1	16	0.0	1.0
 de	02_wind_on	1	16	0.0	0.0
 de	03_wind_off	1	16	0.0	0.0
 de	04_res	1	16	0.0	0.0
@@ -143,7 +143,7 @@ de	06_coal	1	16	0.0	0.0
 de	07_gas	1	16	0.0	0.0
 de	08_non-res	1	16	0.0	0.0
 de	09_hydro_pump	1	16	0.0	0.0
-de	01_solar	1	17	1.0	0.0
+de	01_solar	1	17	0.0	1.0
 de	02_wind_on	1	17	0.0	0.0
 de	03_wind_off	1	17	0.0	0.0
 de	04_res	1	17	0.0	0.0
@@ -152,7 +152,7 @@ de	06_coal	1	17	0.0	0.0
 de	07_gas	1	17	0.0	0.0
 de	08_non-res	1	17	0.0	0.0
 de	09_hydro_pump	1	17	0.0	0.0
-de	01_solar	1	18	1.0	0.0
+de	01_solar	1	18	0.0	1.0
 de	02_wind_on	1	18	0.0	0.0
 de	03_wind_off	1	18	0.0	0.0
 de	04_res	1	18	0.0	0.0
@@ -161,7 +161,7 @@ de	06_coal	1	18	0.0	0.0
 de	07_gas	1	18	0.0	0.0
 de	08_non-res	1	18	0.0	0.0
 de	09_hydro_pump	1	18	0.0	0.0
-de	01_solar	1	19	1.0	0.0
+de	01_solar	1	19	0.0	1.0
 de	02_wind_on	1	19	0.0	0.0
 de	03_wind_off	1	19	0.0	0.0
 de	04_res	1	19	0.0	0.0
@@ -170,7 +170,7 @@ de	06_coal	1	19	0.0	0.0
 de	07_gas	1	19	0.0	0.0
 de	08_non-res	1	19	0.0	0.0
 de	09_hydro_pump	1	19	0.0	0.0
-de	01_solar	1	20	1.0	0.0
+de	01_solar	1	20	0.0	1.0
 de	02_wind_on	1	20	0.0	0.0
 de	03_wind_off	1	20	0.0	0.0
 de	04_res	1	20	0.0	0.0
@@ -179,7 +179,7 @@ de	06_coal	1	20	0.0	0.0
 de	07_gas	1	20	0.0	0.0
 de	08_non-res	1	20	0.0	0.0
 de	09_hydro_pump	1	20	0.0	0.0
-de	01_solar	1	21	1.0	0.0
+de	01_solar	1	21	0.0	1.0
 de	02_wind_on	1	21	0.0	0.0
 de	03_wind_off	1	21	0.0	0.0
 de	04_res	1	21	0.0	0.0
@@ -188,8 +188,8 @@ de	06_coal	1	21	0.0	0.0
 de	07_gas	1	21	0.0	0.0
 de	08_non-res	1	21	0.0	0.0
 de	09_hydro_pump	1	21	0.0	0.0
-de	01_solar	1	22	1.0	0.0
-de	02_wind_on	1	22	1.0	0.0
+de	01_solar	1	22	0.0	1.0
+de	02_wind_on	1	22	0.0	1.0
 de	03_wind_off	1	22	0.0	0.0
 de	04_res	1	22	0.0	0.0
 de	05_nuclear	1	22	0.0	0.0
@@ -197,8 +197,8 @@ de	06_coal	1	22	0.0	0.0
 de	07_gas	1	22	0.0	0.0
 de	08_non-res	1	22	0.0	0.0
 de	09_hydro_pump	1	22	0.0	0.0
-de	01_solar	1	23	1.0	0.0
-de	02_wind_on	1	23	1.0	0.0
+de	01_solar	1	23	0.0	1.0
+de	02_wind_on	1	23	0.0	1.0
 de	03_wind_off	1	23	0.0	0.0
 de	04_res	1	23	0.0	0.0
 de	05_nuclear	1	23	0.0	0.0
@@ -206,8 +206,8 @@ de	06_coal	1	23	0.0	0.0
 de	07_gas	1	23	0.0	0.0
 de	08_non-res	1	23	0.0	0.0
 de	09_hydro_pump	1	23	0.0	0.0
-de	01_solar	1	24	1.0	0.0
-de	02_wind_on	1	24	1.0	0.0
+de	01_solar	1	24	0.0	1.0
+de	02_wind_on	1	24	0.0	1.0
 de	03_wind_off	1	24	0.0	0.0
 de	04_res	1	24	0.0	0.0
 de	05_nuclear	1	24	0.0	0.0
@@ -215,8 +215,8 @@ de	06_coal	1	24	0.0	0.0
 de	07_gas	1	24	0.0	0.0
 de	08_non-res	1	24	0.0	0.0
 de	09_hydro_pump	1	24	0.0	0.0
-de	01_solar	1	25	1.0	0.0
-de	02_wind_on	1	25	1.0	0.0
+de	01_solar	1	25	0.0	1.0
+de	02_wind_on	1	25	0.0	1.0
 de	03_wind_off	1	25	0.0	0.0
 de	04_res	1	25	0.0	0.0
 de	05_nuclear	1	25	0.0	0.0
@@ -224,8 +224,8 @@ de	06_coal	1	25	0.0	0.0
 de	07_gas	1	25	0.0	0.0
 de	08_non-res	1	25	0.0	0.0
 de	09_hydro_pump	1	25	0.0	0.0
-de	01_solar	1	26	1.0	0.0
-de	02_wind_on	1	26	1.0	0.0
+de	01_solar	1	26	0.0	1.0
+de	02_wind_on	1	26	0.0	1.0
 de	03_wind_off	1	26	0.0	0.0
 de	04_res	1	26	0.0	0.0
 de	05_nuclear	1	26	0.0	0.0
@@ -233,8 +233,8 @@ de	06_coal	1	26	0.0	0.0
 de	07_gas	1	26	0.0	0.0
 de	08_non-res	1	26	0.0	0.0
 de	09_hydro_pump	1	26	0.0	0.0
-de	01_solar	1	27	1.0	0.0
-de	02_wind_on	1	27	1.0	0.0
+de	01_solar	1	27	0.0	1.0
+de	02_wind_on	1	27	0.0	1.0
 de	03_wind_off	1	27	0.0	0.0
 de	04_res	1	27	0.0	0.0
 de	05_nuclear	1	27	0.0	0.0
@@ -242,8 +242,8 @@ de	06_coal	1	27	0.0	0.0
 de	07_gas	1	27	0.0	0.0
 de	08_non-res	1	27	0.0	0.0
 de	09_hydro_pump	1	27	0.0	0.0
-de	01_solar	1	28	1.0	0.0
-de	02_wind_on	1	28	1.0	0.0
+de	01_solar	1	28	0.0	1.0
+de	02_wind_on	1	28	0.0	1.0
 de	03_wind_off	1	28	0.0	0.0
 de	04_res	1	28	0.0	0.0
 de	05_nuclear	1	28	0.0	0.0
@@ -251,8 +251,8 @@ de	06_coal	1	28	0.0	0.0
 de	07_gas	1	28	0.0	0.0
 de	08_non-res	1	28	0.0	0.0
 de	09_hydro_pump	1	28	0.0	0.0
-de	01_solar	1	29	1.0	0.0
-de	02_wind_on	1	29	1.0	0.0
+de	01_solar	1	29	0.0	1.0
+de	02_wind_on	1	29	0.0	1.0
 de	03_wind_off	1	29	0.0	0.0
 de	04_res	1	29	0.0	0.0
 de	05_nuclear	1	29	0.0	0.0
@@ -260,8 +260,8 @@ de	06_coal	1	29	0.0	0.0
 de	07_gas	1	29	0.0	0.0
 de	08_non-res	1	29	0.0	0.0
 de	09_hydro_pump	1	29	0.0	0.0
-de	01_solar	1	30	1.0	0.0
-de	02_wind_on	1	30	1.0	0.0
+de	01_solar	1	30	0.0	1.0
+de	02_wind_on	1	30	0.0	1.0
 de	03_wind_off	1	30	0.0	0.0
 de	04_res	1	30	0.0	0.0
 de	05_nuclear	1	30	0.0	0.0
@@ -269,8 +269,8 @@ de	06_coal	1	30	0.0	0.0
 de	07_gas	1	30	0.0	0.0
 de	08_non-res	1	30	0.0	0.0
 de	09_hydro_pump	1	30	0.0	0.0
-de	01_solar	1	31	1.0	0.0
-de	02_wind_on	1	31	1.0	0.0
+de	01_solar	1	31	0.0	1.0
+de	02_wind_on	1	31	0.0	1.0
 de	03_wind_off	1	31	0.0	0.0
 de	04_res	1	31	0.0	0.0
 de	05_nuclear	1	31	0.0	0.0
@@ -278,8 +278,8 @@ de	06_coal	1	31	0.0	0.0
 de	07_gas	1	31	0.0	0.0
 de	08_non-res	1	31	0.0	0.0
 de	09_hydro_pump	1	31	0.0	0.0
-de	01_solar	1	32	1.0	0.0
-de	02_wind_on	1	32	1.0	0.0
+de	01_solar	1	32	0.0	1.0
+de	02_wind_on	1	32	0.0	1.0
 de	03_wind_off	1	32	0.0	0.0
 de	04_res	1	32	0.0	0.0
 de	05_nuclear	1	32	0.0	0.0
@@ -287,8 +287,8 @@ de	06_coal	1	32	0.0	0.0
 de	07_gas	1	32	0.0	0.0
 de	08_non-res	1	32	0.0	0.0
 de	09_hydro_pump	1	32	0.0	0.0
-de	01_solar	1	33	1.0	0.0
-de	02_wind_on	1	33	1.0	0.0
+de	01_solar	1	33	0.0	1.0
+de	02_wind_on	1	33	0.0	1.0
 de	03_wind_off	1	33	0.0	0.0
 de	04_res	1	33	0.0	0.0
 de	05_nuclear	1	33	0.0	0.0
@@ -296,8 +296,8 @@ de	06_coal	1	33	0.0	0.0
 de	07_gas	1	33	0.0	0.0
 de	08_non-res	1	33	0.0	0.0
 de	09_hydro_pump	1	33	0.0	0.0
-de	01_solar	1	34	1.0	0.0
-de	02_wind_on	1	34	1.0	0.0
+de	01_solar	1	34	0.0	1.0
+de	02_wind_on	1	34	0.0	1.0
 de	03_wind_off	1	34	0.0	0.0
 de	04_res	1	34	0.0	0.0
 de	05_nuclear	1	34	0.0	0.0
@@ -305,8 +305,8 @@ de	06_coal	1	34	0.0	0.0
 de	07_gas	1	34	0.0	0.0
 de	08_non-res	1	34	0.0	0.0
 de	09_hydro_pump	1	34	0.0	0.0
-de	01_solar	1	35	1.0	0.0
-de	02_wind_on	1	35	1.0	0.0
+de	01_solar	1	35	0.0	1.0
+de	02_wind_on	1	35	0.0	1.0
 de	03_wind_off	1	35	0.0	0.0
 de	04_res	1	35	0.0	0.0
 de	05_nuclear	1	35	0.0	0.0
@@ -314,8 +314,8 @@ de	06_coal	1	35	0.0	0.0
 de	07_gas	1	35	0.0	0.0
 de	08_non-res	1	35	0.0	0.0
 de	09_hydro_pump	1	35	0.0	0.0
-de	01_solar	1	36	1.0	0.0
-de	02_wind_on	1	36	1.0	0.0
+de	01_solar	1	36	0.0	1.0
+de	02_wind_on	1	36	0.0	1.0
 de	03_wind_off	1	36	0.0	0.0
 de	04_res	1	36	0.0	0.0
 de	05_nuclear	1	36	0.0	0.0
@@ -323,8 +323,8 @@ de	06_coal	1	36	0.0	0.0
 de	07_gas	1	36	0.0	0.0
 de	08_non-res	1	36	0.0	0.0
 de	09_hydro_pump	1	36	0.0	0.0
-de	01_solar	1	37	1.0	0.0
-de	02_wind_on	1	37	1.0	0.0
+de	01_solar	1	37	0.0	1.0
+de	02_wind_on	1	37	0.0	1.0
 de	03_wind_off	1	37	0.0	0.0
 de	04_res	1	37	0.0	0.0
 de	05_nuclear	1	37	0.0	0.0
@@ -332,8 +332,8 @@ de	06_coal	1	37	0.0	0.0
 de	07_gas	1	37	0.0	0.0
 de	08_non-res	1	37	0.0	0.0
 de	09_hydro_pump	1	37	0.0	0.0
-de	01_solar	1	38	1.0	0.0
-de	02_wind_on	1	38	1.0	0.0
+de	01_solar	1	38	0.0	1.0
+de	02_wind_on	1	38	0.0	1.0
 de	03_wind_off	1	38	0.0	0.0
 de	04_res	1	38	0.0	0.0
 de	05_nuclear	1	38	0.0	0.0
@@ -341,8 +341,8 @@ de	06_coal	1	38	0.0	0.0
 de	07_gas	1	38	0.0	0.0
 de	08_non-res	1	38	0.0	0.0
 de	09_hydro_pump	1	38	0.0	0.0
-de	01_solar	1	39	1.0	0.0
-de	02_wind_on	1	39	1.0	0.0
+de	01_solar	1	39	0.0	1.0
+de	02_wind_on	1	39	0.0	1.0
 de	03_wind_off	1	39	0.0	0.0
 de	04_res	1	39	0.0	0.0
 de	05_nuclear	1	39	0.0	0.0
@@ -350,8 +350,8 @@ de	06_coal	1	39	0.0	0.0
 de	07_gas	1	39	0.0	0.0
 de	08_non-res	1	39	0.0	0.0
 de	09_hydro_pump	1	39	0.0	0.0
-de	01_solar	1	40	1.0	0.0
-de	02_wind_on	1	40	1.0	0.0
+de	01_solar	1	40	0.0	1.0
+de	02_wind_on	1	40	0.0	1.0
 de	03_wind_off	1	40	0.0	0.0
 de	04_res	1	40	0.0	0.0
 de	05_nuclear	1	40	0.0	0.0
@@ -359,8 +359,8 @@ de	06_coal	1	40	0.0	0.0
 de	07_gas	1	40	0.0	0.0
 de	08_non-res	1	40	0.0	0.0
 de	09_hydro_pump	1	40	0.0	0.0
-de	01_solar	1	41	1.0	0.0
-de	02_wind_on	1	41	1.0	0.0
+de	01_solar	1	41	0.0	1.0
+de	02_wind_on	1	41	0.0	1.0
 de	03_wind_off	1	41	0.0	0.0
 de	04_res	1	41	0.0	0.0
 de	05_nuclear	1	41	0.0	0.0
@@ -368,1149 +368,1149 @@ de	06_coal	1	41	0.0	0.0
 de	07_gas	1	41	0.0	0.0
 de	08_non-res	1	41	0.0	0.0
 de	09_hydro_pump	1	41	0.0	0.0
-de	01_solar	1	42	1.0	0.0
-de	02_wind_on	1	42	1.0	0.0
-de	03_wind_off	1	42	1.0	0.0
+de	01_solar	1	42	0.0	1.0
+de	02_wind_on	1	42	0.0	1.0
+de	03_wind_off	1	42	0.0	1.0
 de	04_res	1	42	0.0	0.0
 de	05_nuclear	1	42	0.0	0.0
 de	06_coal	1	42	0.0	0.0
 de	07_gas	1	42	0.0	0.0
 de	08_non-res	1	42	0.0	0.0
 de	09_hydro_pump	1	42	0.0	0.0
-de	01_solar	1	43	1.0	0.0
-de	02_wind_on	1	43	1.0	0.0
-de	03_wind_off	1	43	1.0	0.0
+de	01_solar	1	43	0.0	1.0
+de	02_wind_on	1	43	0.0	1.0
+de	03_wind_off	1	43	0.0	1.0
 de	04_res	1	43	0.0	0.0
 de	05_nuclear	1	43	0.0	0.0
 de	06_coal	1	43	0.0	0.0
 de	07_gas	1	43	0.0	0.0
 de	08_non-res	1	43	0.0	0.0
 de	09_hydro_pump	1	43	0.0	0.0
-de	01_solar	1	44	1.0	0.0
-de	02_wind_on	1	44	1.0	0.0
-de	03_wind_off	1	44	1.0	0.0
+de	01_solar	1	44	0.0	1.0
+de	02_wind_on	1	44	0.0	1.0
+de	03_wind_off	1	44	0.0	1.0
 de	04_res	1	44	0.0	0.0
 de	05_nuclear	1	44	0.0	0.0
 de	06_coal	1	44	0.0	0.0
 de	07_gas	1	44	0.0	0.0
 de	08_non-res	1	44	0.0	0.0
 de	09_hydro_pump	1	44	0.0	0.0
-de	01_solar	1	45	1.0	0.0
-de	02_wind_on	1	45	1.0	0.0
-de	03_wind_off	1	45	1.0	0.0
+de	01_solar	1	45	0.0	1.0
+de	02_wind_on	1	45	0.0	1.0
+de	03_wind_off	1	45	0.0	1.0
 de	04_res	1	45	0.0	0.0
 de	05_nuclear	1	45	0.0	0.0
 de	06_coal	1	45	0.0	0.0
 de	07_gas	1	45	0.0	0.0
 de	08_non-res	1	45	0.0	0.0
 de	09_hydro_pump	1	45	0.0	0.0
-de	01_solar	1	46	1.0	0.0
-de	02_wind_on	1	46	1.0	0.0
-de	03_wind_off	1	46	1.0	0.0
+de	01_solar	1	46	0.0	1.0
+de	02_wind_on	1	46	0.0	1.0
+de	03_wind_off	1	46	0.0	1.0
 de	04_res	1	46	0.0	0.0
 de	05_nuclear	1	46	0.0	0.0
 de	06_coal	1	46	0.0	0.0
 de	07_gas	1	46	0.0	0.0
 de	08_non-res	1	46	0.0	0.0
 de	09_hydro_pump	1	46	0.0	0.0
-de	01_solar	1	47	1.0	0.0
-de	02_wind_on	1	47	1.0	0.0
-de	03_wind_off	1	47	1.0	0.0
+de	01_solar	1	47	0.0	1.0
+de	02_wind_on	1	47	0.0	1.0
+de	03_wind_off	1	47	0.0	1.0
 de	04_res	1	47	0.0	0.0
 de	05_nuclear	1	47	0.0	0.0
 de	06_coal	1	47	0.0	0.0
 de	07_gas	1	47	0.0	0.0
 de	08_non-res	1	47	0.0	0.0
 de	09_hydro_pump	1	47	0.0	0.0
-de	01_solar	1	48	1.0	0.0
-de	02_wind_on	1	48	1.0	0.0
-de	03_wind_off	1	48	1.0	0.0
+de	01_solar	1	48	0.0	1.0
+de	02_wind_on	1	48	0.0	1.0
+de	03_wind_off	1	48	0.0	1.0
 de	04_res	1	48	0.0	0.0
 de	05_nuclear	1	48	0.0	0.0
 de	06_coal	1	48	0.0	0.0
 de	07_gas	1	48	0.0	0.0
 de	08_non-res	1	48	0.0	0.0
 de	09_hydro_pump	1	48	0.0	0.0
-de	01_solar	1	49	1.0	0.0
-de	02_wind_on	1	49	1.0	0.0
-de	03_wind_off	1	49	1.0	0.0
+de	01_solar	1	49	0.0	1.0
+de	02_wind_on	1	49	0.0	1.0
+de	03_wind_off	1	49	0.0	1.0
 de	04_res	1	49	0.0	0.0
 de	05_nuclear	1	49	0.0	0.0
 de	06_coal	1	49	0.0	0.0
 de	07_gas	1	49	0.0	0.0
 de	08_non-res	1	49	0.0	0.0
 de	09_hydro_pump	1	49	0.0	0.0
-de	01_solar	1	50	1.0	0.0
-de	02_wind_on	1	50	1.0	0.0
-de	03_wind_off	1	50	1.0	0.0
+de	01_solar	1	50	0.0	1.0
+de	02_wind_on	1	50	0.0	1.0
+de	03_wind_off	1	50	0.0	1.0
 de	04_res	1	50	0.0	0.0
 de	05_nuclear	1	50	0.0	0.0
 de	06_coal	1	50	0.0	0.0
 de	07_gas	1	50	0.0	0.0
 de	08_non-res	1	50	0.0	0.0
 de	09_hydro_pump	1	50	0.0	0.0
-de	01_solar	1	51	1.0	0.0
-de	02_wind_on	1	51	1.0	0.0
-de	03_wind_off	1	51	1.0	0.0
+de	01_solar	1	51	0.0	1.0
+de	02_wind_on	1	51	0.0	1.0
+de	03_wind_off	1	51	0.0	1.0
 de	04_res	1	51	0.0	0.0
 de	05_nuclear	1	51	0.0	0.0
 de	06_coal	1	51	0.0	0.0
 de	07_gas	1	51	0.0	0.0
 de	08_non-res	1	51	0.0	0.0
 de	09_hydro_pump	1	51	0.0	0.0
-de	01_solar	1	52	1.0	0.0
-de	02_wind_on	1	52	1.0	0.0
-de	03_wind_off	1	52	1.0	0.0
+de	01_solar	1	52	0.0	1.0
+de	02_wind_on	1	52	0.0	1.0
+de	03_wind_off	1	52	0.0	1.0
 de	04_res	1	52	0.0	0.0
 de	05_nuclear	1	52	0.0	0.0
 de	06_coal	1	52	0.0	0.0
 de	07_gas	1	52	0.0	0.0
 de	08_non-res	1	52	0.0	0.0
 de	09_hydro_pump	1	52	0.0	0.0
-de	01_solar	1	53	1.0	0.0
-de	02_wind_on	1	53	1.0	0.0
-de	03_wind_off	1	53	1.0	0.0
+de	01_solar	1	53	0.0	1.0
+de	02_wind_on	1	53	0.0	1.0
+de	03_wind_off	1	53	0.0	1.0
 de	04_res	1	53	0.0	0.0
 de	05_nuclear	1	53	0.0	0.0
 de	06_coal	1	53	0.0	0.0
 de	07_gas	1	53	0.0	0.0
 de	08_non-res	1	53	0.0	0.0
 de	09_hydro_pump	1	53	0.0	0.0
-de	01_solar	1	54	1.0	0.0
-de	02_wind_on	1	54	1.0	0.0
-de	03_wind_off	1	54	1.0	0.0
+de	01_solar	1	54	0.0	1.0
+de	02_wind_on	1	54	0.0	1.0
+de	03_wind_off	1	54	0.0	1.0
 de	04_res	1	54	0.0	0.0
 de	05_nuclear	1	54	0.0	0.0
 de	06_coal	1	54	0.0	0.0
 de	07_gas	1	54	0.0	0.0
 de	08_non-res	1	54	0.0	0.0
 de	09_hydro_pump	1	54	0.0	0.0
-de	01_solar	1	55	1.0	0.0
-de	02_wind_on	1	55	1.0	0.0
-de	03_wind_off	1	55	1.0	0.0
+de	01_solar	1	55	0.0	1.0
+de	02_wind_on	1	55	0.0	1.0
+de	03_wind_off	1	55	0.0	1.0
 de	04_res	1	55	0.0	0.0
 de	05_nuclear	1	55	0.0	0.0
 de	06_coal	1	55	0.0	0.0
 de	07_gas	1	55	0.0	0.0
 de	08_non-res	1	55	0.0	0.0
 de	09_hydro_pump	1	55	0.0	0.0
-de	01_solar	1	56	1.0	0.0
-de	02_wind_on	1	56	1.0	0.0
-de	03_wind_off	1	56	1.0	0.0
+de	01_solar	1	56	0.0	1.0
+de	02_wind_on	1	56	0.0	1.0
+de	03_wind_off	1	56	0.0	1.0
 de	04_res	1	56	0.0	0.0
 de	05_nuclear	1	56	0.0	0.0
 de	06_coal	1	56	0.0	0.0
 de	07_gas	1	56	0.0	0.0
 de	08_non-res	1	56	0.0	0.0
 de	09_hydro_pump	1	56	0.0	0.0
-de	01_solar	1	57	1.0	0.0
-de	02_wind_on	1	57	1.0	0.0
-de	03_wind_off	1	57	1.0	0.0
+de	01_solar	1	57	0.0	1.0
+de	02_wind_on	1	57	0.0	1.0
+de	03_wind_off	1	57	0.0	1.0
 de	04_res	1	57	0.0	0.0
 de	05_nuclear	1	57	0.0	0.0
 de	06_coal	1	57	0.0	0.0
 de	07_gas	1	57	0.0	0.0
 de	08_non-res	1	57	0.0	0.0
 de	09_hydro_pump	1	57	0.0	0.0
-de	01_solar	1	58	1.0	0.0
-de	02_wind_on	1	58	1.0	0.0
-de	03_wind_off	1	58	1.0	0.0
+de	01_solar	1	58	0.0	1.0
+de	02_wind_on	1	58	0.0	1.0
+de	03_wind_off	1	58	0.0	1.0
 de	04_res	1	58	0.0	0.0
 de	05_nuclear	1	58	0.0	0.0
 de	06_coal	1	58	0.0	0.0
 de	07_gas	1	58	0.0	0.0
 de	08_non-res	1	58	0.0	0.0
 de	09_hydro_pump	1	58	0.0	0.0
-de	01_solar	1	59	1.0	0.0
-de	02_wind_on	1	59	1.0	0.0
-de	03_wind_off	1	59	1.0	0.0
+de	01_solar	1	59	0.0	1.0
+de	02_wind_on	1	59	0.0	1.0
+de	03_wind_off	1	59	0.0	1.0
 de	04_res	1	59	0.0	0.0
 de	05_nuclear	1	59	0.0	0.0
 de	06_coal	1	59	0.0	0.0
 de	07_gas	1	59	0.0	0.0
 de	08_non-res	1	59	0.0	0.0
 de	09_hydro_pump	1	59	0.0	0.0
-de	01_solar	1	60	1.0	0.0
-de	02_wind_on	1	60	1.0	0.0
-de	03_wind_off	1	60	1.0	0.0
+de	01_solar	1	60	0.0	1.0
+de	02_wind_on	1	60	0.0	1.0
+de	03_wind_off	1	60	0.0	1.0
 de	04_res	1	60	0.0	0.0
 de	05_nuclear	1	60	0.0	0.0
 de	06_coal	1	60	0.0	0.0
 de	07_gas	1	60	0.0	0.0
 de	08_non-res	1	60	0.0	0.0
 de	09_hydro_pump	1	60	0.0	0.0
-de	01_solar	1	61	1.0	0.0
-de	02_wind_on	1	61	1.0	0.0
-de	03_wind_off	1	61	1.0	0.0
+de	01_solar	1	61	0.0	1.0
+de	02_wind_on	1	61	0.0	1.0
+de	03_wind_off	1	61	0.0	1.0
 de	04_res	1	61	0.0	0.0
 de	05_nuclear	1	61	0.0	0.0
 de	06_coal	1	61	0.0	0.0
 de	07_gas	1	61	0.0	0.0
 de	08_non-res	1	61	0.0	0.0
 de	09_hydro_pump	1	61	0.0	0.0
-de	01_solar	1	62	1.0	0.0
-de	02_wind_on	1	62	1.0	0.0
-de	03_wind_off	1	62	1.0	0.0
-de	04_res	1	62	1.0	0.0
+de	01_solar	1	62	0.0	1.0
+de	02_wind_on	1	62	0.0	1.0
+de	03_wind_off	1	62	0.0	1.0
+de	04_res	1	62	0.0	1.0
 de	05_nuclear	1	62	0.0	0.0
 de	06_coal	1	62	0.0	0.0
 de	07_gas	1	62	0.0	0.0
 de	08_non-res	1	62	0.0	0.0
 de	09_hydro_pump	1	62	0.0	0.0
-de	01_solar	1	63	1.0	0.0
-de	02_wind_on	1	63	1.0	0.0
-de	03_wind_off	1	63	1.0	0.0
-de	04_res	1	63	1.0	0.0
+de	01_solar	1	63	0.0	1.0
+de	02_wind_on	1	63	0.0	1.0
+de	03_wind_off	1	63	0.0	1.0
+de	04_res	1	63	0.0	1.0
 de	05_nuclear	1	63	0.0	0.0
 de	06_coal	1	63	0.0	0.0
 de	07_gas	1	63	0.0	0.0
 de	08_non-res	1	63	0.0	0.0
 de	09_hydro_pump	1	63	0.0	0.0
-de	01_solar	1	64	1.0	0.0
-de	02_wind_on	1	64	1.0	0.0
-de	03_wind_off	1	64	1.0	0.0
-de	04_res	1	64	1.0	0.0
+de	01_solar	1	64	0.0	1.0
+de	02_wind_on	1	64	0.0	1.0
+de	03_wind_off	1	64	0.0	1.0
+de	04_res	1	64	0.0	1.0
 de	05_nuclear	1	64	0.0	0.0
 de	06_coal	1	64	0.0	0.0
 de	07_gas	1	64	0.0	0.0
 de	08_non-res	1	64	0.0	0.0
 de	09_hydro_pump	1	64	0.0	0.0
-de	01_solar	1	65	1.0	0.0
-de	02_wind_on	1	65	1.0	0.0
-de	03_wind_off	1	65	1.0	0.0
-de	04_res	1	65	1.0	0.0
+de	01_solar	1	65	0.0	1.0
+de	02_wind_on	1	65	0.0	1.0
+de	03_wind_off	1	65	0.0	1.0
+de	04_res	1	65	0.0	1.0
 de	05_nuclear	1	65	0.0	0.0
 de	06_coal	1	65	0.0	0.0
 de	07_gas	1	65	0.0	0.0
 de	08_non-res	1	65	0.0	0.0
 de	09_hydro_pump	1	65	0.0	0.0
-de	01_solar	1	66	1.0	0.0
-de	02_wind_on	1	66	1.0	0.0
-de	03_wind_off	1	66	1.0	0.0
-de	04_res	1	66	1.0	0.0
+de	01_solar	1	66	0.0	1.0
+de	02_wind_on	1	66	0.0	1.0
+de	03_wind_off	1	66	0.0	1.0
+de	04_res	1	66	0.0	1.0
 de	05_nuclear	1	66	0.0	0.0
 de	06_coal	1	66	0.0	0.0
 de	07_gas	1	66	0.0	0.0
 de	08_non-res	1	66	0.0	0.0
 de	09_hydro_pump	1	66	0.0	0.0
-de	01_solar	1	67	1.0	0.0
-de	02_wind_on	1	67	1.0	0.0
-de	03_wind_off	1	67	1.0	0.0
-de	04_res	1	67	1.0	0.0
+de	01_solar	1	67	0.0	1.0
+de	02_wind_on	1	67	0.0	1.0
+de	03_wind_off	1	67	0.0	1.0
+de	04_res	1	67	0.0	1.0
 de	05_nuclear	1	67	0.0	0.0
 de	06_coal	1	67	0.0	0.0
 de	07_gas	1	67	0.0	0.0
 de	08_non-res	1	67	0.0	0.0
 de	09_hydro_pump	1	67	0.0	0.0
-de	01_solar	1	68	1.0	0.0
-de	02_wind_on	1	68	1.0	0.0
-de	03_wind_off	1	68	1.0	0.0
-de	04_res	1	68	1.0	0.0
+de	01_solar	1	68	0.0	1.0
+de	02_wind_on	1	68	0.0	1.0
+de	03_wind_off	1	68	0.0	1.0
+de	04_res	1	68	0.0	1.0
 de	05_nuclear	1	68	0.0	0.0
 de	06_coal	1	68	0.0	0.0
 de	07_gas	1	68	0.0	0.0
 de	08_non-res	1	68	0.0	0.0
 de	09_hydro_pump	1	68	0.0	0.0
-de	01_solar	1	69	1.0	0.0
-de	02_wind_on	1	69	1.0	0.0
-de	03_wind_off	1	69	1.0	0.0
-de	04_res	1	69	1.0	0.0
+de	01_solar	1	69	0.0	1.0
+de	02_wind_on	1	69	0.0	1.0
+de	03_wind_off	1	69	0.0	1.0
+de	04_res	1	69	0.0	1.0
 de	05_nuclear	1	69	0.0	0.0
 de	06_coal	1	69	0.0	0.0
 de	07_gas	1	69	0.0	0.0
 de	08_non-res	1	69	0.0	0.0
 de	09_hydro_pump	1	69	0.0	0.0
-de	01_solar	1	70	1.0	0.0
-de	02_wind_on	1	70	1.0	0.0
-de	03_wind_off	1	70	1.0	0.0
-de	04_res	1	70	1.0	0.0
+de	01_solar	1	70	0.0	1.0
+de	02_wind_on	1	70	0.0	1.0
+de	03_wind_off	1	70	0.0	1.0
+de	04_res	1	70	0.0	1.0
 de	05_nuclear	1	70	0.0	0.0
 de	06_coal	1	70	0.0	0.0
 de	07_gas	1	70	0.0	0.0
 de	08_non-res	1	70	0.0	0.0
 de	09_hydro_pump	1	70	0.0	0.0
-de	01_solar	1	71	1.0	0.0
-de	02_wind_on	1	71	1.0	0.0
-de	03_wind_off	1	71	1.0	0.0
-de	04_res	1	71	1.0	0.0
+de	01_solar	1	71	0.0	1.0
+de	02_wind_on	1	71	0.0	1.0
+de	03_wind_off	1	71	0.0	1.0
+de	04_res	1	71	0.0	1.0
 de	05_nuclear	1	71	0.0	0.0
 de	06_coal	1	71	0.0	0.0
 de	07_gas	1	71	0.0	0.0
 de	08_non-res	1	71	0.0	0.0
 de	09_hydro_pump	1	71	0.0	0.0
-de	01_solar	1	72	1.0	0.0
-de	02_wind_on	1	72	1.0	0.0
-de	03_wind_off	1	72	1.0	0.0
-de	04_res	1	72	1.0	0.0
+de	01_solar	1	72	0.0	1.0
+de	02_wind_on	1	72	0.0	1.0
+de	03_wind_off	1	72	0.0	1.0
+de	04_res	1	72	0.0	1.0
 de	05_nuclear	1	72	0.0	0.0
 de	06_coal	1	72	0.0	0.0
 de	07_gas	1	72	0.0	0.0
 de	08_non-res	1	72	0.0	0.0
 de	09_hydro_pump	1	72	0.0	0.0
-de	01_solar	1	73	1.0	0.0
-de	02_wind_on	1	73	1.0	0.0
-de	03_wind_off	1	73	1.0	0.0
-de	04_res	1	73	1.0	0.0
+de	01_solar	1	73	0.0	1.0
+de	02_wind_on	1	73	0.0	1.0
+de	03_wind_off	1	73	0.0	1.0
+de	04_res	1	73	0.0	1.0
 de	05_nuclear	1	73	0.0	0.0
 de	06_coal	1	73	0.0	0.0
 de	07_gas	1	73	0.0	0.0
 de	08_non-res	1	73	0.0	0.0
 de	09_hydro_pump	1	73	0.0	0.0
-de	01_solar	1	74	1.0	0.0
-de	02_wind_on	1	74	1.0	0.0
-de	03_wind_off	1	74	1.0	0.0
-de	04_res	1	74	1.0	0.0
+de	01_solar	1	74	0.0	1.0
+de	02_wind_on	1	74	0.0	1.0
+de	03_wind_off	1	74	0.0	1.0
+de	04_res	1	74	0.0	1.0
 de	05_nuclear	1	74	0.0	0.0
 de	06_coal	1	74	0.0	0.0
 de	07_gas	1	74	0.0	0.0
 de	08_non-res	1	74	0.0	0.0
 de	09_hydro_pump	1	74	0.0	0.0
-de	01_solar	1	75	1.0	0.0
-de	02_wind_on	1	75	1.0	0.0
-de	03_wind_off	1	75	1.0	0.0
-de	04_res	1	75	1.0	0.0
+de	01_solar	1	75	0.0	1.0
+de	02_wind_on	1	75	0.0	1.0
+de	03_wind_off	1	75	0.0	1.0
+de	04_res	1	75	0.0	1.0
 de	05_nuclear	1	75	0.0	0.0
 de	06_coal	1	75	0.0	0.0
 de	07_gas	1	75	0.0	0.0
 de	08_non-res	1	75	0.0	0.0
 de	09_hydro_pump	1	75	0.0	0.0
-de	01_solar	1	76	1.0	0.0
-de	02_wind_on	1	76	1.0	0.0
-de	03_wind_off	1	76	1.0	0.0
-de	04_res	1	76	1.0	0.0
+de	01_solar	1	76	0.0	1.0
+de	02_wind_on	1	76	0.0	1.0
+de	03_wind_off	1	76	0.0	1.0
+de	04_res	1	76	0.0	1.0
 de	05_nuclear	1	76	0.0	0.0
 de	06_coal	1	76	0.0	0.0
 de	07_gas	1	76	0.0	0.0
 de	08_non-res	1	76	0.0	0.0
 de	09_hydro_pump	1	76	0.0	0.0
-de	01_solar	1	77	1.0	0.0
-de	02_wind_on	1	77	1.0	0.0
-de	03_wind_off	1	77	1.0	0.0
-de	04_res	1	77	1.0	0.0
+de	01_solar	1	77	0.0	1.0
+de	02_wind_on	1	77	0.0	1.0
+de	03_wind_off	1	77	0.0	1.0
+de	04_res	1	77	0.0	1.0
 de	05_nuclear	1	77	0.0	0.0
 de	06_coal	1	77	0.0	0.0
 de	07_gas	1	77	0.0	0.0
 de	08_non-res	1	77	0.0	0.0
 de	09_hydro_pump	1	77	0.0	0.0
-de	01_solar	1	78	1.0	0.0
-de	02_wind_on	1	78	1.0	0.0
-de	03_wind_off	1	78	1.0	0.0
-de	04_res	1	78	1.0	0.0
+de	01_solar	1	78	0.0	1.0
+de	02_wind_on	1	78	0.0	1.0
+de	03_wind_off	1	78	0.0	1.0
+de	04_res	1	78	0.0	1.0
 de	05_nuclear	1	78	0.0	0.0
 de	06_coal	1	78	0.0	0.0
 de	07_gas	1	78	0.0	0.0
 de	08_non-res	1	78	0.0	0.0
 de	09_hydro_pump	1	78	0.0	0.0
-de	01_solar	1	79	1.0	0.0
-de	02_wind_on	1	79	1.0	0.0
-de	03_wind_off	1	79	1.0	0.0
-de	04_res	1	79	1.0	0.0
+de	01_solar	1	79	0.0	1.0
+de	02_wind_on	1	79	0.0	1.0
+de	03_wind_off	1	79	0.0	1.0
+de	04_res	1	79	0.0	1.0
 de	05_nuclear	1	79	0.0	0.0
 de	06_coal	1	79	0.0	0.0
 de	07_gas	1	79	0.0	0.0
 de	08_non-res	1	79	0.0	0.0
 de	09_hydro_pump	1	79	0.0	0.0
-de	01_solar	1	80	1.0	0.0
-de	02_wind_on	1	80	1.0	0.0
-de	03_wind_off	1	80	1.0	0.0
-de	04_res	1	80	1.0	0.0
+de	01_solar	1	80	0.0	1.0
+de	02_wind_on	1	80	0.0	1.0
+de	03_wind_off	1	80	0.0	1.0
+de	04_res	1	80	0.0	1.0
 de	05_nuclear	1	80	0.0	0.0
 de	06_coal	1	80	0.0	0.0
 de	07_gas	1	80	0.0	0.0
 de	08_non-res	1	80	0.0	0.0
 de	09_hydro_pump	1	80	0.0	0.0
-de	01_solar	1	81	1.0	0.0
-de	02_wind_on	1	81	1.0	0.0
-de	03_wind_off	1	81	1.0	0.0
-de	04_res	1	81	1.0	0.0
+de	01_solar	1	81	0.0	1.0
+de	02_wind_on	1	81	0.0	1.0
+de	03_wind_off	1	81	0.0	1.0
+de	04_res	1	81	0.0	1.0
 de	05_nuclear	1	81	0.0	0.0
 de	06_coal	1	81	0.0	0.0
 de	07_gas	1	81	0.0	0.0
 de	08_non-res	1	81	0.0	0.0
 de	09_hydro_pump	1	81	0.0	0.0
-de	01_solar	1	82	1.0	0.0
-de	02_wind_on	1	82	1.0	0.0
-de	03_wind_off	1	82	1.0	0.0
-de	04_res	1	82	1.0	0.0
-de	05_nuclear	1	82	1.0	0.0
+de	01_solar	1	82	0.0	1.0
+de	02_wind_on	1	82	0.0	1.0
+de	03_wind_off	1	82	0.0	1.0
+de	04_res	1	82	0.0	1.0
+de	05_nuclear	1	82	0.0	1.0
 de	06_coal	1	82	0.0	0.0
 de	07_gas	1	82	0.0	0.0
 de	08_non-res	1	82	0.0	0.0
 de	09_hydro_pump	1	82	0.0	0.0
-de	01_solar	1	83	1.0	0.0
-de	02_wind_on	1	83	1.0	0.0
-de	03_wind_off	1	83	1.0	0.0
-de	04_res	1	83	1.0	0.0
-de	05_nuclear	1	83	1.0	0.0
+de	01_solar	1	83	0.0	1.0
+de	02_wind_on	1	83	0.0	1.0
+de	03_wind_off	1	83	0.0	1.0
+de	04_res	1	83	0.0	1.0
+de	05_nuclear	1	83	0.0	1.0
 de	06_coal	1	83	0.0	0.0
 de	07_gas	1	83	0.0	0.0
 de	08_non-res	1	83	0.0	0.0
 de	09_hydro_pump	1	83	0.0	0.0
-de	01_solar	1	84	1.0	0.0
-de	02_wind_on	1	84	1.0	0.0
-de	03_wind_off	1	84	1.0	0.0
-de	04_res	1	84	1.0	0.0
-de	05_nuclear	1	84	1.0	0.0
+de	01_solar	1	84	0.0	1.0
+de	02_wind_on	1	84	0.0	1.0
+de	03_wind_off	1	84	0.0	1.0
+de	04_res	1	84	0.0	1.0
+de	05_nuclear	1	84	0.0	1.0
 de	06_coal	1	84	0.0	0.0
 de	07_gas	1	84	0.0	0.0
 de	08_non-res	1	84	0.0	0.0
 de	09_hydro_pump	1	84	0.0	0.0
-de	01_solar	1	85	1.0	0.0
-de	02_wind_on	1	85	1.0	0.0
-de	03_wind_off	1	85	1.0	0.0
-de	04_res	1	85	1.0	0.0
-de	05_nuclear	1	85	1.0	0.0
+de	01_solar	1	85	0.0	1.0
+de	02_wind_on	1	85	0.0	1.0
+de	03_wind_off	1	85	0.0	1.0
+de	04_res	1	85	0.0	1.0
+de	05_nuclear	1	85	0.0	1.0
 de	06_coal	1	85	0.0	0.0
 de	07_gas	1	85	0.0	0.0
 de	08_non-res	1	85	0.0	0.0
 de	09_hydro_pump	1	85	0.0	0.0
-de	01_solar	1	86	1.0	0.0
-de	02_wind_on	1	86	1.0	0.0
-de	03_wind_off	1	86	1.0	0.0
-de	04_res	1	86	1.0	0.0
-de	05_nuclear	1	86	1.0	0.0
+de	01_solar	1	86	0.0	1.0
+de	02_wind_on	1	86	0.0	1.0
+de	03_wind_off	1	86	0.0	1.0
+de	04_res	1	86	0.0	1.0
+de	05_nuclear	1	86	0.0	1.0
 de	06_coal	1	86	0.0	0.0
 de	07_gas	1	86	0.0	0.0
 de	08_non-res	1	86	0.0	0.0
 de	09_hydro_pump	1	86	0.0	0.0
-de	01_solar	1	87	1.0	0.0
-de	02_wind_on	1	87	1.0	0.0
-de	03_wind_off	1	87	1.0	0.0
-de	04_res	1	87	1.0	0.0
-de	05_nuclear	1	87	1.0	0.0
+de	01_solar	1	87	0.0	1.0
+de	02_wind_on	1	87	0.0	1.0
+de	03_wind_off	1	87	0.0	1.0
+de	04_res	1	87	0.0	1.0
+de	05_nuclear	1	87	0.0	1.0
 de	06_coal	1	87	0.0	0.0
 de	07_gas	1	87	0.0	0.0
 de	08_non-res	1	87	0.0	0.0
 de	09_hydro_pump	1	87	0.0	0.0
-de	01_solar	1	88	1.0	0.0
-de	02_wind_on	1	88	1.0	0.0
-de	03_wind_off	1	88	1.0	0.0
-de	04_res	1	88	1.0	0.0
-de	05_nuclear	1	88	1.0	0.0
+de	01_solar	1	88	0.0	1.0
+de	02_wind_on	1	88	0.0	1.0
+de	03_wind_off	1	88	0.0	1.0
+de	04_res	1	88	0.0	1.0
+de	05_nuclear	1	88	0.0	1.0
 de	06_coal	1	88	0.0	0.0
 de	07_gas	1	88	0.0	0.0
 de	08_non-res	1	88	0.0	0.0
 de	09_hydro_pump	1	88	0.0	0.0
-de	01_solar	1	89	1.0	0.0
-de	02_wind_on	1	89	1.0	0.0
-de	03_wind_off	1	89	1.0	0.0
-de	04_res	1	89	1.0	0.0
-de	05_nuclear	1	89	1.0	0.0
+de	01_solar	1	89	0.0	1.0
+de	02_wind_on	1	89	0.0	1.0
+de	03_wind_off	1	89	0.0	1.0
+de	04_res	1	89	0.0	1.0
+de	05_nuclear	1	89	0.0	1.0
 de	06_coal	1	89	0.0	0.0
 de	07_gas	1	89	0.0	0.0
 de	08_non-res	1	89	0.0	0.0
 de	09_hydro_pump	1	89	0.0	0.0
-de	01_solar	1	90	1.0	0.0
-de	02_wind_on	1	90	1.0	0.0
-de	03_wind_off	1	90	1.0	0.0
-de	04_res	1	90	1.0	0.0
-de	05_nuclear	1	90	1.0	0.0
+de	01_solar	1	90	0.0	1.0
+de	02_wind_on	1	90	0.0	1.0
+de	03_wind_off	1	90	0.0	1.0
+de	04_res	1	90	0.0	1.0
+de	05_nuclear	1	90	0.0	1.0
 de	06_coal	1	90	0.0	0.0
 de	07_gas	1	90	0.0	0.0
 de	08_non-res	1	90	0.0	0.0
 de	09_hydro_pump	1	90	0.0	0.0
-de	01_solar	1	91	1.0	0.0
-de	02_wind_on	1	91	1.0	0.0
-de	03_wind_off	1	91	1.0	0.0
-de	04_res	1	91	1.0	0.0
-de	05_nuclear	1	91	1.0	0.0
+de	01_solar	1	91	0.0	1.0
+de	02_wind_on	1	91	0.0	1.0
+de	03_wind_off	1	91	0.0	1.0
+de	04_res	1	91	0.0	1.0
+de	05_nuclear	1	91	0.0	1.0
 de	06_coal	1	91	0.0	0.0
 de	07_gas	1	91	0.0	0.0
 de	08_non-res	1	91	0.0	0.0
 de	09_hydro_pump	1	91	0.0	0.0
-de	01_solar	1	92	1.0	0.0
-de	02_wind_on	1	92	1.0	0.0
-de	03_wind_off	1	92	1.0	0.0
-de	04_res	1	92	1.0	0.0
-de	05_nuclear	1	92	1.0	0.0
+de	01_solar	1	92	0.0	1.0
+de	02_wind_on	1	92	0.0	1.0
+de	03_wind_off	1	92	0.0	1.0
+de	04_res	1	92	0.0	1.0
+de	05_nuclear	1	92	0.0	1.0
 de	06_coal	1	92	0.0	0.0
 de	07_gas	1	92	0.0	0.0
 de	08_non-res	1	92	0.0	0.0
 de	09_hydro_pump	1	92	0.0	0.0
-de	01_solar	1	93	1.0	0.0
-de	02_wind_on	1	93	1.0	0.0
-de	03_wind_off	1	93	1.0	0.0
-de	04_res	1	93	1.0	0.0
-de	05_nuclear	1	93	1.0	0.0
+de	01_solar	1	93	0.0	1.0
+de	02_wind_on	1	93	0.0	1.0
+de	03_wind_off	1	93	0.0	1.0
+de	04_res	1	93	0.0	1.0
+de	05_nuclear	1	93	0.0	1.0
 de	06_coal	1	93	0.0	0.0
 de	07_gas	1	93	0.0	0.0
 de	08_non-res	1	93	0.0	0.0
 de	09_hydro_pump	1	93	0.0	0.0
-de	01_solar	1	94	1.0	0.0
-de	02_wind_on	1	94	1.0	0.0
-de	03_wind_off	1	94	1.0	0.0
-de	04_res	1	94	1.0	0.0
-de	05_nuclear	1	94	1.0	0.0
+de	01_solar	1	94	0.0	1.0
+de	02_wind_on	1	94	0.0	1.0
+de	03_wind_off	1	94	0.0	1.0
+de	04_res	1	94	0.0	1.0
+de	05_nuclear	1	94	0.0	1.0
 de	06_coal	1	94	0.0	0.0
 de	07_gas	1	94	0.0	0.0
 de	08_non-res	1	94	0.0	0.0
 de	09_hydro_pump	1	94	0.0	0.0
-de	01_solar	1	95	1.0	0.0
-de	02_wind_on	1	95	1.0	0.0
-de	03_wind_off	1	95	1.0	0.0
-de	04_res	1	95	1.0	0.0
-de	05_nuclear	1	95	1.0	0.0
+de	01_solar	1	95	0.0	1.0
+de	02_wind_on	1	95	0.0	1.0
+de	03_wind_off	1	95	0.0	1.0
+de	04_res	1	95	0.0	1.0
+de	05_nuclear	1	95	0.0	1.0
 de	06_coal	1	95	0.0	0.0
 de	07_gas	1	95	0.0	0.0
 de	08_non-res	1	95	0.0	0.0
 de	09_hydro_pump	1	95	0.0	0.0
-de	01_solar	1	96	1.0	0.0
-de	02_wind_on	1	96	1.0	0.0
-de	03_wind_off	1	96	1.0	0.0
-de	04_res	1	96	1.0	0.0
-de	05_nuclear	1	96	1.0	0.0
+de	01_solar	1	96	0.0	1.0
+de	02_wind_on	1	96	0.0	1.0
+de	03_wind_off	1	96	0.0	1.0
+de	04_res	1	96	0.0	1.0
+de	05_nuclear	1	96	0.0	1.0
 de	06_coal	1	96	0.0	0.0
 de	07_gas	1	96	0.0	0.0
 de	08_non-res	1	96	0.0	0.0
 de	09_hydro_pump	1	96	0.0	0.0
-de	01_solar	1	97	1.0	0.0
-de	02_wind_on	1	97	1.0	0.0
-de	03_wind_off	1	97	1.0	0.0
-de	04_res	1	97	1.0	0.0
-de	05_nuclear	1	97	1.0	0.0
+de	01_solar	1	97	0.0	1.0
+de	02_wind_on	1	97	0.0	1.0
+de	03_wind_off	1	97	0.0	1.0
+de	04_res	1	97	0.0	1.0
+de	05_nuclear	1	97	0.0	1.0
 de	06_coal	1	97	0.0	0.0
 de	07_gas	1	97	0.0	0.0
 de	08_non-res	1	97	0.0	0.0
 de	09_hydro_pump	1	97	0.0	0.0
-de	01_solar	1	98	1.0	0.0
-de	02_wind_on	1	98	1.0	0.0
-de	03_wind_off	1	98	1.0	0.0
-de	04_res	1	98	1.0	0.0
-de	05_nuclear	1	98	1.0	0.0
+de	01_solar	1	98	0.0	1.0
+de	02_wind_on	1	98	0.0	1.0
+de	03_wind_off	1	98	0.0	1.0
+de	04_res	1	98	0.0	1.0
+de	05_nuclear	1	98	0.0	1.0
 de	06_coal	1	98	0.0	0.0
 de	07_gas	1	98	0.0	0.0
 de	08_non-res	1	98	0.0	0.0
 de	09_hydro_pump	1	98	0.0	0.0
-de	01_solar	1	99	1.0	0.0
-de	02_wind_on	1	99	1.0	0.0
-de	03_wind_off	1	99	1.0	0.0
-de	04_res	1	99	1.0	0.0
-de	05_nuclear	1	99	1.0	0.0
+de	01_solar	1	99	0.0	1.0
+de	02_wind_on	1	99	0.0	1.0
+de	03_wind_off	1	99	0.0	1.0
+de	04_res	1	99	0.0	1.0
+de	05_nuclear	1	99	0.0	1.0
 de	06_coal	1	99	0.0	0.0
 de	07_gas	1	99	0.0	0.0
 de	08_non-res	1	99	0.0	0.0
 de	09_hydro_pump	1	99	0.0	0.0
-de	01_solar	1	100	1.0	0.0
-de	02_wind_on	1	100	1.0	0.0
-de	03_wind_off	1	100	1.0	0.0
-de	04_res	1	100	1.0	0.0
-de	05_nuclear	1	100	1.0	0.0
+de	01_solar	1	100	0.0	1.0
+de	02_wind_on	1	100	0.0	1.0
+de	03_wind_off	1	100	0.0	1.0
+de	04_res	1	100	0.0	1.0
+de	05_nuclear	1	100	0.0	1.0
 de	06_coal	1	100	0.0	0.0
 de	07_gas	1	100	0.0	0.0
 de	08_non-res	1	100	0.0	0.0
 de	09_hydro_pump	1	100	0.0	0.0
-de	01_solar	1	101	1.0	0.0
-de	02_wind_on	1	101	1.0	0.0
-de	03_wind_off	1	101	1.0	0.0
-de	04_res	1	101	1.0	0.0
-de	05_nuclear	1	101	1.0	0.0
+de	01_solar	1	101	0.0	1.0
+de	02_wind_on	1	101	0.0	1.0
+de	03_wind_off	1	101	0.0	1.0
+de	04_res	1	101	0.0	1.0
+de	05_nuclear	1	101	0.0	1.0
 de	06_coal	1	101	0.0	0.0
 de	07_gas	1	101	0.0	0.0
 de	08_non-res	1	101	0.0	0.0
 de	09_hydro_pump	1	101	0.0	0.0
-de	01_solar	1	102	1.0	0.0
-de	02_wind_on	1	102	1.0	0.0
-de	03_wind_off	1	102	1.0	0.0
-de	04_res	1	102	1.0	0.0
-de	05_nuclear	1	102	1.0	0.0
-de	06_coal	1	102	1.0	0.0
+de	01_solar	1	102	0.0	1.0
+de	02_wind_on	1	102	0.0	1.0
+de	03_wind_off	1	102	0.0	1.0
+de	04_res	1	102	0.0	1.0
+de	05_nuclear	1	102	0.0	1.0
+de	06_coal	1	102	0.0	1.0
 de	07_gas	1	102	0.0	0.0
 de	08_non-res	1	102	0.0	0.0
 de	09_hydro_pump	1	102	0.0	0.0
-de	01_solar	1	103	1.0	0.0
-de	02_wind_on	1	103	1.0	0.0
-de	03_wind_off	1	103	1.0	0.0
-de	04_res	1	103	1.0	0.0
-de	05_nuclear	1	103	1.0	0.0
-de	06_coal	1	103	1.0	0.0
+de	01_solar	1	103	0.0	1.0
+de	02_wind_on	1	103	0.0	1.0
+de	03_wind_off	1	103	0.0	1.0
+de	04_res	1	103	0.0	1.0
+de	05_nuclear	1	103	0.0	1.0
+de	06_coal	1	103	0.0	1.0
 de	07_gas	1	103	0.0	0.0
 de	08_non-res	1	103	0.0	0.0
 de	09_hydro_pump	1	103	0.0	0.0
-de	01_solar	1	104	1.0	0.0
-de	02_wind_on	1	104	1.0	0.0
-de	03_wind_off	1	104	1.0	0.0
-de	04_res	1	104	1.0	0.0
-de	05_nuclear	1	104	1.0	0.0
-de	06_coal	1	104	1.0	0.0
+de	01_solar	1	104	0.0	1.0
+de	02_wind_on	1	104	0.0	1.0
+de	03_wind_off	1	104	0.0	1.0
+de	04_res	1	104	0.0	1.0
+de	05_nuclear	1	104	0.0	1.0
+de	06_coal	1	104	0.0	1.0
 de	07_gas	1	104	0.0	0.0
 de	08_non-res	1	104	0.0	0.0
 de	09_hydro_pump	1	104	0.0	0.0
-de	01_solar	1	105	1.0	0.0
-de	02_wind_on	1	105	1.0	0.0
-de	03_wind_off	1	105	1.0	0.0
-de	04_res	1	105	1.0	0.0
-de	05_nuclear	1	105	1.0	0.0
-de	06_coal	1	105	1.0	0.0
+de	01_solar	1	105	0.0	1.0
+de	02_wind_on	1	105	0.0	1.0
+de	03_wind_off	1	105	0.0	1.0
+de	04_res	1	105	0.0	1.0
+de	05_nuclear	1	105	0.0	1.0
+de	06_coal	1	105	0.0	1.0
 de	07_gas	1	105	0.0	0.0
 de	08_non-res	1	105	0.0	0.0
 de	09_hydro_pump	1	105	0.0	0.0
-de	01_solar	1	106	1.0	0.0
-de	02_wind_on	1	106	1.0	0.0
-de	03_wind_off	1	106	1.0	0.0
-de	04_res	1	106	1.0	0.0
-de	05_nuclear	1	106	1.0	0.0
-de	06_coal	1	106	1.0	0.0
+de	01_solar	1	106	0.0	1.0
+de	02_wind_on	1	106	0.0	1.0
+de	03_wind_off	1	106	0.0	1.0
+de	04_res	1	106	0.0	1.0
+de	05_nuclear	1	106	0.0	1.0
+de	06_coal	1	106	0.0	1.0
 de	07_gas	1	106	0.0	0.0
 de	08_non-res	1	106	0.0	0.0
 de	09_hydro_pump	1	106	0.0	0.0
-de	01_solar	1	107	1.0	0.0
-de	02_wind_on	1	107	1.0	0.0
-de	03_wind_off	1	107	1.0	0.0
-de	04_res	1	107	1.0	0.0
-de	05_nuclear	1	107	1.0	0.0
-de	06_coal	1	107	1.0	0.0
+de	01_solar	1	107	0.0	1.0
+de	02_wind_on	1	107	0.0	1.0
+de	03_wind_off	1	107	0.0	1.0
+de	04_res	1	107	0.0	1.0
+de	05_nuclear	1	107	0.0	1.0
+de	06_coal	1	107	0.0	1.0
 de	07_gas	1	107	0.0	0.0
 de	08_non-res	1	107	0.0	0.0
 de	09_hydro_pump	1	107	0.0	0.0
-de	01_solar	1	108	1.0	0.0
-de	02_wind_on	1	108	1.0	0.0
-de	03_wind_off	1	108	1.0	0.0
-de	04_res	1	108	1.0	0.0
-de	05_nuclear	1	108	1.0	0.0
-de	06_coal	1	108	1.0	0.0
+de	01_solar	1	108	0.0	1.0
+de	02_wind_on	1	108	0.0	1.0
+de	03_wind_off	1	108	0.0	1.0
+de	04_res	1	108	0.0	1.0
+de	05_nuclear	1	108	0.0	1.0
+de	06_coal	1	108	0.0	1.0
 de	07_gas	1	108	0.0	0.0
 de	08_non-res	1	108	0.0	0.0
 de	09_hydro_pump	1	108	0.0	0.0
-de	01_solar	1	109	1.0	0.0
-de	02_wind_on	1	109	1.0	0.0
-de	03_wind_off	1	109	1.0	0.0
-de	04_res	1	109	1.0	0.0
-de	05_nuclear	1	109	1.0	0.0
-de	06_coal	1	109	1.0	0.0
+de	01_solar	1	109	0.0	1.0
+de	02_wind_on	1	109	0.0	1.0
+de	03_wind_off	1	109	0.0	1.0
+de	04_res	1	109	0.0	1.0
+de	05_nuclear	1	109	0.0	1.0
+de	06_coal	1	109	0.0	1.0
 de	07_gas	1	109	0.0	0.0
 de	08_non-res	1	109	0.0	0.0
 de	09_hydro_pump	1	109	0.0	0.0
-de	01_solar	1	110	1.0	0.0
-de	02_wind_on	1	110	1.0	0.0
-de	03_wind_off	1	110	1.0	0.0
-de	04_res	1	110	1.0	0.0
-de	05_nuclear	1	110	1.0	0.0
-de	06_coal	1	110	1.0	0.0
+de	01_solar	1	110	0.0	1.0
+de	02_wind_on	1	110	0.0	1.0
+de	03_wind_off	1	110	0.0	1.0
+de	04_res	1	110	0.0	1.0
+de	05_nuclear	1	110	0.0	1.0
+de	06_coal	1	110	0.0	1.0
 de	07_gas	1	110	0.0	0.0
 de	08_non-res	1	110	0.0	0.0
 de	09_hydro_pump	1	110	0.0	0.0
-de	01_solar	1	111	1.0	0.0
-de	02_wind_on	1	111	1.0	0.0
-de	03_wind_off	1	111	1.0	0.0
-de	04_res	1	111	1.0	0.0
-de	05_nuclear	1	111	1.0	0.0
-de	06_coal	1	111	1.0	0.0
+de	01_solar	1	111	0.0	1.0
+de	02_wind_on	1	111	0.0	1.0
+de	03_wind_off	1	111	0.0	1.0
+de	04_res	1	111	0.0	1.0
+de	05_nuclear	1	111	0.0	1.0
+de	06_coal	1	111	0.0	1.0
 de	07_gas	1	111	0.0	0.0
 de	08_non-res	1	111	0.0	0.0
 de	09_hydro_pump	1	111	0.0	0.0
-de	01_solar	1	112	1.0	0.0
-de	02_wind_on	1	112	1.0	0.0
-de	03_wind_off	1	112	1.0	0.0
-de	04_res	1	112	1.0	0.0
-de	05_nuclear	1	112	1.0	0.0
-de	06_coal	1	112	1.0	0.0
+de	01_solar	1	112	0.0	1.0
+de	02_wind_on	1	112	0.0	1.0
+de	03_wind_off	1	112	0.0	1.0
+de	04_res	1	112	0.0	1.0
+de	05_nuclear	1	112	0.0	1.0
+de	06_coal	1	112	0.0	1.0
 de	07_gas	1	112	0.0	0.0
 de	08_non-res	1	112	0.0	0.0
 de	09_hydro_pump	1	112	0.0	0.0
-de	01_solar	1	113	1.0	0.0
-de	02_wind_on	1	113	1.0	0.0
-de	03_wind_off	1	113	1.0	0.0
-de	04_res	1	113	1.0	0.0
-de	05_nuclear	1	113	1.0	0.0
-de	06_coal	1	113	1.0	0.0
+de	01_solar	1	113	0.0	1.0
+de	02_wind_on	1	113	0.0	1.0
+de	03_wind_off	1	113	0.0	1.0
+de	04_res	1	113	0.0	1.0
+de	05_nuclear	1	113	0.0	1.0
+de	06_coal	1	113	0.0	1.0
 de	07_gas	1	113	0.0	0.0
 de	08_non-res	1	113	0.0	0.0
 de	09_hydro_pump	1	113	0.0	0.0
-de	01_solar	1	114	1.0	0.0
-de	02_wind_on	1	114	1.0	0.0
-de	03_wind_off	1	114	1.0	0.0
-de	04_res	1	114	1.0	0.0
-de	05_nuclear	1	114	1.0	0.0
-de	06_coal	1	114	1.0	0.0
+de	01_solar	1	114	0.0	1.0
+de	02_wind_on	1	114	0.0	1.0
+de	03_wind_off	1	114	0.0	1.0
+de	04_res	1	114	0.0	1.0
+de	05_nuclear	1	114	0.0	1.0
+de	06_coal	1	114	0.0	1.0
 de	07_gas	1	114	0.0	0.0
 de	08_non-res	1	114	0.0	0.0
 de	09_hydro_pump	1	114	0.0	0.0
-de	01_solar	1	115	1.0	0.0
-de	02_wind_on	1	115	1.0	0.0
-de	03_wind_off	1	115	1.0	0.0
-de	04_res	1	115	1.0	0.0
-de	05_nuclear	1	115	1.0	0.0
-de	06_coal	1	115	1.0	0.0
+de	01_solar	1	115	0.0	1.0
+de	02_wind_on	1	115	0.0	1.0
+de	03_wind_off	1	115	0.0	1.0
+de	04_res	1	115	0.0	1.0
+de	05_nuclear	1	115	0.0	1.0
+de	06_coal	1	115	0.0	1.0
 de	07_gas	1	115	0.0	0.0
 de	08_non-res	1	115	0.0	0.0
 de	09_hydro_pump	1	115	0.0	0.0
-de	01_solar	1	116	1.0	0.0
-de	02_wind_on	1	116	1.0	0.0
-de	03_wind_off	1	116	1.0	0.0
-de	04_res	1	116	1.0	0.0
-de	05_nuclear	1	116	1.0	0.0
-de	06_coal	1	116	1.0	0.0
+de	01_solar	1	116	0.0	1.0
+de	02_wind_on	1	116	0.0	1.0
+de	03_wind_off	1	116	0.0	1.0
+de	04_res	1	116	0.0	1.0
+de	05_nuclear	1	116	0.0	1.0
+de	06_coal	1	116	0.0	1.0
 de	07_gas	1	116	0.0	0.0
 de	08_non-res	1	116	0.0	0.0
 de	09_hydro_pump	1	116	0.0	0.0
-de	01_solar	1	117	1.0	0.0
-de	02_wind_on	1	117	1.0	0.0
-de	03_wind_off	1	117	1.0	0.0
-de	04_res	1	117	1.0	0.0
-de	05_nuclear	1	117	1.0	0.0
-de	06_coal	1	117	1.0	0.0
+de	01_solar	1	117	0.0	1.0
+de	02_wind_on	1	117	0.0	1.0
+de	03_wind_off	1	117	0.0	1.0
+de	04_res	1	117	0.0	1.0
+de	05_nuclear	1	117	0.0	1.0
+de	06_coal	1	117	0.0	1.0
 de	07_gas	1	117	0.0	0.0
 de	08_non-res	1	117	0.0	0.0
 de	09_hydro_pump	1	117	0.0	0.0
-de	01_solar	1	118	1.0	0.0
-de	02_wind_on	1	118	1.0	0.0
-de	03_wind_off	1	118	1.0	0.0
-de	04_res	1	118	1.0	0.0
-de	05_nuclear	1	118	1.0	0.0
-de	06_coal	1	118	1.0	0.0
+de	01_solar	1	118	0.0	1.0
+de	02_wind_on	1	118	0.0	1.0
+de	03_wind_off	1	118	0.0	1.0
+de	04_res	1	118	0.0	1.0
+de	05_nuclear	1	118	0.0	1.0
+de	06_coal	1	118	0.0	1.0
 de	07_gas	1	118	0.0	0.0
 de	08_non-res	1	118	0.0	0.0
 de	09_hydro_pump	1	118	0.0	0.0
-de	01_solar	1	119	1.0	0.0
-de	02_wind_on	1	119	1.0	0.0
-de	03_wind_off	1	119	1.0	0.0
-de	04_res	1	119	1.0	0.0
-de	05_nuclear	1	119	1.0	0.0
-de	06_coal	1	119	1.0	0.0
+de	01_solar	1	119	0.0	1.0
+de	02_wind_on	1	119	0.0	1.0
+de	03_wind_off	1	119	0.0	1.0
+de	04_res	1	119	0.0	1.0
+de	05_nuclear	1	119	0.0	1.0
+de	06_coal	1	119	0.0	1.0
 de	07_gas	1	119	0.0	0.0
 de	08_non-res	1	119	0.0	0.0
 de	09_hydro_pump	1	119	0.0	0.0
-de	01_solar	1	120	1.0	0.0
-de	02_wind_on	1	120	1.0	0.0
-de	03_wind_off	1	120	1.0	0.0
-de	04_res	1	120	1.0	0.0
-de	05_nuclear	1	120	1.0	0.0
-de	06_coal	1	120	1.0	0.0
+de	01_solar	1	120	0.0	1.0
+de	02_wind_on	1	120	0.0	1.0
+de	03_wind_off	1	120	0.0	1.0
+de	04_res	1	120	0.0	1.0
+de	05_nuclear	1	120	0.0	1.0
+de	06_coal	1	120	0.0	1.0
 de	07_gas	1	120	0.0	0.0
 de	08_non-res	1	120	0.0	0.0
 de	09_hydro_pump	1	120	0.0	0.0
-de	01_solar	1	121	1.0	0.0
-de	02_wind_on	1	121	1.0	0.0
-de	03_wind_off	1	121	1.0	0.0
-de	04_res	1	121	1.0	0.0
-de	05_nuclear	1	121	1.0	0.0
-de	06_coal	1	121	1.0	0.0
+de	01_solar	1	121	0.0	1.0
+de	02_wind_on	1	121	0.0	1.0
+de	03_wind_off	1	121	0.0	1.0
+de	04_res	1	121	0.0	1.0
+de	05_nuclear	1	121	0.0	1.0
+de	06_coal	1	121	0.0	1.0
 de	07_gas	1	121	0.0	0.0
 de	08_non-res	1	121	0.0	0.0
 de	09_hydro_pump	1	121	0.0	0.0
-de	01_solar	1	122	1.0	0.0
-de	02_wind_on	1	122	1.0	0.0
-de	03_wind_off	1	122	1.0	0.0
-de	04_res	1	122	1.0	0.0
-de	05_nuclear	1	122	1.0	0.0
-de	06_coal	1	122	1.0	0.0
-de	07_gas	1	122	1.0	0.0
+de	01_solar	1	122	0.0	1.0
+de	02_wind_on	1	122	0.0	1.0
+de	03_wind_off	1	122	0.0	1.0
+de	04_res	1	122	0.0	1.0
+de	05_nuclear	1	122	0.0	1.0
+de	06_coal	1	122	0.0	1.0
+de	07_gas	1	122	0.0	1.0
 de	08_non-res	1	122	0.0	0.0
 de	09_hydro_pump	1	122	0.0	0.0
-de	01_solar	1	123	1.0	0.0
-de	02_wind_on	1	123	1.0	0.0
-de	03_wind_off	1	123	1.0	0.0
-de	04_res	1	123	1.0	0.0
-de	05_nuclear	1	123	1.0	0.0
-de	06_coal	1	123	1.0	0.0
-de	07_gas	1	123	1.0	0.0
+de	01_solar	1	123	0.0	1.0
+de	02_wind_on	1	123	0.0	1.0
+de	03_wind_off	1	123	0.0	1.0
+de	04_res	1	123	0.0	1.0
+de	05_nuclear	1	123	0.0	1.0
+de	06_coal	1	123	0.0	1.0
+de	07_gas	1	123	0.0	1.0
 de	08_non-res	1	123	0.0	0.0
 de	09_hydro_pump	1	123	0.0	0.0
-de	01_solar	1	124	1.0	0.0
-de	02_wind_on	1	124	1.0	0.0
-de	03_wind_off	1	124	1.0	0.0
-de	04_res	1	124	1.0	0.0
-de	05_nuclear	1	124	1.0	0.0
-de	06_coal	1	124	1.0	0.0
-de	07_gas	1	124	1.0	0.0
+de	01_solar	1	124	0.0	1.0
+de	02_wind_on	1	124	0.0	1.0
+de	03_wind_off	1	124	0.0	1.0
+de	04_res	1	124	0.0	1.0
+de	05_nuclear	1	124	0.0	1.0
+de	06_coal	1	124	0.0	1.0
+de	07_gas	1	124	0.0	1.0
 de	08_non-res	1	124	0.0	0.0
 de	09_hydro_pump	1	124	0.0	0.0
-de	01_solar	1	125	1.0	0.0
-de	02_wind_on	1	125	1.0	0.0
-de	03_wind_off	1	125	1.0	0.0
-de	04_res	1	125	1.0	0.0
-de	05_nuclear	1	125	1.0	0.0
-de	06_coal	1	125	1.0	0.0
-de	07_gas	1	125	1.0	0.0
+de	01_solar	1	125	0.0	1.0
+de	02_wind_on	1	125	0.0	1.0
+de	03_wind_off	1	125	0.0	1.0
+de	04_res	1	125	0.0	1.0
+de	05_nuclear	1	125	0.0	1.0
+de	06_coal	1	125	0.0	1.0
+de	07_gas	1	125	0.0	1.0
 de	08_non-res	1	125	0.0	0.0
 de	09_hydro_pump	1	125	0.0	0.0
-de	01_solar	1	126	1.0	0.0
-de	02_wind_on	1	126	1.0	0.0
-de	03_wind_off	1	126	1.0	0.0
-de	04_res	1	126	1.0	0.0
-de	05_nuclear	1	126	1.0	0.0
-de	06_coal	1	126	1.0	0.0
-de	07_gas	1	126	1.0	0.0
+de	01_solar	1	126	0.0	1.0
+de	02_wind_on	1	126	0.0	1.0
+de	03_wind_off	1	126	0.0	1.0
+de	04_res	1	126	0.0	1.0
+de	05_nuclear	1	126	0.0	1.0
+de	06_coal	1	126	0.0	1.0
+de	07_gas	1	126	0.0	1.0
 de	08_non-res	1	126	0.0	0.0
 de	09_hydro_pump	1	126	0.0	0.0
-de	01_solar	1	127	1.0	0.0
-de	02_wind_on	1	127	1.0	0.0
-de	03_wind_off	1	127	1.0	0.0
-de	04_res	1	127	1.0	0.0
-de	05_nuclear	1	127	1.0	0.0
-de	06_coal	1	127	1.0	0.0
-de	07_gas	1	127	1.0	0.0
+de	01_solar	1	127	0.0	1.0
+de	02_wind_on	1	127	0.0	1.0
+de	03_wind_off	1	127	0.0	1.0
+de	04_res	1	127	0.0	1.0
+de	05_nuclear	1	127	0.0	1.0
+de	06_coal	1	127	0.0	1.0
+de	07_gas	1	127	0.0	1.0
 de	08_non-res	1	127	0.0	0.0
 de	09_hydro_pump	1	127	0.0	0.0
-de	01_solar	1	128	1.0	0.0
-de	02_wind_on	1	128	1.0	0.0
-de	03_wind_off	1	128	1.0	0.0
-de	04_res	1	128	1.0	0.0
-de	05_nuclear	1	128	1.0	0.0
-de	06_coal	1	128	1.0	0.0
-de	07_gas	1	128	1.0	0.0
+de	01_solar	1	128	0.0	1.0
+de	02_wind_on	1	128	0.0	1.0
+de	03_wind_off	1	128	0.0	1.0
+de	04_res	1	128	0.0	1.0
+de	05_nuclear	1	128	0.0	1.0
+de	06_coal	1	128	0.0	1.0
+de	07_gas	1	128	0.0	1.0
 de	08_non-res	1	128	0.0	0.0
 de	09_hydro_pump	1	128	0.0	0.0
-de	01_solar	1	129	1.0	0.0
-de	02_wind_on	1	129	1.0	0.0
-de	03_wind_off	1	129	1.0	0.0
-de	04_res	1	129	1.0	0.0
-de	05_nuclear	1	129	1.0	0.0
-de	06_coal	1	129	1.0	0.0
-de	07_gas	1	129	1.0	0.0
+de	01_solar	1	129	0.0	1.0
+de	02_wind_on	1	129	0.0	1.0
+de	03_wind_off	1	129	0.0	1.0
+de	04_res	1	129	0.0	1.0
+de	05_nuclear	1	129	0.0	1.0
+de	06_coal	1	129	0.0	1.0
+de	07_gas	1	129	0.0	1.0
 de	08_non-res	1	129	0.0	0.0
 de	09_hydro_pump	1	129	0.0	0.0
-de	01_solar	1	130	1.0	0.0
-de	02_wind_on	1	130	1.0	0.0
-de	03_wind_off	1	130	1.0	0.0
-de	04_res	1	130	1.0	0.0
-de	05_nuclear	1	130	1.0	0.0
-de	06_coal	1	130	1.0	0.0
-de	07_gas	1	130	1.0	0.0
+de	01_solar	1	130	0.0	1.0
+de	02_wind_on	1	130	0.0	1.0
+de	03_wind_off	1	130	0.0	1.0
+de	04_res	1	130	0.0	1.0
+de	05_nuclear	1	130	0.0	1.0
+de	06_coal	1	130	0.0	1.0
+de	07_gas	1	130	0.0	1.0
 de	08_non-res	1	130	0.0	0.0
 de	09_hydro_pump	1	130	0.0	0.0
-de	01_solar	1	131	1.0	0.0
-de	02_wind_on	1	131	1.0	0.0
-de	03_wind_off	1	131	1.0	0.0
-de	04_res	1	131	1.0	0.0
-de	05_nuclear	1	131	1.0	0.0
-de	06_coal	1	131	1.0	0.0
-de	07_gas	1	131	1.0	0.0
+de	01_solar	1	131	0.0	1.0
+de	02_wind_on	1	131	0.0	1.0
+de	03_wind_off	1	131	0.0	1.0
+de	04_res	1	131	0.0	1.0
+de	05_nuclear	1	131	0.0	1.0
+de	06_coal	1	131	0.0	1.0
+de	07_gas	1	131	0.0	1.0
 de	08_non-res	1	131	0.0	0.0
 de	09_hydro_pump	1	131	0.0	0.0
-de	01_solar	1	132	1.0	0.0
-de	02_wind_on	1	132	1.0	0.0
-de	03_wind_off	1	132	1.0	0.0
-de	04_res	1	132	1.0	0.0
-de	05_nuclear	1	132	1.0	0.0
-de	06_coal	1	132	1.0	0.0
-de	07_gas	1	132	1.0	0.0
+de	01_solar	1	132	0.0	1.0
+de	02_wind_on	1	132	0.0	1.0
+de	03_wind_off	1	132	0.0	1.0
+de	04_res	1	132	0.0	1.0
+de	05_nuclear	1	132	0.0	1.0
+de	06_coal	1	132	0.0	1.0
+de	07_gas	1	132	0.0	1.0
 de	08_non-res	1	132	0.0	0.0
 de	09_hydro_pump	1	132	0.0	0.0
-de	01_solar	1	133	1.0	0.0
-de	02_wind_on	1	133	1.0	0.0
-de	03_wind_off	1	133	1.0	0.0
-de	04_res	1	133	1.0	0.0
-de	05_nuclear	1	133	1.0	0.0
-de	06_coal	1	133	1.0	0.0
-de	07_gas	1	133	1.0	0.0
+de	01_solar	1	133	0.0	1.0
+de	02_wind_on	1	133	0.0	1.0
+de	03_wind_off	1	133	0.0	1.0
+de	04_res	1	133	0.0	1.0
+de	05_nuclear	1	133	0.0	1.0
+de	06_coal	1	133	0.0	1.0
+de	07_gas	1	133	0.0	1.0
 de	08_non-res	1	133	0.0	0.0
 de	09_hydro_pump	1	133	0.0	0.0
-de	01_solar	1	134	1.0	0.0
-de	02_wind_on	1	134	1.0	0.0
-de	03_wind_off	1	134	1.0	0.0
-de	04_res	1	134	1.0	0.0
-de	05_nuclear	1	134	1.0	0.0
-de	06_coal	1	134	1.0	0.0
-de	07_gas	1	134	1.0	0.0
+de	01_solar	1	134	0.0	1.0
+de	02_wind_on	1	134	0.0	1.0
+de	03_wind_off	1	134	0.0	1.0
+de	04_res	1	134	0.0	1.0
+de	05_nuclear	1	134	0.0	1.0
+de	06_coal	1	134	0.0	1.0
+de	07_gas	1	134	0.0	1.0
 de	08_non-res	1	134	0.0	0.0
 de	09_hydro_pump	1	134	0.0	0.0
-de	01_solar	1	135	1.0	0.0
-de	02_wind_on	1	135	1.0	0.0
-de	03_wind_off	1	135	1.0	0.0
-de	04_res	1	135	1.0	0.0
-de	05_nuclear	1	135	1.0	0.0
-de	06_coal	1	135	1.0	0.0
-de	07_gas	1	135	1.0	0.0
+de	01_solar	1	135	0.0	1.0
+de	02_wind_on	1	135	0.0	1.0
+de	03_wind_off	1	135	0.0	1.0
+de	04_res	1	135	0.0	1.0
+de	05_nuclear	1	135	0.0	1.0
+de	06_coal	1	135	0.0	1.0
+de	07_gas	1	135	0.0	1.0
 de	08_non-res	1	135	0.0	0.0
 de	09_hydro_pump	1	135	0.0	0.0
-de	01_solar	1	136	1.0	0.0
-de	02_wind_on	1	136	1.0	0.0
-de	03_wind_off	1	136	1.0	0.0
-de	04_res	1	136	1.0	0.0
-de	05_nuclear	1	136	1.0	0.0
-de	06_coal	1	136	1.0	0.0
-de	07_gas	1	136	1.0	0.0
+de	01_solar	1	136	0.0	1.0
+de	02_wind_on	1	136	0.0	1.0
+de	03_wind_off	1	136	0.0	1.0
+de	04_res	1	136	0.0	1.0
+de	05_nuclear	1	136	0.0	1.0
+de	06_coal	1	136	0.0	1.0
+de	07_gas	1	136	0.0	1.0
 de	08_non-res	1	136	0.0	0.0
 de	09_hydro_pump	1	136	0.0	0.0
-de	01_solar	1	137	1.0	0.0
-de	02_wind_on	1	137	1.0	0.0
-de	03_wind_off	1	137	1.0	0.0
-de	04_res	1	137	1.0	0.0
-de	05_nuclear	1	137	1.0	0.0
-de	06_coal	1	137	1.0	0.0
-de	07_gas	1	137	1.0	0.0
+de	01_solar	1	137	0.0	1.0
+de	02_wind_on	1	137	0.0	1.0
+de	03_wind_off	1	137	0.0	1.0
+de	04_res	1	137	0.0	1.0
+de	05_nuclear	1	137	0.0	1.0
+de	06_coal	1	137	0.0	1.0
+de	07_gas	1	137	0.0	1.0
 de	08_non-res	1	137	0.0	0.0
 de	09_hydro_pump	1	137	0.0	0.0
-de	01_solar	1	138	1.0	0.0
-de	02_wind_on	1	138	1.0	0.0
-de	03_wind_off	1	138	1.0	0.0
-de	04_res	1	138	1.0	0.0
-de	05_nuclear	1	138	1.0	0.0
-de	06_coal	1	138	1.0	0.0
-de	07_gas	1	138	1.0	0.0
+de	01_solar	1	138	0.0	1.0
+de	02_wind_on	1	138	0.0	1.0
+de	03_wind_off	1	138	0.0	1.0
+de	04_res	1	138	0.0	1.0
+de	05_nuclear	1	138	0.0	1.0
+de	06_coal	1	138	0.0	1.0
+de	07_gas	1	138	0.0	1.0
 de	08_non-res	1	138	0.0	0.0
 de	09_hydro_pump	1	138	0.0	0.0
-de	01_solar	1	139	1.0	0.0
-de	02_wind_on	1	139	1.0	0.0
-de	03_wind_off	1	139	1.0	0.0
-de	04_res	1	139	1.0	0.0
-de	05_nuclear	1	139	1.0	0.0
-de	06_coal	1	139	1.0	0.0
-de	07_gas	1	139	1.0	0.0
+de	01_solar	1	139	0.0	1.0
+de	02_wind_on	1	139	0.0	1.0
+de	03_wind_off	1	139	0.0	1.0
+de	04_res	1	139	0.0	1.0
+de	05_nuclear	1	139	0.0	1.0
+de	06_coal	1	139	0.0	1.0
+de	07_gas	1	139	0.0	1.0
 de	08_non-res	1	139	0.0	0.0
 de	09_hydro_pump	1	139	0.0	0.0
-de	01_solar	1	140	1.0	0.0
-de	02_wind_on	1	140	1.0	0.0
-de	03_wind_off	1	140	1.0	0.0
-de	04_res	1	140	1.0	0.0
-de	05_nuclear	1	140	1.0	0.0
-de	06_coal	1	140	1.0	0.0
-de	07_gas	1	140	1.0	0.0
+de	01_solar	1	140	0.0	1.0
+de	02_wind_on	1	140	0.0	1.0
+de	03_wind_off	1	140	0.0	1.0
+de	04_res	1	140	0.0	1.0
+de	05_nuclear	1	140	0.0	1.0
+de	06_coal	1	140	0.0	1.0
+de	07_gas	1	140	0.0	1.0
 de	08_non-res	1	140	0.0	0.0
 de	09_hydro_pump	1	140	0.0	0.0
-de	01_solar	1	141	1.0	0.0
-de	02_wind_on	1	141	1.0	0.0
-de	03_wind_off	1	141	1.0	0.0
-de	04_res	1	141	1.0	0.0
-de	05_nuclear	1	141	1.0	0.0
-de	06_coal	1	141	1.0	0.0
-de	07_gas	1	141	1.0	0.0
+de	01_solar	1	141	0.0	1.0
+de	02_wind_on	1	141	0.0	1.0
+de	03_wind_off	1	141	0.0	1.0
+de	04_res	1	141	0.0	1.0
+de	05_nuclear	1	141	0.0	1.0
+de	06_coal	1	141	0.0	1.0
+de	07_gas	1	141	0.0	1.0
 de	08_non-res	1	141	0.0	0.0
 de	09_hydro_pump	1	141	0.0	0.0
-de	01_solar	1	142	1.0	0.0
-de	02_wind_on	1	142	1.0	0.0
-de	03_wind_off	1	142	1.0	0.0
-de	04_res	1	142	1.0	0.0
-de	05_nuclear	1	142	1.0	0.0
-de	06_coal	1	142	1.0	0.0
-de	07_gas	1	142	1.0	0.0
-de	08_non-res	1	142	1.0	0.0
+de	01_solar	1	142	0.0	1.0
+de	02_wind_on	1	142	0.0	1.0
+de	03_wind_off	1	142	0.0	1.0
+de	04_res	1	142	0.0	1.0
+de	05_nuclear	1	142	0.0	1.0
+de	06_coal	1	142	0.0	1.0
+de	07_gas	1	142	0.0	1.0
+de	08_non-res	1	142	0.0	1.0
 de	09_hydro_pump	1	142	0.0	0.0
-de	01_solar	1	143	1.0	0.0
-de	02_wind_on	1	143	1.0	0.0
-de	03_wind_off	1	143	1.0	0.0
-de	04_res	1	143	1.0	0.0
-de	05_nuclear	1	143	1.0	0.0
-de	06_coal	1	143	1.0	0.0
-de	07_gas	1	143	1.0	0.0
-de	08_non-res	1	143	1.0	0.0
+de	01_solar	1	143	0.0	1.0
+de	02_wind_on	1	143	0.0	1.0
+de	03_wind_off	1	143	0.0	1.0
+de	04_res	1	143	0.0	1.0
+de	05_nuclear	1	143	0.0	1.0
+de	06_coal	1	143	0.0	1.0
+de	07_gas	1	143	0.0	1.0
+de	08_non-res	1	143	0.0	1.0
 de	09_hydro_pump	1	143	0.0	0.0
-de	01_solar	1	144	1.0	0.0
-de	02_wind_on	1	144	1.0	0.0
-de	03_wind_off	1	144	1.0	0.0
-de	04_res	1	144	1.0	0.0
-de	05_nuclear	1	144	1.0	0.0
-de	06_coal	1	144	1.0	0.0
-de	07_gas	1	144	1.0	0.0
-de	08_non-res	1	144	1.0	0.0
+de	01_solar	1	144	0.0	1.0
+de	02_wind_on	1	144	0.0	1.0
+de	03_wind_off	1	144	0.0	1.0
+de	04_res	1	144	0.0	1.0
+de	05_nuclear	1	144	0.0	1.0
+de	06_coal	1	144	0.0	1.0
+de	07_gas	1	144	0.0	1.0
+de	08_non-res	1	144	0.0	1.0
 de	09_hydro_pump	1	144	0.0	0.0
-de	01_solar	1	145	1.0	0.0
-de	02_wind_on	1	145	1.0	0.0
-de	03_wind_off	1	145	1.0	0.0
-de	04_res	1	145	1.0	0.0
-de	05_nuclear	1	145	1.0	0.0
-de	06_coal	1	145	1.0	0.0
-de	07_gas	1	145	1.0	0.0
-de	08_non-res	1	145	1.0	0.0
+de	01_solar	1	145	0.0	1.0
+de	02_wind_on	1	145	0.0	1.0
+de	03_wind_off	1	145	0.0	1.0
+de	04_res	1	145	0.0	1.0
+de	05_nuclear	1	145	0.0	1.0
+de	06_coal	1	145	0.0	1.0
+de	07_gas	1	145	0.0	1.0
+de	08_non-res	1	145	0.0	1.0
 de	09_hydro_pump	1	145	0.0	0.0
-de	01_solar	1	146	1.0	0.0
-de	02_wind_on	1	146	1.0	0.0
-de	03_wind_off	1	146	1.0	0.0
-de	04_res	1	146	1.0	0.0
-de	05_nuclear	1	146	1.0	0.0
-de	06_coal	1	146	1.0	0.0
-de	07_gas	1	146	1.0	0.0
-de	08_non-res	1	146	1.0	0.0
+de	01_solar	1	146	0.0	1.0
+de	02_wind_on	1	146	0.0	1.0
+de	03_wind_off	1	146	0.0	1.0
+de	04_res	1	146	0.0	1.0
+de	05_nuclear	1	146	0.0	1.0
+de	06_coal	1	146	0.0	1.0
+de	07_gas	1	146	0.0	1.0
+de	08_non-res	1	146	0.0	1.0
 de	09_hydro_pump	1	146	0.0	0.0
-de	01_solar	1	147	1.0	0.0
-de	02_wind_on	1	147	1.0	0.0
-de	03_wind_off	1	147	1.0	0.0
-de	04_res	1	147	1.0	0.0
-de	05_nuclear	1	147	1.0	0.0
-de	06_coal	1	147	1.0	0.0
-de	07_gas	1	147	1.0	0.0
-de	08_non-res	1	147	1.0	0.0
+de	01_solar	1	147	0.0	1.0
+de	02_wind_on	1	147	0.0	1.0
+de	03_wind_off	1	147	0.0	1.0
+de	04_res	1	147	0.0	1.0
+de	05_nuclear	1	147	0.0	1.0
+de	06_coal	1	147	0.0	1.0
+de	07_gas	1	147	0.0	1.0
+de	08_non-res	1	147	0.0	1.0
 de	09_hydro_pump	1	147	0.0	0.0
-de	01_solar	1	148	1.0	0.0
-de	02_wind_on	1	148	1.0	0.0
-de	03_wind_off	1	148	1.0	0.0
-de	04_res	1	148	1.0	0.0
-de	05_nuclear	1	148	1.0	0.0
-de	06_coal	1	148	1.0	0.0
-de	07_gas	1	148	1.0	0.0
-de	08_non-res	1	148	1.0	0.0
+de	01_solar	1	148	0.0	1.0
+de	02_wind_on	1	148	0.0	1.0
+de	03_wind_off	1	148	0.0	1.0
+de	04_res	1	148	0.0	1.0
+de	05_nuclear	1	148	0.0	1.0
+de	06_coal	1	148	0.0	1.0
+de	07_gas	1	148	0.0	1.0
+de	08_non-res	1	148	0.0	1.0
 de	09_hydro_pump	1	148	0.0	0.0
-de	01_solar	1	149	1.0	0.0
-de	02_wind_on	1	149	1.0	0.0
-de	03_wind_off	1	149	1.0	0.0
-de	04_res	1	149	1.0	0.0
-de	05_nuclear	1	149	1.0	0.0
-de	06_coal	1	149	1.0	0.0
-de	07_gas	1	149	1.0	0.0
-de	08_non-res	1	149	1.0	0.0
+de	01_solar	1	149	0.0	1.0
+de	02_wind_on	1	149	0.0	1.0
+de	03_wind_off	1	149	0.0	1.0
+de	04_res	1	149	0.0	1.0
+de	05_nuclear	1	149	0.0	1.0
+de	06_coal	1	149	0.0	1.0
+de	07_gas	1	149	0.0	1.0
+de	08_non-res	1	149	0.0	1.0
 de	09_hydro_pump	1	149	0.0	0.0
-de	01_solar	1	150	1.0	0.0
-de	02_wind_on	1	150	1.0	0.0
-de	03_wind_off	1	150	1.0	0.0
-de	04_res	1	150	1.0	0.0
-de	05_nuclear	1	150	1.0	0.0
-de	06_coal	1	150	1.0	0.0
-de	07_gas	1	150	1.0	0.0
-de	08_non-res	1	150	1.0	0.0
+de	01_solar	1	150	0.0	1.0
+de	02_wind_on	1	150	0.0	1.0
+de	03_wind_off	1	150	0.0	1.0
+de	04_res	1	150	0.0	1.0
+de	05_nuclear	1	150	0.0	1.0
+de	06_coal	1	150	0.0	1.0
+de	07_gas	1	150	0.0	1.0
+de	08_non-res	1	150	0.0	1.0
 de	09_hydro_pump	1	150	0.0	0.0
-de	01_solar	1	151	1.0	0.0
-de	02_wind_on	1	151	1.0	0.0
-de	03_wind_off	1	151	1.0	0.0
-de	04_res	1	151	1.0	0.0
-de	05_nuclear	1	151	1.0	0.0
-de	06_coal	1	151	1.0	0.0
-de	07_gas	1	151	1.0	0.0
-de	08_non-res	1	151	1.0	0.0
+de	01_solar	1	151	0.0	1.0
+de	02_wind_on	1	151	0.0	1.0
+de	03_wind_off	1	151	0.0	1.0
+de	04_res	1	151	0.0	1.0
+de	05_nuclear	1	151	0.0	1.0
+de	06_coal	1	151	0.0	1.0
+de	07_gas	1	151	0.0	1.0
+de	08_non-res	1	151	0.0	1.0
 de	09_hydro_pump	1	151	0.0	0.0
-de	01_solar	1	152	1.0	0.0
-de	02_wind_on	1	152	1.0	0.0
-de	03_wind_off	1	152	1.0	0.0
-de	04_res	1	152	1.0	0.0
-de	05_nuclear	1	152	1.0	0.0
-de	06_coal	1	152	1.0	0.0
-de	07_gas	1	152	1.0	0.0
-de	08_non-res	1	152	1.0	0.0
+de	01_solar	1	152	0.0	1.0
+de	02_wind_on	1	152	0.0	1.0
+de	03_wind_off	1	152	0.0	1.0
+de	04_res	1	152	0.0	1.0
+de	05_nuclear	1	152	0.0	1.0
+de	06_coal	1	152	0.0	1.0
+de	07_gas	1	152	0.0	1.0
+de	08_non-res	1	152	0.0	1.0
 de	09_hydro_pump	1	152	0.0	0.0
-de	01_solar	1	153	1.0	0.0
-de	02_wind_on	1	153	1.0	0.0
-de	03_wind_off	1	153	1.0	0.0
-de	04_res	1	153	1.0	0.0
-de	05_nuclear	1	153	1.0	0.0
-de	06_coal	1	153	1.0	0.0
-de	07_gas	1	153	1.0	0.0
-de	08_non-res	1	153	1.0	0.0
+de	01_solar	1	153	0.0	1.0
+de	02_wind_on	1	153	0.0	1.0
+de	03_wind_off	1	153	0.0	1.0
+de	04_res	1	153	0.0	1.0
+de	05_nuclear	1	153	0.0	1.0
+de	06_coal	1	153	0.0	1.0
+de	07_gas	1	153	0.0	1.0
+de	08_non-res	1	153	0.0	1.0
 de	09_hydro_pump	1	153	0.0	0.0
-de	01_solar	1	154	1.0	0.0
-de	02_wind_on	1	154	1.0	0.0
-de	03_wind_off	1	154	1.0	0.0
-de	04_res	1	154	1.0	0.0
-de	05_nuclear	1	154	1.0	0.0
-de	06_coal	1	154	1.0	0.0
-de	07_gas	1	154	1.0	0.0
-de	08_non-res	1	154	1.0	0.0
+de	01_solar	1	154	0.0	1.0
+de	02_wind_on	1	154	0.0	1.0
+de	03_wind_off	1	154	0.0	1.0
+de	04_res	1	154	0.0	1.0
+de	05_nuclear	1	154	0.0	1.0
+de	06_coal	1	154	0.0	1.0
+de	07_gas	1	154	0.0	1.0
+de	08_non-res	1	154	0.0	1.0
 de	09_hydro_pump	1	154	0.0	0.0
-de	01_solar	1	155	1.0	0.0
-de	02_wind_on	1	155	1.0	0.0
-de	03_wind_off	1	155	1.0	0.0
-de	04_res	1	155	1.0	0.0
-de	05_nuclear	1	155	1.0	0.0
-de	06_coal	1	155	1.0	0.0
-de	07_gas	1	155	1.0	0.0
-de	08_non-res	1	155	1.0	0.0
+de	01_solar	1	155	0.0	1.0
+de	02_wind_on	1	155	0.0	1.0
+de	03_wind_off	1	155	0.0	1.0
+de	04_res	1	155	0.0	1.0
+de	05_nuclear	1	155	0.0	1.0
+de	06_coal	1	155	0.0	1.0
+de	07_gas	1	155	0.0	1.0
+de	08_non-res	1	155	0.0	1.0
 de	09_hydro_pump	1	155	0.0	0.0
-de	01_solar	1	156	1.0	0.0
-de	02_wind_on	1	156	1.0	0.0
-de	03_wind_off	1	156	1.0	0.0
-de	04_res	1	156	1.0	0.0
-de	05_nuclear	1	156	1.0	0.0
-de	06_coal	1	156	1.0	0.0
-de	07_gas	1	156	1.0	0.0
-de	08_non-res	1	156	1.0	0.0
+de	01_solar	1	156	0.0	1.0
+de	02_wind_on	1	156	0.0	1.0
+de	03_wind_off	1	156	0.0	1.0
+de	04_res	1	156	0.0	1.0
+de	05_nuclear	1	156	0.0	1.0
+de	06_coal	1	156	0.0	1.0
+de	07_gas	1	156	0.0	1.0
+de	08_non-res	1	156	0.0	1.0
 de	09_hydro_pump	1	156	0.0	0.0
-de	01_solar	1	157	1.0	0.0
-de	02_wind_on	1	157	1.0	0.0
-de	03_wind_off	1	157	1.0	0.0
-de	04_res	1	157	1.0	0.0
-de	05_nuclear	1	157	1.0	0.0
-de	06_coal	1	157	1.0	0.0
-de	07_gas	1	157	1.0	0.0
-de	08_non-res	1	157	1.0	0.0
+de	01_solar	1	157	0.0	1.0
+de	02_wind_on	1	157	0.0	1.0
+de	03_wind_off	1	157	0.0	1.0
+de	04_res	1	157	0.0	1.0
+de	05_nuclear	1	157	0.0	1.0
+de	06_coal	1	157	0.0	1.0
+de	07_gas	1	157	0.0	1.0
+de	08_non-res	1	157	0.0	1.0
 de	09_hydro_pump	1	157	0.0	0.0
-de	01_solar	1	158	1.0	0.0
-de	02_wind_on	1	158	1.0	0.0
-de	03_wind_off	1	158	1.0	0.0
-de	04_res	1	158	1.0	0.0
-de	05_nuclear	1	158	1.0	0.0
-de	06_coal	1	158	1.0	0.0
-de	07_gas	1	158	1.0	0.0
-de	08_non-res	1	158	1.0	0.0
+de	01_solar	1	158	0.0	1.0
+de	02_wind_on	1	158	0.0	1.0
+de	03_wind_off	1	158	0.0	1.0
+de	04_res	1	158	0.0	1.0
+de	05_nuclear	1	158	0.0	1.0
+de	06_coal	1	158	0.0	1.0
+de	07_gas	1	158	0.0	1.0
+de	08_non-res	1	158	0.0	1.0
 de	09_hydro_pump	1	158	0.0	0.0
-de	01_solar	1	159	1.0	0.0
-de	02_wind_on	1	159	1.0	0.0
-de	03_wind_off	1	159	1.0	0.0
-de	04_res	1	159	1.0	0.0
-de	05_nuclear	1	159	1.0	0.0
-de	06_coal	1	159	1.0	0.0
-de	07_gas	1	159	1.0	0.0
-de	08_non-res	1	159	1.0	0.0
+de	01_solar	1	159	0.0	1.0
+de	02_wind_on	1	159	0.0	1.0
+de	03_wind_off	1	159	0.0	1.0
+de	04_res	1	159	0.0	1.0
+de	05_nuclear	1	159	0.0	1.0
+de	06_coal	1	159	0.0	1.0
+de	07_gas	1	159	0.0	1.0
+de	08_non-res	1	159	0.0	1.0
 de	09_hydro_pump	1	159	0.0	0.0
-de	01_solar	1	160	1.0	0.0
-de	02_wind_on	1	160	1.0	0.0
-de	03_wind_off	1	160	1.0	0.0
-de	04_res	1	160	1.0	0.0
-de	05_nuclear	1	160	1.0	0.0
-de	06_coal	1	160	1.0	0.0
-de	07_gas	1	160	1.0	0.0
-de	08_non-res	1	160	1.0	0.0
+de	01_solar	1	160	0.0	1.0
+de	02_wind_on	1	160	0.0	1.0
+de	03_wind_off	1	160	0.0	1.0
+de	04_res	1	160	0.0	1.0
+de	05_nuclear	1	160	0.0	1.0
+de	06_coal	1	160	0.0	1.0
+de	07_gas	1	160	0.0	1.0
+de	08_non-res	1	160	0.0	1.0
 de	09_hydro_pump	1	160	0.0	0.0
-de	01_solar	1	161	1.0	0.0
-de	02_wind_on	1	161	1.0	0.0
-de	03_wind_off	1	161	1.0	0.0
-de	04_res	1	161	1.0	0.0
-de	05_nuclear	1	161	1.0	0.0
-de	06_coal	1	161	1.0	0.0
-de	07_gas	1	161	1.0	0.0
-de	08_non-res	1	161	1.0	0.0
+de	01_solar	1	161	0.0	1.0
+de	02_wind_on	1	161	0.0	1.0
+de	03_wind_off	1	161	0.0	1.0
+de	04_res	1	161	0.0	1.0
+de	05_nuclear	1	161	0.0	1.0
+de	06_coal	1	161	0.0	1.0
+de	07_gas	1	161	0.0	1.0
+de	08_non-res	1	161	0.0	1.0
 de	09_hydro_pump	1	161	0.0	0.0
-de	01_solar	1	162	1.0	0.0
-de	02_wind_on	1	162	1.0	0.0
-de	03_wind_off	1	162	1.0	0.0
-de	04_res	1	162	1.0	0.0
-de	05_nuclear	1	162	1.0	0.0
-de	06_coal	1	162	1.0	0.0
-de	07_gas	1	162	1.0	0.0
-de	08_non-res	1	162	1.0	0.0
-de	09_hydro_pump	1	162	1.0	0.0
-de	01_solar	1	163	1.0	0.0
-de	02_wind_on	1	163	1.0	0.0
-de	03_wind_off	1	163	1.0	0.0
-de	04_res	1	163	1.0	0.0
-de	05_nuclear	1	163	1.0	0.0
-de	06_coal	1	163	1.0	0.0
-de	07_gas	1	163	1.0	0.0
-de	08_non-res	1	163	1.0	0.0
-de	09_hydro_pump	1	163	1.0	0.0
-de	01_solar	1	164	1.0	0.0
-de	02_wind_on	1	164	1.0	0.0
-de	03_wind_off	1	164	1.0	0.0
-de	04_res	1	164	1.0	0.0
-de	05_nuclear	1	164	1.0	0.0
-de	06_coal	1	164	1.0	0.0
-de	07_gas	1	164	1.0	0.0
-de	08_non-res	1	164	1.0	0.0
-de	09_hydro_pump	1	164	1.0	0.0
-de	01_solar	1	165	1.0	0.0
-de	02_wind_on	1	165	1.0	0.0
-de	03_wind_off	1	165	1.0	0.0
-de	04_res	1	165	1.0	0.0
-de	05_nuclear	1	165	1.0	0.0
-de	06_coal	1	165	1.0	0.0
-de	07_gas	1	165	1.0	0.0
-de	08_non-res	1	165	1.0	0.0
-de	09_hydro_pump	1	165	1.0	0.0
-de	01_solar	1	166	1.0	0.0
-de	02_wind_on	1	166	1.0	0.0
-de	03_wind_off	1	166	1.0	0.0
-de	04_res	1	166	1.0	0.0
-de	05_nuclear	1	166	1.0	0.0
-de	06_coal	1	166	1.0	0.0
-de	07_gas	1	166	1.0	0.0
-de	08_non-res	1	166	1.0	0.0
-de	09_hydro_pump	1	166	1.0	0.0
-de	01_solar	1	167	1.0	0.0
-de	02_wind_on	1	167	1.0	0.0
-de	03_wind_off	1	167	1.0	0.0
-de	04_res	1	167	1.0	0.0
-de	05_nuclear	1	167	1.0	0.0
-de	06_coal	1	167	1.0	0.0
-de	07_gas	1	167	1.0	0.0
-de	08_non-res	1	167	1.0	0.0
-de	09_hydro_pump	1	167	1.0	0.0
-de	01_solar	1	168	1.0	0.0
-de	02_wind_on	1	168	1.0	0.0
-de	03_wind_off	1	168	1.0	0.0
-de	04_res	1	168	1.0	0.0
-de	05_nuclear	1	168	1.0	0.0
-de	06_coal	1	168	1.0	0.0
-de	07_gas	1	168	1.0	0.0
-de	08_non-res	1	168	1.0	0.0
-de	09_hydro_pump	1	168	1.0	0.0
+de	01_solar	1	162	0.0	1.0
+de	02_wind_on	1	162	0.0	1.0
+de	03_wind_off	1	162	0.0	1.0
+de	04_res	1	162	0.0	1.0
+de	05_nuclear	1	162	0.0	1.0
+de	06_coal	1	162	0.0	1.0
+de	07_gas	1	162	0.0	1.0
+de	08_non-res	1	162	0.0	1.0
+de	09_hydro_pump	1	162	0.0	1.0
+de	01_solar	1	163	0.0	1.0
+de	02_wind_on	1	163	0.0	1.0
+de	03_wind_off	1	163	0.0	1.0
+de	04_res	1	163	0.0	1.0
+de	05_nuclear	1	163	0.0	1.0
+de	06_coal	1	163	0.0	1.0
+de	07_gas	1	163	0.0	1.0
+de	08_non-res	1	163	0.0	1.0
+de	09_hydro_pump	1	163	0.0	1.0
+de	01_solar	1	164	0.0	1.0
+de	02_wind_on	1	164	0.0	1.0
+de	03_wind_off	1	164	0.0	1.0
+de	04_res	1	164	0.0	1.0
+de	05_nuclear	1	164	0.0	1.0
+de	06_coal	1	164	0.0	1.0
+de	07_gas	1	164	0.0	1.0
+de	08_non-res	1	164	0.0	1.0
+de	09_hydro_pump	1	164	0.0	1.0
+de	01_solar	1	165	0.0	1.0
+de	02_wind_on	1	165	0.0	1.0
+de	03_wind_off	1	165	0.0	1.0
+de	04_res	1	165	0.0	1.0
+de	05_nuclear	1	165	0.0	1.0
+de	06_coal	1	165	0.0	1.0
+de	07_gas	1	165	0.0	1.0
+de	08_non-res	1	165	0.0	1.0
+de	09_hydro_pump	1	165	0.0	1.0
+de	01_solar	1	166	0.0	1.0
+de	02_wind_on	1	166	0.0	1.0
+de	03_wind_off	1	166	0.0	1.0
+de	04_res	1	166	0.0	1.0
+de	05_nuclear	1	166	0.0	1.0
+de	06_coal	1	166	0.0	1.0
+de	07_gas	1	166	0.0	1.0
+de	08_non-res	1	166	0.0	1.0
+de	09_hydro_pump	1	166	0.0	1.0
+de	01_solar	1	167	0.0	1.0
+de	02_wind_on	1	167	0.0	1.0
+de	03_wind_off	1	167	0.0	1.0
+de	04_res	1	167	0.0	1.0
+de	05_nuclear	1	167	0.0	1.0
+de	06_coal	1	167	0.0	1.0
+de	07_gas	1	167	0.0	1.0
+de	08_non-res	1	167	0.0	1.0
+de	09_hydro_pump	1	167	0.0	1.0
+de	01_solar	1	168	0.0	1.0
+de	02_wind_on	1	168	0.0	1.0
+de	03_wind_off	1	168	0.0	1.0
+de	04_res	1	168	0.0	1.0
+de	05_nuclear	1	168	0.0	1.0
+de	06_coal	1	168	0.0	1.0
+de	07_gas	1	168	0.0	1.0
+de	08_non-res	1	168	0.0	1.0
+de	09_hydro_pump	1	168	0.0	1.0
 de	01_solar	1	169	0.0	0.0
 de	02_wind_on	1	169	0.0	0.0
 de	03_wind_off	1	169	0.0	0.0
@@ -1520,7 +1520,7 @@ de	06_coal	1	169	0.0	0.0
 de	07_gas	1	169	0.0	0.0
 de	08_non-res	1	169	0.0	0.0
 de	09_hydro_pump	1	169	0.0	0.0
-de	01_solar	1	170	1.0	0.0
+de	01_solar	1	170	0.0	1.0
 de	02_wind_on	1	170	0.0	0.0
 de	03_wind_off	1	170	0.0	0.0
 de	04_res	1	170	0.0	0.0
@@ -1529,7 +1529,7 @@ de	06_coal	1	170	0.0	0.0
 de	07_gas	1	170	0.0	0.0
 de	08_non-res	1	170	0.0	0.0
 de	09_hydro_pump	1	170	0.0	0.0
-de	01_solar	1	171	1.0	0.0
+de	01_solar	1	171	0.0	1.0
 de	02_wind_on	1	171	0.0	0.0
 de	03_wind_off	1	171	0.0	0.0
 de	04_res	1	171	0.0	0.0
@@ -1538,7 +1538,7 @@ de	06_coal	1	171	0.0	0.0
 de	07_gas	1	171	0.0	0.0
 de	08_non-res	1	171	0.0	0.0
 de	09_hydro_pump	1	171	0.0	0.0
-de	01_solar	1	172	1.0	0.0
+de	01_solar	1	172	0.0	1.0
 de	02_wind_on	1	172	0.0	0.0
 de	03_wind_off	1	172	0.0	0.0
 de	04_res	1	172	0.0	0.0
@@ -1547,7 +1547,7 @@ de	06_coal	1	172	0.0	0.0
 de	07_gas	1	172	0.0	0.0
 de	08_non-res	1	172	0.0	0.0
 de	09_hydro_pump	1	172	0.0	0.0
-de	01_solar	1	173	1.0	0.0
+de	01_solar	1	173	0.0	1.0
 de	02_wind_on	1	173	0.0	0.0
 de	03_wind_off	1	173	0.0	0.0
 de	04_res	1	173	0.0	0.0
@@ -1556,7 +1556,7 @@ de	06_coal	1	173	0.0	0.0
 de	07_gas	1	173	0.0	0.0
 de	08_non-res	1	173	0.0	0.0
 de	09_hydro_pump	1	173	0.0	0.0
-de	01_solar	1	174	1.0	0.0
+de	01_solar	1	174	0.0	1.0
 de	02_wind_on	1	174	0.0	0.0
 de	03_wind_off	1	174	0.0	0.0
 de	04_res	1	174	0.0	0.0
@@ -1565,7 +1565,7 @@ de	06_coal	1	174	0.0	0.0
 de	07_gas	1	174	0.0	0.0
 de	08_non-res	1	174	0.0	0.0
 de	09_hydro_pump	1	174	0.0	0.0
-de	01_solar	1	175	1.0	0.0
+de	01_solar	1	175	0.0	1.0
 de	02_wind_on	1	175	0.0	0.0
 de	03_wind_off	1	175	0.0	0.0
 de	04_res	1	175	0.0	0.0
@@ -1574,7 +1574,7 @@ de	06_coal	1	175	0.0	0.0
 de	07_gas	1	175	0.0	0.0
 de	08_non-res	1	175	0.0	0.0
 de	09_hydro_pump	1	175	0.0	0.0
-de	01_solar	1	176	1.0	0.0
+de	01_solar	1	176	0.0	1.0
 de	02_wind_on	1	176	0.0	0.0
 de	03_wind_off	1	176	0.0	0.0
 de	04_res	1	176	0.0	0.0
@@ -1583,7 +1583,7 @@ de	06_coal	1	176	0.0	0.0
 de	07_gas	1	176	0.0	0.0
 de	08_non-res	1	176	0.0	0.0
 de	09_hydro_pump	1	176	0.0	0.0
-de	01_solar	1	177	1.0	0.0
+de	01_solar	1	177	0.0	1.0
 de	02_wind_on	1	177	0.0	0.0
 de	03_wind_off	1	177	0.0	0.0
 de	04_res	1	177	0.0	0.0
@@ -1592,7 +1592,7 @@ de	06_coal	1	177	0.0	0.0
 de	07_gas	1	177	0.0	0.0
 de	08_non-res	1	177	0.0	0.0
 de	09_hydro_pump	1	177	0.0	0.0
-de	01_solar	1	178	1.0	0.0
+de	01_solar	1	178	0.0	1.0
 de	02_wind_on	1	178	0.0	0.0
 de	03_wind_off	1	178	0.0	0.0
 de	04_res	1	178	0.0	0.0
@@ -1601,7 +1601,7 @@ de	06_coal	1	178	0.0	0.0
 de	07_gas	1	178	0.0	0.0
 de	08_non-res	1	178	0.0	0.0
 de	09_hydro_pump	1	178	0.0	0.0
-de	01_solar	1	179	1.0	0.0
+de	01_solar	1	179	0.0	1.0
 de	02_wind_on	1	179	0.0	0.0
 de	03_wind_off	1	179	0.0	0.0
 de	04_res	1	179	0.0	0.0
@@ -1610,7 +1610,7 @@ de	06_coal	1	179	0.0	0.0
 de	07_gas	1	179	0.0	0.0
 de	08_non-res	1	179	0.0	0.0
 de	09_hydro_pump	1	179	0.0	0.0
-de	01_solar	1	180	1.0	0.0
+de	01_solar	1	180	0.0	1.0
 de	02_wind_on	1	180	0.0	0.0
 de	03_wind_off	1	180	0.0	0.0
 de	04_res	1	180	0.0	0.0
@@ -1619,7 +1619,7 @@ de	06_coal	1	180	0.0	0.0
 de	07_gas	1	180	0.0	0.0
 de	08_non-res	1	180	0.0	0.0
 de	09_hydro_pump	1	180	0.0	0.0
-de	01_solar	1	181	1.0	0.0
+de	01_solar	1	181	0.0	1.0
 de	02_wind_on	1	181	0.0	0.0
 de	03_wind_off	1	181	0.0	0.0
 de	04_res	1	181	0.0	0.0
@@ -1628,7 +1628,7 @@ de	06_coal	1	181	0.0	0.0
 de	07_gas	1	181	0.0	0.0
 de	08_non-res	1	181	0.0	0.0
 de	09_hydro_pump	1	181	0.0	0.0
-de	01_solar	1	182	1.0	0.0
+de	01_solar	1	182	0.0	1.0
 de	02_wind_on	1	182	0.0	0.0
 de	03_wind_off	1	182	0.0	0.0
 de	04_res	1	182	0.0	0.0
@@ -1637,7 +1637,7 @@ de	06_coal	1	182	0.0	0.0
 de	07_gas	1	182	0.0	0.0
 de	08_non-res	1	182	0.0	0.0
 de	09_hydro_pump	1	182	0.0	0.0
-de	01_solar	1	183	1.0	0.0
+de	01_solar	1	183	0.0	1.0
 de	02_wind_on	1	183	0.0	0.0
 de	03_wind_off	1	183	0.0	0.0
 de	04_res	1	183	0.0	0.0
@@ -1646,7 +1646,7 @@ de	06_coal	1	183	0.0	0.0
 de	07_gas	1	183	0.0	0.0
 de	08_non-res	1	183	0.0	0.0
 de	09_hydro_pump	1	183	0.0	0.0
-de	01_solar	1	184	1.0	0.0
+de	01_solar	1	184	0.0	1.0
 de	02_wind_on	1	184	0.0	0.0
 de	03_wind_off	1	184	0.0	0.0
 de	04_res	1	184	0.0	0.0
@@ -1655,7 +1655,7 @@ de	06_coal	1	184	0.0	0.0
 de	07_gas	1	184	0.0	0.0
 de	08_non-res	1	184	0.0	0.0
 de	09_hydro_pump	1	184	0.0	0.0
-de	01_solar	1	185	1.0	0.0
+de	01_solar	1	185	0.0	1.0
 de	02_wind_on	1	185	0.0	0.0
 de	03_wind_off	1	185	0.0	0.0
 de	04_res	1	185	0.0	0.0
@@ -1664,7 +1664,7 @@ de	06_coal	1	185	0.0	0.0
 de	07_gas	1	185	0.0	0.0
 de	08_non-res	1	185	0.0	0.0
 de	09_hydro_pump	1	185	0.0	0.0
-de	01_solar	1	186	1.0	0.0
+de	01_solar	1	186	0.0	1.0
 de	02_wind_on	1	186	0.0	0.0
 de	03_wind_off	1	186	0.0	0.0
 de	04_res	1	186	0.0	0.0
@@ -1673,7 +1673,7 @@ de	06_coal	1	186	0.0	0.0
 de	07_gas	1	186	0.0	0.0
 de	08_non-res	1	186	0.0	0.0
 de	09_hydro_pump	1	186	0.0	0.0
-de	01_solar	1	187	1.0	0.0
+de	01_solar	1	187	0.0	1.0
 de	02_wind_on	1	187	0.0	0.0
 de	03_wind_off	1	187	0.0	0.0
 de	04_res	1	187	0.0	0.0
@@ -1682,7 +1682,7 @@ de	06_coal	1	187	0.0	0.0
 de	07_gas	1	187	0.0	0.0
 de	08_non-res	1	187	0.0	0.0
 de	09_hydro_pump	1	187	0.0	0.0
-de	01_solar	1	188	1.0	0.0
+de	01_solar	1	188	0.0	1.0
 de	02_wind_on	1	188	0.0	0.0
 de	03_wind_off	1	188	0.0	0.0
 de	04_res	1	188	0.0	0.0
@@ -1691,7 +1691,7 @@ de	06_coal	1	188	0.0	0.0
 de	07_gas	1	188	0.0	0.0
 de	08_non-res	1	188	0.0	0.0
 de	09_hydro_pump	1	188	0.0	0.0
-de	01_solar	1	189	1.0	0.0
+de	01_solar	1	189	0.0	1.0
 de	02_wind_on	1	189	0.0	0.0
 de	03_wind_off	1	189	0.0	0.0
 de	04_res	1	189	0.0	0.0
@@ -1700,8 +1700,8 @@ de	06_coal	1	189	0.0	0.0
 de	07_gas	1	189	0.0	0.0
 de	08_non-res	1	189	0.0	0.0
 de	09_hydro_pump	1	189	0.0	0.0
-de	01_solar	1	190	1.0	0.0
-de	02_wind_on	1	190	1.0	0.0
+de	01_solar	1	190	0.0	1.0
+de	02_wind_on	1	190	0.0	1.0
 de	03_wind_off	1	190	0.0	0.0
 de	04_res	1	190	0.0	0.0
 de	05_nuclear	1	190	0.0	0.0
@@ -1709,8 +1709,8 @@ de	06_coal	1	190	0.0	0.0
 de	07_gas	1	190	0.0	0.0
 de	08_non-res	1	190	0.0	0.0
 de	09_hydro_pump	1	190	0.0	0.0
-de	01_solar	1	191	1.0	0.0
-de	02_wind_on	1	191	1.0	0.0
+de	01_solar	1	191	0.0	1.0
+de	02_wind_on	1	191	0.0	1.0
 de	03_wind_off	1	191	0.0	0.0
 de	04_res	1	191	0.0	0.0
 de	05_nuclear	1	191	0.0	0.0
@@ -1718,8 +1718,8 @@ de	06_coal	1	191	0.0	0.0
 de	07_gas	1	191	0.0	0.0
 de	08_non-res	1	191	0.0	0.0
 de	09_hydro_pump	1	191	0.0	0.0
-de	01_solar	1	192	1.0	0.0
-de	02_wind_on	1	192	1.0	0.0
+de	01_solar	1	192	0.0	1.0
+de	02_wind_on	1	192	0.0	1.0
 de	03_wind_off	1	192	0.0	0.0
 de	04_res	1	192	0.0	0.0
 de	05_nuclear	1	192	0.0	0.0
@@ -1727,8 +1727,8 @@ de	06_coal	1	192	0.0	0.0
 de	07_gas	1	192	0.0	0.0
 de	08_non-res	1	192	0.0	0.0
 de	09_hydro_pump	1	192	0.0	0.0
-de	01_solar	1	193	1.0	0.0
-de	02_wind_on	1	193	1.0	0.0
+de	01_solar	1	193	0.0	1.0
+de	02_wind_on	1	193	0.0	1.0
 de	03_wind_off	1	193	0.0	0.0
 de	04_res	1	193	0.0	0.0
 de	05_nuclear	1	193	0.0	0.0
@@ -1736,8 +1736,8 @@ de	06_coal	1	193	0.0	0.0
 de	07_gas	1	193	0.0	0.0
 de	08_non-res	1	193	0.0	0.0
 de	09_hydro_pump	1	193	0.0	0.0
-de	01_solar	1	194	1.0	0.0
-de	02_wind_on	1	194	1.0	0.0
+de	01_solar	1	194	0.0	1.0
+de	02_wind_on	1	194	0.0	1.0
 de	03_wind_off	1	194	0.0	0.0
 de	04_res	1	194	0.0	0.0
 de	05_nuclear	1	194	0.0	0.0
@@ -1745,8 +1745,8 @@ de	06_coal	1	194	0.0	0.0
 de	07_gas	1	194	0.0	0.0
 de	08_non-res	1	194	0.0	0.0
 de	09_hydro_pump	1	194	0.0	0.0
-de	01_solar	1	195	1.0	0.0
-de	02_wind_on	1	195	1.0	0.0
+de	01_solar	1	195	0.0	1.0
+de	02_wind_on	1	195	0.0	1.0
 de	03_wind_off	1	195	0.0	0.0
 de	04_res	1	195	0.0	0.0
 de	05_nuclear	1	195	0.0	0.0
@@ -1754,8 +1754,8 @@ de	06_coal	1	195	0.0	0.0
 de	07_gas	1	195	0.0	0.0
 de	08_non-res	1	195	0.0	0.0
 de	09_hydro_pump	1	195	0.0	0.0
-de	01_solar	1	196	1.0	0.0
-de	02_wind_on	1	196	1.0	0.0
+de	01_solar	1	196	0.0	1.0
+de	02_wind_on	1	196	0.0	1.0
 de	03_wind_off	1	196	0.0	0.0
 de	04_res	1	196	0.0	0.0
 de	05_nuclear	1	196	0.0	0.0
@@ -1763,8 +1763,8 @@ de	06_coal	1	196	0.0	0.0
 de	07_gas	1	196	0.0	0.0
 de	08_non-res	1	196	0.0	0.0
 de	09_hydro_pump	1	196	0.0	0.0
-de	01_solar	1	197	1.0	0.0
-de	02_wind_on	1	197	1.0	0.0
+de	01_solar	1	197	0.0	1.0
+de	02_wind_on	1	197	0.0	1.0
 de	03_wind_off	1	197	0.0	0.0
 de	04_res	1	197	0.0	0.0
 de	05_nuclear	1	197	0.0	0.0
@@ -1772,8 +1772,8 @@ de	06_coal	1	197	0.0	0.0
 de	07_gas	1	197	0.0	0.0
 de	08_non-res	1	197	0.0	0.0
 de	09_hydro_pump	1	197	0.0	0.0
-de	01_solar	1	198	1.0	0.0
-de	02_wind_on	1	198	1.0	0.0
+de	01_solar	1	198	0.0	1.0
+de	02_wind_on	1	198	0.0	1.0
 de	03_wind_off	1	198	0.0	0.0
 de	04_res	1	198	0.0	0.0
 de	05_nuclear	1	198	0.0	0.0
@@ -1781,8 +1781,8 @@ de	06_coal	1	198	0.0	0.0
 de	07_gas	1	198	0.0	0.0
 de	08_non-res	1	198	0.0	0.0
 de	09_hydro_pump	1	198	0.0	0.0
-de	01_solar	1	199	1.0	0.0
-de	02_wind_on	1	199	1.0	0.0
+de	01_solar	1	199	0.0	1.0
+de	02_wind_on	1	199	0.0	1.0
 de	03_wind_off	1	199	0.0	0.0
 de	04_res	1	199	0.0	0.0
 de	05_nuclear	1	199	0.0	0.0
@@ -1790,8 +1790,8 @@ de	06_coal	1	199	0.0	0.0
 de	07_gas	1	199	0.0	0.0
 de	08_non-res	1	199	0.0	0.0
 de	09_hydro_pump	1	199	0.0	0.0
-de	01_solar	1	200	1.0	0.0
-de	02_wind_on	1	200	1.0	0.0
+de	01_solar	1	200	0.0	1.0
+de	02_wind_on	1	200	0.0	1.0
 de	03_wind_off	1	200	0.0	0.0
 de	04_res	1	200	0.0	0.0
 de	05_nuclear	1	200	0.0	0.0
@@ -1799,8 +1799,8 @@ de	06_coal	1	200	0.0	0.0
 de	07_gas	1	200	0.0	0.0
 de	08_non-res	1	200	0.0	0.0
 de	09_hydro_pump	1	200	0.0	0.0
-de	01_solar	1	201	1.0	0.0
-de	02_wind_on	1	201	1.0	0.0
+de	01_solar	1	201	0.0	1.0
+de	02_wind_on	1	201	0.0	1.0
 de	03_wind_off	1	201	0.0	0.0
 de	04_res	1	201	0.0	0.0
 de	05_nuclear	1	201	0.0	0.0
@@ -1808,8 +1808,8 @@ de	06_coal	1	201	0.0	0.0
 de	07_gas	1	201	0.0	0.0
 de	08_non-res	1	201	0.0	0.0
 de	09_hydro_pump	1	201	0.0	0.0
-de	01_solar	1	202	1.0	0.0
-de	02_wind_on	1	202	1.0	0.0
+de	01_solar	1	202	0.0	1.0
+de	02_wind_on	1	202	0.0	1.0
 de	03_wind_off	1	202	0.0	0.0
 de	04_res	1	202	0.0	0.0
 de	05_nuclear	1	202	0.0	0.0
@@ -1817,8 +1817,8 @@ de	06_coal	1	202	0.0	0.0
 de	07_gas	1	202	0.0	0.0
 de	08_non-res	1	202	0.0	0.0
 de	09_hydro_pump	1	202	0.0	0.0
-de	01_solar	1	203	1.0	0.0
-de	02_wind_on	1	203	1.0	0.0
+de	01_solar	1	203	0.0	1.0
+de	02_wind_on	1	203	0.0	1.0
 de	03_wind_off	1	203	0.0	0.0
 de	04_res	1	203	0.0	0.0
 de	05_nuclear	1	203	0.0	0.0
@@ -1826,8 +1826,8 @@ de	06_coal	1	203	0.0	0.0
 de	07_gas	1	203	0.0	0.0
 de	08_non-res	1	203	0.0	0.0
 de	09_hydro_pump	1	203	0.0	0.0
-de	01_solar	1	204	1.0	0.0
-de	02_wind_on	1	204	1.0	0.0
+de	01_solar	1	204	0.0	1.0
+de	02_wind_on	1	204	0.0	1.0
 de	03_wind_off	1	204	0.0	0.0
 de	04_res	1	204	0.0	0.0
 de	05_nuclear	1	204	0.0	0.0
@@ -1835,8 +1835,8 @@ de	06_coal	1	204	0.0	0.0
 de	07_gas	1	204	0.0	0.0
 de	08_non-res	1	204	0.0	0.0
 de	09_hydro_pump	1	204	0.0	0.0
-de	01_solar	1	205	1.0	0.0
-de	02_wind_on	1	205	1.0	0.0
+de	01_solar	1	205	0.0	1.0
+de	02_wind_on	1	205	0.0	1.0
 de	03_wind_off	1	205	0.0	0.0
 de	04_res	1	205	0.0	0.0
 de	05_nuclear	1	205	0.0	0.0
@@ -1844,8 +1844,8 @@ de	06_coal	1	205	0.0	0.0
 de	07_gas	1	205	0.0	0.0
 de	08_non-res	1	205	0.0	0.0
 de	09_hydro_pump	1	205	0.0	0.0
-de	01_solar	1	206	1.0	0.0
-de	02_wind_on	1	206	1.0	0.0
+de	01_solar	1	206	0.0	1.0
+de	02_wind_on	1	206	0.0	1.0
 de	03_wind_off	1	206	0.0	0.0
 de	04_res	1	206	0.0	0.0
 de	05_nuclear	1	206	0.0	0.0
@@ -1853,8 +1853,8 @@ de	06_coal	1	206	0.0	0.0
 de	07_gas	1	206	0.0	0.0
 de	08_non-res	1	206	0.0	0.0
 de	09_hydro_pump	1	206	0.0	0.0
-de	01_solar	1	207	1.0	0.0
-de	02_wind_on	1	207	1.0	0.0
+de	01_solar	1	207	0.0	1.0
+de	02_wind_on	1	207	0.0	1.0
 de	03_wind_off	1	207	0.0	0.0
 de	04_res	1	207	0.0	0.0
 de	05_nuclear	1	207	0.0	0.0
@@ -1862,8 +1862,8 @@ de	06_coal	1	207	0.0	0.0
 de	07_gas	1	207	0.0	0.0
 de	08_non-res	1	207	0.0	0.0
 de	09_hydro_pump	1	207	0.0	0.0
-de	01_solar	1	208	1.0	0.0
-de	02_wind_on	1	208	1.0	0.0
+de	01_solar	1	208	0.0	1.0
+de	02_wind_on	1	208	0.0	1.0
 de	03_wind_off	1	208	0.0	0.0
 de	04_res	1	208	0.0	0.0
 de	05_nuclear	1	208	0.0	0.0
@@ -1871,8 +1871,8 @@ de	06_coal	1	208	0.0	0.0
 de	07_gas	1	208	0.0	0.0
 de	08_non-res	1	208	0.0	0.0
 de	09_hydro_pump	1	208	0.0	0.0
-de	01_solar	1	209	1.0	0.0
-de	02_wind_on	1	209	1.0	0.0
+de	01_solar	1	209	0.0	1.0
+de	02_wind_on	1	209	0.0	1.0
 de	03_wind_off	1	209	0.0	0.0
 de	04_res	1	209	0.0	0.0
 de	05_nuclear	1	209	0.0	0.0
@@ -1880,1149 +1880,1149 @@ de	06_coal	1	209	0.0	0.0
 de	07_gas	1	209	0.0	0.0
 de	08_non-res	1	209	0.0	0.0
 de	09_hydro_pump	1	209	0.0	0.0
-de	01_solar	1	210	1.0	0.0
-de	02_wind_on	1	210	1.0	0.0
-de	03_wind_off	1	210	1.0	0.0
+de	01_solar	1	210	0.0	1.0
+de	02_wind_on	1	210	0.0	1.0
+de	03_wind_off	1	210	0.0	1.0
 de	04_res	1	210	0.0	0.0
 de	05_nuclear	1	210	0.0	0.0
 de	06_coal	1	210	0.0	0.0
 de	07_gas	1	210	0.0	0.0
 de	08_non-res	1	210	0.0	0.0
 de	09_hydro_pump	1	210	0.0	0.0
-de	01_solar	1	211	1.0	0.0
-de	02_wind_on	1	211	1.0	0.0
-de	03_wind_off	1	211	1.0	0.0
+de	01_solar	1	211	0.0	1.0
+de	02_wind_on	1	211	0.0	1.0
+de	03_wind_off	1	211	0.0	1.0
 de	04_res	1	211	0.0	0.0
 de	05_nuclear	1	211	0.0	0.0
 de	06_coal	1	211	0.0	0.0
 de	07_gas	1	211	0.0	0.0
 de	08_non-res	1	211	0.0	0.0
 de	09_hydro_pump	1	211	0.0	0.0
-de	01_solar	1	212	1.0	0.0
-de	02_wind_on	1	212	1.0	0.0
-de	03_wind_off	1	212	1.0	0.0
+de	01_solar	1	212	0.0	1.0
+de	02_wind_on	1	212	0.0	1.0
+de	03_wind_off	1	212	0.0	1.0
 de	04_res	1	212	0.0	0.0
 de	05_nuclear	1	212	0.0	0.0
 de	06_coal	1	212	0.0	0.0
 de	07_gas	1	212	0.0	0.0
 de	08_non-res	1	212	0.0	0.0
 de	09_hydro_pump	1	212	0.0	0.0
-de	01_solar	1	213	1.0	0.0
-de	02_wind_on	1	213	1.0	0.0
-de	03_wind_off	1	213	1.0	0.0
+de	01_solar	1	213	0.0	1.0
+de	02_wind_on	1	213	0.0	1.0
+de	03_wind_off	1	213	0.0	1.0
 de	04_res	1	213	0.0	0.0
 de	05_nuclear	1	213	0.0	0.0
 de	06_coal	1	213	0.0	0.0
 de	07_gas	1	213	0.0	0.0
 de	08_non-res	1	213	0.0	0.0
 de	09_hydro_pump	1	213	0.0	0.0
-de	01_solar	1	214	1.0	0.0
-de	02_wind_on	1	214	1.0	0.0
-de	03_wind_off	1	214	1.0	0.0
+de	01_solar	1	214	0.0	1.0
+de	02_wind_on	1	214	0.0	1.0
+de	03_wind_off	1	214	0.0	1.0
 de	04_res	1	214	0.0	0.0
 de	05_nuclear	1	214	0.0	0.0
 de	06_coal	1	214	0.0	0.0
 de	07_gas	1	214	0.0	0.0
 de	08_non-res	1	214	0.0	0.0
 de	09_hydro_pump	1	214	0.0	0.0
-de	01_solar	1	215	1.0	0.0
-de	02_wind_on	1	215	1.0	0.0
-de	03_wind_off	1	215	1.0	0.0
+de	01_solar	1	215	0.0	1.0
+de	02_wind_on	1	215	0.0	1.0
+de	03_wind_off	1	215	0.0	1.0
 de	04_res	1	215	0.0	0.0
 de	05_nuclear	1	215	0.0	0.0
 de	06_coal	1	215	0.0	0.0
 de	07_gas	1	215	0.0	0.0
 de	08_non-res	1	215	0.0	0.0
 de	09_hydro_pump	1	215	0.0	0.0
-de	01_solar	1	216	1.0	0.0
-de	02_wind_on	1	216	1.0	0.0
-de	03_wind_off	1	216	1.0	0.0
+de	01_solar	1	216	0.0	1.0
+de	02_wind_on	1	216	0.0	1.0
+de	03_wind_off	1	216	0.0	1.0
 de	04_res	1	216	0.0	0.0
 de	05_nuclear	1	216	0.0	0.0
 de	06_coal	1	216	0.0	0.0
 de	07_gas	1	216	0.0	0.0
 de	08_non-res	1	216	0.0	0.0
 de	09_hydro_pump	1	216	0.0	0.0
-de	01_solar	1	217	1.0	0.0
-de	02_wind_on	1	217	1.0	0.0
-de	03_wind_off	1	217	1.0	0.0
+de	01_solar	1	217	0.0	1.0
+de	02_wind_on	1	217	0.0	1.0
+de	03_wind_off	1	217	0.0	1.0
 de	04_res	1	217	0.0	0.0
 de	05_nuclear	1	217	0.0	0.0
 de	06_coal	1	217	0.0	0.0
 de	07_gas	1	217	0.0	0.0
 de	08_non-res	1	217	0.0	0.0
 de	09_hydro_pump	1	217	0.0	0.0
-de	01_solar	1	218	1.0	0.0
-de	02_wind_on	1	218	1.0	0.0
-de	03_wind_off	1	218	1.0	0.0
+de	01_solar	1	218	0.0	1.0
+de	02_wind_on	1	218	0.0	1.0
+de	03_wind_off	1	218	0.0	1.0
 de	04_res	1	218	0.0	0.0
 de	05_nuclear	1	218	0.0	0.0
 de	06_coal	1	218	0.0	0.0
 de	07_gas	1	218	0.0	0.0
 de	08_non-res	1	218	0.0	0.0
 de	09_hydro_pump	1	218	0.0	0.0
-de	01_solar	1	219	1.0	0.0
-de	02_wind_on	1	219	1.0	0.0
-de	03_wind_off	1	219	1.0	0.0
+de	01_solar	1	219	0.0	1.0
+de	02_wind_on	1	219	0.0	1.0
+de	03_wind_off	1	219	0.0	1.0
 de	04_res	1	219	0.0	0.0
 de	05_nuclear	1	219	0.0	0.0
 de	06_coal	1	219	0.0	0.0
 de	07_gas	1	219	0.0	0.0
 de	08_non-res	1	219	0.0	0.0
 de	09_hydro_pump	1	219	0.0	0.0
-de	01_solar	1	220	1.0	0.0
-de	02_wind_on	1	220	1.0	0.0
-de	03_wind_off	1	220	1.0	0.0
+de	01_solar	1	220	0.0	1.0
+de	02_wind_on	1	220	0.0	1.0
+de	03_wind_off	1	220	0.0	1.0
 de	04_res	1	220	0.0	0.0
 de	05_nuclear	1	220	0.0	0.0
 de	06_coal	1	220	0.0	0.0
 de	07_gas	1	220	0.0	0.0
 de	08_non-res	1	220	0.0	0.0
 de	09_hydro_pump	1	220	0.0	0.0
-de	01_solar	1	221	1.0	0.0
-de	02_wind_on	1	221	1.0	0.0
-de	03_wind_off	1	221	1.0	0.0
+de	01_solar	1	221	0.0	1.0
+de	02_wind_on	1	221	0.0	1.0
+de	03_wind_off	1	221	0.0	1.0
 de	04_res	1	221	0.0	0.0
 de	05_nuclear	1	221	0.0	0.0
 de	06_coal	1	221	0.0	0.0
 de	07_gas	1	221	0.0	0.0
 de	08_non-res	1	221	0.0	0.0
 de	09_hydro_pump	1	221	0.0	0.0
-de	01_solar	1	222	1.0	0.0
-de	02_wind_on	1	222	1.0	0.0
-de	03_wind_off	1	222	1.0	0.0
+de	01_solar	1	222	0.0	1.0
+de	02_wind_on	1	222	0.0	1.0
+de	03_wind_off	1	222	0.0	1.0
 de	04_res	1	222	0.0	0.0
 de	05_nuclear	1	222	0.0	0.0
 de	06_coal	1	222	0.0	0.0
 de	07_gas	1	222	0.0	0.0
 de	08_non-res	1	222	0.0	0.0
 de	09_hydro_pump	1	222	0.0	0.0
-de	01_solar	1	223	1.0	0.0
-de	02_wind_on	1	223	1.0	0.0
-de	03_wind_off	1	223	1.0	0.0
+de	01_solar	1	223	0.0	1.0
+de	02_wind_on	1	223	0.0	1.0
+de	03_wind_off	1	223	0.0	1.0
 de	04_res	1	223	0.0	0.0
 de	05_nuclear	1	223	0.0	0.0
 de	06_coal	1	223	0.0	0.0
 de	07_gas	1	223	0.0	0.0
 de	08_non-res	1	223	0.0	0.0
 de	09_hydro_pump	1	223	0.0	0.0
-de	01_solar	1	224	1.0	0.0
-de	02_wind_on	1	224	1.0	0.0
-de	03_wind_off	1	224	1.0	0.0
+de	01_solar	1	224	0.0	1.0
+de	02_wind_on	1	224	0.0	1.0
+de	03_wind_off	1	224	0.0	1.0
 de	04_res	1	224	0.0	0.0
 de	05_nuclear	1	224	0.0	0.0
 de	06_coal	1	224	0.0	0.0
 de	07_gas	1	224	0.0	0.0
 de	08_non-res	1	224	0.0	0.0
 de	09_hydro_pump	1	224	0.0	0.0
-de	01_solar	1	225	1.0	0.0
-de	02_wind_on	1	225	1.0	0.0
-de	03_wind_off	1	225	1.0	0.0
+de	01_solar	1	225	0.0	1.0
+de	02_wind_on	1	225	0.0	1.0
+de	03_wind_off	1	225	0.0	1.0
 de	04_res	1	225	0.0	0.0
 de	05_nuclear	1	225	0.0	0.0
 de	06_coal	1	225	0.0	0.0
 de	07_gas	1	225	0.0	0.0
 de	08_non-res	1	225	0.0	0.0
 de	09_hydro_pump	1	225	0.0	0.0
-de	01_solar	1	226	1.0	0.0
-de	02_wind_on	1	226	1.0	0.0
-de	03_wind_off	1	226	1.0	0.0
+de	01_solar	1	226	0.0	1.0
+de	02_wind_on	1	226	0.0	1.0
+de	03_wind_off	1	226	0.0	1.0
 de	04_res	1	226	0.0	0.0
 de	05_nuclear	1	226	0.0	0.0
 de	06_coal	1	226	0.0	0.0
 de	07_gas	1	226	0.0	0.0
 de	08_non-res	1	226	0.0	0.0
 de	09_hydro_pump	1	226	0.0	0.0
-de	01_solar	1	227	1.0	0.0
-de	02_wind_on	1	227	1.0	0.0
-de	03_wind_off	1	227	1.0	0.0
+de	01_solar	1	227	0.0	1.0
+de	02_wind_on	1	227	0.0	1.0
+de	03_wind_off	1	227	0.0	1.0
 de	04_res	1	227	0.0	0.0
 de	05_nuclear	1	227	0.0	0.0
 de	06_coal	1	227	0.0	0.0
 de	07_gas	1	227	0.0	0.0
 de	08_non-res	1	227	0.0	0.0
 de	09_hydro_pump	1	227	0.0	0.0
-de	01_solar	1	228	1.0	0.0
-de	02_wind_on	1	228	1.0	0.0
-de	03_wind_off	1	228	1.0	0.0
+de	01_solar	1	228	0.0	1.0
+de	02_wind_on	1	228	0.0	1.0
+de	03_wind_off	1	228	0.0	1.0
 de	04_res	1	228	0.0	0.0
 de	05_nuclear	1	228	0.0	0.0
 de	06_coal	1	228	0.0	0.0
 de	07_gas	1	228	0.0	0.0
 de	08_non-res	1	228	0.0	0.0
 de	09_hydro_pump	1	228	0.0	0.0
-de	01_solar	1	229	1.0	0.0
-de	02_wind_on	1	229	1.0	0.0
-de	03_wind_off	1	229	1.0	0.0
+de	01_solar	1	229	0.0	1.0
+de	02_wind_on	1	229	0.0	1.0
+de	03_wind_off	1	229	0.0	1.0
 de	04_res	1	229	0.0	0.0
 de	05_nuclear	1	229	0.0	0.0
 de	06_coal	1	229	0.0	0.0
 de	07_gas	1	229	0.0	0.0
 de	08_non-res	1	229	0.0	0.0
 de	09_hydro_pump	1	229	0.0	0.0
-de	01_solar	1	230	1.0	0.0
-de	02_wind_on	1	230	1.0	0.0
-de	03_wind_off	1	230	1.0	0.0
-de	04_res	1	230	1.0	0.0
+de	01_solar	1	230	0.0	1.0
+de	02_wind_on	1	230	0.0	1.0
+de	03_wind_off	1	230	0.0	1.0
+de	04_res	1	230	0.0	1.0
 de	05_nuclear	1	230	0.0	0.0
 de	06_coal	1	230	0.0	0.0
 de	07_gas	1	230	0.0	0.0
 de	08_non-res	1	230	0.0	0.0
 de	09_hydro_pump	1	230	0.0	0.0
-de	01_solar	1	231	1.0	0.0
-de	02_wind_on	1	231	1.0	0.0
-de	03_wind_off	1	231	1.0	0.0
-de	04_res	1	231	1.0	0.0
+de	01_solar	1	231	0.0	1.0
+de	02_wind_on	1	231	0.0	1.0
+de	03_wind_off	1	231	0.0	1.0
+de	04_res	1	231	0.0	1.0
 de	05_nuclear	1	231	0.0	0.0
 de	06_coal	1	231	0.0	0.0
 de	07_gas	1	231	0.0	0.0
 de	08_non-res	1	231	0.0	0.0
 de	09_hydro_pump	1	231	0.0	0.0
-de	01_solar	1	232	1.0	0.0
-de	02_wind_on	1	232	1.0	0.0
-de	03_wind_off	1	232	1.0	0.0
-de	04_res	1	232	1.0	0.0
+de	01_solar	1	232	0.0	1.0
+de	02_wind_on	1	232	0.0	1.0
+de	03_wind_off	1	232	0.0	1.0
+de	04_res	1	232	0.0	1.0
 de	05_nuclear	1	232	0.0	0.0
 de	06_coal	1	232	0.0	0.0
 de	07_gas	1	232	0.0	0.0
 de	08_non-res	1	232	0.0	0.0
 de	09_hydro_pump	1	232	0.0	0.0
-de	01_solar	1	233	1.0	0.0
-de	02_wind_on	1	233	1.0	0.0
-de	03_wind_off	1	233	1.0	0.0
-de	04_res	1	233	1.0	0.0
+de	01_solar	1	233	0.0	1.0
+de	02_wind_on	1	233	0.0	1.0
+de	03_wind_off	1	233	0.0	1.0
+de	04_res	1	233	0.0	1.0
 de	05_nuclear	1	233	0.0	0.0
 de	06_coal	1	233	0.0	0.0
 de	07_gas	1	233	0.0	0.0
 de	08_non-res	1	233	0.0	0.0
 de	09_hydro_pump	1	233	0.0	0.0
-de	01_solar	1	234	1.0	0.0
-de	02_wind_on	1	234	1.0	0.0
-de	03_wind_off	1	234	1.0	0.0
-de	04_res	1	234	1.0	0.0
+de	01_solar	1	234	0.0	1.0
+de	02_wind_on	1	234	0.0	1.0
+de	03_wind_off	1	234	0.0	1.0
+de	04_res	1	234	0.0	1.0
 de	05_nuclear	1	234	0.0	0.0
 de	06_coal	1	234	0.0	0.0
 de	07_gas	1	234	0.0	0.0
 de	08_non-res	1	234	0.0	0.0
 de	09_hydro_pump	1	234	0.0	0.0
-de	01_solar	1	235	1.0	0.0
-de	02_wind_on	1	235	1.0	0.0
-de	03_wind_off	1	235	1.0	0.0
-de	04_res	1	235	1.0	0.0
+de	01_solar	1	235	0.0	1.0
+de	02_wind_on	1	235	0.0	1.0
+de	03_wind_off	1	235	0.0	1.0
+de	04_res	1	235	0.0	1.0
 de	05_nuclear	1	235	0.0	0.0
 de	06_coal	1	235	0.0	0.0
 de	07_gas	1	235	0.0	0.0
 de	08_non-res	1	235	0.0	0.0
 de	09_hydro_pump	1	235	0.0	0.0
-de	01_solar	1	236	1.0	0.0
-de	02_wind_on	1	236	1.0	0.0
-de	03_wind_off	1	236	1.0	0.0
-de	04_res	1	236	1.0	0.0
+de	01_solar	1	236	0.0	1.0
+de	02_wind_on	1	236	0.0	1.0
+de	03_wind_off	1	236	0.0	1.0
+de	04_res	1	236	0.0	1.0
 de	05_nuclear	1	236	0.0	0.0
 de	06_coal	1	236	0.0	0.0
 de	07_gas	1	236	0.0	0.0
 de	08_non-res	1	236	0.0	0.0
 de	09_hydro_pump	1	236	0.0	0.0
-de	01_solar	1	237	1.0	0.0
-de	02_wind_on	1	237	1.0	0.0
-de	03_wind_off	1	237	1.0	0.0
-de	04_res	1	237	1.0	0.0
+de	01_solar	1	237	0.0	1.0
+de	02_wind_on	1	237	0.0	1.0
+de	03_wind_off	1	237	0.0	1.0
+de	04_res	1	237	0.0	1.0
 de	05_nuclear	1	237	0.0	0.0
 de	06_coal	1	237	0.0	0.0
 de	07_gas	1	237	0.0	0.0
 de	08_non-res	1	237	0.0	0.0
 de	09_hydro_pump	1	237	0.0	0.0
-de	01_solar	1	238	1.0	0.0
-de	02_wind_on	1	238	1.0	0.0
-de	03_wind_off	1	238	1.0	0.0
-de	04_res	1	238	1.0	0.0
+de	01_solar	1	238	0.0	1.0
+de	02_wind_on	1	238	0.0	1.0
+de	03_wind_off	1	238	0.0	1.0
+de	04_res	1	238	0.0	1.0
 de	05_nuclear	1	238	0.0	0.0
 de	06_coal	1	238	0.0	0.0
 de	07_gas	1	238	0.0	0.0
 de	08_non-res	1	238	0.0	0.0
 de	09_hydro_pump	1	238	0.0	0.0
-de	01_solar	1	239	1.0	0.0
-de	02_wind_on	1	239	1.0	0.0
-de	03_wind_off	1	239	1.0	0.0
-de	04_res	1	239	1.0	0.0
+de	01_solar	1	239	0.0	1.0
+de	02_wind_on	1	239	0.0	1.0
+de	03_wind_off	1	239	0.0	1.0
+de	04_res	1	239	0.0	1.0
 de	05_nuclear	1	239	0.0	0.0
 de	06_coal	1	239	0.0	0.0
 de	07_gas	1	239	0.0	0.0
 de	08_non-res	1	239	0.0	0.0
 de	09_hydro_pump	1	239	0.0	0.0
-de	01_solar	1	240	1.0	0.0
-de	02_wind_on	1	240	1.0	0.0
-de	03_wind_off	1	240	1.0	0.0
-de	04_res	1	240	1.0	0.0
+de	01_solar	1	240	0.0	1.0
+de	02_wind_on	1	240	0.0	1.0
+de	03_wind_off	1	240	0.0	1.0
+de	04_res	1	240	0.0	1.0
 de	05_nuclear	1	240	0.0	0.0
 de	06_coal	1	240	0.0	0.0
 de	07_gas	1	240	0.0	0.0
 de	08_non-res	1	240	0.0	0.0
 de	09_hydro_pump	1	240	0.0	0.0
-de	01_solar	1	241	1.0	0.0
-de	02_wind_on	1	241	1.0	0.0
-de	03_wind_off	1	241	1.0	0.0
-de	04_res	1	241	1.0	0.0
+de	01_solar	1	241	0.0	1.0
+de	02_wind_on	1	241	0.0	1.0
+de	03_wind_off	1	241	0.0	1.0
+de	04_res	1	241	0.0	1.0
 de	05_nuclear	1	241	0.0	0.0
 de	06_coal	1	241	0.0	0.0
 de	07_gas	1	241	0.0	0.0
 de	08_non-res	1	241	0.0	0.0
 de	09_hydro_pump	1	241	0.0	0.0
-de	01_solar	1	242	1.0	0.0
-de	02_wind_on	1	242	1.0	0.0
-de	03_wind_off	1	242	1.0	0.0
-de	04_res	1	242	1.0	0.0
+de	01_solar	1	242	0.0	1.0
+de	02_wind_on	1	242	0.0	1.0
+de	03_wind_off	1	242	0.0	1.0
+de	04_res	1	242	0.0	1.0
 de	05_nuclear	1	242	0.0	0.0
 de	06_coal	1	242	0.0	0.0
 de	07_gas	1	242	0.0	0.0
 de	08_non-res	1	242	0.0	0.0
 de	09_hydro_pump	1	242	0.0	0.0
-de	01_solar	1	243	1.0	0.0
-de	02_wind_on	1	243	1.0	0.0
-de	03_wind_off	1	243	1.0	0.0
-de	04_res	1	243	1.0	0.0
+de	01_solar	1	243	0.0	1.0
+de	02_wind_on	1	243	0.0	1.0
+de	03_wind_off	1	243	0.0	1.0
+de	04_res	1	243	0.0	1.0
 de	05_nuclear	1	243	0.0	0.0
 de	06_coal	1	243	0.0	0.0
 de	07_gas	1	243	0.0	0.0
 de	08_non-res	1	243	0.0	0.0
 de	09_hydro_pump	1	243	0.0	0.0
-de	01_solar	1	244	1.0	0.0
-de	02_wind_on	1	244	1.0	0.0
-de	03_wind_off	1	244	1.0	0.0
-de	04_res	1	244	1.0	0.0
+de	01_solar	1	244	0.0	1.0
+de	02_wind_on	1	244	0.0	1.0
+de	03_wind_off	1	244	0.0	1.0
+de	04_res	1	244	0.0	1.0
 de	05_nuclear	1	244	0.0	0.0
 de	06_coal	1	244	0.0	0.0
 de	07_gas	1	244	0.0	0.0
 de	08_non-res	1	244	0.0	0.0
 de	09_hydro_pump	1	244	0.0	0.0
-de	01_solar	1	245	1.0	0.0
-de	02_wind_on	1	245	1.0	0.0
-de	03_wind_off	1	245	1.0	0.0
-de	04_res	1	245	1.0	0.0
+de	01_solar	1	245	0.0	1.0
+de	02_wind_on	1	245	0.0	1.0
+de	03_wind_off	1	245	0.0	1.0
+de	04_res	1	245	0.0	1.0
 de	05_nuclear	1	245	0.0	0.0
 de	06_coal	1	245	0.0	0.0
 de	07_gas	1	245	0.0	0.0
 de	08_non-res	1	245	0.0	0.0
 de	09_hydro_pump	1	245	0.0	0.0
-de	01_solar	1	246	1.0	0.0
-de	02_wind_on	1	246	1.0	0.0
-de	03_wind_off	1	246	1.0	0.0
-de	04_res	1	246	1.0	0.0
+de	01_solar	1	246	0.0	1.0
+de	02_wind_on	1	246	0.0	1.0
+de	03_wind_off	1	246	0.0	1.0
+de	04_res	1	246	0.0	1.0
 de	05_nuclear	1	246	0.0	0.0
 de	06_coal	1	246	0.0	0.0
 de	07_gas	1	246	0.0	0.0
 de	08_non-res	1	246	0.0	0.0
 de	09_hydro_pump	1	246	0.0	0.0
-de	01_solar	1	247	1.0	0.0
-de	02_wind_on	1	247	1.0	0.0
-de	03_wind_off	1	247	1.0	0.0
-de	04_res	1	247	1.0	0.0
+de	01_solar	1	247	0.0	1.0
+de	02_wind_on	1	247	0.0	1.0
+de	03_wind_off	1	247	0.0	1.0
+de	04_res	1	247	0.0	1.0
 de	05_nuclear	1	247	0.0	0.0
 de	06_coal	1	247	0.0	0.0
 de	07_gas	1	247	0.0	0.0
 de	08_non-res	1	247	0.0	0.0
 de	09_hydro_pump	1	247	0.0	0.0
-de	01_solar	1	248	1.0	0.0
-de	02_wind_on	1	248	1.0	0.0
-de	03_wind_off	1	248	1.0	0.0
-de	04_res	1	248	1.0	0.0
+de	01_solar	1	248	0.0	1.0
+de	02_wind_on	1	248	0.0	1.0
+de	03_wind_off	1	248	0.0	1.0
+de	04_res	1	248	0.0	1.0
 de	05_nuclear	1	248	0.0	0.0
 de	06_coal	1	248	0.0	0.0
 de	07_gas	1	248	0.0	0.0
 de	08_non-res	1	248	0.0	0.0
 de	09_hydro_pump	1	248	0.0	0.0
-de	01_solar	1	249	1.0	0.0
-de	02_wind_on	1	249	1.0	0.0
-de	03_wind_off	1	249	1.0	0.0
-de	04_res	1	249	1.0	0.0
+de	01_solar	1	249	0.0	1.0
+de	02_wind_on	1	249	0.0	1.0
+de	03_wind_off	1	249	0.0	1.0
+de	04_res	1	249	0.0	1.0
 de	05_nuclear	1	249	0.0	0.0
 de	06_coal	1	249	0.0	0.0
 de	07_gas	1	249	0.0	0.0
 de	08_non-res	1	249	0.0	0.0
 de	09_hydro_pump	1	249	0.0	0.0
-de	01_solar	1	250	1.0	0.0
-de	02_wind_on	1	250	1.0	0.0
-de	03_wind_off	1	250	1.0	0.0
-de	04_res	1	250	1.0	0.0
-de	05_nuclear	1	250	1.0	0.0
+de	01_solar	1	250	0.0	1.0
+de	02_wind_on	1	250	0.0	1.0
+de	03_wind_off	1	250	0.0	1.0
+de	04_res	1	250	0.0	1.0
+de	05_nuclear	1	250	0.0	1.0
 de	06_coal	1	250	0.0	0.0
 de	07_gas	1	250	0.0	0.0
 de	08_non-res	1	250	0.0	0.0
 de	09_hydro_pump	1	250	0.0	0.0
-de	01_solar	1	251	1.0	0.0
-de	02_wind_on	1	251	1.0	0.0
-de	03_wind_off	1	251	1.0	0.0
-de	04_res	1	251	1.0	0.0
-de	05_nuclear	1	251	1.0	0.0
+de	01_solar	1	251	0.0	1.0
+de	02_wind_on	1	251	0.0	1.0
+de	03_wind_off	1	251	0.0	1.0
+de	04_res	1	251	0.0	1.0
+de	05_nuclear	1	251	0.0	1.0
 de	06_coal	1	251	0.0	0.0
 de	07_gas	1	251	0.0	0.0
 de	08_non-res	1	251	0.0	0.0
 de	09_hydro_pump	1	251	0.0	0.0
-de	01_solar	1	252	1.0	0.0
-de	02_wind_on	1	252	1.0	0.0
-de	03_wind_off	1	252	1.0	0.0
-de	04_res	1	252	1.0	0.0
-de	05_nuclear	1	252	1.0	0.0
+de	01_solar	1	252	0.0	1.0
+de	02_wind_on	1	252	0.0	1.0
+de	03_wind_off	1	252	0.0	1.0
+de	04_res	1	252	0.0	1.0
+de	05_nuclear	1	252	0.0	1.0
 de	06_coal	1	252	0.0	0.0
 de	07_gas	1	252	0.0	0.0
 de	08_non-res	1	252	0.0	0.0
 de	09_hydro_pump	1	252	0.0	0.0
-de	01_solar	1	253	1.0	0.0
-de	02_wind_on	1	253	1.0	0.0
-de	03_wind_off	1	253	1.0	0.0
-de	04_res	1	253	1.0	0.0
-de	05_nuclear	1	253	1.0	0.0
+de	01_solar	1	253	0.0	1.0
+de	02_wind_on	1	253	0.0	1.0
+de	03_wind_off	1	253	0.0	1.0
+de	04_res	1	253	0.0	1.0
+de	05_nuclear	1	253	0.0	1.0
 de	06_coal	1	253	0.0	0.0
 de	07_gas	1	253	0.0	0.0
 de	08_non-res	1	253	0.0	0.0
 de	09_hydro_pump	1	253	0.0	0.0
-de	01_solar	1	254	1.0	0.0
-de	02_wind_on	1	254	1.0	0.0
-de	03_wind_off	1	254	1.0	0.0
-de	04_res	1	254	1.0	0.0
-de	05_nuclear	1	254	1.0	0.0
+de	01_solar	1	254	0.0	1.0
+de	02_wind_on	1	254	0.0	1.0
+de	03_wind_off	1	254	0.0	1.0
+de	04_res	1	254	0.0	1.0
+de	05_nuclear	1	254	0.0	1.0
 de	06_coal	1	254	0.0	0.0
 de	07_gas	1	254	0.0	0.0
 de	08_non-res	1	254	0.0	0.0
 de	09_hydro_pump	1	254	0.0	0.0
-de	01_solar	1	255	1.0	0.0
-de	02_wind_on	1	255	1.0	0.0
-de	03_wind_off	1	255	1.0	0.0
-de	04_res	1	255	1.0	0.0
-de	05_nuclear	1	255	1.0	0.0
+de	01_solar	1	255	0.0	1.0
+de	02_wind_on	1	255	0.0	1.0
+de	03_wind_off	1	255	0.0	1.0
+de	04_res	1	255	0.0	1.0
+de	05_nuclear	1	255	0.0	1.0
 de	06_coal	1	255	0.0	0.0
 de	07_gas	1	255	0.0	0.0
 de	08_non-res	1	255	0.0	0.0
 de	09_hydro_pump	1	255	0.0	0.0
-de	01_solar	1	256	1.0	0.0
-de	02_wind_on	1	256	1.0	0.0
-de	03_wind_off	1	256	1.0	0.0
-de	04_res	1	256	1.0	0.0
-de	05_nuclear	1	256	1.0	0.0
+de	01_solar	1	256	0.0	1.0
+de	02_wind_on	1	256	0.0	1.0
+de	03_wind_off	1	256	0.0	1.0
+de	04_res	1	256	0.0	1.0
+de	05_nuclear	1	256	0.0	1.0
 de	06_coal	1	256	0.0	0.0
 de	07_gas	1	256	0.0	0.0
 de	08_non-res	1	256	0.0	0.0
 de	09_hydro_pump	1	256	0.0	0.0
-de	01_solar	1	257	1.0	0.0
-de	02_wind_on	1	257	1.0	0.0
-de	03_wind_off	1	257	1.0	0.0
-de	04_res	1	257	1.0	0.0
-de	05_nuclear	1	257	1.0	0.0
+de	01_solar	1	257	0.0	1.0
+de	02_wind_on	1	257	0.0	1.0
+de	03_wind_off	1	257	0.0	1.0
+de	04_res	1	257	0.0	1.0
+de	05_nuclear	1	257	0.0	1.0
 de	06_coal	1	257	0.0	0.0
 de	07_gas	1	257	0.0	0.0
 de	08_non-res	1	257	0.0	0.0
 de	09_hydro_pump	1	257	0.0	0.0
-de	01_solar	1	258	1.0	0.0
-de	02_wind_on	1	258	1.0	0.0
-de	03_wind_off	1	258	1.0	0.0
-de	04_res	1	258	1.0	0.0
-de	05_nuclear	1	258	1.0	0.0
+de	01_solar	1	258	0.0	1.0
+de	02_wind_on	1	258	0.0	1.0
+de	03_wind_off	1	258	0.0	1.0
+de	04_res	1	258	0.0	1.0
+de	05_nuclear	1	258	0.0	1.0
 de	06_coal	1	258	0.0	0.0
 de	07_gas	1	258	0.0	0.0
 de	08_non-res	1	258	0.0	0.0
 de	09_hydro_pump	1	258	0.0	0.0
-de	01_solar	1	259	1.0	0.0
-de	02_wind_on	1	259	1.0	0.0
-de	03_wind_off	1	259	1.0	0.0
-de	04_res	1	259	1.0	0.0
-de	05_nuclear	1	259	1.0	0.0
+de	01_solar	1	259	0.0	1.0
+de	02_wind_on	1	259	0.0	1.0
+de	03_wind_off	1	259	0.0	1.0
+de	04_res	1	259	0.0	1.0
+de	05_nuclear	1	259	0.0	1.0
 de	06_coal	1	259	0.0	0.0
 de	07_gas	1	259	0.0	0.0
 de	08_non-res	1	259	0.0	0.0
 de	09_hydro_pump	1	259	0.0	0.0
-de	01_solar	1	260	1.0	0.0
-de	02_wind_on	1	260	1.0	0.0
-de	03_wind_off	1	260	1.0	0.0
-de	04_res	1	260	1.0	0.0
-de	05_nuclear	1	260	1.0	0.0
+de	01_solar	1	260	0.0	1.0
+de	02_wind_on	1	260	0.0	1.0
+de	03_wind_off	1	260	0.0	1.0
+de	04_res	1	260	0.0	1.0
+de	05_nuclear	1	260	0.0	1.0
 de	06_coal	1	260	0.0	0.0
 de	07_gas	1	260	0.0	0.0
 de	08_non-res	1	260	0.0	0.0
 de	09_hydro_pump	1	260	0.0	0.0
-de	01_solar	1	261	1.0	0.0
-de	02_wind_on	1	261	1.0	0.0
-de	03_wind_off	1	261	1.0	0.0
-de	04_res	1	261	1.0	0.0
-de	05_nuclear	1	261	1.0	0.0
+de	01_solar	1	261	0.0	1.0
+de	02_wind_on	1	261	0.0	1.0
+de	03_wind_off	1	261	0.0	1.0
+de	04_res	1	261	0.0	1.0
+de	05_nuclear	1	261	0.0	1.0
 de	06_coal	1	261	0.0	0.0
 de	07_gas	1	261	0.0	0.0
 de	08_non-res	1	261	0.0	0.0
 de	09_hydro_pump	1	261	0.0	0.0
-de	01_solar	1	262	1.0	0.0
-de	02_wind_on	1	262	1.0	0.0
-de	03_wind_off	1	262	1.0	0.0
-de	04_res	1	262	1.0	0.0
-de	05_nuclear	1	262	1.0	0.0
+de	01_solar	1	262	0.0	1.0
+de	02_wind_on	1	262	0.0	1.0
+de	03_wind_off	1	262	0.0	1.0
+de	04_res	1	262	0.0	1.0
+de	05_nuclear	1	262	0.0	1.0
 de	06_coal	1	262	0.0	0.0
 de	07_gas	1	262	0.0	0.0
 de	08_non-res	1	262	0.0	0.0
 de	09_hydro_pump	1	262	0.0	0.0
-de	01_solar	1	263	1.0	0.0
-de	02_wind_on	1	263	1.0	0.0
-de	03_wind_off	1	263	1.0	0.0
-de	04_res	1	263	1.0	0.0
-de	05_nuclear	1	263	1.0	0.0
+de	01_solar	1	263	0.0	1.0
+de	02_wind_on	1	263	0.0	1.0
+de	03_wind_off	1	263	0.0	1.0
+de	04_res	1	263	0.0	1.0
+de	05_nuclear	1	263	0.0	1.0
 de	06_coal	1	263	0.0	0.0
 de	07_gas	1	263	0.0	0.0
 de	08_non-res	1	263	0.0	0.0
 de	09_hydro_pump	1	263	0.0	0.0
-de	01_solar	1	264	1.0	0.0
-de	02_wind_on	1	264	1.0	0.0
-de	03_wind_off	1	264	1.0	0.0
-de	04_res	1	264	1.0	0.0
-de	05_nuclear	1	264	1.0	0.0
+de	01_solar	1	264	0.0	1.0
+de	02_wind_on	1	264	0.0	1.0
+de	03_wind_off	1	264	0.0	1.0
+de	04_res	1	264	0.0	1.0
+de	05_nuclear	1	264	0.0	1.0
 de	06_coal	1	264	0.0	0.0
 de	07_gas	1	264	0.0	0.0
 de	08_non-res	1	264	0.0	0.0
 de	09_hydro_pump	1	264	0.0	0.0
-de	01_solar	1	265	1.0	0.0
-de	02_wind_on	1	265	1.0	0.0
-de	03_wind_off	1	265	1.0	0.0
-de	04_res	1	265	1.0	0.0
-de	05_nuclear	1	265	1.0	0.0
+de	01_solar	1	265	0.0	1.0
+de	02_wind_on	1	265	0.0	1.0
+de	03_wind_off	1	265	0.0	1.0
+de	04_res	1	265	0.0	1.0
+de	05_nuclear	1	265	0.0	1.0
 de	06_coal	1	265	0.0	0.0
 de	07_gas	1	265	0.0	0.0
 de	08_non-res	1	265	0.0	0.0
 de	09_hydro_pump	1	265	0.0	0.0
-de	01_solar	1	266	1.0	0.0
-de	02_wind_on	1	266	1.0	0.0
-de	03_wind_off	1	266	1.0	0.0
-de	04_res	1	266	1.0	0.0
-de	05_nuclear	1	266	1.0	0.0
+de	01_solar	1	266	0.0	1.0
+de	02_wind_on	1	266	0.0	1.0
+de	03_wind_off	1	266	0.0	1.0
+de	04_res	1	266	0.0	1.0
+de	05_nuclear	1	266	0.0	1.0
 de	06_coal	1	266	0.0	0.0
 de	07_gas	1	266	0.0	0.0
 de	08_non-res	1	266	0.0	0.0
 de	09_hydro_pump	1	266	0.0	0.0
-de	01_solar	1	267	1.0	0.0
-de	02_wind_on	1	267	1.0	0.0
-de	03_wind_off	1	267	1.0	0.0
-de	04_res	1	267	1.0	0.0
-de	05_nuclear	1	267	1.0	0.0
+de	01_solar	1	267	0.0	1.0
+de	02_wind_on	1	267	0.0	1.0
+de	03_wind_off	1	267	0.0	1.0
+de	04_res	1	267	0.0	1.0
+de	05_nuclear	1	267	0.0	1.0
 de	06_coal	1	267	0.0	0.0
 de	07_gas	1	267	0.0	0.0
 de	08_non-res	1	267	0.0	0.0
 de	09_hydro_pump	1	267	0.0	0.0
-de	01_solar	1	268	1.0	0.0
-de	02_wind_on	1	268	1.0	0.0
-de	03_wind_off	1	268	1.0	0.0
-de	04_res	1	268	1.0	0.0
-de	05_nuclear	1	268	1.0	0.0
+de	01_solar	1	268	0.0	1.0
+de	02_wind_on	1	268	0.0	1.0
+de	03_wind_off	1	268	0.0	1.0
+de	04_res	1	268	0.0	1.0
+de	05_nuclear	1	268	0.0	1.0
 de	06_coal	1	268	0.0	0.0
 de	07_gas	1	268	0.0	0.0
 de	08_non-res	1	268	0.0	0.0
 de	09_hydro_pump	1	268	0.0	0.0
-de	01_solar	1	269	1.0	0.0
-de	02_wind_on	1	269	1.0	0.0
-de	03_wind_off	1	269	1.0	0.0
-de	04_res	1	269	1.0	0.0
-de	05_nuclear	1	269	1.0	0.0
+de	01_solar	1	269	0.0	1.0
+de	02_wind_on	1	269	0.0	1.0
+de	03_wind_off	1	269	0.0	1.0
+de	04_res	1	269	0.0	1.0
+de	05_nuclear	1	269	0.0	1.0
 de	06_coal	1	269	0.0	0.0
 de	07_gas	1	269	0.0	0.0
 de	08_non-res	1	269	0.0	0.0
 de	09_hydro_pump	1	269	0.0	0.0
-de	01_solar	1	270	1.0	0.0
-de	02_wind_on	1	270	1.0	0.0
-de	03_wind_off	1	270	1.0	0.0
-de	04_res	1	270	1.0	0.0
-de	05_nuclear	1	270	1.0	0.0
-de	06_coal	1	270	1.0	0.0
+de	01_solar	1	270	0.0	1.0
+de	02_wind_on	1	270	0.0	1.0
+de	03_wind_off	1	270	0.0	1.0
+de	04_res	1	270	0.0	1.0
+de	05_nuclear	1	270	0.0	1.0
+de	06_coal	1	270	0.0	1.0
 de	07_gas	1	270	0.0	0.0
 de	08_non-res	1	270	0.0	0.0
 de	09_hydro_pump	1	270	0.0	0.0
-de	01_solar	1	271	1.0	0.0
-de	02_wind_on	1	271	1.0	0.0
-de	03_wind_off	1	271	1.0	0.0
-de	04_res	1	271	1.0	0.0
-de	05_nuclear	1	271	1.0	0.0
-de	06_coal	1	271	1.0	0.0
+de	01_solar	1	271	0.0	1.0
+de	02_wind_on	1	271	0.0	1.0
+de	03_wind_off	1	271	0.0	1.0
+de	04_res	1	271	0.0	1.0
+de	05_nuclear	1	271	0.0	1.0
+de	06_coal	1	271	0.0	1.0
 de	07_gas	1	271	0.0	0.0
 de	08_non-res	1	271	0.0	0.0
 de	09_hydro_pump	1	271	0.0	0.0
-de	01_solar	1	272	1.0	0.0
-de	02_wind_on	1	272	1.0	0.0
-de	03_wind_off	1	272	1.0	0.0
-de	04_res	1	272	1.0	0.0
-de	05_nuclear	1	272	1.0	0.0
-de	06_coal	1	272	1.0	0.0
+de	01_solar	1	272	0.0	1.0
+de	02_wind_on	1	272	0.0	1.0
+de	03_wind_off	1	272	0.0	1.0
+de	04_res	1	272	0.0	1.0
+de	05_nuclear	1	272	0.0	1.0
+de	06_coal	1	272	0.0	1.0
 de	07_gas	1	272	0.0	0.0
 de	08_non-res	1	272	0.0	0.0
 de	09_hydro_pump	1	272	0.0	0.0
-de	01_solar	1	273	1.0	0.0
-de	02_wind_on	1	273	1.0	0.0
-de	03_wind_off	1	273	1.0	0.0
-de	04_res	1	273	1.0	0.0
-de	05_nuclear	1	273	1.0	0.0
-de	06_coal	1	273	1.0	0.0
+de	01_solar	1	273	0.0	1.0
+de	02_wind_on	1	273	0.0	1.0
+de	03_wind_off	1	273	0.0	1.0
+de	04_res	1	273	0.0	1.0
+de	05_nuclear	1	273	0.0	1.0
+de	06_coal	1	273	0.0	1.0
 de	07_gas	1	273	0.0	0.0
 de	08_non-res	1	273	0.0	0.0
 de	09_hydro_pump	1	273	0.0	0.0
-de	01_solar	1	274	1.0	0.0
-de	02_wind_on	1	274	1.0	0.0
-de	03_wind_off	1	274	1.0	0.0
-de	04_res	1	274	1.0	0.0
-de	05_nuclear	1	274	1.0	0.0
-de	06_coal	1	274	1.0	0.0
+de	01_solar	1	274	0.0	1.0
+de	02_wind_on	1	274	0.0	1.0
+de	03_wind_off	1	274	0.0	1.0
+de	04_res	1	274	0.0	1.0
+de	05_nuclear	1	274	0.0	1.0
+de	06_coal	1	274	0.0	1.0
 de	07_gas	1	274	0.0	0.0
 de	08_non-res	1	274	0.0	0.0
 de	09_hydro_pump	1	274	0.0	0.0
-de	01_solar	1	275	1.0	0.0
-de	02_wind_on	1	275	1.0	0.0
-de	03_wind_off	1	275	1.0	0.0
-de	04_res	1	275	1.0	0.0
-de	05_nuclear	1	275	1.0	0.0
-de	06_coal	1	275	1.0	0.0
+de	01_solar	1	275	0.0	1.0
+de	02_wind_on	1	275	0.0	1.0
+de	03_wind_off	1	275	0.0	1.0
+de	04_res	1	275	0.0	1.0
+de	05_nuclear	1	275	0.0	1.0
+de	06_coal	1	275	0.0	1.0
 de	07_gas	1	275	0.0	0.0
 de	08_non-res	1	275	0.0	0.0
 de	09_hydro_pump	1	275	0.0	0.0
-de	01_solar	1	276	1.0	0.0
-de	02_wind_on	1	276	1.0	0.0
-de	03_wind_off	1	276	1.0	0.0
-de	04_res	1	276	1.0	0.0
-de	05_nuclear	1	276	1.0	0.0
-de	06_coal	1	276	1.0	0.0
+de	01_solar	1	276	0.0	1.0
+de	02_wind_on	1	276	0.0	1.0
+de	03_wind_off	1	276	0.0	1.0
+de	04_res	1	276	0.0	1.0
+de	05_nuclear	1	276	0.0	1.0
+de	06_coal	1	276	0.0	1.0
 de	07_gas	1	276	0.0	0.0
 de	08_non-res	1	276	0.0	0.0
 de	09_hydro_pump	1	276	0.0	0.0
-de	01_solar	1	277	1.0	0.0
-de	02_wind_on	1	277	1.0	0.0
-de	03_wind_off	1	277	1.0	0.0
-de	04_res	1	277	1.0	0.0
-de	05_nuclear	1	277	1.0	0.0
-de	06_coal	1	277	1.0	0.0
+de	01_solar	1	277	0.0	1.0
+de	02_wind_on	1	277	0.0	1.0
+de	03_wind_off	1	277	0.0	1.0
+de	04_res	1	277	0.0	1.0
+de	05_nuclear	1	277	0.0	1.0
+de	06_coal	1	277	0.0	1.0
 de	07_gas	1	277	0.0	0.0
 de	08_non-res	1	277	0.0	0.0
 de	09_hydro_pump	1	277	0.0	0.0
-de	01_solar	1	278	1.0	0.0
-de	02_wind_on	1	278	1.0	0.0
-de	03_wind_off	1	278	1.0	0.0
-de	04_res	1	278	1.0	0.0
-de	05_nuclear	1	278	1.0	0.0
-de	06_coal	1	278	1.0	0.0
+de	01_solar	1	278	0.0	1.0
+de	02_wind_on	1	278	0.0	1.0
+de	03_wind_off	1	278	0.0	1.0
+de	04_res	1	278	0.0	1.0
+de	05_nuclear	1	278	0.0	1.0
+de	06_coal	1	278	0.0	1.0
 de	07_gas	1	278	0.0	0.0
 de	08_non-res	1	278	0.0	0.0
 de	09_hydro_pump	1	278	0.0	0.0
-de	01_solar	1	279	1.0	0.0
-de	02_wind_on	1	279	1.0	0.0
-de	03_wind_off	1	279	1.0	0.0
-de	04_res	1	279	1.0	0.0
-de	05_nuclear	1	279	1.0	0.0
-de	06_coal	1	279	1.0	0.0
+de	01_solar	1	279	0.0	1.0
+de	02_wind_on	1	279	0.0	1.0
+de	03_wind_off	1	279	0.0	1.0
+de	04_res	1	279	0.0	1.0
+de	05_nuclear	1	279	0.0	1.0
+de	06_coal	1	279	0.0	1.0
 de	07_gas	1	279	0.0	0.0
 de	08_non-res	1	279	0.0	0.0
 de	09_hydro_pump	1	279	0.0	0.0
-de	01_solar	1	280	1.0	0.0
-de	02_wind_on	1	280	1.0	0.0
-de	03_wind_off	1	280	1.0	0.0
-de	04_res	1	280	1.0	0.0
-de	05_nuclear	1	280	1.0	0.0
-de	06_coal	1	280	1.0	0.0
+de	01_solar	1	280	0.0	1.0
+de	02_wind_on	1	280	0.0	1.0
+de	03_wind_off	1	280	0.0	1.0
+de	04_res	1	280	0.0	1.0
+de	05_nuclear	1	280	0.0	1.0
+de	06_coal	1	280	0.0	1.0
 de	07_gas	1	280	0.0	0.0
 de	08_non-res	1	280	0.0	0.0
 de	09_hydro_pump	1	280	0.0	0.0
-de	01_solar	1	281	1.0	0.0
-de	02_wind_on	1	281	1.0	0.0
-de	03_wind_off	1	281	1.0	0.0
-de	04_res	1	281	1.0	0.0
-de	05_nuclear	1	281	1.0	0.0
-de	06_coal	1	281	1.0	0.0
+de	01_solar	1	281	0.0	1.0
+de	02_wind_on	1	281	0.0	1.0
+de	03_wind_off	1	281	0.0	1.0
+de	04_res	1	281	0.0	1.0
+de	05_nuclear	1	281	0.0	1.0
+de	06_coal	1	281	0.0	1.0
 de	07_gas	1	281	0.0	0.0
 de	08_non-res	1	281	0.0	0.0
 de	09_hydro_pump	1	281	0.0	0.0
-de	01_solar	1	282	1.0	0.0
-de	02_wind_on	1	282	1.0	0.0
-de	03_wind_off	1	282	1.0	0.0
-de	04_res	1	282	1.0	0.0
-de	05_nuclear	1	282	1.0	0.0
-de	06_coal	1	282	1.0	0.0
+de	01_solar	1	282	0.0	1.0
+de	02_wind_on	1	282	0.0	1.0
+de	03_wind_off	1	282	0.0	1.0
+de	04_res	1	282	0.0	1.0
+de	05_nuclear	1	282	0.0	1.0
+de	06_coal	1	282	0.0	1.0
 de	07_gas	1	282	0.0	0.0
 de	08_non-res	1	282	0.0	0.0
 de	09_hydro_pump	1	282	0.0	0.0
-de	01_solar	1	283	1.0	0.0
-de	02_wind_on	1	283	1.0	0.0
-de	03_wind_off	1	283	1.0	0.0
-de	04_res	1	283	1.0	0.0
-de	05_nuclear	1	283	1.0	0.0
-de	06_coal	1	283	1.0	0.0
+de	01_solar	1	283	0.0	1.0
+de	02_wind_on	1	283	0.0	1.0
+de	03_wind_off	1	283	0.0	1.0
+de	04_res	1	283	0.0	1.0
+de	05_nuclear	1	283	0.0	1.0
+de	06_coal	1	283	0.0	1.0
 de	07_gas	1	283	0.0	0.0
 de	08_non-res	1	283	0.0	0.0
 de	09_hydro_pump	1	283	0.0	0.0
-de	01_solar	1	284	1.0	0.0
-de	02_wind_on	1	284	1.0	0.0
-de	03_wind_off	1	284	1.0	0.0
-de	04_res	1	284	1.0	0.0
-de	05_nuclear	1	284	1.0	0.0
-de	06_coal	1	284	1.0	0.0
+de	01_solar	1	284	0.0	1.0
+de	02_wind_on	1	284	0.0	1.0
+de	03_wind_off	1	284	0.0	1.0
+de	04_res	1	284	0.0	1.0
+de	05_nuclear	1	284	0.0	1.0
+de	06_coal	1	284	0.0	1.0
 de	07_gas	1	284	0.0	0.0
 de	08_non-res	1	284	0.0	0.0
 de	09_hydro_pump	1	284	0.0	0.0
-de	01_solar	1	285	1.0	0.0
-de	02_wind_on	1	285	1.0	0.0
-de	03_wind_off	1	285	1.0	0.0
-de	04_res	1	285	1.0	0.0
-de	05_nuclear	1	285	1.0	0.0
-de	06_coal	1	285	1.0	0.0
+de	01_solar	1	285	0.0	1.0
+de	02_wind_on	1	285	0.0	1.0
+de	03_wind_off	1	285	0.0	1.0
+de	04_res	1	285	0.0	1.0
+de	05_nuclear	1	285	0.0	1.0
+de	06_coal	1	285	0.0	1.0
 de	07_gas	1	285	0.0	0.0
 de	08_non-res	1	285	0.0	0.0
 de	09_hydro_pump	1	285	0.0	0.0
-de	01_solar	1	286	1.0	0.0
-de	02_wind_on	1	286	1.0	0.0
-de	03_wind_off	1	286	1.0	0.0
-de	04_res	1	286	1.0	0.0
-de	05_nuclear	1	286	1.0	0.0
-de	06_coal	1	286	1.0	0.0
+de	01_solar	1	286	0.0	1.0
+de	02_wind_on	1	286	0.0	1.0
+de	03_wind_off	1	286	0.0	1.0
+de	04_res	1	286	0.0	1.0
+de	05_nuclear	1	286	0.0	1.0
+de	06_coal	1	286	0.0	1.0
 de	07_gas	1	286	0.0	0.0
 de	08_non-res	1	286	0.0	0.0
 de	09_hydro_pump	1	286	0.0	0.0
-de	01_solar	1	287	1.0	0.0
-de	02_wind_on	1	287	1.0	0.0
-de	03_wind_off	1	287	1.0	0.0
-de	04_res	1	287	1.0	0.0
-de	05_nuclear	1	287	1.0	0.0
-de	06_coal	1	287	1.0	0.0
+de	01_solar	1	287	0.0	1.0
+de	02_wind_on	1	287	0.0	1.0
+de	03_wind_off	1	287	0.0	1.0
+de	04_res	1	287	0.0	1.0
+de	05_nuclear	1	287	0.0	1.0
+de	06_coal	1	287	0.0	1.0
 de	07_gas	1	287	0.0	0.0
 de	08_non-res	1	287	0.0	0.0
 de	09_hydro_pump	1	287	0.0	0.0
-de	01_solar	1	288	1.0	0.0
-de	02_wind_on	1	288	1.0	0.0
-de	03_wind_off	1	288	1.0	0.0
-de	04_res	1	288	1.0	0.0
-de	05_nuclear	1	288	1.0	0.0
-de	06_coal	1	288	1.0	0.0
+de	01_solar	1	288	0.0	1.0
+de	02_wind_on	1	288	0.0	1.0
+de	03_wind_off	1	288	0.0	1.0
+de	04_res	1	288	0.0	1.0
+de	05_nuclear	1	288	0.0	1.0
+de	06_coal	1	288	0.0	1.0
 de	07_gas	1	288	0.0	0.0
 de	08_non-res	1	288	0.0	0.0
 de	09_hydro_pump	1	288	0.0	0.0
-de	01_solar	1	289	1.0	0.0
-de	02_wind_on	1	289	1.0	0.0
-de	03_wind_off	1	289	1.0	0.0
-de	04_res	1	289	1.0	0.0
-de	05_nuclear	1	289	1.0	0.0
-de	06_coal	1	289	1.0	0.0
+de	01_solar	1	289	0.0	1.0
+de	02_wind_on	1	289	0.0	1.0
+de	03_wind_off	1	289	0.0	1.0
+de	04_res	1	289	0.0	1.0
+de	05_nuclear	1	289	0.0	1.0
+de	06_coal	1	289	0.0	1.0
 de	07_gas	1	289	0.0	0.0
 de	08_non-res	1	289	0.0	0.0
 de	09_hydro_pump	1	289	0.0	0.0
-de	01_solar	1	290	1.0	0.0
-de	02_wind_on	1	290	1.0	0.0
-de	03_wind_off	1	290	1.0	0.0
-de	04_res	1	290	1.0	0.0
-de	05_nuclear	1	290	1.0	0.0
-de	06_coal	1	290	1.0	0.0
-de	07_gas	1	290	1.0	0.0
+de	01_solar	1	290	0.0	1.0
+de	02_wind_on	1	290	0.0	1.0
+de	03_wind_off	1	290	0.0	1.0
+de	04_res	1	290	0.0	1.0
+de	05_nuclear	1	290	0.0	1.0
+de	06_coal	1	290	0.0	1.0
+de	07_gas	1	290	0.0	1.0
 de	08_non-res	1	290	0.0	0.0
 de	09_hydro_pump	1	290	0.0	0.0
-de	01_solar	1	291	1.0	0.0
-de	02_wind_on	1	291	1.0	0.0
-de	03_wind_off	1	291	1.0	0.0
-de	04_res	1	291	1.0	0.0
-de	05_nuclear	1	291	1.0	0.0
-de	06_coal	1	291	1.0	0.0
-de	07_gas	1	291	1.0	0.0
+de	01_solar	1	291	0.0	1.0
+de	02_wind_on	1	291	0.0	1.0
+de	03_wind_off	1	291	0.0	1.0
+de	04_res	1	291	0.0	1.0
+de	05_nuclear	1	291	0.0	1.0
+de	06_coal	1	291	0.0	1.0
+de	07_gas	1	291	0.0	1.0
 de	08_non-res	1	291	0.0	0.0
 de	09_hydro_pump	1	291	0.0	0.0
-de	01_solar	1	292	1.0	0.0
-de	02_wind_on	1	292	1.0	0.0
-de	03_wind_off	1	292	1.0	0.0
-de	04_res	1	292	1.0	0.0
-de	05_nuclear	1	292	1.0	0.0
-de	06_coal	1	292	1.0	0.0
-de	07_gas	1	292	1.0	0.0
+de	01_solar	1	292	0.0	1.0
+de	02_wind_on	1	292	0.0	1.0
+de	03_wind_off	1	292	0.0	1.0
+de	04_res	1	292	0.0	1.0
+de	05_nuclear	1	292	0.0	1.0
+de	06_coal	1	292	0.0	1.0
+de	07_gas	1	292	0.0	1.0
 de	08_non-res	1	292	0.0	0.0
 de	09_hydro_pump	1	292	0.0	0.0
-de	01_solar	1	293	1.0	0.0
-de	02_wind_on	1	293	1.0	0.0
-de	03_wind_off	1	293	1.0	0.0
-de	04_res	1	293	1.0	0.0
-de	05_nuclear	1	293	1.0	0.0
-de	06_coal	1	293	1.0	0.0
-de	07_gas	1	293	1.0	0.0
+de	01_solar	1	293	0.0	1.0
+de	02_wind_on	1	293	0.0	1.0
+de	03_wind_off	1	293	0.0	1.0
+de	04_res	1	293	0.0	1.0
+de	05_nuclear	1	293	0.0	1.0
+de	06_coal	1	293	0.0	1.0
+de	07_gas	1	293	0.0	1.0
 de	08_non-res	1	293	0.0	0.0
 de	09_hydro_pump	1	293	0.0	0.0
-de	01_solar	1	294	1.0	0.0
-de	02_wind_on	1	294	1.0	0.0
-de	03_wind_off	1	294	1.0	0.0
-de	04_res	1	294	1.0	0.0
-de	05_nuclear	1	294	1.0	0.0
-de	06_coal	1	294	1.0	0.0
-de	07_gas	1	294	1.0	0.0
+de	01_solar	1	294	0.0	1.0
+de	02_wind_on	1	294	0.0	1.0
+de	03_wind_off	1	294	0.0	1.0
+de	04_res	1	294	0.0	1.0
+de	05_nuclear	1	294	0.0	1.0
+de	06_coal	1	294	0.0	1.0
+de	07_gas	1	294	0.0	1.0
 de	08_non-res	1	294	0.0	0.0
 de	09_hydro_pump	1	294	0.0	0.0
-de	01_solar	1	295	1.0	0.0
-de	02_wind_on	1	295	1.0	0.0
-de	03_wind_off	1	295	1.0	0.0
-de	04_res	1	295	1.0	0.0
-de	05_nuclear	1	295	1.0	0.0
-de	06_coal	1	295	1.0	0.0
-de	07_gas	1	295	1.0	0.0
+de	01_solar	1	295	0.0	1.0
+de	02_wind_on	1	295	0.0	1.0
+de	03_wind_off	1	295	0.0	1.0
+de	04_res	1	295	0.0	1.0
+de	05_nuclear	1	295	0.0	1.0
+de	06_coal	1	295	0.0	1.0
+de	07_gas	1	295	0.0	1.0
 de	08_non-res	1	295	0.0	0.0
 de	09_hydro_pump	1	295	0.0	0.0
-de	01_solar	1	296	1.0	0.0
-de	02_wind_on	1	296	1.0	0.0
-de	03_wind_off	1	296	1.0	0.0
-de	04_res	1	296	1.0	0.0
-de	05_nuclear	1	296	1.0	0.0
-de	06_coal	1	296	1.0	0.0
-de	07_gas	1	296	1.0	0.0
+de	01_solar	1	296	0.0	1.0
+de	02_wind_on	1	296	0.0	1.0
+de	03_wind_off	1	296	0.0	1.0
+de	04_res	1	296	0.0	1.0
+de	05_nuclear	1	296	0.0	1.0
+de	06_coal	1	296	0.0	1.0
+de	07_gas	1	296	0.0	1.0
 de	08_non-res	1	296	0.0	0.0
 de	09_hydro_pump	1	296	0.0	0.0
-de	01_solar	1	297	1.0	0.0
-de	02_wind_on	1	297	1.0	0.0
-de	03_wind_off	1	297	1.0	0.0
-de	04_res	1	297	1.0	0.0
-de	05_nuclear	1	297	1.0	0.0
-de	06_coal	1	297	1.0	0.0
-de	07_gas	1	297	1.0	0.0
+de	01_solar	1	297	0.0	1.0
+de	02_wind_on	1	297	0.0	1.0
+de	03_wind_off	1	297	0.0	1.0
+de	04_res	1	297	0.0	1.0
+de	05_nuclear	1	297	0.0	1.0
+de	06_coal	1	297	0.0	1.0
+de	07_gas	1	297	0.0	1.0
 de	08_non-res	1	297	0.0	0.0
 de	09_hydro_pump	1	297	0.0	0.0
-de	01_solar	1	298	1.0	0.0
-de	02_wind_on	1	298	1.0	0.0
-de	03_wind_off	1	298	1.0	0.0
-de	04_res	1	298	1.0	0.0
-de	05_nuclear	1	298	1.0	0.0
-de	06_coal	1	298	1.0	0.0
-de	07_gas	1	298	1.0	0.0
+de	01_solar	1	298	0.0	1.0
+de	02_wind_on	1	298	0.0	1.0
+de	03_wind_off	1	298	0.0	1.0
+de	04_res	1	298	0.0	1.0
+de	05_nuclear	1	298	0.0	1.0
+de	06_coal	1	298	0.0	1.0
+de	07_gas	1	298	0.0	1.0
 de	08_non-res	1	298	0.0	0.0
 de	09_hydro_pump	1	298	0.0	0.0
-de	01_solar	1	299	1.0	0.0
-de	02_wind_on	1	299	1.0	0.0
-de	03_wind_off	1	299	1.0	0.0
-de	04_res	1	299	1.0	0.0
-de	05_nuclear	1	299	1.0	0.0
-de	06_coal	1	299	1.0	0.0
-de	07_gas	1	299	1.0	0.0
+de	01_solar	1	299	0.0	1.0
+de	02_wind_on	1	299	0.0	1.0
+de	03_wind_off	1	299	0.0	1.0
+de	04_res	1	299	0.0	1.0
+de	05_nuclear	1	299	0.0	1.0
+de	06_coal	1	299	0.0	1.0
+de	07_gas	1	299	0.0	1.0
 de	08_non-res	1	299	0.0	0.0
 de	09_hydro_pump	1	299	0.0	0.0
-de	01_solar	1	300	1.0	0.0
-de	02_wind_on	1	300	1.0	0.0
-de	03_wind_off	1	300	1.0	0.0
-de	04_res	1	300	1.0	0.0
-de	05_nuclear	1	300	1.0	0.0
-de	06_coal	1	300	1.0	0.0
-de	07_gas	1	300	1.0	0.0
+de	01_solar	1	300	0.0	1.0
+de	02_wind_on	1	300	0.0	1.0
+de	03_wind_off	1	300	0.0	1.0
+de	04_res	1	300	0.0	1.0
+de	05_nuclear	1	300	0.0	1.0
+de	06_coal	1	300	0.0	1.0
+de	07_gas	1	300	0.0	1.0
 de	08_non-res	1	300	0.0	0.0
 de	09_hydro_pump	1	300	0.0	0.0
-de	01_solar	1	301	1.0	0.0
-de	02_wind_on	1	301	1.0	0.0
-de	03_wind_off	1	301	1.0	0.0
-de	04_res	1	301	1.0	0.0
-de	05_nuclear	1	301	1.0	0.0
-de	06_coal	1	301	1.0	0.0
-de	07_gas	1	301	1.0	0.0
+de	01_solar	1	301	0.0	1.0
+de	02_wind_on	1	301	0.0	1.0
+de	03_wind_off	1	301	0.0	1.0
+de	04_res	1	301	0.0	1.0
+de	05_nuclear	1	301	0.0	1.0
+de	06_coal	1	301	0.0	1.0
+de	07_gas	1	301	0.0	1.0
 de	08_non-res	1	301	0.0	0.0
 de	09_hydro_pump	1	301	0.0	0.0
-de	01_solar	1	302	1.0	0.0
-de	02_wind_on	1	302	1.0	0.0
-de	03_wind_off	1	302	1.0	0.0
-de	04_res	1	302	1.0	0.0
-de	05_nuclear	1	302	1.0	0.0
-de	06_coal	1	302	1.0	0.0
-de	07_gas	1	302	1.0	0.0
+de	01_solar	1	302	0.0	1.0
+de	02_wind_on	1	302	0.0	1.0
+de	03_wind_off	1	302	0.0	1.0
+de	04_res	1	302	0.0	1.0
+de	05_nuclear	1	302	0.0	1.0
+de	06_coal	1	302	0.0	1.0
+de	07_gas	1	302	0.0	1.0
 de	08_non-res	1	302	0.0	0.0
 de	09_hydro_pump	1	302	0.0	0.0
-de	01_solar	1	303	1.0	0.0
-de	02_wind_on	1	303	1.0	0.0
-de	03_wind_off	1	303	1.0	0.0
-de	04_res	1	303	1.0	0.0
-de	05_nuclear	1	303	1.0	0.0
-de	06_coal	1	303	1.0	0.0
-de	07_gas	1	303	1.0	0.0
+de	01_solar	1	303	0.0	1.0
+de	02_wind_on	1	303	0.0	1.0
+de	03_wind_off	1	303	0.0	1.0
+de	04_res	1	303	0.0	1.0
+de	05_nuclear	1	303	0.0	1.0
+de	06_coal	1	303	0.0	1.0
+de	07_gas	1	303	0.0	1.0
 de	08_non-res	1	303	0.0	0.0
 de	09_hydro_pump	1	303	0.0	0.0
-de	01_solar	1	304	1.0	0.0
-de	02_wind_on	1	304	1.0	0.0
-de	03_wind_off	1	304	1.0	0.0
-de	04_res	1	304	1.0	0.0
-de	05_nuclear	1	304	1.0	0.0
-de	06_coal	1	304	1.0	0.0
-de	07_gas	1	304	1.0	0.0
+de	01_solar	1	304	0.0	1.0
+de	02_wind_on	1	304	0.0	1.0
+de	03_wind_off	1	304	0.0	1.0
+de	04_res	1	304	0.0	1.0
+de	05_nuclear	1	304	0.0	1.0
+de	06_coal	1	304	0.0	1.0
+de	07_gas	1	304	0.0	1.0
 de	08_non-res	1	304	0.0	0.0
 de	09_hydro_pump	1	304	0.0	0.0
-de	01_solar	1	305	1.0	0.0
-de	02_wind_on	1	305	1.0	0.0
-de	03_wind_off	1	305	1.0	0.0
-de	04_res	1	305	1.0	0.0
-de	05_nuclear	1	305	1.0	0.0
-de	06_coal	1	305	1.0	0.0
-de	07_gas	1	305	1.0	0.0
+de	01_solar	1	305	0.0	1.0
+de	02_wind_on	1	305	0.0	1.0
+de	03_wind_off	1	305	0.0	1.0
+de	04_res	1	305	0.0	1.0
+de	05_nuclear	1	305	0.0	1.0
+de	06_coal	1	305	0.0	1.0
+de	07_gas	1	305	0.0	1.0
 de	08_non-res	1	305	0.0	0.0
 de	09_hydro_pump	1	305	0.0	0.0
-de	01_solar	1	306	1.0	0.0
-de	02_wind_on	1	306	1.0	0.0
-de	03_wind_off	1	306	1.0	0.0
-de	04_res	1	306	1.0	0.0
-de	05_nuclear	1	306	1.0	0.0
-de	06_coal	1	306	1.0	0.0
-de	07_gas	1	306	1.0	0.0
+de	01_solar	1	306	0.0	1.0
+de	02_wind_on	1	306	0.0	1.0
+de	03_wind_off	1	306	0.0	1.0
+de	04_res	1	306	0.0	1.0
+de	05_nuclear	1	306	0.0	1.0
+de	06_coal	1	306	0.0	1.0
+de	07_gas	1	306	0.0	1.0
 de	08_non-res	1	306	0.0	0.0
 de	09_hydro_pump	1	306	0.0	0.0
-de	01_solar	1	307	1.0	0.0
-de	02_wind_on	1	307	1.0	0.0
-de	03_wind_off	1	307	1.0	0.0
-de	04_res	1	307	1.0	0.0
-de	05_nuclear	1	307	1.0	0.0
-de	06_coal	1	307	1.0	0.0
-de	07_gas	1	307	1.0	0.0
+de	01_solar	1	307	0.0	1.0
+de	02_wind_on	1	307	0.0	1.0
+de	03_wind_off	1	307	0.0	1.0
+de	04_res	1	307	0.0	1.0
+de	05_nuclear	1	307	0.0	1.0
+de	06_coal	1	307	0.0	1.0
+de	07_gas	1	307	0.0	1.0
 de	08_non-res	1	307	0.0	0.0
 de	09_hydro_pump	1	307	0.0	0.0
-de	01_solar	1	308	1.0	0.0
-de	02_wind_on	1	308	1.0	0.0
-de	03_wind_off	1	308	1.0	0.0
-de	04_res	1	308	1.0	0.0
-de	05_nuclear	1	308	1.0	0.0
-de	06_coal	1	308	1.0	0.0
-de	07_gas	1	308	1.0	0.0
+de	01_solar	1	308	0.0	1.0
+de	02_wind_on	1	308	0.0	1.0
+de	03_wind_off	1	308	0.0	1.0
+de	04_res	1	308	0.0	1.0
+de	05_nuclear	1	308	0.0	1.0
+de	06_coal	1	308	0.0	1.0
+de	07_gas	1	308	0.0	1.0
 de	08_non-res	1	308	0.0	0.0
 de	09_hydro_pump	1	308	0.0	0.0
-de	01_solar	1	309	1.0	0.0
-de	02_wind_on	1	309	1.0	0.0
-de	03_wind_off	1	309	1.0	0.0
-de	04_res	1	309	1.0	0.0
-de	05_nuclear	1	309	1.0	0.0
-de	06_coal	1	309	1.0	0.0
-de	07_gas	1	309	1.0	0.0
+de	01_solar	1	309	0.0	1.0
+de	02_wind_on	1	309	0.0	1.0
+de	03_wind_off	1	309	0.0	1.0
+de	04_res	1	309	0.0	1.0
+de	05_nuclear	1	309	0.0	1.0
+de	06_coal	1	309	0.0	1.0
+de	07_gas	1	309	0.0	1.0
 de	08_non-res	1	309	0.0	0.0
 de	09_hydro_pump	1	309	0.0	0.0
-de	01_solar	1	310	1.0	0.0
-de	02_wind_on	1	310	1.0	0.0
-de	03_wind_off	1	310	1.0	0.0
-de	04_res	1	310	1.0	0.0
-de	05_nuclear	1	310	1.0	0.0
-de	06_coal	1	310	1.0	0.0
-de	07_gas	1	310	1.0	0.0
-de	08_non-res	1	310	1.0	0.0
+de	01_solar	1	310	0.0	1.0
+de	02_wind_on	1	310	0.0	1.0
+de	03_wind_off	1	310	0.0	1.0
+de	04_res	1	310	0.0	1.0
+de	05_nuclear	1	310	0.0	1.0
+de	06_coal	1	310	0.0	1.0
+de	07_gas	1	310	0.0	1.0
+de	08_non-res	1	310	0.0	1.0
 de	09_hydro_pump	1	310	0.0	0.0
-de	01_solar	1	311	1.0	0.0
-de	02_wind_on	1	311	1.0	0.0
-de	03_wind_off	1	311	1.0	0.0
-de	04_res	1	311	1.0	0.0
-de	05_nuclear	1	311	1.0	0.0
-de	06_coal	1	311	1.0	0.0
-de	07_gas	1	311	1.0	0.0
-de	08_non-res	1	311	1.0	0.0
+de	01_solar	1	311	0.0	1.0
+de	02_wind_on	1	311	0.0	1.0
+de	03_wind_off	1	311	0.0	1.0
+de	04_res	1	311	0.0	1.0
+de	05_nuclear	1	311	0.0	1.0
+de	06_coal	1	311	0.0	1.0
+de	07_gas	1	311	0.0	1.0
+de	08_non-res	1	311	0.0	1.0
 de	09_hydro_pump	1	311	0.0	0.0
-de	01_solar	1	312	1.0	0.0
-de	02_wind_on	1	312	1.0	0.0
-de	03_wind_off	1	312	1.0	0.0
-de	04_res	1	312	1.0	0.0
-de	05_nuclear	1	312	1.0	0.0
-de	06_coal	1	312	1.0	0.0
-de	07_gas	1	312	1.0	0.0
-de	08_non-res	1	312	1.0	0.0
+de	01_solar	1	312	0.0	1.0
+de	02_wind_on	1	312	0.0	1.0
+de	03_wind_off	1	312	0.0	1.0
+de	04_res	1	312	0.0	1.0
+de	05_nuclear	1	312	0.0	1.0
+de	06_coal	1	312	0.0	1.0
+de	07_gas	1	312	0.0	1.0
+de	08_non-res	1	312	0.0	1.0
 de	09_hydro_pump	1	312	0.0	0.0
-de	01_solar	1	313	1.0	0.0
-de	02_wind_on	1	313	1.0	0.0
-de	03_wind_off	1	313	1.0	0.0
-de	04_res	1	313	1.0	0.0
-de	05_nuclear	1	313	1.0	0.0
-de	06_coal	1	313	1.0	0.0
-de	07_gas	1	313	1.0	0.0
-de	08_non-res	1	313	1.0	0.0
+de	01_solar	1	313	0.0	1.0
+de	02_wind_on	1	313	0.0	1.0
+de	03_wind_off	1	313	0.0	1.0
+de	04_res	1	313	0.0	1.0
+de	05_nuclear	1	313	0.0	1.0
+de	06_coal	1	313	0.0	1.0
+de	07_gas	1	313	0.0	1.0
+de	08_non-res	1	313	0.0	1.0
 de	09_hydro_pump	1	313	0.0	0.0
-de	01_solar	1	314	1.0	0.0
-de	02_wind_on	1	314	1.0	0.0
-de	03_wind_off	1	314	1.0	0.0
-de	04_res	1	314	1.0	0.0
-de	05_nuclear	1	314	1.0	0.0
-de	06_coal	1	314	1.0	0.0
-de	07_gas	1	314	1.0	0.0
-de	08_non-res	1	314	1.0	0.0
+de	01_solar	1	314	0.0	1.0
+de	02_wind_on	1	314	0.0	1.0
+de	03_wind_off	1	314	0.0	1.0
+de	04_res	1	314	0.0	1.0
+de	05_nuclear	1	314	0.0	1.0
+de	06_coal	1	314	0.0	1.0
+de	07_gas	1	314	0.0	1.0
+de	08_non-res	1	314	0.0	1.0
 de	09_hydro_pump	1	314	0.0	0.0
-de	01_solar	1	315	1.0	0.0
-de	02_wind_on	1	315	1.0	0.0
-de	03_wind_off	1	315	1.0	0.0
-de	04_res	1	315	1.0	0.0
-de	05_nuclear	1	315	1.0	0.0
-de	06_coal	1	315	1.0	0.0
-de	07_gas	1	315	1.0	0.0
-de	08_non-res	1	315	1.0	0.0
+de	01_solar	1	315	0.0	1.0
+de	02_wind_on	1	315	0.0	1.0
+de	03_wind_off	1	315	0.0	1.0
+de	04_res	1	315	0.0	1.0
+de	05_nuclear	1	315	0.0	1.0
+de	06_coal	1	315	0.0	1.0
+de	07_gas	1	315	0.0	1.0
+de	08_non-res	1	315	0.0	1.0
 de	09_hydro_pump	1	315	0.0	0.0
-de	01_solar	1	316	1.0	0.0
-de	02_wind_on	1	316	1.0	0.0
-de	03_wind_off	1	316	1.0	0.0
-de	04_res	1	316	1.0	0.0
-de	05_nuclear	1	316	1.0	0.0
-de	06_coal	1	316	1.0	0.0
-de	07_gas	1	316	1.0	0.0
-de	08_non-res	1	316	1.0	0.0
+de	01_solar	1	316	0.0	1.0
+de	02_wind_on	1	316	0.0	1.0
+de	03_wind_off	1	316	0.0	1.0
+de	04_res	1	316	0.0	1.0
+de	05_nuclear	1	316	0.0	1.0
+de	06_coal	1	316	0.0	1.0
+de	07_gas	1	316	0.0	1.0
+de	08_non-res	1	316	0.0	1.0
 de	09_hydro_pump	1	316	0.0	0.0
-de	01_solar	1	317	1.0	0.0
-de	02_wind_on	1	317	1.0	0.0
-de	03_wind_off	1	317	1.0	0.0
-de	04_res	1	317	1.0	0.0
-de	05_nuclear	1	317	1.0	0.0
-de	06_coal	1	317	1.0	0.0
-de	07_gas	1	317	1.0	0.0
-de	08_non-res	1	317	1.0	0.0
+de	01_solar	1	317	0.0	1.0
+de	02_wind_on	1	317	0.0	1.0
+de	03_wind_off	1	317	0.0	1.0
+de	04_res	1	317	0.0	1.0
+de	05_nuclear	1	317	0.0	1.0
+de	06_coal	1	317	0.0	1.0
+de	07_gas	1	317	0.0	1.0
+de	08_non-res	1	317	0.0	1.0
 de	09_hydro_pump	1	317	0.0	0.0
-de	01_solar	1	318	1.0	0.0
-de	02_wind_on	1	318	1.0	0.0
-de	03_wind_off	1	318	1.0	0.0
-de	04_res	1	318	1.0	0.0
-de	05_nuclear	1	318	1.0	0.0
-de	06_coal	1	318	1.0	0.0
-de	07_gas	1	318	1.0	0.0
-de	08_non-res	1	318	1.0	0.0
+de	01_solar	1	318	0.0	1.0
+de	02_wind_on	1	318	0.0	1.0
+de	03_wind_off	1	318	0.0	1.0
+de	04_res	1	318	0.0	1.0
+de	05_nuclear	1	318	0.0	1.0
+de	06_coal	1	318	0.0	1.0
+de	07_gas	1	318	0.0	1.0
+de	08_non-res	1	318	0.0	1.0
 de	09_hydro_pump	1	318	0.0	0.0
-de	01_solar	1	319	1.0	0.0
-de	02_wind_on	1	319	1.0	0.0
-de	03_wind_off	1	319	1.0	0.0
-de	04_res	1	319	1.0	0.0
-de	05_nuclear	1	319	1.0	0.0
-de	06_coal	1	319	1.0	0.0
-de	07_gas	1	319	1.0	0.0
-de	08_non-res	1	319	1.0	0.0
+de	01_solar	1	319	0.0	1.0
+de	02_wind_on	1	319	0.0	1.0
+de	03_wind_off	1	319	0.0	1.0
+de	04_res	1	319	0.0	1.0
+de	05_nuclear	1	319	0.0	1.0
+de	06_coal	1	319	0.0	1.0
+de	07_gas	1	319	0.0	1.0
+de	08_non-res	1	319	0.0	1.0
 de	09_hydro_pump	1	319	0.0	0.0
-de	01_solar	1	320	1.0	0.0
-de	02_wind_on	1	320	1.0	0.0
-de	03_wind_off	1	320	1.0	0.0
-de	04_res	1	320	1.0	0.0
-de	05_nuclear	1	320	1.0	0.0
-de	06_coal	1	320	1.0	0.0
-de	07_gas	1	320	1.0	0.0
-de	08_non-res	1	320	1.0	0.0
+de	01_solar	1	320	0.0	1.0
+de	02_wind_on	1	320	0.0	1.0
+de	03_wind_off	1	320	0.0	1.0
+de	04_res	1	320	0.0	1.0
+de	05_nuclear	1	320	0.0	1.0
+de	06_coal	1	320	0.0	1.0
+de	07_gas	1	320	0.0	1.0
+de	08_non-res	1	320	0.0	1.0
 de	09_hydro_pump	1	320	0.0	0.0
-de	01_solar	1	321	1.0	0.0
-de	02_wind_on	1	321	1.0	0.0
-de	03_wind_off	1	321	1.0	0.0
-de	04_res	1	321	1.0	0.0
-de	05_nuclear	1	321	1.0	0.0
-de	06_coal	1	321	1.0	0.0
-de	07_gas	1	321	1.0	0.0
-de	08_non-res	1	321	1.0	0.0
+de	01_solar	1	321	0.0	1.0
+de	02_wind_on	1	321	0.0	1.0
+de	03_wind_off	1	321	0.0	1.0
+de	04_res	1	321	0.0	1.0
+de	05_nuclear	1	321	0.0	1.0
+de	06_coal	1	321	0.0	1.0
+de	07_gas	1	321	0.0	1.0
+de	08_non-res	1	321	0.0	1.0
 de	09_hydro_pump	1	321	0.0	0.0
-de	01_solar	1	322	1.0	0.0
-de	02_wind_on	1	322	1.0	0.0
-de	03_wind_off	1	322	1.0	0.0
-de	04_res	1	322	1.0	0.0
-de	05_nuclear	1	322	1.0	0.0
-de	06_coal	1	322	1.0	0.0
-de	07_gas	1	322	1.0	0.0
-de	08_non-res	1	322	1.0	0.0
+de	01_solar	1	322	0.0	1.0
+de	02_wind_on	1	322	0.0	1.0
+de	03_wind_off	1	322	0.0	1.0
+de	04_res	1	322	0.0	1.0
+de	05_nuclear	1	322	0.0	1.0
+de	06_coal	1	322	0.0	1.0
+de	07_gas	1	322	0.0	1.0
+de	08_non-res	1	322	0.0	1.0
 de	09_hydro_pump	1	322	0.0	0.0
-de	01_solar	1	323	1.0	0.0
-de	02_wind_on	1	323	1.0	0.0
-de	03_wind_off	1	323	1.0	0.0
-de	04_res	1	323	1.0	0.0
-de	05_nuclear	1	323	1.0	0.0
-de	06_coal	1	323	1.0	0.0
-de	07_gas	1	323	1.0	0.0
-de	08_non-res	1	323	1.0	0.0
+de	01_solar	1	323	0.0	1.0
+de	02_wind_on	1	323	0.0	1.0
+de	03_wind_off	1	323	0.0	1.0
+de	04_res	1	323	0.0	1.0
+de	05_nuclear	1	323	0.0	1.0
+de	06_coal	1	323	0.0	1.0
+de	07_gas	1	323	0.0	1.0
+de	08_non-res	1	323	0.0	1.0
 de	09_hydro_pump	1	323	0.0	0.0
-de	01_solar	1	324	1.0	0.0
-de	02_wind_on	1	324	1.0	0.0
-de	03_wind_off	1	324	1.0	0.0
-de	04_res	1	324	1.0	0.0
-de	05_nuclear	1	324	1.0	0.0
-de	06_coal	1	324	1.0	0.0
-de	07_gas	1	324	1.0	0.0
-de	08_non-res	1	324	1.0	0.0
+de	01_solar	1	324	0.0	1.0
+de	02_wind_on	1	324	0.0	1.0
+de	03_wind_off	1	324	0.0	1.0
+de	04_res	1	324	0.0	1.0
+de	05_nuclear	1	324	0.0	1.0
+de	06_coal	1	324	0.0	1.0
+de	07_gas	1	324	0.0	1.0
+de	08_non-res	1	324	0.0	1.0
 de	09_hydro_pump	1	324	0.0	0.0
-de	01_solar	1	325	1.0	0.0
-de	02_wind_on	1	325	1.0	0.0
-de	03_wind_off	1	325	1.0	0.0
-de	04_res	1	325	1.0	0.0
-de	05_nuclear	1	325	1.0	0.0
-de	06_coal	1	325	1.0	0.0
-de	07_gas	1	325	1.0	0.0
-de	08_non-res	1	325	1.0	0.0
+de	01_solar	1	325	0.0	1.0
+de	02_wind_on	1	325	0.0	1.0
+de	03_wind_off	1	325	0.0	1.0
+de	04_res	1	325	0.0	1.0
+de	05_nuclear	1	325	0.0	1.0
+de	06_coal	1	325	0.0	1.0
+de	07_gas	1	325	0.0	1.0
+de	08_non-res	1	325	0.0	1.0
 de	09_hydro_pump	1	325	0.0	0.0
-de	01_solar	1	326	1.0	0.0
-de	02_wind_on	1	326	1.0	0.0
-de	03_wind_off	1	326	1.0	0.0
-de	04_res	1	326	1.0	0.0
-de	05_nuclear	1	326	1.0	0.0
-de	06_coal	1	326	1.0	0.0
-de	07_gas	1	326	1.0	0.0
-de	08_non-res	1	326	1.0	0.0
+de	01_solar	1	326	0.0	1.0
+de	02_wind_on	1	326	0.0	1.0
+de	03_wind_off	1	326	0.0	1.0
+de	04_res	1	326	0.0	1.0
+de	05_nuclear	1	326	0.0	1.0
+de	06_coal	1	326	0.0	1.0
+de	07_gas	1	326	0.0	1.0
+de	08_non-res	1	326	0.0	1.0
 de	09_hydro_pump	1	326	0.0	0.0
-de	01_solar	1	327	1.0	0.0
-de	02_wind_on	1	327	1.0	0.0
-de	03_wind_off	1	327	1.0	0.0
-de	04_res	1	327	1.0	0.0
-de	05_nuclear	1	327	1.0	0.0
-de	06_coal	1	327	1.0	0.0
-de	07_gas	1	327	1.0	0.0
-de	08_non-res	1	327	1.0	0.0
+de	01_solar	1	327	0.0	1.0
+de	02_wind_on	1	327	0.0	1.0
+de	03_wind_off	1	327	0.0	1.0
+de	04_res	1	327	0.0	1.0
+de	05_nuclear	1	327	0.0	1.0
+de	06_coal	1	327	0.0	1.0
+de	07_gas	1	327	0.0	1.0
+de	08_non-res	1	327	0.0	1.0
 de	09_hydro_pump	1	327	0.0	0.0
-de	01_solar	1	328	1.0	0.0
-de	02_wind_on	1	328	1.0	0.0
-de	03_wind_off	1	328	1.0	0.0
-de	04_res	1	328	1.0	0.0
-de	05_nuclear	1	328	1.0	0.0
-de	06_coal	1	328	1.0	0.0
-de	07_gas	1	328	1.0	0.0
-de	08_non-res	1	328	1.0	0.0
+de	01_solar	1	328	0.0	1.0
+de	02_wind_on	1	328	0.0	1.0
+de	03_wind_off	1	328	0.0	1.0
+de	04_res	1	328	0.0	1.0
+de	05_nuclear	1	328	0.0	1.0
+de	06_coal	1	328	0.0	1.0
+de	07_gas	1	328	0.0	1.0
+de	08_non-res	1	328	0.0	1.0
 de	09_hydro_pump	1	328	0.0	0.0
-de	01_solar	1	329	1.0	0.0
-de	02_wind_on	1	329	1.0	0.0
-de	03_wind_off	1	329	1.0	0.0
-de	04_res	1	329	1.0	0.0
-de	05_nuclear	1	329	1.0	0.0
-de	06_coal	1	329	1.0	0.0
-de	07_gas	1	329	1.0	0.0
-de	08_non-res	1	329	1.0	0.0
+de	01_solar	1	329	0.0	1.0
+de	02_wind_on	1	329	0.0	1.0
+de	03_wind_off	1	329	0.0	1.0
+de	04_res	1	329	0.0	1.0
+de	05_nuclear	1	329	0.0	1.0
+de	06_coal	1	329	0.0	1.0
+de	07_gas	1	329	0.0	1.0
+de	08_non-res	1	329	0.0	1.0
 de	09_hydro_pump	1	329	0.0	0.0
-de	01_solar	1	330	1.0	0.0
-de	02_wind_on	1	330	1.0	0.0
-de	03_wind_off	1	330	1.0	0.0
-de	04_res	1	330	1.0	0.0
-de	05_nuclear	1	330	1.0	0.0
-de	06_coal	1	330	1.0	0.0
-de	07_gas	1	330	1.0	0.0
-de	08_non-res	1	330	1.0	0.0
-de	09_hydro_pump	1	330	1.0	0.0
-de	01_solar	1	331	1.0	0.0
-de	02_wind_on	1	331	1.0	0.0
-de	03_wind_off	1	331	1.0	0.0
-de	04_res	1	331	1.0	0.0
-de	05_nuclear	1	331	1.0	0.0
-de	06_coal	1	331	1.0	0.0
-de	07_gas	1	331	1.0	0.0
-de	08_non-res	1	331	1.0	0.0
-de	09_hydro_pump	1	331	1.0	0.0
-de	01_solar	1	332	1.0	0.0
-de	02_wind_on	1	332	1.0	0.0
-de	03_wind_off	1	332	1.0	0.0
-de	04_res	1	332	1.0	0.0
-de	05_nuclear	1	332	1.0	0.0
-de	06_coal	1	332	1.0	0.0
-de	07_gas	1	332	1.0	0.0
-de	08_non-res	1	332	1.0	0.0
-de	09_hydro_pump	1	332	1.0	0.0
-de	01_solar	1	333	1.0	0.0
-de	02_wind_on	1	333	1.0	0.0
-de	03_wind_off	1	333	1.0	0.0
-de	04_res	1	333	1.0	0.0
-de	05_nuclear	1	333	1.0	0.0
-de	06_coal	1	333	1.0	0.0
-de	07_gas	1	333	1.0	0.0
-de	08_non-res	1	333	1.0	0.0
-de	09_hydro_pump	1	333	1.0	0.0
-de	01_solar	1	334	1.0	0.0
-de	02_wind_on	1	334	1.0	0.0
-de	03_wind_off	1	334	1.0	0.0
-de	04_res	1	334	1.0	0.0
-de	05_nuclear	1	334	1.0	0.0
-de	06_coal	1	334	1.0	0.0
-de	07_gas	1	334	1.0	0.0
-de	08_non-res	1	334	1.0	0.0
-de	09_hydro_pump	1	334	1.0	0.0
-de	01_solar	1	335	1.0	0.0
-de	02_wind_on	1	335	1.0	0.0
-de	03_wind_off	1	335	1.0	0.0
-de	04_res	1	335	1.0	0.0
-de	05_nuclear	1	335	1.0	0.0
-de	06_coal	1	335	1.0	0.0
-de	07_gas	1	335	1.0	0.0
-de	08_non-res	1	335	1.0	0.0
-de	09_hydro_pump	1	335	1.0	0.0
-de	01_solar	1	336	1.0	0.0
-de	02_wind_on	1	336	1.0	0.0
-de	03_wind_off	1	336	1.0	0.0
-de	04_res	1	336	1.0	0.0
-de	05_nuclear	1	336	1.0	0.0
-de	06_coal	1	336	1.0	0.0
-de	07_gas	1	336	1.0	0.0
-de	08_non-res	1	336	1.0	0.0
-de	09_hydro_pump	1	336	1.0	0.0
+de	01_solar	1	330	0.0	1.0
+de	02_wind_on	1	330	0.0	1.0
+de	03_wind_off	1	330	0.0	1.0
+de	04_res	1	330	0.0	1.0
+de	05_nuclear	1	330	0.0	1.0
+de	06_coal	1	330	0.0	1.0
+de	07_gas	1	330	0.0	1.0
+de	08_non-res	1	330	0.0	1.0
+de	09_hydro_pump	1	330	0.0	1.0
+de	01_solar	1	331	0.0	1.0
+de	02_wind_on	1	331	0.0	1.0
+de	03_wind_off	1	331	0.0	1.0
+de	04_res	1	331	0.0	1.0
+de	05_nuclear	1	331	0.0	1.0
+de	06_coal	1	331	0.0	1.0
+de	07_gas	1	331	0.0	1.0
+de	08_non-res	1	331	0.0	1.0
+de	09_hydro_pump	1	331	0.0	1.0
+de	01_solar	1	332	0.0	1.0
+de	02_wind_on	1	332	0.0	1.0
+de	03_wind_off	1	332	0.0	1.0
+de	04_res	1	332	0.0	1.0
+de	05_nuclear	1	332	0.0	1.0
+de	06_coal	1	332	0.0	1.0
+de	07_gas	1	332	0.0	1.0
+de	08_non-res	1	332	0.0	1.0
+de	09_hydro_pump	1	332	0.0	1.0
+de	01_solar	1	333	0.0	1.0
+de	02_wind_on	1	333	0.0	1.0
+de	03_wind_off	1	333	0.0	1.0
+de	04_res	1	333	0.0	1.0
+de	05_nuclear	1	333	0.0	1.0
+de	06_coal	1	333	0.0	1.0
+de	07_gas	1	333	0.0	1.0
+de	08_non-res	1	333	0.0	1.0
+de	09_hydro_pump	1	333	0.0	1.0
+de	01_solar	1	334	0.0	1.0
+de	02_wind_on	1	334	0.0	1.0
+de	03_wind_off	1	334	0.0	1.0
+de	04_res	1	334	0.0	1.0
+de	05_nuclear	1	334	0.0	1.0
+de	06_coal	1	334	0.0	1.0
+de	07_gas	1	334	0.0	1.0
+de	08_non-res	1	334	0.0	1.0
+de	09_hydro_pump	1	334	0.0	1.0
+de	01_solar	1	335	0.0	1.0
+de	02_wind_on	1	335	0.0	1.0
+de	03_wind_off	1	335	0.0	1.0
+de	04_res	1	335	0.0	1.0
+de	05_nuclear	1	335	0.0	1.0
+de	06_coal	1	335	0.0	1.0
+de	07_gas	1	335	0.0	1.0
+de	08_non-res	1	335	0.0	1.0
+de	09_hydro_pump	1	335	0.0	1.0
+de	01_solar	1	336	0.0	1.0
+de	02_wind_on	1	336	0.0	1.0
+de	03_wind_off	1	336	0.0	1.0
+de	04_res	1	336	0.0	1.0
+de	05_nuclear	1	336	0.0	1.0
+de	06_coal	1	336	0.0	1.0
+de	07_gas	1	336	0.0	1.0
+de	08_non-res	1	336	0.0	1.0
+de	09_hydro_pump	1	336	0.0	1.0
 es	01_solar	1	1	0.0	0.0
 es	02_wind_on	1	1	0.0	0.0
 es	03_wind_off	1	1	0.0	0.0
@@ -3032,7 +3032,7 @@ es	06_coal	1	1	0.0	0.0
 es	07_gas	1	1	0.0	0.0
 es	08_non-res	1	1	0.0	0.0
 es	09_hydro_pump	1	1	0.0	0.0
-es	01_solar	1	2	1.0	0.0
+es	01_solar	1	2	0.0	1.0
 es	02_wind_on	1	2	0.0	0.0
 es	03_wind_off	1	2	0.0	0.0
 es	04_res	1	2	0.0	0.0
@@ -3041,7 +3041,7 @@ es	06_coal	1	2	0.0	0.0
 es	07_gas	1	2	0.0	0.0
 es	08_non-res	1	2	0.0	0.0
 es	09_hydro_pump	1	2	0.0	0.0
-es	01_solar	1	3	1.0	0.0
+es	01_solar	1	3	0.0	1.0
 es	02_wind_on	1	3	0.0	0.0
 es	03_wind_off	1	3	0.0	0.0
 es	04_res	1	3	0.0	0.0
@@ -3050,7 +3050,7 @@ es	06_coal	1	3	0.0	0.0
 es	07_gas	1	3	0.0	0.0
 es	08_non-res	1	3	0.0	0.0
 es	09_hydro_pump	1	3	0.0	0.0
-es	01_solar	1	4	1.0	0.0
+es	01_solar	1	4	0.0	1.0
 es	02_wind_on	1	4	0.0	0.0
 es	03_wind_off	1	4	0.0	0.0
 es	04_res	1	4	0.0	0.0
@@ -3059,7 +3059,7 @@ es	06_coal	1	4	0.0	0.0
 es	07_gas	1	4	0.0	0.0
 es	08_non-res	1	4	0.0	0.0
 es	09_hydro_pump	1	4	0.0	0.0
-es	01_solar	1	5	1.0	0.0
+es	01_solar	1	5	0.0	1.0
 es	02_wind_on	1	5	0.0	0.0
 es	03_wind_off	1	5	0.0	0.0
 es	04_res	1	5	0.0	0.0
@@ -3068,7 +3068,7 @@ es	06_coal	1	5	0.0	0.0
 es	07_gas	1	5	0.0	0.0
 es	08_non-res	1	5	0.0	0.0
 es	09_hydro_pump	1	5	0.0	0.0
-es	01_solar	1	6	1.0	0.0
+es	01_solar	1	6	0.0	1.0
 es	02_wind_on	1	6	0.0	0.0
 es	03_wind_off	1	6	0.0	0.0
 es	04_res	1	6	0.0	0.0
@@ -3077,7 +3077,7 @@ es	06_coal	1	6	0.0	0.0
 es	07_gas	1	6	0.0	0.0
 es	08_non-res	1	6	0.0	0.0
 es	09_hydro_pump	1	6	0.0	0.0
-es	01_solar	1	7	1.0	0.0
+es	01_solar	1	7	0.0	1.0
 es	02_wind_on	1	7	0.0	0.0
 es	03_wind_off	1	7	0.0	0.0
 es	04_res	1	7	0.0	0.0
@@ -3086,7 +3086,7 @@ es	06_coal	1	7	0.0	0.0
 es	07_gas	1	7	0.0	0.0
 es	08_non-res	1	7	0.0	0.0
 es	09_hydro_pump	1	7	0.0	0.0
-es	01_solar	1	8	1.0	0.0
+es	01_solar	1	8	0.0	1.0
 es	02_wind_on	1	8	0.0	0.0
 es	03_wind_off	1	8	0.0	0.0
 es	04_res	1	8	0.0	0.0
@@ -3095,7 +3095,7 @@ es	06_coal	1	8	0.0	0.0
 es	07_gas	1	8	0.0	0.0
 es	08_non-res	1	8	0.0	0.0
 es	09_hydro_pump	1	8	0.0	0.0
-es	01_solar	1	9	1.0	0.0
+es	01_solar	1	9	0.0	1.0
 es	02_wind_on	1	9	0.0	0.0
 es	03_wind_off	1	9	0.0	0.0
 es	04_res	1	9	0.0	0.0
@@ -3104,7 +3104,7 @@ es	06_coal	1	9	0.0	0.0
 es	07_gas	1	9	0.0	0.0
 es	08_non-res	1	9	0.0	0.0
 es	09_hydro_pump	1	9	0.0	0.0
-es	01_solar	1	10	1.0	0.0
+es	01_solar	1	10	0.0	1.0
 es	02_wind_on	1	10	0.0	0.0
 es	03_wind_off	1	10	0.0	0.0
 es	04_res	1	10	0.0	0.0
@@ -3113,7 +3113,7 @@ es	06_coal	1	10	0.0	0.0
 es	07_gas	1	10	0.0	0.0
 es	08_non-res	1	10	0.0	0.0
 es	09_hydro_pump	1	10	0.0	0.0
-es	01_solar	1	11	1.0	0.0
+es	01_solar	1	11	0.0	1.0
 es	02_wind_on	1	11	0.0	0.0
 es	03_wind_off	1	11	0.0	0.0
 es	04_res	1	11	0.0	0.0
@@ -3122,7 +3122,7 @@ es	06_coal	1	11	0.0	0.0
 es	07_gas	1	11	0.0	0.0
 es	08_non-res	1	11	0.0	0.0
 es	09_hydro_pump	1	11	0.0	0.0
-es	01_solar	1	12	1.0	0.0
+es	01_solar	1	12	0.0	1.0
 es	02_wind_on	1	12	0.0	0.0
 es	03_wind_off	1	12	0.0	0.0
 es	04_res	1	12	0.0	0.0
@@ -3131,7 +3131,7 @@ es	06_coal	1	12	0.0	0.0
 es	07_gas	1	12	0.0	0.0
 es	08_non-res	1	12	0.0	0.0
 es	09_hydro_pump	1	12	0.0	0.0
-es	01_solar	1	13	1.0	0.0
+es	01_solar	1	13	0.0	1.0
 es	02_wind_on	1	13	0.0	0.0
 es	03_wind_off	1	13	0.0	0.0
 es	04_res	1	13	0.0	0.0
@@ -3140,7 +3140,7 @@ es	06_coal	1	13	0.0	0.0
 es	07_gas	1	13	0.0	0.0
 es	08_non-res	1	13	0.0	0.0
 es	09_hydro_pump	1	13	0.0	0.0
-es	01_solar	1	14	1.0	0.0
+es	01_solar	1	14	0.0	1.0
 es	02_wind_on	1	14	0.0	0.0
 es	03_wind_off	1	14	0.0	0.0
 es	04_res	1	14	0.0	0.0
@@ -3149,7 +3149,7 @@ es	06_coal	1	14	0.0	0.0
 es	07_gas	1	14	0.0	0.0
 es	08_non-res	1	14	0.0	0.0
 es	09_hydro_pump	1	14	0.0	0.0
-es	01_solar	1	15	1.0	0.0
+es	01_solar	1	15	0.0	1.0
 es	02_wind_on	1	15	0.0	0.0
 es	03_wind_off	1	15	0.0	0.0
 es	04_res	1	15	0.0	0.0
@@ -3158,7 +3158,7 @@ es	06_coal	1	15	0.0	0.0
 es	07_gas	1	15	0.0	0.0
 es	08_non-res	1	15	0.0	0.0
 es	09_hydro_pump	1	15	0.0	0.0
-es	01_solar	1	16	1.0	0.0
+es	01_solar	1	16	0.0	1.0
 es	02_wind_on	1	16	0.0	0.0
 es	03_wind_off	1	16	0.0	0.0
 es	04_res	1	16	0.0	0.0
@@ -3167,7 +3167,7 @@ es	06_coal	1	16	0.0	0.0
 es	07_gas	1	16	0.0	0.0
 es	08_non-res	1	16	0.0	0.0
 es	09_hydro_pump	1	16	0.0	0.0
-es	01_solar	1	17	1.0	0.0
+es	01_solar	1	17	0.0	1.0
 es	02_wind_on	1	17	0.0	0.0
 es	03_wind_off	1	17	0.0	0.0
 es	04_res	1	17	0.0	0.0
@@ -3176,7 +3176,7 @@ es	06_coal	1	17	0.0	0.0
 es	07_gas	1	17	0.0	0.0
 es	08_non-res	1	17	0.0	0.0
 es	09_hydro_pump	1	17	0.0	0.0
-es	01_solar	1	18	1.0	0.0
+es	01_solar	1	18	0.0	1.0
 es	02_wind_on	1	18	0.0	0.0
 es	03_wind_off	1	18	0.0	0.0
 es	04_res	1	18	0.0	0.0
@@ -3185,7 +3185,7 @@ es	06_coal	1	18	0.0	0.0
 es	07_gas	1	18	0.0	0.0
 es	08_non-res	1	18	0.0	0.0
 es	09_hydro_pump	1	18	0.0	0.0
-es	01_solar	1	19	1.0	0.0
+es	01_solar	1	19	0.0	1.0
 es	02_wind_on	1	19	0.0	0.0
 es	03_wind_off	1	19	0.0	0.0
 es	04_res	1	19	0.0	0.0
@@ -3194,7 +3194,7 @@ es	06_coal	1	19	0.0	0.0
 es	07_gas	1	19	0.0	0.0
 es	08_non-res	1	19	0.0	0.0
 es	09_hydro_pump	1	19	0.0	0.0
-es	01_solar	1	20	1.0	0.0
+es	01_solar	1	20	0.0	1.0
 es	02_wind_on	1	20	0.0	0.0
 es	03_wind_off	1	20	0.0	0.0
 es	04_res	1	20	0.0	0.0
@@ -3203,7 +3203,7 @@ es	06_coal	1	20	0.0	0.0
 es	07_gas	1	20	0.0	0.0
 es	08_non-res	1	20	0.0	0.0
 es	09_hydro_pump	1	20	0.0	0.0
-es	01_solar	1	21	1.0	0.0
+es	01_solar	1	21	0.0	1.0
 es	02_wind_on	1	21	0.0	0.0
 es	03_wind_off	1	21	0.0	0.0
 es	04_res	1	21	0.0	0.0
@@ -3212,8 +3212,8 @@ es	06_coal	1	21	0.0	0.0
 es	07_gas	1	21	0.0	0.0
 es	08_non-res	1	21	0.0	0.0
 es	09_hydro_pump	1	21	0.0	0.0
-es	01_solar	1	22	1.0	0.0
-es	02_wind_on	1	22	1.0	0.0
+es	01_solar	1	22	0.0	1.0
+es	02_wind_on	1	22	0.0	1.0
 es	03_wind_off	1	22	0.0	0.0
 es	04_res	1	22	0.0	0.0
 es	05_nuclear	1	22	0.0	0.0
@@ -3221,8 +3221,8 @@ es	06_coal	1	22	0.0	0.0
 es	07_gas	1	22	0.0	0.0
 es	08_non-res	1	22	0.0	0.0
 es	09_hydro_pump	1	22	0.0	0.0
-es	01_solar	1	23	1.0	0.0
-es	02_wind_on	1	23	1.0	0.0
+es	01_solar	1	23	0.0	1.0
+es	02_wind_on	1	23	0.0	1.0
 es	03_wind_off	1	23	0.0	0.0
 es	04_res	1	23	0.0	0.0
 es	05_nuclear	1	23	0.0	0.0
@@ -3230,8 +3230,8 @@ es	06_coal	1	23	0.0	0.0
 es	07_gas	1	23	0.0	0.0
 es	08_non-res	1	23	0.0	0.0
 es	09_hydro_pump	1	23	0.0	0.0
-es	01_solar	1	24	1.0	0.0
-es	02_wind_on	1	24	1.0	0.0
+es	01_solar	1	24	0.0	1.0
+es	02_wind_on	1	24	0.0	1.0
 es	03_wind_off	1	24	0.0	0.0
 es	04_res	1	24	0.0	0.0
 es	05_nuclear	1	24	0.0	0.0
@@ -3239,8 +3239,8 @@ es	06_coal	1	24	0.0	0.0
 es	07_gas	1	24	0.0	0.0
 es	08_non-res	1	24	0.0	0.0
 es	09_hydro_pump	1	24	0.0	0.0
-es	01_solar	1	25	1.0	0.0
-es	02_wind_on	1	25	1.0	0.0
+es	01_solar	1	25	0.0	1.0
+es	02_wind_on	1	25	0.0	1.0
 es	03_wind_off	1	25	0.0	0.0
 es	04_res	1	25	0.0	0.0
 es	05_nuclear	1	25	0.0	0.0
@@ -3248,8 +3248,8 @@ es	06_coal	1	25	0.0	0.0
 es	07_gas	1	25	0.0	0.0
 es	08_non-res	1	25	0.0	0.0
 es	09_hydro_pump	1	25	0.0	0.0
-es	01_solar	1	26	1.0	0.0
-es	02_wind_on	1	26	1.0	0.0
+es	01_solar	1	26	0.0	1.0
+es	02_wind_on	1	26	0.0	1.0
 es	03_wind_off	1	26	0.0	0.0
 es	04_res	1	26	0.0	0.0
 es	05_nuclear	1	26	0.0	0.0
@@ -3257,8 +3257,8 @@ es	06_coal	1	26	0.0	0.0
 es	07_gas	1	26	0.0	0.0
 es	08_non-res	1	26	0.0	0.0
 es	09_hydro_pump	1	26	0.0	0.0
-es	01_solar	1	27	1.0	0.0
-es	02_wind_on	1	27	1.0	0.0
+es	01_solar	1	27	0.0	1.0
+es	02_wind_on	1	27	0.0	1.0
 es	03_wind_off	1	27	0.0	0.0
 es	04_res	1	27	0.0	0.0
 es	05_nuclear	1	27	0.0	0.0
@@ -3266,8 +3266,8 @@ es	06_coal	1	27	0.0	0.0
 es	07_gas	1	27	0.0	0.0
 es	08_non-res	1	27	0.0	0.0
 es	09_hydro_pump	1	27	0.0	0.0
-es	01_solar	1	28	1.0	0.0
-es	02_wind_on	1	28	1.0	0.0
+es	01_solar	1	28	0.0	1.0
+es	02_wind_on	1	28	0.0	1.0
 es	03_wind_off	1	28	0.0	0.0
 es	04_res	1	28	0.0	0.0
 es	05_nuclear	1	28	0.0	0.0
@@ -3275,8 +3275,8 @@ es	06_coal	1	28	0.0	0.0
 es	07_gas	1	28	0.0	0.0
 es	08_non-res	1	28	0.0	0.0
 es	09_hydro_pump	1	28	0.0	0.0
-es	01_solar	1	29	1.0	0.0
-es	02_wind_on	1	29	1.0	0.0
+es	01_solar	1	29	0.0	1.0
+es	02_wind_on	1	29	0.0	1.0
 es	03_wind_off	1	29	0.0	0.0
 es	04_res	1	29	0.0	0.0
 es	05_nuclear	1	29	0.0	0.0
@@ -3284,8 +3284,8 @@ es	06_coal	1	29	0.0	0.0
 es	07_gas	1	29	0.0	0.0
 es	08_non-res	1	29	0.0	0.0
 es	09_hydro_pump	1	29	0.0	0.0
-es	01_solar	1	30	1.0	0.0
-es	02_wind_on	1	30	1.0	0.0
+es	01_solar	1	30	0.0	1.0
+es	02_wind_on	1	30	0.0	1.0
 es	03_wind_off	1	30	0.0	0.0
 es	04_res	1	30	0.0	0.0
 es	05_nuclear	1	30	0.0	0.0
@@ -3293,8 +3293,8 @@ es	06_coal	1	30	0.0	0.0
 es	07_gas	1	30	0.0	0.0
 es	08_non-res	1	30	0.0	0.0
 es	09_hydro_pump	1	30	0.0	0.0
-es	01_solar	1	31	1.0	0.0
-es	02_wind_on	1	31	1.0	0.0
+es	01_solar	1	31	0.0	1.0
+es	02_wind_on	1	31	0.0	1.0
 es	03_wind_off	1	31	0.0	0.0
 es	04_res	1	31	0.0	0.0
 es	05_nuclear	1	31	0.0	0.0
@@ -3302,8 +3302,8 @@ es	06_coal	1	31	0.0	0.0
 es	07_gas	1	31	0.0	0.0
 es	08_non-res	1	31	0.0	0.0
 es	09_hydro_pump	1	31	0.0	0.0
-es	01_solar	1	32	1.0	0.0
-es	02_wind_on	1	32	1.0	0.0
+es	01_solar	1	32	0.0	1.0
+es	02_wind_on	1	32	0.0	1.0
 es	03_wind_off	1	32	0.0	0.0
 es	04_res	1	32	0.0	0.0
 es	05_nuclear	1	32	0.0	0.0
@@ -3311,8 +3311,8 @@ es	06_coal	1	32	0.0	0.0
 es	07_gas	1	32	0.0	0.0
 es	08_non-res	1	32	0.0	0.0
 es	09_hydro_pump	1	32	0.0	0.0
-es	01_solar	1	33	1.0	0.0
-es	02_wind_on	1	33	1.0	0.0
+es	01_solar	1	33	0.0	1.0
+es	02_wind_on	1	33	0.0	1.0
 es	03_wind_off	1	33	0.0	0.0
 es	04_res	1	33	0.0	0.0
 es	05_nuclear	1	33	0.0	0.0
@@ -3320,8 +3320,8 @@ es	06_coal	1	33	0.0	0.0
 es	07_gas	1	33	0.0	0.0
 es	08_non-res	1	33	0.0	0.0
 es	09_hydro_pump	1	33	0.0	0.0
-es	01_solar	1	34	1.0	0.0
-es	02_wind_on	1	34	1.0	0.0
+es	01_solar	1	34	0.0	1.0
+es	02_wind_on	1	34	0.0	1.0
 es	03_wind_off	1	34	0.0	0.0
 es	04_res	1	34	0.0	0.0
 es	05_nuclear	1	34	0.0	0.0
@@ -3329,8 +3329,8 @@ es	06_coal	1	34	0.0	0.0
 es	07_gas	1	34	0.0	0.0
 es	08_non-res	1	34	0.0	0.0
 es	09_hydro_pump	1	34	0.0	0.0
-es	01_solar	1	35	1.0	0.0
-es	02_wind_on	1	35	1.0	0.0
+es	01_solar	1	35	0.0	1.0
+es	02_wind_on	1	35	0.0	1.0
 es	03_wind_off	1	35	0.0	0.0
 es	04_res	1	35	0.0	0.0
 es	05_nuclear	1	35	0.0	0.0
@@ -3338,8 +3338,8 @@ es	06_coal	1	35	0.0	0.0
 es	07_gas	1	35	0.0	0.0
 es	08_non-res	1	35	0.0	0.0
 es	09_hydro_pump	1	35	0.0	0.0
-es	01_solar	1	36	1.0	0.0
-es	02_wind_on	1	36	1.0	0.0
+es	01_solar	1	36	0.0	1.0
+es	02_wind_on	1	36	0.0	1.0
 es	03_wind_off	1	36	0.0	0.0
 es	04_res	1	36	0.0	0.0
 es	05_nuclear	1	36	0.0	0.0
@@ -3347,8 +3347,8 @@ es	06_coal	1	36	0.0	0.0
 es	07_gas	1	36	0.0	0.0
 es	08_non-res	1	36	0.0	0.0
 es	09_hydro_pump	1	36	0.0	0.0
-es	01_solar	1	37	1.0	0.0
-es	02_wind_on	1	37	1.0	0.0
+es	01_solar	1	37	0.0	1.0
+es	02_wind_on	1	37	0.0	1.0
 es	03_wind_off	1	37	0.0	0.0
 es	04_res	1	37	0.0	0.0
 es	05_nuclear	1	37	0.0	0.0
@@ -3356,8 +3356,8 @@ es	06_coal	1	37	0.0	0.0
 es	07_gas	1	37	0.0	0.0
 es	08_non-res	1	37	0.0	0.0
 es	09_hydro_pump	1	37	0.0	0.0
-es	01_solar	1	38	1.0	0.0
-es	02_wind_on	1	38	1.0	0.0
+es	01_solar	1	38	0.0	1.0
+es	02_wind_on	1	38	0.0	1.0
 es	03_wind_off	1	38	0.0	0.0
 es	04_res	1	38	0.0	0.0
 es	05_nuclear	1	38	0.0	0.0
@@ -3365,8 +3365,8 @@ es	06_coal	1	38	0.0	0.0
 es	07_gas	1	38	0.0	0.0
 es	08_non-res	1	38	0.0	0.0
 es	09_hydro_pump	1	38	0.0	0.0
-es	01_solar	1	39	1.0	0.0
-es	02_wind_on	1	39	1.0	0.0
+es	01_solar	1	39	0.0	1.0
+es	02_wind_on	1	39	0.0	1.0
 es	03_wind_off	1	39	0.0	0.0
 es	04_res	1	39	0.0	0.0
 es	05_nuclear	1	39	0.0	0.0
@@ -3374,8 +3374,8 @@ es	06_coal	1	39	0.0	0.0
 es	07_gas	1	39	0.0	0.0
 es	08_non-res	1	39	0.0	0.0
 es	09_hydro_pump	1	39	0.0	0.0
-es	01_solar	1	40	1.0	0.0
-es	02_wind_on	1	40	1.0	0.0
+es	01_solar	1	40	0.0	1.0
+es	02_wind_on	1	40	0.0	1.0
 es	03_wind_off	1	40	0.0	0.0
 es	04_res	1	40	0.0	0.0
 es	05_nuclear	1	40	0.0	0.0
@@ -3383,8 +3383,8 @@ es	06_coal	1	40	0.0	0.0
 es	07_gas	1	40	0.0	0.0
 es	08_non-res	1	40	0.0	0.0
 es	09_hydro_pump	1	40	0.0	0.0
-es	01_solar	1	41	1.0	0.0
-es	02_wind_on	1	41	1.0	0.0
+es	01_solar	1	41	0.0	1.0
+es	02_wind_on	1	41	0.0	1.0
 es	03_wind_off	1	41	0.0	0.0
 es	04_res	1	41	0.0	0.0
 es	05_nuclear	1	41	0.0	0.0
@@ -3392,1149 +3392,1149 @@ es	06_coal	1	41	0.0	0.0
 es	07_gas	1	41	0.0	0.0
 es	08_non-res	1	41	0.0	0.0
 es	09_hydro_pump	1	41	0.0	0.0
-es	01_solar	1	42	1.0	0.0
-es	02_wind_on	1	42	1.0	0.0
-es	03_wind_off	1	42	1.0	0.0
+es	01_solar	1	42	0.0	1.0
+es	02_wind_on	1	42	0.0	1.0
+es	03_wind_off	1	42	0.0	1.0
 es	04_res	1	42	0.0	0.0
 es	05_nuclear	1	42	0.0	0.0
 es	06_coal	1	42	0.0	0.0
 es	07_gas	1	42	0.0	0.0
 es	08_non-res	1	42	0.0	0.0
 es	09_hydro_pump	1	42	0.0	0.0
-es	01_solar	1	43	1.0	0.0
-es	02_wind_on	1	43	1.0	0.0
-es	03_wind_off	1	43	1.0	0.0
+es	01_solar	1	43	0.0	1.0
+es	02_wind_on	1	43	0.0	1.0
+es	03_wind_off	1	43	0.0	1.0
 es	04_res	1	43	0.0	0.0
 es	05_nuclear	1	43	0.0	0.0
 es	06_coal	1	43	0.0	0.0
 es	07_gas	1	43	0.0	0.0
 es	08_non-res	1	43	0.0	0.0
 es	09_hydro_pump	1	43	0.0	0.0
-es	01_solar	1	44	1.0	0.0
-es	02_wind_on	1	44	1.0	0.0
-es	03_wind_off	1	44	1.0	0.0
+es	01_solar	1	44	0.0	1.0
+es	02_wind_on	1	44	0.0	1.0
+es	03_wind_off	1	44	0.0	1.0
 es	04_res	1	44	0.0	0.0
 es	05_nuclear	1	44	0.0	0.0
 es	06_coal	1	44	0.0	0.0
 es	07_gas	1	44	0.0	0.0
 es	08_non-res	1	44	0.0	0.0
 es	09_hydro_pump	1	44	0.0	0.0
-es	01_solar	1	45	1.0	0.0
-es	02_wind_on	1	45	1.0	0.0
-es	03_wind_off	1	45	1.0	0.0
+es	01_solar	1	45	0.0	1.0
+es	02_wind_on	1	45	0.0	1.0
+es	03_wind_off	1	45	0.0	1.0
 es	04_res	1	45	0.0	0.0
 es	05_nuclear	1	45	0.0	0.0
 es	06_coal	1	45	0.0	0.0
 es	07_gas	1	45	0.0	0.0
 es	08_non-res	1	45	0.0	0.0
 es	09_hydro_pump	1	45	0.0	0.0
-es	01_solar	1	46	1.0	0.0
-es	02_wind_on	1	46	1.0	0.0
-es	03_wind_off	1	46	1.0	0.0
+es	01_solar	1	46	0.0	1.0
+es	02_wind_on	1	46	0.0	1.0
+es	03_wind_off	1	46	0.0	1.0
 es	04_res	1	46	0.0	0.0
 es	05_nuclear	1	46	0.0	0.0
 es	06_coal	1	46	0.0	0.0
 es	07_gas	1	46	0.0	0.0
 es	08_non-res	1	46	0.0	0.0
 es	09_hydro_pump	1	46	0.0	0.0
-es	01_solar	1	47	1.0	0.0
-es	02_wind_on	1	47	1.0	0.0
-es	03_wind_off	1	47	1.0	0.0
+es	01_solar	1	47	0.0	1.0
+es	02_wind_on	1	47	0.0	1.0
+es	03_wind_off	1	47	0.0	1.0
 es	04_res	1	47	0.0	0.0
 es	05_nuclear	1	47	0.0	0.0
 es	06_coal	1	47	0.0	0.0
 es	07_gas	1	47	0.0	0.0
 es	08_non-res	1	47	0.0	0.0
 es	09_hydro_pump	1	47	0.0	0.0
-es	01_solar	1	48	1.0	0.0
-es	02_wind_on	1	48	1.0	0.0
-es	03_wind_off	1	48	1.0	0.0
+es	01_solar	1	48	0.0	1.0
+es	02_wind_on	1	48	0.0	1.0
+es	03_wind_off	1	48	0.0	1.0
 es	04_res	1	48	0.0	0.0
 es	05_nuclear	1	48	0.0	0.0
 es	06_coal	1	48	0.0	0.0
 es	07_gas	1	48	0.0	0.0
 es	08_non-res	1	48	0.0	0.0
 es	09_hydro_pump	1	48	0.0	0.0
-es	01_solar	1	49	1.0	0.0
-es	02_wind_on	1	49	1.0	0.0
-es	03_wind_off	1	49	1.0	0.0
+es	01_solar	1	49	0.0	1.0
+es	02_wind_on	1	49	0.0	1.0
+es	03_wind_off	1	49	0.0	1.0
 es	04_res	1	49	0.0	0.0
 es	05_nuclear	1	49	0.0	0.0
 es	06_coal	1	49	0.0	0.0
 es	07_gas	1	49	0.0	0.0
 es	08_non-res	1	49	0.0	0.0
 es	09_hydro_pump	1	49	0.0	0.0
-es	01_solar	1	50	1.0	0.0
-es	02_wind_on	1	50	1.0	0.0
-es	03_wind_off	1	50	1.0	0.0
+es	01_solar	1	50	0.0	1.0
+es	02_wind_on	1	50	0.0	1.0
+es	03_wind_off	1	50	0.0	1.0
 es	04_res	1	50	0.0	0.0
 es	05_nuclear	1	50	0.0	0.0
 es	06_coal	1	50	0.0	0.0
 es	07_gas	1	50	0.0	0.0
 es	08_non-res	1	50	0.0	0.0
 es	09_hydro_pump	1	50	0.0	0.0
-es	01_solar	1	51	1.0	0.0
-es	02_wind_on	1	51	1.0	0.0
-es	03_wind_off	1	51	1.0	0.0
+es	01_solar	1	51	0.0	1.0
+es	02_wind_on	1	51	0.0	1.0
+es	03_wind_off	1	51	0.0	1.0
 es	04_res	1	51	0.0	0.0
 es	05_nuclear	1	51	0.0	0.0
 es	06_coal	1	51	0.0	0.0
 es	07_gas	1	51	0.0	0.0
 es	08_non-res	1	51	0.0	0.0
 es	09_hydro_pump	1	51	0.0	0.0
-es	01_solar	1	52	1.0	0.0
-es	02_wind_on	1	52	1.0	0.0
-es	03_wind_off	1	52	1.0	0.0
+es	01_solar	1	52	0.0	1.0
+es	02_wind_on	1	52	0.0	1.0
+es	03_wind_off	1	52	0.0	1.0
 es	04_res	1	52	0.0	0.0
 es	05_nuclear	1	52	0.0	0.0
 es	06_coal	1	52	0.0	0.0
 es	07_gas	1	52	0.0	0.0
 es	08_non-res	1	52	0.0	0.0
 es	09_hydro_pump	1	52	0.0	0.0
-es	01_solar	1	53	1.0	0.0
-es	02_wind_on	1	53	1.0	0.0
-es	03_wind_off	1	53	1.0	0.0
+es	01_solar	1	53	0.0	1.0
+es	02_wind_on	1	53	0.0	1.0
+es	03_wind_off	1	53	0.0	1.0
 es	04_res	1	53	0.0	0.0
 es	05_nuclear	1	53	0.0	0.0
 es	06_coal	1	53	0.0	0.0
 es	07_gas	1	53	0.0	0.0
 es	08_non-res	1	53	0.0	0.0
 es	09_hydro_pump	1	53	0.0	0.0
-es	01_solar	1	54	1.0	0.0
-es	02_wind_on	1	54	1.0	0.0
-es	03_wind_off	1	54	1.0	0.0
+es	01_solar	1	54	0.0	1.0
+es	02_wind_on	1	54	0.0	1.0
+es	03_wind_off	1	54	0.0	1.0
 es	04_res	1	54	0.0	0.0
 es	05_nuclear	1	54	0.0	0.0
 es	06_coal	1	54	0.0	0.0
 es	07_gas	1	54	0.0	0.0
 es	08_non-res	1	54	0.0	0.0
 es	09_hydro_pump	1	54	0.0	0.0
-es	01_solar	1	55	1.0	0.0
-es	02_wind_on	1	55	1.0	0.0
-es	03_wind_off	1	55	1.0	0.0
+es	01_solar	1	55	0.0	1.0
+es	02_wind_on	1	55	0.0	1.0
+es	03_wind_off	1	55	0.0	1.0
 es	04_res	1	55	0.0	0.0
 es	05_nuclear	1	55	0.0	0.0
 es	06_coal	1	55	0.0	0.0
 es	07_gas	1	55	0.0	0.0
 es	08_non-res	1	55	0.0	0.0
 es	09_hydro_pump	1	55	0.0	0.0
-es	01_solar	1	56	1.0	0.0
-es	02_wind_on	1	56	1.0	0.0
-es	03_wind_off	1	56	1.0	0.0
+es	01_solar	1	56	0.0	1.0
+es	02_wind_on	1	56	0.0	1.0
+es	03_wind_off	1	56	0.0	1.0
 es	04_res	1	56	0.0	0.0
 es	05_nuclear	1	56	0.0	0.0
 es	06_coal	1	56	0.0	0.0
 es	07_gas	1	56	0.0	0.0
 es	08_non-res	1	56	0.0	0.0
 es	09_hydro_pump	1	56	0.0	0.0
-es	01_solar	1	57	1.0	0.0
-es	02_wind_on	1	57	1.0	0.0
-es	03_wind_off	1	57	1.0	0.0
+es	01_solar	1	57	0.0	1.0
+es	02_wind_on	1	57	0.0	1.0
+es	03_wind_off	1	57	0.0	1.0
 es	04_res	1	57	0.0	0.0
 es	05_nuclear	1	57	0.0	0.0
 es	06_coal	1	57	0.0	0.0
 es	07_gas	1	57	0.0	0.0
 es	08_non-res	1	57	0.0	0.0
 es	09_hydro_pump	1	57	0.0	0.0
-es	01_solar	1	58	1.0	0.0
-es	02_wind_on	1	58	1.0	0.0
-es	03_wind_off	1	58	1.0	0.0
+es	01_solar	1	58	0.0	1.0
+es	02_wind_on	1	58	0.0	1.0
+es	03_wind_off	1	58	0.0	1.0
 es	04_res	1	58	0.0	0.0
 es	05_nuclear	1	58	0.0	0.0
 es	06_coal	1	58	0.0	0.0
 es	07_gas	1	58	0.0	0.0
 es	08_non-res	1	58	0.0	0.0
 es	09_hydro_pump	1	58	0.0	0.0
-es	01_solar	1	59	1.0	0.0
-es	02_wind_on	1	59	1.0	0.0
-es	03_wind_off	1	59	1.0	0.0
+es	01_solar	1	59	0.0	1.0
+es	02_wind_on	1	59	0.0	1.0
+es	03_wind_off	1	59	0.0	1.0
 es	04_res	1	59	0.0	0.0
 es	05_nuclear	1	59	0.0	0.0
 es	06_coal	1	59	0.0	0.0
 es	07_gas	1	59	0.0	0.0
 es	08_non-res	1	59	0.0	0.0
 es	09_hydro_pump	1	59	0.0	0.0
-es	01_solar	1	60	1.0	0.0
-es	02_wind_on	1	60	1.0	0.0
-es	03_wind_off	1	60	1.0	0.0
+es	01_solar	1	60	0.0	1.0
+es	02_wind_on	1	60	0.0	1.0
+es	03_wind_off	1	60	0.0	1.0
 es	04_res	1	60	0.0	0.0
 es	05_nuclear	1	60	0.0	0.0
 es	06_coal	1	60	0.0	0.0
 es	07_gas	1	60	0.0	0.0
 es	08_non-res	1	60	0.0	0.0
 es	09_hydro_pump	1	60	0.0	0.0
-es	01_solar	1	61	1.0	0.0
-es	02_wind_on	1	61	1.0	0.0
-es	03_wind_off	1	61	1.0	0.0
+es	01_solar	1	61	0.0	1.0
+es	02_wind_on	1	61	0.0	1.0
+es	03_wind_off	1	61	0.0	1.0
 es	04_res	1	61	0.0	0.0
 es	05_nuclear	1	61	0.0	0.0
 es	06_coal	1	61	0.0	0.0
 es	07_gas	1	61	0.0	0.0
 es	08_non-res	1	61	0.0	0.0
 es	09_hydro_pump	1	61	0.0	0.0
-es	01_solar	1	62	1.0	0.0
-es	02_wind_on	1	62	1.0	0.0
-es	03_wind_off	1	62	1.0	0.0
-es	04_res	1	62	1.0	0.0
+es	01_solar	1	62	0.0	1.0
+es	02_wind_on	1	62	0.0	1.0
+es	03_wind_off	1	62	0.0	1.0
+es	04_res	1	62	0.0	1.0
 es	05_nuclear	1	62	0.0	0.0
 es	06_coal	1	62	0.0	0.0
 es	07_gas	1	62	0.0	0.0
 es	08_non-res	1	62	0.0	0.0
 es	09_hydro_pump	1	62	0.0	0.0
-es	01_solar	1	63	1.0	0.0
-es	02_wind_on	1	63	1.0	0.0
-es	03_wind_off	1	63	1.0	0.0
-es	04_res	1	63	1.0	0.0
+es	01_solar	1	63	0.0	1.0
+es	02_wind_on	1	63	0.0	1.0
+es	03_wind_off	1	63	0.0	1.0
+es	04_res	1	63	0.0	1.0
 es	05_nuclear	1	63	0.0	0.0
 es	06_coal	1	63	0.0	0.0
 es	07_gas	1	63	0.0	0.0
 es	08_non-res	1	63	0.0	0.0
 es	09_hydro_pump	1	63	0.0	0.0
-es	01_solar	1	64	1.0	0.0
-es	02_wind_on	1	64	1.0	0.0
-es	03_wind_off	1	64	1.0	0.0
-es	04_res	1	64	1.0	0.0
+es	01_solar	1	64	0.0	1.0
+es	02_wind_on	1	64	0.0	1.0
+es	03_wind_off	1	64	0.0	1.0
+es	04_res	1	64	0.0	1.0
 es	05_nuclear	1	64	0.0	0.0
 es	06_coal	1	64	0.0	0.0
 es	07_gas	1	64	0.0	0.0
 es	08_non-res	1	64	0.0	0.0
 es	09_hydro_pump	1	64	0.0	0.0
-es	01_solar	1	65	1.0	0.0
-es	02_wind_on	1	65	1.0	0.0
-es	03_wind_off	1	65	1.0	0.0
-es	04_res	1	65	1.0	0.0
+es	01_solar	1	65	0.0	1.0
+es	02_wind_on	1	65	0.0	1.0
+es	03_wind_off	1	65	0.0	1.0
+es	04_res	1	65	0.0	1.0
 es	05_nuclear	1	65	0.0	0.0
 es	06_coal	1	65	0.0	0.0
 es	07_gas	1	65	0.0	0.0
 es	08_non-res	1	65	0.0	0.0
 es	09_hydro_pump	1	65	0.0	0.0
-es	01_solar	1	66	1.0	0.0
-es	02_wind_on	1	66	1.0	0.0
-es	03_wind_off	1	66	1.0	0.0
-es	04_res	1	66	1.0	0.0
+es	01_solar	1	66	0.0	1.0
+es	02_wind_on	1	66	0.0	1.0
+es	03_wind_off	1	66	0.0	1.0
+es	04_res	1	66	0.0	1.0
 es	05_nuclear	1	66	0.0	0.0
 es	06_coal	1	66	0.0	0.0
 es	07_gas	1	66	0.0	0.0
 es	08_non-res	1	66	0.0	0.0
 es	09_hydro_pump	1	66	0.0	0.0
-es	01_solar	1	67	1.0	0.0
-es	02_wind_on	1	67	1.0	0.0
-es	03_wind_off	1	67	1.0	0.0
-es	04_res	1	67	1.0	0.0
+es	01_solar	1	67	0.0	1.0
+es	02_wind_on	1	67	0.0	1.0
+es	03_wind_off	1	67	0.0	1.0
+es	04_res	1	67	0.0	1.0
 es	05_nuclear	1	67	0.0	0.0
 es	06_coal	1	67	0.0	0.0
 es	07_gas	1	67	0.0	0.0
 es	08_non-res	1	67	0.0	0.0
 es	09_hydro_pump	1	67	0.0	0.0
-es	01_solar	1	68	1.0	0.0
-es	02_wind_on	1	68	1.0	0.0
-es	03_wind_off	1	68	1.0	0.0
-es	04_res	1	68	1.0	0.0
+es	01_solar	1	68	0.0	1.0
+es	02_wind_on	1	68	0.0	1.0
+es	03_wind_off	1	68	0.0	1.0
+es	04_res	1	68	0.0	1.0
 es	05_nuclear	1	68	0.0	0.0
 es	06_coal	1	68	0.0	0.0
 es	07_gas	1	68	0.0	0.0
 es	08_non-res	1	68	0.0	0.0
 es	09_hydro_pump	1	68	0.0	0.0
-es	01_solar	1	69	1.0	0.0
-es	02_wind_on	1	69	1.0	0.0
-es	03_wind_off	1	69	1.0	0.0
-es	04_res	1	69	1.0	0.0
+es	01_solar	1	69	0.0	1.0
+es	02_wind_on	1	69	0.0	1.0
+es	03_wind_off	1	69	0.0	1.0
+es	04_res	1	69	0.0	1.0
 es	05_nuclear	1	69	0.0	0.0
 es	06_coal	1	69	0.0	0.0
 es	07_gas	1	69	0.0	0.0
 es	08_non-res	1	69	0.0	0.0
 es	09_hydro_pump	1	69	0.0	0.0
-es	01_solar	1	70	1.0	0.0
-es	02_wind_on	1	70	1.0	0.0
-es	03_wind_off	1	70	1.0	0.0
-es	04_res	1	70	1.0	0.0
+es	01_solar	1	70	0.0	1.0
+es	02_wind_on	1	70	0.0	1.0
+es	03_wind_off	1	70	0.0	1.0
+es	04_res	1	70	0.0	1.0
 es	05_nuclear	1	70	0.0	0.0
 es	06_coal	1	70	0.0	0.0
 es	07_gas	1	70	0.0	0.0
 es	08_non-res	1	70	0.0	0.0
 es	09_hydro_pump	1	70	0.0	0.0
-es	01_solar	1	71	1.0	0.0
-es	02_wind_on	1	71	1.0	0.0
-es	03_wind_off	1	71	1.0	0.0
-es	04_res	1	71	1.0	0.0
+es	01_solar	1	71	0.0	1.0
+es	02_wind_on	1	71	0.0	1.0
+es	03_wind_off	1	71	0.0	1.0
+es	04_res	1	71	0.0	1.0
 es	05_nuclear	1	71	0.0	0.0
 es	06_coal	1	71	0.0	0.0
 es	07_gas	1	71	0.0	0.0
 es	08_non-res	1	71	0.0	0.0
 es	09_hydro_pump	1	71	0.0	0.0
-es	01_solar	1	72	1.0	0.0
-es	02_wind_on	1	72	1.0	0.0
-es	03_wind_off	1	72	1.0	0.0
-es	04_res	1	72	1.0	0.0
+es	01_solar	1	72	0.0	1.0
+es	02_wind_on	1	72	0.0	1.0
+es	03_wind_off	1	72	0.0	1.0
+es	04_res	1	72	0.0	1.0
 es	05_nuclear	1	72	0.0	0.0
 es	06_coal	1	72	0.0	0.0
 es	07_gas	1	72	0.0	0.0
 es	08_non-res	1	72	0.0	0.0
 es	09_hydro_pump	1	72	0.0	0.0
-es	01_solar	1	73	1.0	0.0
-es	02_wind_on	1	73	1.0	0.0
-es	03_wind_off	1	73	1.0	0.0
-es	04_res	1	73	1.0	0.0
+es	01_solar	1	73	0.0	1.0
+es	02_wind_on	1	73	0.0	1.0
+es	03_wind_off	1	73	0.0	1.0
+es	04_res	1	73	0.0	1.0
 es	05_nuclear	1	73	0.0	0.0
 es	06_coal	1	73	0.0	0.0
 es	07_gas	1	73	0.0	0.0
 es	08_non-res	1	73	0.0	0.0
 es	09_hydro_pump	1	73	0.0	0.0
-es	01_solar	1	74	1.0	0.0
-es	02_wind_on	1	74	1.0	0.0
-es	03_wind_off	1	74	1.0	0.0
-es	04_res	1	74	1.0	0.0
+es	01_solar	1	74	0.0	1.0
+es	02_wind_on	1	74	0.0	1.0
+es	03_wind_off	1	74	0.0	1.0
+es	04_res	1	74	0.0	1.0
 es	05_nuclear	1	74	0.0	0.0
 es	06_coal	1	74	0.0	0.0
 es	07_gas	1	74	0.0	0.0
 es	08_non-res	1	74	0.0	0.0
 es	09_hydro_pump	1	74	0.0	0.0
-es	01_solar	1	75	1.0	0.0
-es	02_wind_on	1	75	1.0	0.0
-es	03_wind_off	1	75	1.0	0.0
-es	04_res	1	75	1.0	0.0
+es	01_solar	1	75	0.0	1.0
+es	02_wind_on	1	75	0.0	1.0
+es	03_wind_off	1	75	0.0	1.0
+es	04_res	1	75	0.0	1.0
 es	05_nuclear	1	75	0.0	0.0
 es	06_coal	1	75	0.0	0.0
 es	07_gas	1	75	0.0	0.0
 es	08_non-res	1	75	0.0	0.0
 es	09_hydro_pump	1	75	0.0	0.0
-es	01_solar	1	76	1.0	0.0
-es	02_wind_on	1	76	1.0	0.0
-es	03_wind_off	1	76	1.0	0.0
-es	04_res	1	76	1.0	0.0
+es	01_solar	1	76	0.0	1.0
+es	02_wind_on	1	76	0.0	1.0
+es	03_wind_off	1	76	0.0	1.0
+es	04_res	1	76	0.0	1.0
 es	05_nuclear	1	76	0.0	0.0
 es	06_coal	1	76	0.0	0.0
 es	07_gas	1	76	0.0	0.0
 es	08_non-res	1	76	0.0	0.0
 es	09_hydro_pump	1	76	0.0	0.0
-es	01_solar	1	77	1.0	0.0
-es	02_wind_on	1	77	1.0	0.0
-es	03_wind_off	1	77	1.0	0.0
-es	04_res	1	77	1.0	0.0
+es	01_solar	1	77	0.0	1.0
+es	02_wind_on	1	77	0.0	1.0
+es	03_wind_off	1	77	0.0	1.0
+es	04_res	1	77	0.0	1.0
 es	05_nuclear	1	77	0.0	0.0
 es	06_coal	1	77	0.0	0.0
 es	07_gas	1	77	0.0	0.0
 es	08_non-res	1	77	0.0	0.0
 es	09_hydro_pump	1	77	0.0	0.0
-es	01_solar	1	78	1.0	0.0
-es	02_wind_on	1	78	1.0	0.0
-es	03_wind_off	1	78	1.0	0.0
-es	04_res	1	78	1.0	0.0
+es	01_solar	1	78	0.0	1.0
+es	02_wind_on	1	78	0.0	1.0
+es	03_wind_off	1	78	0.0	1.0
+es	04_res	1	78	0.0	1.0
 es	05_nuclear	1	78	0.0	0.0
 es	06_coal	1	78	0.0	0.0
 es	07_gas	1	78	0.0	0.0
 es	08_non-res	1	78	0.0	0.0
 es	09_hydro_pump	1	78	0.0	0.0
-es	01_solar	1	79	1.0	0.0
-es	02_wind_on	1	79	1.0	0.0
-es	03_wind_off	1	79	1.0	0.0
-es	04_res	1	79	1.0	0.0
+es	01_solar	1	79	0.0	1.0
+es	02_wind_on	1	79	0.0	1.0
+es	03_wind_off	1	79	0.0	1.0
+es	04_res	1	79	0.0	1.0
 es	05_nuclear	1	79	0.0	0.0
 es	06_coal	1	79	0.0	0.0
 es	07_gas	1	79	0.0	0.0
 es	08_non-res	1	79	0.0	0.0
 es	09_hydro_pump	1	79	0.0	0.0
-es	01_solar	1	80	1.0	0.0
-es	02_wind_on	1	80	1.0	0.0
-es	03_wind_off	1	80	1.0	0.0
-es	04_res	1	80	1.0	0.0
+es	01_solar	1	80	0.0	1.0
+es	02_wind_on	1	80	0.0	1.0
+es	03_wind_off	1	80	0.0	1.0
+es	04_res	1	80	0.0	1.0
 es	05_nuclear	1	80	0.0	0.0
 es	06_coal	1	80	0.0	0.0
 es	07_gas	1	80	0.0	0.0
 es	08_non-res	1	80	0.0	0.0
 es	09_hydro_pump	1	80	0.0	0.0
-es	01_solar	1	81	1.0	0.0
-es	02_wind_on	1	81	1.0	0.0
-es	03_wind_off	1	81	1.0	0.0
-es	04_res	1	81	1.0	0.0
+es	01_solar	1	81	0.0	1.0
+es	02_wind_on	1	81	0.0	1.0
+es	03_wind_off	1	81	0.0	1.0
+es	04_res	1	81	0.0	1.0
 es	05_nuclear	1	81	0.0	0.0
 es	06_coal	1	81	0.0	0.0
 es	07_gas	1	81	0.0	0.0
 es	08_non-res	1	81	0.0	0.0
 es	09_hydro_pump	1	81	0.0	0.0
-es	01_solar	1	82	1.0	0.0
-es	02_wind_on	1	82	1.0	0.0
-es	03_wind_off	1	82	1.0	0.0
-es	04_res	1	82	1.0	0.0
-es	05_nuclear	1	82	1.0	0.0
+es	01_solar	1	82	0.0	1.0
+es	02_wind_on	1	82	0.0	1.0
+es	03_wind_off	1	82	0.0	1.0
+es	04_res	1	82	0.0	1.0
+es	05_nuclear	1	82	0.0	1.0
 es	06_coal	1	82	0.0	0.0
 es	07_gas	1	82	0.0	0.0
 es	08_non-res	1	82	0.0	0.0
 es	09_hydro_pump	1	82	0.0	0.0
-es	01_solar	1	83	1.0	0.0
-es	02_wind_on	1	83	1.0	0.0
-es	03_wind_off	1	83	1.0	0.0
-es	04_res	1	83	1.0	0.0
-es	05_nuclear	1	83	1.0	0.0
+es	01_solar	1	83	0.0	1.0
+es	02_wind_on	1	83	0.0	1.0
+es	03_wind_off	1	83	0.0	1.0
+es	04_res	1	83	0.0	1.0
+es	05_nuclear	1	83	0.0	1.0
 es	06_coal	1	83	0.0	0.0
 es	07_gas	1	83	0.0	0.0
 es	08_non-res	1	83	0.0	0.0
 es	09_hydro_pump	1	83	0.0	0.0
-es	01_solar	1	84	1.0	0.0
-es	02_wind_on	1	84	1.0	0.0
-es	03_wind_off	1	84	1.0	0.0
-es	04_res	1	84	1.0	0.0
-es	05_nuclear	1	84	1.0	0.0
+es	01_solar	1	84	0.0	1.0
+es	02_wind_on	1	84	0.0	1.0
+es	03_wind_off	1	84	0.0	1.0
+es	04_res	1	84	0.0	1.0
+es	05_nuclear	1	84	0.0	1.0
 es	06_coal	1	84	0.0	0.0
 es	07_gas	1	84	0.0	0.0
 es	08_non-res	1	84	0.0	0.0
 es	09_hydro_pump	1	84	0.0	0.0
-es	01_solar	1	85	1.0	0.0
-es	02_wind_on	1	85	1.0	0.0
-es	03_wind_off	1	85	1.0	0.0
-es	04_res	1	85	1.0	0.0
-es	05_nuclear	1	85	1.0	0.0
+es	01_solar	1	85	0.0	1.0
+es	02_wind_on	1	85	0.0	1.0
+es	03_wind_off	1	85	0.0	1.0
+es	04_res	1	85	0.0	1.0
+es	05_nuclear	1	85	0.0	1.0
 es	06_coal	1	85	0.0	0.0
 es	07_gas	1	85	0.0	0.0
 es	08_non-res	1	85	0.0	0.0
 es	09_hydro_pump	1	85	0.0	0.0
-es	01_solar	1	86	1.0	0.0
-es	02_wind_on	1	86	1.0	0.0
-es	03_wind_off	1	86	1.0	0.0
-es	04_res	1	86	1.0	0.0
-es	05_nuclear	1	86	1.0	0.0
+es	01_solar	1	86	0.0	1.0
+es	02_wind_on	1	86	0.0	1.0
+es	03_wind_off	1	86	0.0	1.0
+es	04_res	1	86	0.0	1.0
+es	05_nuclear	1	86	0.0	1.0
 es	06_coal	1	86	0.0	0.0
 es	07_gas	1	86	0.0	0.0
 es	08_non-res	1	86	0.0	0.0
 es	09_hydro_pump	1	86	0.0	0.0
-es	01_solar	1	87	1.0	0.0
-es	02_wind_on	1	87	1.0	0.0
-es	03_wind_off	1	87	1.0	0.0
-es	04_res	1	87	1.0	0.0
-es	05_nuclear	1	87	1.0	0.0
+es	01_solar	1	87	0.0	1.0
+es	02_wind_on	1	87	0.0	1.0
+es	03_wind_off	1	87	0.0	1.0
+es	04_res	1	87	0.0	1.0
+es	05_nuclear	1	87	0.0	1.0
 es	06_coal	1	87	0.0	0.0
 es	07_gas	1	87	0.0	0.0
 es	08_non-res	1	87	0.0	0.0
 es	09_hydro_pump	1	87	0.0	0.0
-es	01_solar	1	88	1.0	0.0
-es	02_wind_on	1	88	1.0	0.0
-es	03_wind_off	1	88	1.0	0.0
-es	04_res	1	88	1.0	0.0
-es	05_nuclear	1	88	1.0	0.0
+es	01_solar	1	88	0.0	1.0
+es	02_wind_on	1	88	0.0	1.0
+es	03_wind_off	1	88	0.0	1.0
+es	04_res	1	88	0.0	1.0
+es	05_nuclear	1	88	0.0	1.0
 es	06_coal	1	88	0.0	0.0
 es	07_gas	1	88	0.0	0.0
 es	08_non-res	1	88	0.0	0.0
 es	09_hydro_pump	1	88	0.0	0.0
-es	01_solar	1	89	1.0	0.0
-es	02_wind_on	1	89	1.0	0.0
-es	03_wind_off	1	89	1.0	0.0
-es	04_res	1	89	1.0	0.0
-es	05_nuclear	1	89	1.0	0.0
+es	01_solar	1	89	0.0	1.0
+es	02_wind_on	1	89	0.0	1.0
+es	03_wind_off	1	89	0.0	1.0
+es	04_res	1	89	0.0	1.0
+es	05_nuclear	1	89	0.0	1.0
 es	06_coal	1	89	0.0	0.0
 es	07_gas	1	89	0.0	0.0
 es	08_non-res	1	89	0.0	0.0
 es	09_hydro_pump	1	89	0.0	0.0
-es	01_solar	1	90	1.0	0.0
-es	02_wind_on	1	90	1.0	0.0
-es	03_wind_off	1	90	1.0	0.0
-es	04_res	1	90	1.0	0.0
-es	05_nuclear	1	90	1.0	0.0
+es	01_solar	1	90	0.0	1.0
+es	02_wind_on	1	90	0.0	1.0
+es	03_wind_off	1	90	0.0	1.0
+es	04_res	1	90	0.0	1.0
+es	05_nuclear	1	90	0.0	1.0
 es	06_coal	1	90	0.0	0.0
 es	07_gas	1	90	0.0	0.0
 es	08_non-res	1	90	0.0	0.0
 es	09_hydro_pump	1	90	0.0	0.0
-es	01_solar	1	91	1.0	0.0
-es	02_wind_on	1	91	1.0	0.0
-es	03_wind_off	1	91	1.0	0.0
-es	04_res	1	91	1.0	0.0
-es	05_nuclear	1	91	1.0	0.0
+es	01_solar	1	91	0.0	1.0
+es	02_wind_on	1	91	0.0	1.0
+es	03_wind_off	1	91	0.0	1.0
+es	04_res	1	91	0.0	1.0
+es	05_nuclear	1	91	0.0	1.0
 es	06_coal	1	91	0.0	0.0
 es	07_gas	1	91	0.0	0.0
 es	08_non-res	1	91	0.0	0.0
 es	09_hydro_pump	1	91	0.0	0.0
-es	01_solar	1	92	1.0	0.0
-es	02_wind_on	1	92	1.0	0.0
-es	03_wind_off	1	92	1.0	0.0
-es	04_res	1	92	1.0	0.0
-es	05_nuclear	1	92	1.0	0.0
+es	01_solar	1	92	0.0	1.0
+es	02_wind_on	1	92	0.0	1.0
+es	03_wind_off	1	92	0.0	1.0
+es	04_res	1	92	0.0	1.0
+es	05_nuclear	1	92	0.0	1.0
 es	06_coal	1	92	0.0	0.0
 es	07_gas	1	92	0.0	0.0
 es	08_non-res	1	92	0.0	0.0
 es	09_hydro_pump	1	92	0.0	0.0
-es	01_solar	1	93	1.0	0.0
-es	02_wind_on	1	93	1.0	0.0
-es	03_wind_off	1	93	1.0	0.0
-es	04_res	1	93	1.0	0.0
-es	05_nuclear	1	93	1.0	0.0
+es	01_solar	1	93	0.0	1.0
+es	02_wind_on	1	93	0.0	1.0
+es	03_wind_off	1	93	0.0	1.0
+es	04_res	1	93	0.0	1.0
+es	05_nuclear	1	93	0.0	1.0
 es	06_coal	1	93	0.0	0.0
 es	07_gas	1	93	0.0	0.0
 es	08_non-res	1	93	0.0	0.0
 es	09_hydro_pump	1	93	0.0	0.0
-es	01_solar	1	94	1.0	0.0
-es	02_wind_on	1	94	1.0	0.0
-es	03_wind_off	1	94	1.0	0.0
-es	04_res	1	94	1.0	0.0
-es	05_nuclear	1	94	1.0	0.0
+es	01_solar	1	94	0.0	1.0
+es	02_wind_on	1	94	0.0	1.0
+es	03_wind_off	1	94	0.0	1.0
+es	04_res	1	94	0.0	1.0
+es	05_nuclear	1	94	0.0	1.0
 es	06_coal	1	94	0.0	0.0
 es	07_gas	1	94	0.0	0.0
 es	08_non-res	1	94	0.0	0.0
 es	09_hydro_pump	1	94	0.0	0.0
-es	01_solar	1	95	1.0	0.0
-es	02_wind_on	1	95	1.0	0.0
-es	03_wind_off	1	95	1.0	0.0
-es	04_res	1	95	1.0	0.0
-es	05_nuclear	1	95	1.0	0.0
+es	01_solar	1	95	0.0	1.0
+es	02_wind_on	1	95	0.0	1.0
+es	03_wind_off	1	95	0.0	1.0
+es	04_res	1	95	0.0	1.0
+es	05_nuclear	1	95	0.0	1.0
 es	06_coal	1	95	0.0	0.0
 es	07_gas	1	95	0.0	0.0
 es	08_non-res	1	95	0.0	0.0
 es	09_hydro_pump	1	95	0.0	0.0
-es	01_solar	1	96	1.0	0.0
-es	02_wind_on	1	96	1.0	0.0
-es	03_wind_off	1	96	1.0	0.0
-es	04_res	1	96	1.0	0.0
-es	05_nuclear	1	96	1.0	0.0
+es	01_solar	1	96	0.0	1.0
+es	02_wind_on	1	96	0.0	1.0
+es	03_wind_off	1	96	0.0	1.0
+es	04_res	1	96	0.0	1.0
+es	05_nuclear	1	96	0.0	1.0
 es	06_coal	1	96	0.0	0.0
 es	07_gas	1	96	0.0	0.0
 es	08_non-res	1	96	0.0	0.0
 es	09_hydro_pump	1	96	0.0	0.0
-es	01_solar	1	97	1.0	0.0
-es	02_wind_on	1	97	1.0	0.0
-es	03_wind_off	1	97	1.0	0.0
-es	04_res	1	97	1.0	0.0
-es	05_nuclear	1	97	1.0	0.0
+es	01_solar	1	97	0.0	1.0
+es	02_wind_on	1	97	0.0	1.0
+es	03_wind_off	1	97	0.0	1.0
+es	04_res	1	97	0.0	1.0
+es	05_nuclear	1	97	0.0	1.0
 es	06_coal	1	97	0.0	0.0
 es	07_gas	1	97	0.0	0.0
 es	08_non-res	1	97	0.0	0.0
 es	09_hydro_pump	1	97	0.0	0.0
-es	01_solar	1	98	1.0	0.0
-es	02_wind_on	1	98	1.0	0.0
-es	03_wind_off	1	98	1.0	0.0
-es	04_res	1	98	1.0	0.0
-es	05_nuclear	1	98	1.0	0.0
+es	01_solar	1	98	0.0	1.0
+es	02_wind_on	1	98	0.0	1.0
+es	03_wind_off	1	98	0.0	1.0
+es	04_res	1	98	0.0	1.0
+es	05_nuclear	1	98	0.0	1.0
 es	06_coal	1	98	0.0	0.0
 es	07_gas	1	98	0.0	0.0
 es	08_non-res	1	98	0.0	0.0
 es	09_hydro_pump	1	98	0.0	0.0
-es	01_solar	1	99	1.0	0.0
-es	02_wind_on	1	99	1.0	0.0
-es	03_wind_off	1	99	1.0	0.0
-es	04_res	1	99	1.0	0.0
-es	05_nuclear	1	99	1.0	0.0
+es	01_solar	1	99	0.0	1.0
+es	02_wind_on	1	99	0.0	1.0
+es	03_wind_off	1	99	0.0	1.0
+es	04_res	1	99	0.0	1.0
+es	05_nuclear	1	99	0.0	1.0
 es	06_coal	1	99	0.0	0.0
 es	07_gas	1	99	0.0	0.0
 es	08_non-res	1	99	0.0	0.0
 es	09_hydro_pump	1	99	0.0	0.0
-es	01_solar	1	100	1.0	0.0
-es	02_wind_on	1	100	1.0	0.0
-es	03_wind_off	1	100	1.0	0.0
-es	04_res	1	100	1.0	0.0
-es	05_nuclear	1	100	1.0	0.0
+es	01_solar	1	100	0.0	1.0
+es	02_wind_on	1	100	0.0	1.0
+es	03_wind_off	1	100	0.0	1.0
+es	04_res	1	100	0.0	1.0
+es	05_nuclear	1	100	0.0	1.0
 es	06_coal	1	100	0.0	0.0
 es	07_gas	1	100	0.0	0.0
 es	08_non-res	1	100	0.0	0.0
 es	09_hydro_pump	1	100	0.0	0.0
-es	01_solar	1	101	1.0	0.0
-es	02_wind_on	1	101	1.0	0.0
-es	03_wind_off	1	101	1.0	0.0
-es	04_res	1	101	1.0	0.0
-es	05_nuclear	1	101	1.0	0.0
+es	01_solar	1	101	0.0	1.0
+es	02_wind_on	1	101	0.0	1.0
+es	03_wind_off	1	101	0.0	1.0
+es	04_res	1	101	0.0	1.0
+es	05_nuclear	1	101	0.0	1.0
 es	06_coal	1	101	0.0	0.0
 es	07_gas	1	101	0.0	0.0
 es	08_non-res	1	101	0.0	0.0
 es	09_hydro_pump	1	101	0.0	0.0
-es	01_solar	1	102	1.0	0.0
-es	02_wind_on	1	102	1.0	0.0
-es	03_wind_off	1	102	1.0	0.0
-es	04_res	1	102	1.0	0.0
-es	05_nuclear	1	102	1.0	0.0
-es	06_coal	1	102	1.0	0.0
+es	01_solar	1	102	0.0	1.0
+es	02_wind_on	1	102	0.0	1.0
+es	03_wind_off	1	102	0.0	1.0
+es	04_res	1	102	0.0	1.0
+es	05_nuclear	1	102	0.0	1.0
+es	06_coal	1	102	0.0	1.0
 es	07_gas	1	102	0.0	0.0
 es	08_non-res	1	102	0.0	0.0
 es	09_hydro_pump	1	102	0.0	0.0
-es	01_solar	1	103	1.0	0.0
-es	02_wind_on	1	103	1.0	0.0
-es	03_wind_off	1	103	1.0	0.0
-es	04_res	1	103	1.0	0.0
-es	05_nuclear	1	103	1.0	0.0
-es	06_coal	1	103	1.0	0.0
+es	01_solar	1	103	0.0	1.0
+es	02_wind_on	1	103	0.0	1.0
+es	03_wind_off	1	103	0.0	1.0
+es	04_res	1	103	0.0	1.0
+es	05_nuclear	1	103	0.0	1.0
+es	06_coal	1	103	0.0	1.0
 es	07_gas	1	103	0.0	0.0
 es	08_non-res	1	103	0.0	0.0
 es	09_hydro_pump	1	103	0.0	0.0
-es	01_solar	1	104	1.0	0.0
-es	02_wind_on	1	104	1.0	0.0
-es	03_wind_off	1	104	1.0	0.0
-es	04_res	1	104	1.0	0.0
-es	05_nuclear	1	104	1.0	0.0
-es	06_coal	1	104	1.0	0.0
+es	01_solar	1	104	0.0	1.0
+es	02_wind_on	1	104	0.0	1.0
+es	03_wind_off	1	104	0.0	1.0
+es	04_res	1	104	0.0	1.0
+es	05_nuclear	1	104	0.0	1.0
+es	06_coal	1	104	0.0	1.0
 es	07_gas	1	104	0.0	0.0
 es	08_non-res	1	104	0.0	0.0
 es	09_hydro_pump	1	104	0.0	0.0
-es	01_solar	1	105	1.0	0.0
-es	02_wind_on	1	105	1.0	0.0
-es	03_wind_off	1	105	1.0	0.0
-es	04_res	1	105	1.0	0.0
-es	05_nuclear	1	105	1.0	0.0
-es	06_coal	1	105	1.0	0.0
+es	01_solar	1	105	0.0	1.0
+es	02_wind_on	1	105	0.0	1.0
+es	03_wind_off	1	105	0.0	1.0
+es	04_res	1	105	0.0	1.0
+es	05_nuclear	1	105	0.0	1.0
+es	06_coal	1	105	0.0	1.0
 es	07_gas	1	105	0.0	0.0
 es	08_non-res	1	105	0.0	0.0
 es	09_hydro_pump	1	105	0.0	0.0
-es	01_solar	1	106	1.0	0.0
-es	02_wind_on	1	106	1.0	0.0
-es	03_wind_off	1	106	1.0	0.0
-es	04_res	1	106	1.0	0.0
-es	05_nuclear	1	106	1.0	0.0
-es	06_coal	1	106	1.0	0.0
+es	01_solar	1	106	0.0	1.0
+es	02_wind_on	1	106	0.0	1.0
+es	03_wind_off	1	106	0.0	1.0
+es	04_res	1	106	0.0	1.0
+es	05_nuclear	1	106	0.0	1.0
+es	06_coal	1	106	0.0	1.0
 es	07_gas	1	106	0.0	0.0
 es	08_non-res	1	106	0.0	0.0
 es	09_hydro_pump	1	106	0.0	0.0
-es	01_solar	1	107	1.0	0.0
-es	02_wind_on	1	107	1.0	0.0
-es	03_wind_off	1	107	1.0	0.0
-es	04_res	1	107	1.0	0.0
-es	05_nuclear	1	107	1.0	0.0
-es	06_coal	1	107	1.0	0.0
+es	01_solar	1	107	0.0	1.0
+es	02_wind_on	1	107	0.0	1.0
+es	03_wind_off	1	107	0.0	1.0
+es	04_res	1	107	0.0	1.0
+es	05_nuclear	1	107	0.0	1.0
+es	06_coal	1	107	0.0	1.0
 es	07_gas	1	107	0.0	0.0
 es	08_non-res	1	107	0.0	0.0
 es	09_hydro_pump	1	107	0.0	0.0
-es	01_solar	1	108	1.0	0.0
-es	02_wind_on	1	108	1.0	0.0
-es	03_wind_off	1	108	1.0	0.0
-es	04_res	1	108	1.0	0.0
-es	05_nuclear	1	108	1.0	0.0
-es	06_coal	1	108	1.0	0.0
+es	01_solar	1	108	0.0	1.0
+es	02_wind_on	1	108	0.0	1.0
+es	03_wind_off	1	108	0.0	1.0
+es	04_res	1	108	0.0	1.0
+es	05_nuclear	1	108	0.0	1.0
+es	06_coal	1	108	0.0	1.0
 es	07_gas	1	108	0.0	0.0
 es	08_non-res	1	108	0.0	0.0
 es	09_hydro_pump	1	108	0.0	0.0
-es	01_solar	1	109	1.0	0.0
-es	02_wind_on	1	109	1.0	0.0
-es	03_wind_off	1	109	1.0	0.0
-es	04_res	1	109	1.0	0.0
-es	05_nuclear	1	109	1.0	0.0
-es	06_coal	1	109	1.0	0.0
+es	01_solar	1	109	0.0	1.0
+es	02_wind_on	1	109	0.0	1.0
+es	03_wind_off	1	109	0.0	1.0
+es	04_res	1	109	0.0	1.0
+es	05_nuclear	1	109	0.0	1.0
+es	06_coal	1	109	0.0	1.0
 es	07_gas	1	109	0.0	0.0
 es	08_non-res	1	109	0.0	0.0
 es	09_hydro_pump	1	109	0.0	0.0
-es	01_solar	1	110	1.0	0.0
-es	02_wind_on	1	110	1.0	0.0
-es	03_wind_off	1	110	1.0	0.0
-es	04_res	1	110	1.0	0.0
-es	05_nuclear	1	110	1.0	0.0
-es	06_coal	1	110	1.0	0.0
+es	01_solar	1	110	0.0	1.0
+es	02_wind_on	1	110	0.0	1.0
+es	03_wind_off	1	110	0.0	1.0
+es	04_res	1	110	0.0	1.0
+es	05_nuclear	1	110	0.0	1.0
+es	06_coal	1	110	0.0	1.0
 es	07_gas	1	110	0.0	0.0
 es	08_non-res	1	110	0.0	0.0
 es	09_hydro_pump	1	110	0.0	0.0
-es	01_solar	1	111	1.0	0.0
-es	02_wind_on	1	111	1.0	0.0
-es	03_wind_off	1	111	1.0	0.0
-es	04_res	1	111	1.0	0.0
-es	05_nuclear	1	111	1.0	0.0
-es	06_coal	1	111	1.0	0.0
+es	01_solar	1	111	0.0	1.0
+es	02_wind_on	1	111	0.0	1.0
+es	03_wind_off	1	111	0.0	1.0
+es	04_res	1	111	0.0	1.0
+es	05_nuclear	1	111	0.0	1.0
+es	06_coal	1	111	0.0	1.0
 es	07_gas	1	111	0.0	0.0
 es	08_non-res	1	111	0.0	0.0
 es	09_hydro_pump	1	111	0.0	0.0
-es	01_solar	1	112	1.0	0.0
-es	02_wind_on	1	112	1.0	0.0
-es	03_wind_off	1	112	1.0	0.0
-es	04_res	1	112	1.0	0.0
-es	05_nuclear	1	112	1.0	0.0
-es	06_coal	1	112	1.0	0.0
+es	01_solar	1	112	0.0	1.0
+es	02_wind_on	1	112	0.0	1.0
+es	03_wind_off	1	112	0.0	1.0
+es	04_res	1	112	0.0	1.0
+es	05_nuclear	1	112	0.0	1.0
+es	06_coal	1	112	0.0	1.0
 es	07_gas	1	112	0.0	0.0
 es	08_non-res	1	112	0.0	0.0
 es	09_hydro_pump	1	112	0.0	0.0
-es	01_solar	1	113	1.0	0.0
-es	02_wind_on	1	113	1.0	0.0
-es	03_wind_off	1	113	1.0	0.0
-es	04_res	1	113	1.0	0.0
-es	05_nuclear	1	113	1.0	0.0
-es	06_coal	1	113	1.0	0.0
+es	01_solar	1	113	0.0	1.0
+es	02_wind_on	1	113	0.0	1.0
+es	03_wind_off	1	113	0.0	1.0
+es	04_res	1	113	0.0	1.0
+es	05_nuclear	1	113	0.0	1.0
+es	06_coal	1	113	0.0	1.0
 es	07_gas	1	113	0.0	0.0
 es	08_non-res	1	113	0.0	0.0
 es	09_hydro_pump	1	113	0.0	0.0
-es	01_solar	1	114	1.0	0.0
-es	02_wind_on	1	114	1.0	0.0
-es	03_wind_off	1	114	1.0	0.0
-es	04_res	1	114	1.0	0.0
-es	05_nuclear	1	114	1.0	0.0
-es	06_coal	1	114	1.0	0.0
+es	01_solar	1	114	0.0	1.0
+es	02_wind_on	1	114	0.0	1.0
+es	03_wind_off	1	114	0.0	1.0
+es	04_res	1	114	0.0	1.0
+es	05_nuclear	1	114	0.0	1.0
+es	06_coal	1	114	0.0	1.0
 es	07_gas	1	114	0.0	0.0
 es	08_non-res	1	114	0.0	0.0
 es	09_hydro_pump	1	114	0.0	0.0
-es	01_solar	1	115	1.0	0.0
-es	02_wind_on	1	115	1.0	0.0
-es	03_wind_off	1	115	1.0	0.0
-es	04_res	1	115	1.0	0.0
-es	05_nuclear	1	115	1.0	0.0
-es	06_coal	1	115	1.0	0.0
+es	01_solar	1	115	0.0	1.0
+es	02_wind_on	1	115	0.0	1.0
+es	03_wind_off	1	115	0.0	1.0
+es	04_res	1	115	0.0	1.0
+es	05_nuclear	1	115	0.0	1.0
+es	06_coal	1	115	0.0	1.0
 es	07_gas	1	115	0.0	0.0
 es	08_non-res	1	115	0.0	0.0
 es	09_hydro_pump	1	115	0.0	0.0
-es	01_solar	1	116	1.0	0.0
-es	02_wind_on	1	116	1.0	0.0
-es	03_wind_off	1	116	1.0	0.0
-es	04_res	1	116	1.0	0.0
-es	05_nuclear	1	116	1.0	0.0
-es	06_coal	1	116	1.0	0.0
+es	01_solar	1	116	0.0	1.0
+es	02_wind_on	1	116	0.0	1.0
+es	03_wind_off	1	116	0.0	1.0
+es	04_res	1	116	0.0	1.0
+es	05_nuclear	1	116	0.0	1.0
+es	06_coal	1	116	0.0	1.0
 es	07_gas	1	116	0.0	0.0
 es	08_non-res	1	116	0.0	0.0
 es	09_hydro_pump	1	116	0.0	0.0
-es	01_solar	1	117	1.0	0.0
-es	02_wind_on	1	117	1.0	0.0
-es	03_wind_off	1	117	1.0	0.0
-es	04_res	1	117	1.0	0.0
-es	05_nuclear	1	117	1.0	0.0
-es	06_coal	1	117	1.0	0.0
+es	01_solar	1	117	0.0	1.0
+es	02_wind_on	1	117	0.0	1.0
+es	03_wind_off	1	117	0.0	1.0
+es	04_res	1	117	0.0	1.0
+es	05_nuclear	1	117	0.0	1.0
+es	06_coal	1	117	0.0	1.0
 es	07_gas	1	117	0.0	0.0
 es	08_non-res	1	117	0.0	0.0
 es	09_hydro_pump	1	117	0.0	0.0
-es	01_solar	1	118	1.0	0.0
-es	02_wind_on	1	118	1.0	0.0
-es	03_wind_off	1	118	1.0	0.0
-es	04_res	1	118	1.0	0.0
-es	05_nuclear	1	118	1.0	0.0
-es	06_coal	1	118	1.0	0.0
+es	01_solar	1	118	0.0	1.0
+es	02_wind_on	1	118	0.0	1.0
+es	03_wind_off	1	118	0.0	1.0
+es	04_res	1	118	0.0	1.0
+es	05_nuclear	1	118	0.0	1.0
+es	06_coal	1	118	0.0	1.0
 es	07_gas	1	118	0.0	0.0
 es	08_non-res	1	118	0.0	0.0
 es	09_hydro_pump	1	118	0.0	0.0
-es	01_solar	1	119	1.0	0.0
-es	02_wind_on	1	119	1.0	0.0
-es	03_wind_off	1	119	1.0	0.0
-es	04_res	1	119	1.0	0.0
-es	05_nuclear	1	119	1.0	0.0
-es	06_coal	1	119	1.0	0.0
+es	01_solar	1	119	0.0	1.0
+es	02_wind_on	1	119	0.0	1.0
+es	03_wind_off	1	119	0.0	1.0
+es	04_res	1	119	0.0	1.0
+es	05_nuclear	1	119	0.0	1.0
+es	06_coal	1	119	0.0	1.0
 es	07_gas	1	119	0.0	0.0
 es	08_non-res	1	119	0.0	0.0
 es	09_hydro_pump	1	119	0.0	0.0
-es	01_solar	1	120	1.0	0.0
-es	02_wind_on	1	120	1.0	0.0
-es	03_wind_off	1	120	1.0	0.0
-es	04_res	1	120	1.0	0.0
-es	05_nuclear	1	120	1.0	0.0
-es	06_coal	1	120	1.0	0.0
+es	01_solar	1	120	0.0	1.0
+es	02_wind_on	1	120	0.0	1.0
+es	03_wind_off	1	120	0.0	1.0
+es	04_res	1	120	0.0	1.0
+es	05_nuclear	1	120	0.0	1.0
+es	06_coal	1	120	0.0	1.0
 es	07_gas	1	120	0.0	0.0
 es	08_non-res	1	120	0.0	0.0
 es	09_hydro_pump	1	120	0.0	0.0
-es	01_solar	1	121	1.0	0.0
-es	02_wind_on	1	121	1.0	0.0
-es	03_wind_off	1	121	1.0	0.0
-es	04_res	1	121	1.0	0.0
-es	05_nuclear	1	121	1.0	0.0
-es	06_coal	1	121	1.0	0.0
+es	01_solar	1	121	0.0	1.0
+es	02_wind_on	1	121	0.0	1.0
+es	03_wind_off	1	121	0.0	1.0
+es	04_res	1	121	0.0	1.0
+es	05_nuclear	1	121	0.0	1.0
+es	06_coal	1	121	0.0	1.0
 es	07_gas	1	121	0.0	0.0
 es	08_non-res	1	121	0.0	0.0
 es	09_hydro_pump	1	121	0.0	0.0
-es	01_solar	1	122	1.0	0.0
-es	02_wind_on	1	122	1.0	0.0
-es	03_wind_off	1	122	1.0	0.0
-es	04_res	1	122	1.0	0.0
-es	05_nuclear	1	122	1.0	0.0
-es	06_coal	1	122	1.0	0.0
-es	07_gas	1	122	1.0	0.0
+es	01_solar	1	122	0.0	1.0
+es	02_wind_on	1	122	0.0	1.0
+es	03_wind_off	1	122	0.0	1.0
+es	04_res	1	122	0.0	1.0
+es	05_nuclear	1	122	0.0	1.0
+es	06_coal	1	122	0.0	1.0
+es	07_gas	1	122	0.0	1.0
 es	08_non-res	1	122	0.0	0.0
 es	09_hydro_pump	1	122	0.0	0.0
-es	01_solar	1	123	1.0	0.0
-es	02_wind_on	1	123	1.0	0.0
-es	03_wind_off	1	123	1.0	0.0
-es	04_res	1	123	1.0	0.0
-es	05_nuclear	1	123	1.0	0.0
-es	06_coal	1	123	1.0	0.0
-es	07_gas	1	123	1.0	0.0
+es	01_solar	1	123	0.0	1.0
+es	02_wind_on	1	123	0.0	1.0
+es	03_wind_off	1	123	0.0	1.0
+es	04_res	1	123	0.0	1.0
+es	05_nuclear	1	123	0.0	1.0
+es	06_coal	1	123	0.0	1.0
+es	07_gas	1	123	0.0	1.0
 es	08_non-res	1	123	0.0	0.0
 es	09_hydro_pump	1	123	0.0	0.0
-es	01_solar	1	124	1.0	0.0
-es	02_wind_on	1	124	1.0	0.0
-es	03_wind_off	1	124	1.0	0.0
-es	04_res	1	124	1.0	0.0
-es	05_nuclear	1	124	1.0	0.0
-es	06_coal	1	124	1.0	0.0
-es	07_gas	1	124	1.0	0.0
+es	01_solar	1	124	0.0	1.0
+es	02_wind_on	1	124	0.0	1.0
+es	03_wind_off	1	124	0.0	1.0
+es	04_res	1	124	0.0	1.0
+es	05_nuclear	1	124	0.0	1.0
+es	06_coal	1	124	0.0	1.0
+es	07_gas	1	124	0.0	1.0
 es	08_non-res	1	124	0.0	0.0
 es	09_hydro_pump	1	124	0.0	0.0
-es	01_solar	1	125	1.0	0.0
-es	02_wind_on	1	125	1.0	0.0
-es	03_wind_off	1	125	1.0	0.0
-es	04_res	1	125	1.0	0.0
-es	05_nuclear	1	125	1.0	0.0
-es	06_coal	1	125	1.0	0.0
-es	07_gas	1	125	1.0	0.0
+es	01_solar	1	125	0.0	1.0
+es	02_wind_on	1	125	0.0	1.0
+es	03_wind_off	1	125	0.0	1.0
+es	04_res	1	125	0.0	1.0
+es	05_nuclear	1	125	0.0	1.0
+es	06_coal	1	125	0.0	1.0
+es	07_gas	1	125	0.0	1.0
 es	08_non-res	1	125	0.0	0.0
 es	09_hydro_pump	1	125	0.0	0.0
-es	01_solar	1	126	1.0	0.0
-es	02_wind_on	1	126	1.0	0.0
-es	03_wind_off	1	126	1.0	0.0
-es	04_res	1	126	1.0	0.0
-es	05_nuclear	1	126	1.0	0.0
-es	06_coal	1	126	1.0	0.0
-es	07_gas	1	126	1.0	0.0
+es	01_solar	1	126	0.0	1.0
+es	02_wind_on	1	126	0.0	1.0
+es	03_wind_off	1	126	0.0	1.0
+es	04_res	1	126	0.0	1.0
+es	05_nuclear	1	126	0.0	1.0
+es	06_coal	1	126	0.0	1.0
+es	07_gas	1	126	0.0	1.0
 es	08_non-res	1	126	0.0	0.0
 es	09_hydro_pump	1	126	0.0	0.0
-es	01_solar	1	127	1.0	0.0
-es	02_wind_on	1	127	1.0	0.0
-es	03_wind_off	1	127	1.0	0.0
-es	04_res	1	127	1.0	0.0
-es	05_nuclear	1	127	1.0	0.0
-es	06_coal	1	127	1.0	0.0
-es	07_gas	1	127	1.0	0.0
+es	01_solar	1	127	0.0	1.0
+es	02_wind_on	1	127	0.0	1.0
+es	03_wind_off	1	127	0.0	1.0
+es	04_res	1	127	0.0	1.0
+es	05_nuclear	1	127	0.0	1.0
+es	06_coal	1	127	0.0	1.0
+es	07_gas	1	127	0.0	1.0
 es	08_non-res	1	127	0.0	0.0
 es	09_hydro_pump	1	127	0.0	0.0
-es	01_solar	1	128	1.0	0.0
-es	02_wind_on	1	128	1.0	0.0
-es	03_wind_off	1	128	1.0	0.0
-es	04_res	1	128	1.0	0.0
-es	05_nuclear	1	128	1.0	0.0
-es	06_coal	1	128	1.0	0.0
-es	07_gas	1	128	1.0	0.0
+es	01_solar	1	128	0.0	1.0
+es	02_wind_on	1	128	0.0	1.0
+es	03_wind_off	1	128	0.0	1.0
+es	04_res	1	128	0.0	1.0
+es	05_nuclear	1	128	0.0	1.0
+es	06_coal	1	128	0.0	1.0
+es	07_gas	1	128	0.0	1.0
 es	08_non-res	1	128	0.0	0.0
 es	09_hydro_pump	1	128	0.0	0.0
-es	01_solar	1	129	1.0	0.0
-es	02_wind_on	1	129	1.0	0.0
-es	03_wind_off	1	129	1.0	0.0
-es	04_res	1	129	1.0	0.0
-es	05_nuclear	1	129	1.0	0.0
-es	06_coal	1	129	1.0	0.0
-es	07_gas	1	129	1.0	0.0
+es	01_solar	1	129	0.0	1.0
+es	02_wind_on	1	129	0.0	1.0
+es	03_wind_off	1	129	0.0	1.0
+es	04_res	1	129	0.0	1.0
+es	05_nuclear	1	129	0.0	1.0
+es	06_coal	1	129	0.0	1.0
+es	07_gas	1	129	0.0	1.0
 es	08_non-res	1	129	0.0	0.0
 es	09_hydro_pump	1	129	0.0	0.0
-es	01_solar	1	130	1.0	0.0
-es	02_wind_on	1	130	1.0	0.0
-es	03_wind_off	1	130	1.0	0.0
-es	04_res	1	130	1.0	0.0
-es	05_nuclear	1	130	1.0	0.0
-es	06_coal	1	130	1.0	0.0
-es	07_gas	1	130	1.0	0.0
+es	01_solar	1	130	0.0	1.0
+es	02_wind_on	1	130	0.0	1.0
+es	03_wind_off	1	130	0.0	1.0
+es	04_res	1	130	0.0	1.0
+es	05_nuclear	1	130	0.0	1.0
+es	06_coal	1	130	0.0	1.0
+es	07_gas	1	130	0.0	1.0
 es	08_non-res	1	130	0.0	0.0
 es	09_hydro_pump	1	130	0.0	0.0
-es	01_solar	1	131	1.0	0.0
-es	02_wind_on	1	131	1.0	0.0
-es	03_wind_off	1	131	1.0	0.0
-es	04_res	1	131	1.0	0.0
-es	05_nuclear	1	131	1.0	0.0
-es	06_coal	1	131	1.0	0.0
-es	07_gas	1	131	1.0	0.0
+es	01_solar	1	131	0.0	1.0
+es	02_wind_on	1	131	0.0	1.0
+es	03_wind_off	1	131	0.0	1.0
+es	04_res	1	131	0.0	1.0
+es	05_nuclear	1	131	0.0	1.0
+es	06_coal	1	131	0.0	1.0
+es	07_gas	1	131	0.0	1.0
 es	08_non-res	1	131	0.0	0.0
 es	09_hydro_pump	1	131	0.0	0.0
-es	01_solar	1	132	1.0	0.0
-es	02_wind_on	1	132	1.0	0.0
-es	03_wind_off	1	132	1.0	0.0
-es	04_res	1	132	1.0	0.0
-es	05_nuclear	1	132	1.0	0.0
-es	06_coal	1	132	1.0	0.0
-es	07_gas	1	132	1.0	0.0
+es	01_solar	1	132	0.0	1.0
+es	02_wind_on	1	132	0.0	1.0
+es	03_wind_off	1	132	0.0	1.0
+es	04_res	1	132	0.0	1.0
+es	05_nuclear	1	132	0.0	1.0
+es	06_coal	1	132	0.0	1.0
+es	07_gas	1	132	0.0	1.0
 es	08_non-res	1	132	0.0	0.0
 es	09_hydro_pump	1	132	0.0	0.0
-es	01_solar	1	133	1.0	0.0
-es	02_wind_on	1	133	1.0	0.0
-es	03_wind_off	1	133	1.0	0.0
-es	04_res	1	133	1.0	0.0
-es	05_nuclear	1	133	1.0	0.0
-es	06_coal	1	133	1.0	0.0
-es	07_gas	1	133	1.0	0.0
+es	01_solar	1	133	0.0	1.0
+es	02_wind_on	1	133	0.0	1.0
+es	03_wind_off	1	133	0.0	1.0
+es	04_res	1	133	0.0	1.0
+es	05_nuclear	1	133	0.0	1.0
+es	06_coal	1	133	0.0	1.0
+es	07_gas	1	133	0.0	1.0
 es	08_non-res	1	133	0.0	0.0
 es	09_hydro_pump	1	133	0.0	0.0
-es	01_solar	1	134	1.0	0.0
-es	02_wind_on	1	134	1.0	0.0
-es	03_wind_off	1	134	1.0	0.0
-es	04_res	1	134	1.0	0.0
-es	05_nuclear	1	134	1.0	0.0
-es	06_coal	1	134	1.0	0.0
-es	07_gas	1	134	1.0	0.0
+es	01_solar	1	134	0.0	1.0
+es	02_wind_on	1	134	0.0	1.0
+es	03_wind_off	1	134	0.0	1.0
+es	04_res	1	134	0.0	1.0
+es	05_nuclear	1	134	0.0	1.0
+es	06_coal	1	134	0.0	1.0
+es	07_gas	1	134	0.0	1.0
 es	08_non-res	1	134	0.0	0.0
 es	09_hydro_pump	1	134	0.0	0.0
-es	01_solar	1	135	1.0	0.0
-es	02_wind_on	1	135	1.0	0.0
-es	03_wind_off	1	135	1.0	0.0
-es	04_res	1	135	1.0	0.0
-es	05_nuclear	1	135	1.0	0.0
-es	06_coal	1	135	1.0	0.0
-es	07_gas	1	135	1.0	0.0
+es	01_solar	1	135	0.0	1.0
+es	02_wind_on	1	135	0.0	1.0
+es	03_wind_off	1	135	0.0	1.0
+es	04_res	1	135	0.0	1.0
+es	05_nuclear	1	135	0.0	1.0
+es	06_coal	1	135	0.0	1.0
+es	07_gas	1	135	0.0	1.0
 es	08_non-res	1	135	0.0	0.0
 es	09_hydro_pump	1	135	0.0	0.0
-es	01_solar	1	136	1.0	0.0
-es	02_wind_on	1	136	1.0	0.0
-es	03_wind_off	1	136	1.0	0.0
-es	04_res	1	136	1.0	0.0
-es	05_nuclear	1	136	1.0	0.0
-es	06_coal	1	136	1.0	0.0
-es	07_gas	1	136	1.0	0.0
+es	01_solar	1	136	0.0	1.0
+es	02_wind_on	1	136	0.0	1.0
+es	03_wind_off	1	136	0.0	1.0
+es	04_res	1	136	0.0	1.0
+es	05_nuclear	1	136	0.0	1.0
+es	06_coal	1	136	0.0	1.0
+es	07_gas	1	136	0.0	1.0
 es	08_non-res	1	136	0.0	0.0
 es	09_hydro_pump	1	136	0.0	0.0
-es	01_solar	1	137	1.0	0.0
-es	02_wind_on	1	137	1.0	0.0
-es	03_wind_off	1	137	1.0	0.0
-es	04_res	1	137	1.0	0.0
-es	05_nuclear	1	137	1.0	0.0
-es	06_coal	1	137	1.0	0.0
-es	07_gas	1	137	1.0	0.0
+es	01_solar	1	137	0.0	1.0
+es	02_wind_on	1	137	0.0	1.0
+es	03_wind_off	1	137	0.0	1.0
+es	04_res	1	137	0.0	1.0
+es	05_nuclear	1	137	0.0	1.0
+es	06_coal	1	137	0.0	1.0
+es	07_gas	1	137	0.0	1.0
 es	08_non-res	1	137	0.0	0.0
 es	09_hydro_pump	1	137	0.0	0.0
-es	01_solar	1	138	1.0	0.0
-es	02_wind_on	1	138	1.0	0.0
-es	03_wind_off	1	138	1.0	0.0
-es	04_res	1	138	1.0	0.0
-es	05_nuclear	1	138	1.0	0.0
-es	06_coal	1	138	1.0	0.0
-es	07_gas	1	138	1.0	0.0
+es	01_solar	1	138	0.0	1.0
+es	02_wind_on	1	138	0.0	1.0
+es	03_wind_off	1	138	0.0	1.0
+es	04_res	1	138	0.0	1.0
+es	05_nuclear	1	138	0.0	1.0
+es	06_coal	1	138	0.0	1.0
+es	07_gas	1	138	0.0	1.0
 es	08_non-res	1	138	0.0	0.0
 es	09_hydro_pump	1	138	0.0	0.0
-es	01_solar	1	139	1.0	0.0
-es	02_wind_on	1	139	1.0	0.0
-es	03_wind_off	1	139	1.0	0.0
-es	04_res	1	139	1.0	0.0
-es	05_nuclear	1	139	1.0	0.0
-es	06_coal	1	139	1.0	0.0
-es	07_gas	1	139	1.0	0.0
+es	01_solar	1	139	0.0	1.0
+es	02_wind_on	1	139	0.0	1.0
+es	03_wind_off	1	139	0.0	1.0
+es	04_res	1	139	0.0	1.0
+es	05_nuclear	1	139	0.0	1.0
+es	06_coal	1	139	0.0	1.0
+es	07_gas	1	139	0.0	1.0
 es	08_non-res	1	139	0.0	0.0
 es	09_hydro_pump	1	139	0.0	0.0
-es	01_solar	1	140	1.0	0.0
-es	02_wind_on	1	140	1.0	0.0
-es	03_wind_off	1	140	1.0	0.0
-es	04_res	1	140	1.0	0.0
-es	05_nuclear	1	140	1.0	0.0
-es	06_coal	1	140	1.0	0.0
-es	07_gas	1	140	1.0	0.0
+es	01_solar	1	140	0.0	1.0
+es	02_wind_on	1	140	0.0	1.0
+es	03_wind_off	1	140	0.0	1.0
+es	04_res	1	140	0.0	1.0
+es	05_nuclear	1	140	0.0	1.0
+es	06_coal	1	140	0.0	1.0
+es	07_gas	1	140	0.0	1.0
 es	08_non-res	1	140	0.0	0.0
 es	09_hydro_pump	1	140	0.0	0.0
-es	01_solar	1	141	1.0	0.0
-es	02_wind_on	1	141	1.0	0.0
-es	03_wind_off	1	141	1.0	0.0
-es	04_res	1	141	1.0	0.0
-es	05_nuclear	1	141	1.0	0.0
-es	06_coal	1	141	1.0	0.0
-es	07_gas	1	141	1.0	0.0
+es	01_solar	1	141	0.0	1.0
+es	02_wind_on	1	141	0.0	1.0
+es	03_wind_off	1	141	0.0	1.0
+es	04_res	1	141	0.0	1.0
+es	05_nuclear	1	141	0.0	1.0
+es	06_coal	1	141	0.0	1.0
+es	07_gas	1	141	0.0	1.0
 es	08_non-res	1	141	0.0	0.0
 es	09_hydro_pump	1	141	0.0	0.0
-es	01_solar	1	142	1.0	0.0
-es	02_wind_on	1	142	1.0	0.0
-es	03_wind_off	1	142	1.0	0.0
-es	04_res	1	142	1.0	0.0
-es	05_nuclear	1	142	1.0	0.0
-es	06_coal	1	142	1.0	0.0
-es	07_gas	1	142	1.0	0.0
-es	08_non-res	1	142	1.0	0.0
+es	01_solar	1	142	0.0	1.0
+es	02_wind_on	1	142	0.0	1.0
+es	03_wind_off	1	142	0.0	1.0
+es	04_res	1	142	0.0	1.0
+es	05_nuclear	1	142	0.0	1.0
+es	06_coal	1	142	0.0	1.0
+es	07_gas	1	142	0.0	1.0
+es	08_non-res	1	142	0.0	1.0
 es	09_hydro_pump	1	142	0.0	0.0
-es	01_solar	1	143	1.0	0.0
-es	02_wind_on	1	143	1.0	0.0
-es	03_wind_off	1	143	1.0	0.0
-es	04_res	1	143	1.0	0.0
-es	05_nuclear	1	143	1.0	0.0
-es	06_coal	1	143	1.0	0.0
-es	07_gas	1	143	1.0	0.0
-es	08_non-res	1	143	1.0	0.0
+es	01_solar	1	143	0.0	1.0
+es	02_wind_on	1	143	0.0	1.0
+es	03_wind_off	1	143	0.0	1.0
+es	04_res	1	143	0.0	1.0
+es	05_nuclear	1	143	0.0	1.0
+es	06_coal	1	143	0.0	1.0
+es	07_gas	1	143	0.0	1.0
+es	08_non-res	1	143	0.0	1.0
 es	09_hydro_pump	1	143	0.0	0.0
-es	01_solar	1	144	1.0	0.0
-es	02_wind_on	1	144	1.0	0.0
-es	03_wind_off	1	144	1.0	0.0
-es	04_res	1	144	1.0	0.0
-es	05_nuclear	1	144	1.0	0.0
-es	06_coal	1	144	1.0	0.0
-es	07_gas	1	144	1.0	0.0
-es	08_non-res	1	144	1.0	0.0
+es	01_solar	1	144	0.0	1.0
+es	02_wind_on	1	144	0.0	1.0
+es	03_wind_off	1	144	0.0	1.0
+es	04_res	1	144	0.0	1.0
+es	05_nuclear	1	144	0.0	1.0
+es	06_coal	1	144	0.0	1.0
+es	07_gas	1	144	0.0	1.0
+es	08_non-res	1	144	0.0	1.0
 es	09_hydro_pump	1	144	0.0	0.0
-es	01_solar	1	145	1.0	0.0
-es	02_wind_on	1	145	1.0	0.0
-es	03_wind_off	1	145	1.0	0.0
-es	04_res	1	145	1.0	0.0
-es	05_nuclear	1	145	1.0	0.0
-es	06_coal	1	145	1.0	0.0
-es	07_gas	1	145	1.0	0.0
-es	08_non-res	1	145	1.0	0.0
+es	01_solar	1	145	0.0	1.0
+es	02_wind_on	1	145	0.0	1.0
+es	03_wind_off	1	145	0.0	1.0
+es	04_res	1	145	0.0	1.0
+es	05_nuclear	1	145	0.0	1.0
+es	06_coal	1	145	0.0	1.0
+es	07_gas	1	145	0.0	1.0
+es	08_non-res	1	145	0.0	1.0
 es	09_hydro_pump	1	145	0.0	0.0
-es	01_solar	1	146	1.0	0.0
-es	02_wind_on	1	146	1.0	0.0
-es	03_wind_off	1	146	1.0	0.0
-es	04_res	1	146	1.0	0.0
-es	05_nuclear	1	146	1.0	0.0
-es	06_coal	1	146	1.0	0.0
-es	07_gas	1	146	1.0	0.0
-es	08_non-res	1	146	1.0	0.0
+es	01_solar	1	146	0.0	1.0
+es	02_wind_on	1	146	0.0	1.0
+es	03_wind_off	1	146	0.0	1.0
+es	04_res	1	146	0.0	1.0
+es	05_nuclear	1	146	0.0	1.0
+es	06_coal	1	146	0.0	1.0
+es	07_gas	1	146	0.0	1.0
+es	08_non-res	1	146	0.0	1.0
 es	09_hydro_pump	1	146	0.0	0.0
-es	01_solar	1	147	1.0	0.0
-es	02_wind_on	1	147	1.0	0.0
-es	03_wind_off	1	147	1.0	0.0
-es	04_res	1	147	1.0	0.0
-es	05_nuclear	1	147	1.0	0.0
-es	06_coal	1	147	1.0	0.0
-es	07_gas	1	147	1.0	0.0
-es	08_non-res	1	147	1.0	0.0
+es	01_solar	1	147	0.0	1.0
+es	02_wind_on	1	147	0.0	1.0
+es	03_wind_off	1	147	0.0	1.0
+es	04_res	1	147	0.0	1.0
+es	05_nuclear	1	147	0.0	1.0
+es	06_coal	1	147	0.0	1.0
+es	07_gas	1	147	0.0	1.0
+es	08_non-res	1	147	0.0	1.0
 es	09_hydro_pump	1	147	0.0	0.0
-es	01_solar	1	148	1.0	0.0
-es	02_wind_on	1	148	1.0	0.0
-es	03_wind_off	1	148	1.0	0.0
-es	04_res	1	148	1.0	0.0
-es	05_nuclear	1	148	1.0	0.0
-es	06_coal	1	148	1.0	0.0
-es	07_gas	1	148	1.0	0.0
-es	08_non-res	1	148	1.0	0.0
+es	01_solar	1	148	0.0	1.0
+es	02_wind_on	1	148	0.0	1.0
+es	03_wind_off	1	148	0.0	1.0
+es	04_res	1	148	0.0	1.0
+es	05_nuclear	1	148	0.0	1.0
+es	06_coal	1	148	0.0	1.0
+es	07_gas	1	148	0.0	1.0
+es	08_non-res	1	148	0.0	1.0
 es	09_hydro_pump	1	148	0.0	0.0
-es	01_solar	1	149	1.0	0.0
-es	02_wind_on	1	149	1.0	0.0
-es	03_wind_off	1	149	1.0	0.0
-es	04_res	1	149	1.0	0.0
-es	05_nuclear	1	149	1.0	0.0
-es	06_coal	1	149	1.0	0.0
-es	07_gas	1	149	1.0	0.0
-es	08_non-res	1	149	1.0	0.0
+es	01_solar	1	149	0.0	1.0
+es	02_wind_on	1	149	0.0	1.0
+es	03_wind_off	1	149	0.0	1.0
+es	04_res	1	149	0.0	1.0
+es	05_nuclear	1	149	0.0	1.0
+es	06_coal	1	149	0.0	1.0
+es	07_gas	1	149	0.0	1.0
+es	08_non-res	1	149	0.0	1.0
 es	09_hydro_pump	1	149	0.0	0.0
-es	01_solar	1	150	1.0	0.0
-es	02_wind_on	1	150	1.0	0.0
-es	03_wind_off	1	150	1.0	0.0
-es	04_res	1	150	1.0	0.0
-es	05_nuclear	1	150	1.0	0.0
-es	06_coal	1	150	1.0	0.0
-es	07_gas	1	150	1.0	0.0
-es	08_non-res	1	150	1.0	0.0
+es	01_solar	1	150	0.0	1.0
+es	02_wind_on	1	150	0.0	1.0
+es	03_wind_off	1	150	0.0	1.0
+es	04_res	1	150	0.0	1.0
+es	05_nuclear	1	150	0.0	1.0
+es	06_coal	1	150	0.0	1.0
+es	07_gas	1	150	0.0	1.0
+es	08_non-res	1	150	0.0	1.0
 es	09_hydro_pump	1	150	0.0	0.0
-es	01_solar	1	151	1.0	0.0
-es	02_wind_on	1	151	1.0	0.0
-es	03_wind_off	1	151	1.0	0.0
-es	04_res	1	151	1.0	0.0
-es	05_nuclear	1	151	1.0	0.0
-es	06_coal	1	151	1.0	0.0
-es	07_gas	1	151	1.0	0.0
-es	08_non-res	1	151	1.0	0.0
+es	01_solar	1	151	0.0	1.0
+es	02_wind_on	1	151	0.0	1.0
+es	03_wind_off	1	151	0.0	1.0
+es	04_res	1	151	0.0	1.0
+es	05_nuclear	1	151	0.0	1.0
+es	06_coal	1	151	0.0	1.0
+es	07_gas	1	151	0.0	1.0
+es	08_non-res	1	151	0.0	1.0
 es	09_hydro_pump	1	151	0.0	0.0
-es	01_solar	1	152	1.0	0.0
-es	02_wind_on	1	152	1.0	0.0
-es	03_wind_off	1	152	1.0	0.0
-es	04_res	1	152	1.0	0.0
-es	05_nuclear	1	152	1.0	0.0
-es	06_coal	1	152	1.0	0.0
-es	07_gas	1	152	1.0	0.0
-es	08_non-res	1	152	1.0	0.0
+es	01_solar	1	152	0.0	1.0
+es	02_wind_on	1	152	0.0	1.0
+es	03_wind_off	1	152	0.0	1.0
+es	04_res	1	152	0.0	1.0
+es	05_nuclear	1	152	0.0	1.0
+es	06_coal	1	152	0.0	1.0
+es	07_gas	1	152	0.0	1.0
+es	08_non-res	1	152	0.0	1.0
 es	09_hydro_pump	1	152	0.0	0.0
-es	01_solar	1	153	1.0	0.0
-es	02_wind_on	1	153	1.0	0.0
-es	03_wind_off	1	153	1.0	0.0
-es	04_res	1	153	1.0	0.0
-es	05_nuclear	1	153	1.0	0.0
-es	06_coal	1	153	1.0	0.0
-es	07_gas	1	153	1.0	0.0
-es	08_non-res	1	153	1.0	0.0
+es	01_solar	1	153	0.0	1.0
+es	02_wind_on	1	153	0.0	1.0
+es	03_wind_off	1	153	0.0	1.0
+es	04_res	1	153	0.0	1.0
+es	05_nuclear	1	153	0.0	1.0
+es	06_coal	1	153	0.0	1.0
+es	07_gas	1	153	0.0	1.0
+es	08_non-res	1	153	0.0	1.0
 es	09_hydro_pump	1	153	0.0	0.0
-es	01_solar	1	154	1.0	0.0
-es	02_wind_on	1	154	1.0	0.0
-es	03_wind_off	1	154	1.0	0.0
-es	04_res	1	154	1.0	0.0
-es	05_nuclear	1	154	1.0	0.0
-es	06_coal	1	154	1.0	0.0
-es	07_gas	1	154	1.0	0.0
-es	08_non-res	1	154	1.0	0.0
+es	01_solar	1	154	0.0	1.0
+es	02_wind_on	1	154	0.0	1.0
+es	03_wind_off	1	154	0.0	1.0
+es	04_res	1	154	0.0	1.0
+es	05_nuclear	1	154	0.0	1.0
+es	06_coal	1	154	0.0	1.0
+es	07_gas	1	154	0.0	1.0
+es	08_non-res	1	154	0.0	1.0
 es	09_hydro_pump	1	154	0.0	0.0
-es	01_solar	1	155	1.0	0.0
-es	02_wind_on	1	155	1.0	0.0
-es	03_wind_off	1	155	1.0	0.0
-es	04_res	1	155	1.0	0.0
-es	05_nuclear	1	155	1.0	0.0
-es	06_coal	1	155	1.0	0.0
-es	07_gas	1	155	1.0	0.0
-es	08_non-res	1	155	1.0	0.0
+es	01_solar	1	155	0.0	1.0
+es	02_wind_on	1	155	0.0	1.0
+es	03_wind_off	1	155	0.0	1.0
+es	04_res	1	155	0.0	1.0
+es	05_nuclear	1	155	0.0	1.0
+es	06_coal	1	155	0.0	1.0
+es	07_gas	1	155	0.0	1.0
+es	08_non-res	1	155	0.0	1.0
 es	09_hydro_pump	1	155	0.0	0.0
-es	01_solar	1	156	1.0	0.0
-es	02_wind_on	1	156	1.0	0.0
-es	03_wind_off	1	156	1.0	0.0
-es	04_res	1	156	1.0	0.0
-es	05_nuclear	1	156	1.0	0.0
-es	06_coal	1	156	1.0	0.0
-es	07_gas	1	156	1.0	0.0
-es	08_non-res	1	156	1.0	0.0
+es	01_solar	1	156	0.0	1.0
+es	02_wind_on	1	156	0.0	1.0
+es	03_wind_off	1	156	0.0	1.0
+es	04_res	1	156	0.0	1.0
+es	05_nuclear	1	156	0.0	1.0
+es	06_coal	1	156	0.0	1.0
+es	07_gas	1	156	0.0	1.0
+es	08_non-res	1	156	0.0	1.0
 es	09_hydro_pump	1	156	0.0	0.0
-es	01_solar	1	157	1.0	0.0
-es	02_wind_on	1	157	1.0	0.0
-es	03_wind_off	1	157	1.0	0.0
-es	04_res	1	157	1.0	0.0
-es	05_nuclear	1	157	1.0	0.0
-es	06_coal	1	157	1.0	0.0
-es	07_gas	1	157	1.0	0.0
-es	08_non-res	1	157	1.0	0.0
+es	01_solar	1	157	0.0	1.0
+es	02_wind_on	1	157	0.0	1.0
+es	03_wind_off	1	157	0.0	1.0
+es	04_res	1	157	0.0	1.0
+es	05_nuclear	1	157	0.0	1.0
+es	06_coal	1	157	0.0	1.0
+es	07_gas	1	157	0.0	1.0
+es	08_non-res	1	157	0.0	1.0
 es	09_hydro_pump	1	157	0.0	0.0
-es	01_solar	1	158	1.0	0.0
-es	02_wind_on	1	158	1.0	0.0
-es	03_wind_off	1	158	1.0	0.0
-es	04_res	1	158	1.0	0.0
-es	05_nuclear	1	158	1.0	0.0
-es	06_coal	1	158	1.0	0.0
-es	07_gas	1	158	1.0	0.0
-es	08_non-res	1	158	1.0	0.0
+es	01_solar	1	158	0.0	1.0
+es	02_wind_on	1	158	0.0	1.0
+es	03_wind_off	1	158	0.0	1.0
+es	04_res	1	158	0.0	1.0
+es	05_nuclear	1	158	0.0	1.0
+es	06_coal	1	158	0.0	1.0
+es	07_gas	1	158	0.0	1.0
+es	08_non-res	1	158	0.0	1.0
 es	09_hydro_pump	1	158	0.0	0.0
-es	01_solar	1	159	1.0	0.0
-es	02_wind_on	1	159	1.0	0.0
-es	03_wind_off	1	159	1.0	0.0
-es	04_res	1	159	1.0	0.0
-es	05_nuclear	1	159	1.0	0.0
-es	06_coal	1	159	1.0	0.0
-es	07_gas	1	159	1.0	0.0
-es	08_non-res	1	159	1.0	0.0
+es	01_solar	1	159	0.0	1.0
+es	02_wind_on	1	159	0.0	1.0
+es	03_wind_off	1	159	0.0	1.0
+es	04_res	1	159	0.0	1.0
+es	05_nuclear	1	159	0.0	1.0
+es	06_coal	1	159	0.0	1.0
+es	07_gas	1	159	0.0	1.0
+es	08_non-res	1	159	0.0	1.0
 es	09_hydro_pump	1	159	0.0	0.0
-es	01_solar	1	160	1.0	0.0
-es	02_wind_on	1	160	1.0	0.0
-es	03_wind_off	1	160	1.0	0.0
-es	04_res	1	160	1.0	0.0
-es	05_nuclear	1	160	1.0	0.0
-es	06_coal	1	160	1.0	0.0
-es	07_gas	1	160	1.0	0.0
-es	08_non-res	1	160	1.0	0.0
+es	01_solar	1	160	0.0	1.0
+es	02_wind_on	1	160	0.0	1.0
+es	03_wind_off	1	160	0.0	1.0
+es	04_res	1	160	0.0	1.0
+es	05_nuclear	1	160	0.0	1.0
+es	06_coal	1	160	0.0	1.0
+es	07_gas	1	160	0.0	1.0
+es	08_non-res	1	160	0.0	1.0
 es	09_hydro_pump	1	160	0.0	0.0
-es	01_solar	1	161	1.0	0.0
-es	02_wind_on	1	161	1.0	0.0
-es	03_wind_off	1	161	1.0	0.0
-es	04_res	1	161	1.0	0.0
-es	05_nuclear	1	161	1.0	0.0
-es	06_coal	1	161	1.0	0.0
-es	07_gas	1	161	1.0	0.0
-es	08_non-res	1	161	1.0	0.0
+es	01_solar	1	161	0.0	1.0
+es	02_wind_on	1	161	0.0	1.0
+es	03_wind_off	1	161	0.0	1.0
+es	04_res	1	161	0.0	1.0
+es	05_nuclear	1	161	0.0	1.0
+es	06_coal	1	161	0.0	1.0
+es	07_gas	1	161	0.0	1.0
+es	08_non-res	1	161	0.0	1.0
 es	09_hydro_pump	1	161	0.0	0.0
-es	01_solar	1	162	1.0	0.0
-es	02_wind_on	1	162	1.0	0.0
-es	03_wind_off	1	162	1.0	0.0
-es	04_res	1	162	1.0	0.0
-es	05_nuclear	1	162	1.0	0.0
-es	06_coal	1	162	1.0	0.0
-es	07_gas	1	162	1.0	0.0
-es	08_non-res	1	162	1.0	0.0
-es	09_hydro_pump	1	162	1.0	0.0
-es	01_solar	1	163	1.0	0.0
-es	02_wind_on	1	163	1.0	0.0
-es	03_wind_off	1	163	1.0	0.0
-es	04_res	1	163	1.0	0.0
-es	05_nuclear	1	163	1.0	0.0
-es	06_coal	1	163	1.0	0.0
-es	07_gas	1	163	1.0	0.0
-es	08_non-res	1	163	1.0	0.0
-es	09_hydro_pump	1	163	1.0	0.0
-es	01_solar	1	164	1.0	0.0
-es	02_wind_on	1	164	1.0	0.0
-es	03_wind_off	1	164	1.0	0.0
-es	04_res	1	164	1.0	0.0
-es	05_nuclear	1	164	1.0	0.0
-es	06_coal	1	164	1.0	0.0
-es	07_gas	1	164	1.0	0.0
-es	08_non-res	1	164	1.0	0.0
-es	09_hydro_pump	1	164	1.0	0.0
-es	01_solar	1	165	1.0	0.0
-es	02_wind_on	1	165	1.0	0.0
-es	03_wind_off	1	165	1.0	0.0
-es	04_res	1	165	1.0	0.0
-es	05_nuclear	1	165	1.0	0.0
-es	06_coal	1	165	1.0	0.0
-es	07_gas	1	165	1.0	0.0
-es	08_non-res	1	165	1.0	0.0
-es	09_hydro_pump	1	165	1.0	0.0
-es	01_solar	1	166	1.0	0.0
-es	02_wind_on	1	166	1.0	0.0
-es	03_wind_off	1	166	1.0	0.0
-es	04_res	1	166	1.0	0.0
-es	05_nuclear	1	166	1.0	0.0
-es	06_coal	1	166	1.0	0.0
-es	07_gas	1	166	1.0	0.0
-es	08_non-res	1	166	1.0	0.0
-es	09_hydro_pump	1	166	1.0	0.0
-es	01_solar	1	167	1.0	0.0
-es	02_wind_on	1	167	1.0	0.0
-es	03_wind_off	1	167	1.0	0.0
-es	04_res	1	167	1.0	0.0
-es	05_nuclear	1	167	1.0	0.0
-es	06_coal	1	167	1.0	0.0
-es	07_gas	1	167	1.0	0.0
-es	08_non-res	1	167	1.0	0.0
-es	09_hydro_pump	1	167	1.0	0.0
-es	01_solar	1	168	1.0	0.0
-es	02_wind_on	1	168	1.0	0.0
-es	03_wind_off	1	168	1.0	0.0
-es	04_res	1	168	1.0	0.0
-es	05_nuclear	1	168	1.0	0.0
-es	06_coal	1	168	1.0	0.0
-es	07_gas	1	168	1.0	0.0
-es	08_non-res	1	168	1.0	0.0
-es	09_hydro_pump	1	168	1.0	0.0
+es	01_solar	1	162	0.0	1.0
+es	02_wind_on	1	162	0.0	1.0
+es	03_wind_off	1	162	0.0	1.0
+es	04_res	1	162	0.0	1.0
+es	05_nuclear	1	162	0.0	1.0
+es	06_coal	1	162	0.0	1.0
+es	07_gas	1	162	0.0	1.0
+es	08_non-res	1	162	0.0	1.0
+es	09_hydro_pump	1	162	0.0	1.0
+es	01_solar	1	163	0.0	1.0
+es	02_wind_on	1	163	0.0	1.0
+es	03_wind_off	1	163	0.0	1.0
+es	04_res	1	163	0.0	1.0
+es	05_nuclear	1	163	0.0	1.0
+es	06_coal	1	163	0.0	1.0
+es	07_gas	1	163	0.0	1.0
+es	08_non-res	1	163	0.0	1.0
+es	09_hydro_pump	1	163	0.0	1.0
+es	01_solar	1	164	0.0	1.0
+es	02_wind_on	1	164	0.0	1.0
+es	03_wind_off	1	164	0.0	1.0
+es	04_res	1	164	0.0	1.0
+es	05_nuclear	1	164	0.0	1.0
+es	06_coal	1	164	0.0	1.0
+es	07_gas	1	164	0.0	1.0
+es	08_non-res	1	164	0.0	1.0
+es	09_hydro_pump	1	164	0.0	1.0
+es	01_solar	1	165	0.0	1.0
+es	02_wind_on	1	165	0.0	1.0
+es	03_wind_off	1	165	0.0	1.0
+es	04_res	1	165	0.0	1.0
+es	05_nuclear	1	165	0.0	1.0
+es	06_coal	1	165	0.0	1.0
+es	07_gas	1	165	0.0	1.0
+es	08_non-res	1	165	0.0	1.0
+es	09_hydro_pump	1	165	0.0	1.0
+es	01_solar	1	166	0.0	1.0
+es	02_wind_on	1	166	0.0	1.0
+es	03_wind_off	1	166	0.0	1.0
+es	04_res	1	166	0.0	1.0
+es	05_nuclear	1	166	0.0	1.0
+es	06_coal	1	166	0.0	1.0
+es	07_gas	1	166	0.0	1.0
+es	08_non-res	1	166	0.0	1.0
+es	09_hydro_pump	1	166	0.0	1.0
+es	01_solar	1	167	0.0	1.0
+es	02_wind_on	1	167	0.0	1.0
+es	03_wind_off	1	167	0.0	1.0
+es	04_res	1	167	0.0	1.0
+es	05_nuclear	1	167	0.0	1.0
+es	06_coal	1	167	0.0	1.0
+es	07_gas	1	167	0.0	1.0
+es	08_non-res	1	167	0.0	1.0
+es	09_hydro_pump	1	167	0.0	1.0
+es	01_solar	1	168	0.0	1.0
+es	02_wind_on	1	168	0.0	1.0
+es	03_wind_off	1	168	0.0	1.0
+es	04_res	1	168	0.0	1.0
+es	05_nuclear	1	168	0.0	1.0
+es	06_coal	1	168	0.0	1.0
+es	07_gas	1	168	0.0	1.0
+es	08_non-res	1	168	0.0	1.0
+es	09_hydro_pump	1	168	0.0	1.0
 es	01_solar	1	169	0.0	0.0
 es	02_wind_on	1	169	0.0	0.0
 es	03_wind_off	1	169	0.0	0.0
@@ -4544,7 +4544,7 @@ es	06_coal	1	169	0.0	0.0
 es	07_gas	1	169	0.0	0.0
 es	08_non-res	1	169	0.0	0.0
 es	09_hydro_pump	1	169	0.0	0.0
-es	01_solar	1	170	1.0	0.0
+es	01_solar	1	170	0.0	1.0
 es	02_wind_on	1	170	0.0	0.0
 es	03_wind_off	1	170	0.0	0.0
 es	04_res	1	170	0.0	0.0
@@ -4553,7 +4553,7 @@ es	06_coal	1	170	0.0	0.0
 es	07_gas	1	170	0.0	0.0
 es	08_non-res	1	170	0.0	0.0
 es	09_hydro_pump	1	170	0.0	0.0
-es	01_solar	1	171	1.0	0.0
+es	01_solar	1	171	0.0	1.0
 es	02_wind_on	1	171	0.0	0.0
 es	03_wind_off	1	171	0.0	0.0
 es	04_res	1	171	0.0	0.0
@@ -4562,7 +4562,7 @@ es	06_coal	1	171	0.0	0.0
 es	07_gas	1	171	0.0	0.0
 es	08_non-res	1	171	0.0	0.0
 es	09_hydro_pump	1	171	0.0	0.0
-es	01_solar	1	172	1.0	0.0
+es	01_solar	1	172	0.0	1.0
 es	02_wind_on	1	172	0.0	0.0
 es	03_wind_off	1	172	0.0	0.0
 es	04_res	1	172	0.0	0.0
@@ -4571,7 +4571,7 @@ es	06_coal	1	172	0.0	0.0
 es	07_gas	1	172	0.0	0.0
 es	08_non-res	1	172	0.0	0.0
 es	09_hydro_pump	1	172	0.0	0.0
-es	01_solar	1	173	1.0	0.0
+es	01_solar	1	173	0.0	1.0
 es	02_wind_on	1	173	0.0	0.0
 es	03_wind_off	1	173	0.0	0.0
 es	04_res	1	173	0.0	0.0
@@ -4580,7 +4580,7 @@ es	06_coal	1	173	0.0	0.0
 es	07_gas	1	173	0.0	0.0
 es	08_non-res	1	173	0.0	0.0
 es	09_hydro_pump	1	173	0.0	0.0
-es	01_solar	1	174	1.0	0.0
+es	01_solar	1	174	0.0	1.0
 es	02_wind_on	1	174	0.0	0.0
 es	03_wind_off	1	174	0.0	0.0
 es	04_res	1	174	0.0	0.0
@@ -4589,7 +4589,7 @@ es	06_coal	1	174	0.0	0.0
 es	07_gas	1	174	0.0	0.0
 es	08_non-res	1	174	0.0	0.0
 es	09_hydro_pump	1	174	0.0	0.0
-es	01_solar	1	175	1.0	0.0
+es	01_solar	1	175	0.0	1.0
 es	02_wind_on	1	175	0.0	0.0
 es	03_wind_off	1	175	0.0	0.0
 es	04_res	1	175	0.0	0.0
@@ -4598,7 +4598,7 @@ es	06_coal	1	175	0.0	0.0
 es	07_gas	1	175	0.0	0.0
 es	08_non-res	1	175	0.0	0.0
 es	09_hydro_pump	1	175	0.0	0.0
-es	01_solar	1	176	1.0	0.0
+es	01_solar	1	176	0.0	1.0
 es	02_wind_on	1	176	0.0	0.0
 es	03_wind_off	1	176	0.0	0.0
 es	04_res	1	176	0.0	0.0
@@ -4607,7 +4607,7 @@ es	06_coal	1	176	0.0	0.0
 es	07_gas	1	176	0.0	0.0
 es	08_non-res	1	176	0.0	0.0
 es	09_hydro_pump	1	176	0.0	0.0
-es	01_solar	1	177	1.0	0.0
+es	01_solar	1	177	0.0	1.0
 es	02_wind_on	1	177	0.0	0.0
 es	03_wind_off	1	177	0.0	0.0
 es	04_res	1	177	0.0	0.0
@@ -4616,7 +4616,7 @@ es	06_coal	1	177	0.0	0.0
 es	07_gas	1	177	0.0	0.0
 es	08_non-res	1	177	0.0	0.0
 es	09_hydro_pump	1	177	0.0	0.0
-es	01_solar	1	178	1.0	0.0
+es	01_solar	1	178	0.0	1.0
 es	02_wind_on	1	178	0.0	0.0
 es	03_wind_off	1	178	0.0	0.0
 es	04_res	1	178	0.0	0.0
@@ -4625,7 +4625,7 @@ es	06_coal	1	178	0.0	0.0
 es	07_gas	1	178	0.0	0.0
 es	08_non-res	1	178	0.0	0.0
 es	09_hydro_pump	1	178	0.0	0.0
-es	01_solar	1	179	1.0	0.0
+es	01_solar	1	179	0.0	1.0
 es	02_wind_on	1	179	0.0	0.0
 es	03_wind_off	1	179	0.0	0.0
 es	04_res	1	179	0.0	0.0
@@ -4634,7 +4634,7 @@ es	06_coal	1	179	0.0	0.0
 es	07_gas	1	179	0.0	0.0
 es	08_non-res	1	179	0.0	0.0
 es	09_hydro_pump	1	179	0.0	0.0
-es	01_solar	1	180	1.0	0.0
+es	01_solar	1	180	0.0	1.0
 es	02_wind_on	1	180	0.0	0.0
 es	03_wind_off	1	180	0.0	0.0
 es	04_res	1	180	0.0	0.0
@@ -4643,7 +4643,7 @@ es	06_coal	1	180	0.0	0.0
 es	07_gas	1	180	0.0	0.0
 es	08_non-res	1	180	0.0	0.0
 es	09_hydro_pump	1	180	0.0	0.0
-es	01_solar	1	181	1.0	0.0
+es	01_solar	1	181	0.0	1.0
 es	02_wind_on	1	181	0.0	0.0
 es	03_wind_off	1	181	0.0	0.0
 es	04_res	1	181	0.0	0.0
@@ -4652,7 +4652,7 @@ es	06_coal	1	181	0.0	0.0
 es	07_gas	1	181	0.0	0.0
 es	08_non-res	1	181	0.0	0.0
 es	09_hydro_pump	1	181	0.0	0.0
-es	01_solar	1	182	1.0	0.0
+es	01_solar	1	182	0.0	1.0
 es	02_wind_on	1	182	0.0	0.0
 es	03_wind_off	1	182	0.0	0.0
 es	04_res	1	182	0.0	0.0
@@ -4661,7 +4661,7 @@ es	06_coal	1	182	0.0	0.0
 es	07_gas	1	182	0.0	0.0
 es	08_non-res	1	182	0.0	0.0
 es	09_hydro_pump	1	182	0.0	0.0
-es	01_solar	1	183	1.0	0.0
+es	01_solar	1	183	0.0	1.0
 es	02_wind_on	1	183	0.0	0.0
 es	03_wind_off	1	183	0.0	0.0
 es	04_res	1	183	0.0	0.0
@@ -4670,7 +4670,7 @@ es	06_coal	1	183	0.0	0.0
 es	07_gas	1	183	0.0	0.0
 es	08_non-res	1	183	0.0	0.0
 es	09_hydro_pump	1	183	0.0	0.0
-es	01_solar	1	184	1.0	0.0
+es	01_solar	1	184	0.0	1.0
 es	02_wind_on	1	184	0.0	0.0
 es	03_wind_off	1	184	0.0	0.0
 es	04_res	1	184	0.0	0.0
@@ -4679,7 +4679,7 @@ es	06_coal	1	184	0.0	0.0
 es	07_gas	1	184	0.0	0.0
 es	08_non-res	1	184	0.0	0.0
 es	09_hydro_pump	1	184	0.0	0.0
-es	01_solar	1	185	1.0	0.0
+es	01_solar	1	185	0.0	1.0
 es	02_wind_on	1	185	0.0	0.0
 es	03_wind_off	1	185	0.0	0.0
 es	04_res	1	185	0.0	0.0
@@ -4688,7 +4688,7 @@ es	06_coal	1	185	0.0	0.0
 es	07_gas	1	185	0.0	0.0
 es	08_non-res	1	185	0.0	0.0
 es	09_hydro_pump	1	185	0.0	0.0
-es	01_solar	1	186	1.0	0.0
+es	01_solar	1	186	0.0	1.0
 es	02_wind_on	1	186	0.0	0.0
 es	03_wind_off	1	186	0.0	0.0
 es	04_res	1	186	0.0	0.0
@@ -4697,7 +4697,7 @@ es	06_coal	1	186	0.0	0.0
 es	07_gas	1	186	0.0	0.0
 es	08_non-res	1	186	0.0	0.0
 es	09_hydro_pump	1	186	0.0	0.0
-es	01_solar	1	187	1.0	0.0
+es	01_solar	1	187	0.0	1.0
 es	02_wind_on	1	187	0.0	0.0
 es	03_wind_off	1	187	0.0	0.0
 es	04_res	1	187	0.0	0.0
@@ -4706,7 +4706,7 @@ es	06_coal	1	187	0.0	0.0
 es	07_gas	1	187	0.0	0.0
 es	08_non-res	1	187	0.0	0.0
 es	09_hydro_pump	1	187	0.0	0.0
-es	01_solar	1	188	1.0	0.0
+es	01_solar	1	188	0.0	1.0
 es	02_wind_on	1	188	0.0	0.0
 es	03_wind_off	1	188	0.0	0.0
 es	04_res	1	188	0.0	0.0
@@ -4715,7 +4715,7 @@ es	06_coal	1	188	0.0	0.0
 es	07_gas	1	188	0.0	0.0
 es	08_non-res	1	188	0.0	0.0
 es	09_hydro_pump	1	188	0.0	0.0
-es	01_solar	1	189	1.0	0.0
+es	01_solar	1	189	0.0	1.0
 es	02_wind_on	1	189	0.0	0.0
 es	03_wind_off	1	189	0.0	0.0
 es	04_res	1	189	0.0	0.0
@@ -4724,8 +4724,8 @@ es	06_coal	1	189	0.0	0.0
 es	07_gas	1	189	0.0	0.0
 es	08_non-res	1	189	0.0	0.0
 es	09_hydro_pump	1	189	0.0	0.0
-es	01_solar	1	190	1.0	0.0
-es	02_wind_on	1	190	1.0	0.0
+es	01_solar	1	190	0.0	1.0
+es	02_wind_on	1	190	0.0	1.0
 es	03_wind_off	1	190	0.0	0.0
 es	04_res	1	190	0.0	0.0
 es	05_nuclear	1	190	0.0	0.0
@@ -4733,8 +4733,8 @@ es	06_coal	1	190	0.0	0.0
 es	07_gas	1	190	0.0	0.0
 es	08_non-res	1	190	0.0	0.0
 es	09_hydro_pump	1	190	0.0	0.0
-es	01_solar	1	191	1.0	0.0
-es	02_wind_on	1	191	1.0	0.0
+es	01_solar	1	191	0.0	1.0
+es	02_wind_on	1	191	0.0	1.0
 es	03_wind_off	1	191	0.0	0.0
 es	04_res	1	191	0.0	0.0
 es	05_nuclear	1	191	0.0	0.0
@@ -4742,8 +4742,8 @@ es	06_coal	1	191	0.0	0.0
 es	07_gas	1	191	0.0	0.0
 es	08_non-res	1	191	0.0	0.0
 es	09_hydro_pump	1	191	0.0	0.0
-es	01_solar	1	192	1.0	0.0
-es	02_wind_on	1	192	1.0	0.0
+es	01_solar	1	192	0.0	1.0
+es	02_wind_on	1	192	0.0	1.0
 es	03_wind_off	1	192	0.0	0.0
 es	04_res	1	192	0.0	0.0
 es	05_nuclear	1	192	0.0	0.0
@@ -4751,8 +4751,8 @@ es	06_coal	1	192	0.0	0.0
 es	07_gas	1	192	0.0	0.0
 es	08_non-res	1	192	0.0	0.0
 es	09_hydro_pump	1	192	0.0	0.0
-es	01_solar	1	193	1.0	0.0
-es	02_wind_on	1	193	1.0	0.0
+es	01_solar	1	193	0.0	1.0
+es	02_wind_on	1	193	0.0	1.0
 es	03_wind_off	1	193	0.0	0.0
 es	04_res	1	193	0.0	0.0
 es	05_nuclear	1	193	0.0	0.0
@@ -4760,8 +4760,8 @@ es	06_coal	1	193	0.0	0.0
 es	07_gas	1	193	0.0	0.0
 es	08_non-res	1	193	0.0	0.0
 es	09_hydro_pump	1	193	0.0	0.0
-es	01_solar	1	194	1.0	0.0
-es	02_wind_on	1	194	1.0	0.0
+es	01_solar	1	194	0.0	1.0
+es	02_wind_on	1	194	0.0	1.0
 es	03_wind_off	1	194	0.0	0.0
 es	04_res	1	194	0.0	0.0
 es	05_nuclear	1	194	0.0	0.0
@@ -4769,8 +4769,8 @@ es	06_coal	1	194	0.0	0.0
 es	07_gas	1	194	0.0	0.0
 es	08_non-res	1	194	0.0	0.0
 es	09_hydro_pump	1	194	0.0	0.0
-es	01_solar	1	195	1.0	0.0
-es	02_wind_on	1	195	1.0	0.0
+es	01_solar	1	195	0.0	1.0
+es	02_wind_on	1	195	0.0	1.0
 es	03_wind_off	1	195	0.0	0.0
 es	04_res	1	195	0.0	0.0
 es	05_nuclear	1	195	0.0	0.0
@@ -4778,8 +4778,8 @@ es	06_coal	1	195	0.0	0.0
 es	07_gas	1	195	0.0	0.0
 es	08_non-res	1	195	0.0	0.0
 es	09_hydro_pump	1	195	0.0	0.0
-es	01_solar	1	196	1.0	0.0
-es	02_wind_on	1	196	1.0	0.0
+es	01_solar	1	196	0.0	1.0
+es	02_wind_on	1	196	0.0	1.0
 es	03_wind_off	1	196	0.0	0.0
 es	04_res	1	196	0.0	0.0
 es	05_nuclear	1	196	0.0	0.0
@@ -4787,8 +4787,8 @@ es	06_coal	1	196	0.0	0.0
 es	07_gas	1	196	0.0	0.0
 es	08_non-res	1	196	0.0	0.0
 es	09_hydro_pump	1	196	0.0	0.0
-es	01_solar	1	197	1.0	0.0
-es	02_wind_on	1	197	1.0	0.0
+es	01_solar	1	197	0.0	1.0
+es	02_wind_on	1	197	0.0	1.0
 es	03_wind_off	1	197	0.0	0.0
 es	04_res	1	197	0.0	0.0
 es	05_nuclear	1	197	0.0	0.0
@@ -4796,8 +4796,8 @@ es	06_coal	1	197	0.0	0.0
 es	07_gas	1	197	0.0	0.0
 es	08_non-res	1	197	0.0	0.0
 es	09_hydro_pump	1	197	0.0	0.0
-es	01_solar	1	198	1.0	0.0
-es	02_wind_on	1	198	1.0	0.0
+es	01_solar	1	198	0.0	1.0
+es	02_wind_on	1	198	0.0	1.0
 es	03_wind_off	1	198	0.0	0.0
 es	04_res	1	198	0.0	0.0
 es	05_nuclear	1	198	0.0	0.0
@@ -4805,8 +4805,8 @@ es	06_coal	1	198	0.0	0.0
 es	07_gas	1	198	0.0	0.0
 es	08_non-res	1	198	0.0	0.0
 es	09_hydro_pump	1	198	0.0	0.0
-es	01_solar	1	199	1.0	0.0
-es	02_wind_on	1	199	1.0	0.0
+es	01_solar	1	199	0.0	1.0
+es	02_wind_on	1	199	0.0	1.0
 es	03_wind_off	1	199	0.0	0.0
 es	04_res	1	199	0.0	0.0
 es	05_nuclear	1	199	0.0	0.0
@@ -4814,8 +4814,8 @@ es	06_coal	1	199	0.0	0.0
 es	07_gas	1	199	0.0	0.0
 es	08_non-res	1	199	0.0	0.0
 es	09_hydro_pump	1	199	0.0	0.0
-es	01_solar	1	200	1.0	0.0
-es	02_wind_on	1	200	1.0	0.0
+es	01_solar	1	200	0.0	1.0
+es	02_wind_on	1	200	0.0	1.0
 es	03_wind_off	1	200	0.0	0.0
 es	04_res	1	200	0.0	0.0
 es	05_nuclear	1	200	0.0	0.0
@@ -4823,8 +4823,8 @@ es	06_coal	1	200	0.0	0.0
 es	07_gas	1	200	0.0	0.0
 es	08_non-res	1	200	0.0	0.0
 es	09_hydro_pump	1	200	0.0	0.0
-es	01_solar	1	201	1.0	0.0
-es	02_wind_on	1	201	1.0	0.0
+es	01_solar	1	201	0.0	1.0
+es	02_wind_on	1	201	0.0	1.0
 es	03_wind_off	1	201	0.0	0.0
 es	04_res	1	201	0.0	0.0
 es	05_nuclear	1	201	0.0	0.0
@@ -4832,8 +4832,8 @@ es	06_coal	1	201	0.0	0.0
 es	07_gas	1	201	0.0	0.0
 es	08_non-res	1	201	0.0	0.0
 es	09_hydro_pump	1	201	0.0	0.0
-es	01_solar	1	202	1.0	0.0
-es	02_wind_on	1	202	1.0	0.0
+es	01_solar	1	202	0.0	1.0
+es	02_wind_on	1	202	0.0	1.0
 es	03_wind_off	1	202	0.0	0.0
 es	04_res	1	202	0.0	0.0
 es	05_nuclear	1	202	0.0	0.0
@@ -4841,8 +4841,8 @@ es	06_coal	1	202	0.0	0.0
 es	07_gas	1	202	0.0	0.0
 es	08_non-res	1	202	0.0	0.0
 es	09_hydro_pump	1	202	0.0	0.0
-es	01_solar	1	203	1.0	0.0
-es	02_wind_on	1	203	1.0	0.0
+es	01_solar	1	203	0.0	1.0
+es	02_wind_on	1	203	0.0	1.0
 es	03_wind_off	1	203	0.0	0.0
 es	04_res	1	203	0.0	0.0
 es	05_nuclear	1	203	0.0	0.0
@@ -4850,8 +4850,8 @@ es	06_coal	1	203	0.0	0.0
 es	07_gas	1	203	0.0	0.0
 es	08_non-res	1	203	0.0	0.0
 es	09_hydro_pump	1	203	0.0	0.0
-es	01_solar	1	204	1.0	0.0
-es	02_wind_on	1	204	1.0	0.0
+es	01_solar	1	204	0.0	1.0
+es	02_wind_on	1	204	0.0	1.0
 es	03_wind_off	1	204	0.0	0.0
 es	04_res	1	204	0.0	0.0
 es	05_nuclear	1	204	0.0	0.0
@@ -4859,8 +4859,8 @@ es	06_coal	1	204	0.0	0.0
 es	07_gas	1	204	0.0	0.0
 es	08_non-res	1	204	0.0	0.0
 es	09_hydro_pump	1	204	0.0	0.0
-es	01_solar	1	205	1.0	0.0
-es	02_wind_on	1	205	1.0	0.0
+es	01_solar	1	205	0.0	1.0
+es	02_wind_on	1	205	0.0	1.0
 es	03_wind_off	1	205	0.0	0.0
 es	04_res	1	205	0.0	0.0
 es	05_nuclear	1	205	0.0	0.0
@@ -4868,8 +4868,8 @@ es	06_coal	1	205	0.0	0.0
 es	07_gas	1	205	0.0	0.0
 es	08_non-res	1	205	0.0	0.0
 es	09_hydro_pump	1	205	0.0	0.0
-es	01_solar	1	206	1.0	0.0
-es	02_wind_on	1	206	1.0	0.0
+es	01_solar	1	206	0.0	1.0
+es	02_wind_on	1	206	0.0	1.0
 es	03_wind_off	1	206	0.0	0.0
 es	04_res	1	206	0.0	0.0
 es	05_nuclear	1	206	0.0	0.0
@@ -4877,8 +4877,8 @@ es	06_coal	1	206	0.0	0.0
 es	07_gas	1	206	0.0	0.0
 es	08_non-res	1	206	0.0	0.0
 es	09_hydro_pump	1	206	0.0	0.0
-es	01_solar	1	207	1.0	0.0
-es	02_wind_on	1	207	1.0	0.0
+es	01_solar	1	207	0.0	1.0
+es	02_wind_on	1	207	0.0	1.0
 es	03_wind_off	1	207	0.0	0.0
 es	04_res	1	207	0.0	0.0
 es	05_nuclear	1	207	0.0	0.0
@@ -4886,8 +4886,8 @@ es	06_coal	1	207	0.0	0.0
 es	07_gas	1	207	0.0	0.0
 es	08_non-res	1	207	0.0	0.0
 es	09_hydro_pump	1	207	0.0	0.0
-es	01_solar	1	208	1.0	0.0
-es	02_wind_on	1	208	1.0	0.0
+es	01_solar	1	208	0.0	1.0
+es	02_wind_on	1	208	0.0	1.0
 es	03_wind_off	1	208	0.0	0.0
 es	04_res	1	208	0.0	0.0
 es	05_nuclear	1	208	0.0	0.0
@@ -4895,8 +4895,8 @@ es	06_coal	1	208	0.0	0.0
 es	07_gas	1	208	0.0	0.0
 es	08_non-res	1	208	0.0	0.0
 es	09_hydro_pump	1	208	0.0	0.0
-es	01_solar	1	209	1.0	0.0
-es	02_wind_on	1	209	1.0	0.0
+es	01_solar	1	209	0.0	1.0
+es	02_wind_on	1	209	0.0	1.0
 es	03_wind_off	1	209	0.0	0.0
 es	04_res	1	209	0.0	0.0
 es	05_nuclear	1	209	0.0	0.0
@@ -4904,1149 +4904,1149 @@ es	06_coal	1	209	0.0	0.0
 es	07_gas	1	209	0.0	0.0
 es	08_non-res	1	209	0.0	0.0
 es	09_hydro_pump	1	209	0.0	0.0
-es	01_solar	1	210	1.0	0.0
-es	02_wind_on	1	210	1.0	0.0
-es	03_wind_off	1	210	1.0	0.0
+es	01_solar	1	210	0.0	1.0
+es	02_wind_on	1	210	0.0	1.0
+es	03_wind_off	1	210	0.0	1.0
 es	04_res	1	210	0.0	0.0
 es	05_nuclear	1	210	0.0	0.0
 es	06_coal	1	210	0.0	0.0
 es	07_gas	1	210	0.0	0.0
 es	08_non-res	1	210	0.0	0.0
 es	09_hydro_pump	1	210	0.0	0.0
-es	01_solar	1	211	1.0	0.0
-es	02_wind_on	1	211	1.0	0.0
-es	03_wind_off	1	211	1.0	0.0
+es	01_solar	1	211	0.0	1.0
+es	02_wind_on	1	211	0.0	1.0
+es	03_wind_off	1	211	0.0	1.0
 es	04_res	1	211	0.0	0.0
 es	05_nuclear	1	211	0.0	0.0
 es	06_coal	1	211	0.0	0.0
 es	07_gas	1	211	0.0	0.0
 es	08_non-res	1	211	0.0	0.0
 es	09_hydro_pump	1	211	0.0	0.0
-es	01_solar	1	212	1.0	0.0
-es	02_wind_on	1	212	1.0	0.0
-es	03_wind_off	1	212	1.0	0.0
+es	01_solar	1	212	0.0	1.0
+es	02_wind_on	1	212	0.0	1.0
+es	03_wind_off	1	212	0.0	1.0
 es	04_res	1	212	0.0	0.0
 es	05_nuclear	1	212	0.0	0.0
 es	06_coal	1	212	0.0	0.0
 es	07_gas	1	212	0.0	0.0
 es	08_non-res	1	212	0.0	0.0
 es	09_hydro_pump	1	212	0.0	0.0
-es	01_solar	1	213	1.0	0.0
-es	02_wind_on	1	213	1.0	0.0
-es	03_wind_off	1	213	1.0	0.0
+es	01_solar	1	213	0.0	1.0
+es	02_wind_on	1	213	0.0	1.0
+es	03_wind_off	1	213	0.0	1.0
 es	04_res	1	213	0.0	0.0
 es	05_nuclear	1	213	0.0	0.0
 es	06_coal	1	213	0.0	0.0
 es	07_gas	1	213	0.0	0.0
 es	08_non-res	1	213	0.0	0.0
 es	09_hydro_pump	1	213	0.0	0.0
-es	01_solar	1	214	1.0	0.0
-es	02_wind_on	1	214	1.0	0.0
-es	03_wind_off	1	214	1.0	0.0
+es	01_solar	1	214	0.0	1.0
+es	02_wind_on	1	214	0.0	1.0
+es	03_wind_off	1	214	0.0	1.0
 es	04_res	1	214	0.0	0.0
 es	05_nuclear	1	214	0.0	0.0
 es	06_coal	1	214	0.0	0.0
 es	07_gas	1	214	0.0	0.0
 es	08_non-res	1	214	0.0	0.0
 es	09_hydro_pump	1	214	0.0	0.0
-es	01_solar	1	215	1.0	0.0
-es	02_wind_on	1	215	1.0	0.0
-es	03_wind_off	1	215	1.0	0.0
+es	01_solar	1	215	0.0	1.0
+es	02_wind_on	1	215	0.0	1.0
+es	03_wind_off	1	215	0.0	1.0
 es	04_res	1	215	0.0	0.0
 es	05_nuclear	1	215	0.0	0.0
 es	06_coal	1	215	0.0	0.0
 es	07_gas	1	215	0.0	0.0
 es	08_non-res	1	215	0.0	0.0
 es	09_hydro_pump	1	215	0.0	0.0
-es	01_solar	1	216	1.0	0.0
-es	02_wind_on	1	216	1.0	0.0
-es	03_wind_off	1	216	1.0	0.0
+es	01_solar	1	216	0.0	1.0
+es	02_wind_on	1	216	0.0	1.0
+es	03_wind_off	1	216	0.0	1.0
 es	04_res	1	216	0.0	0.0
 es	05_nuclear	1	216	0.0	0.0
 es	06_coal	1	216	0.0	0.0
 es	07_gas	1	216	0.0	0.0
 es	08_non-res	1	216	0.0	0.0
 es	09_hydro_pump	1	216	0.0	0.0
-es	01_solar	1	217	1.0	0.0
-es	02_wind_on	1	217	1.0	0.0
-es	03_wind_off	1	217	1.0	0.0
+es	01_solar	1	217	0.0	1.0
+es	02_wind_on	1	217	0.0	1.0
+es	03_wind_off	1	217	0.0	1.0
 es	04_res	1	217	0.0	0.0
 es	05_nuclear	1	217	0.0	0.0
 es	06_coal	1	217	0.0	0.0
 es	07_gas	1	217	0.0	0.0
 es	08_non-res	1	217	0.0	0.0
 es	09_hydro_pump	1	217	0.0	0.0
-es	01_solar	1	218	1.0	0.0
-es	02_wind_on	1	218	1.0	0.0
-es	03_wind_off	1	218	1.0	0.0
+es	01_solar	1	218	0.0	1.0
+es	02_wind_on	1	218	0.0	1.0
+es	03_wind_off	1	218	0.0	1.0
 es	04_res	1	218	0.0	0.0
 es	05_nuclear	1	218	0.0	0.0
 es	06_coal	1	218	0.0	0.0
 es	07_gas	1	218	0.0	0.0
 es	08_non-res	1	218	0.0	0.0
 es	09_hydro_pump	1	218	0.0	0.0
-es	01_solar	1	219	1.0	0.0
-es	02_wind_on	1	219	1.0	0.0
-es	03_wind_off	1	219	1.0	0.0
+es	01_solar	1	219	0.0	1.0
+es	02_wind_on	1	219	0.0	1.0
+es	03_wind_off	1	219	0.0	1.0
 es	04_res	1	219	0.0	0.0
 es	05_nuclear	1	219	0.0	0.0
 es	06_coal	1	219	0.0	0.0
 es	07_gas	1	219	0.0	0.0
 es	08_non-res	1	219	0.0	0.0
 es	09_hydro_pump	1	219	0.0	0.0
-es	01_solar	1	220	1.0	0.0
-es	02_wind_on	1	220	1.0	0.0
-es	03_wind_off	1	220	1.0	0.0
+es	01_solar	1	220	0.0	1.0
+es	02_wind_on	1	220	0.0	1.0
+es	03_wind_off	1	220	0.0	1.0
 es	04_res	1	220	0.0	0.0
 es	05_nuclear	1	220	0.0	0.0
 es	06_coal	1	220	0.0	0.0
 es	07_gas	1	220	0.0	0.0
 es	08_non-res	1	220	0.0	0.0
 es	09_hydro_pump	1	220	0.0	0.0
-es	01_solar	1	221	1.0	0.0
-es	02_wind_on	1	221	1.0	0.0
-es	03_wind_off	1	221	1.0	0.0
+es	01_solar	1	221	0.0	1.0
+es	02_wind_on	1	221	0.0	1.0
+es	03_wind_off	1	221	0.0	1.0
 es	04_res	1	221	0.0	0.0
 es	05_nuclear	1	221	0.0	0.0
 es	06_coal	1	221	0.0	0.0
 es	07_gas	1	221	0.0	0.0
 es	08_non-res	1	221	0.0	0.0
 es	09_hydro_pump	1	221	0.0	0.0
-es	01_solar	1	222	1.0	0.0
-es	02_wind_on	1	222	1.0	0.0
-es	03_wind_off	1	222	1.0	0.0
+es	01_solar	1	222	0.0	1.0
+es	02_wind_on	1	222	0.0	1.0
+es	03_wind_off	1	222	0.0	1.0
 es	04_res	1	222	0.0	0.0
 es	05_nuclear	1	222	0.0	0.0
 es	06_coal	1	222	0.0	0.0
 es	07_gas	1	222	0.0	0.0
 es	08_non-res	1	222	0.0	0.0
 es	09_hydro_pump	1	222	0.0	0.0
-es	01_solar	1	223	1.0	0.0
-es	02_wind_on	1	223	1.0	0.0
-es	03_wind_off	1	223	1.0	0.0
+es	01_solar	1	223	0.0	1.0
+es	02_wind_on	1	223	0.0	1.0
+es	03_wind_off	1	223	0.0	1.0
 es	04_res	1	223	0.0	0.0
 es	05_nuclear	1	223	0.0	0.0
 es	06_coal	1	223	0.0	0.0
 es	07_gas	1	223	0.0	0.0
 es	08_non-res	1	223	0.0	0.0
 es	09_hydro_pump	1	223	0.0	0.0
-es	01_solar	1	224	1.0	0.0
-es	02_wind_on	1	224	1.0	0.0
-es	03_wind_off	1	224	1.0	0.0
+es	01_solar	1	224	0.0	1.0
+es	02_wind_on	1	224	0.0	1.0
+es	03_wind_off	1	224	0.0	1.0
 es	04_res	1	224	0.0	0.0
 es	05_nuclear	1	224	0.0	0.0
 es	06_coal	1	224	0.0	0.0
 es	07_gas	1	224	0.0	0.0
 es	08_non-res	1	224	0.0	0.0
 es	09_hydro_pump	1	224	0.0	0.0
-es	01_solar	1	225	1.0	0.0
-es	02_wind_on	1	225	1.0	0.0
-es	03_wind_off	1	225	1.0	0.0
+es	01_solar	1	225	0.0	1.0
+es	02_wind_on	1	225	0.0	1.0
+es	03_wind_off	1	225	0.0	1.0
 es	04_res	1	225	0.0	0.0
 es	05_nuclear	1	225	0.0	0.0
 es	06_coal	1	225	0.0	0.0
 es	07_gas	1	225	0.0	0.0
 es	08_non-res	1	225	0.0	0.0
 es	09_hydro_pump	1	225	0.0	0.0
-es	01_solar	1	226	1.0	0.0
-es	02_wind_on	1	226	1.0	0.0
-es	03_wind_off	1	226	1.0	0.0
+es	01_solar	1	226	0.0	1.0
+es	02_wind_on	1	226	0.0	1.0
+es	03_wind_off	1	226	0.0	1.0
 es	04_res	1	226	0.0	0.0
 es	05_nuclear	1	226	0.0	0.0
 es	06_coal	1	226	0.0	0.0
 es	07_gas	1	226	0.0	0.0
 es	08_non-res	1	226	0.0	0.0
 es	09_hydro_pump	1	226	0.0	0.0
-es	01_solar	1	227	1.0	0.0
-es	02_wind_on	1	227	1.0	0.0
-es	03_wind_off	1	227	1.0	0.0
+es	01_solar	1	227	0.0	1.0
+es	02_wind_on	1	227	0.0	1.0
+es	03_wind_off	1	227	0.0	1.0
 es	04_res	1	227	0.0	0.0
 es	05_nuclear	1	227	0.0	0.0
 es	06_coal	1	227	0.0	0.0
 es	07_gas	1	227	0.0	0.0
 es	08_non-res	1	227	0.0	0.0
 es	09_hydro_pump	1	227	0.0	0.0
-es	01_solar	1	228	1.0	0.0
-es	02_wind_on	1	228	1.0	0.0
-es	03_wind_off	1	228	1.0	0.0
+es	01_solar	1	228	0.0	1.0
+es	02_wind_on	1	228	0.0	1.0
+es	03_wind_off	1	228	0.0	1.0
 es	04_res	1	228	0.0	0.0
 es	05_nuclear	1	228	0.0	0.0
 es	06_coal	1	228	0.0	0.0
 es	07_gas	1	228	0.0	0.0
 es	08_non-res	1	228	0.0	0.0
 es	09_hydro_pump	1	228	0.0	0.0
-es	01_solar	1	229	1.0	0.0
-es	02_wind_on	1	229	1.0	0.0
-es	03_wind_off	1	229	1.0	0.0
+es	01_solar	1	229	0.0	1.0
+es	02_wind_on	1	229	0.0	1.0
+es	03_wind_off	1	229	0.0	1.0
 es	04_res	1	229	0.0	0.0
 es	05_nuclear	1	229	0.0	0.0
 es	06_coal	1	229	0.0	0.0
 es	07_gas	1	229	0.0	0.0
 es	08_non-res	1	229	0.0	0.0
 es	09_hydro_pump	1	229	0.0	0.0
-es	01_solar	1	230	1.0	0.0
-es	02_wind_on	1	230	1.0	0.0
-es	03_wind_off	1	230	1.0	0.0
-es	04_res	1	230	1.0	0.0
+es	01_solar	1	230	0.0	1.0
+es	02_wind_on	1	230	0.0	1.0
+es	03_wind_off	1	230	0.0	1.0
+es	04_res	1	230	0.0	1.0
 es	05_nuclear	1	230	0.0	0.0
 es	06_coal	1	230	0.0	0.0
 es	07_gas	1	230	0.0	0.0
 es	08_non-res	1	230	0.0	0.0
 es	09_hydro_pump	1	230	0.0	0.0
-es	01_solar	1	231	1.0	0.0
-es	02_wind_on	1	231	1.0	0.0
-es	03_wind_off	1	231	1.0	0.0
-es	04_res	1	231	1.0	0.0
+es	01_solar	1	231	0.0	1.0
+es	02_wind_on	1	231	0.0	1.0
+es	03_wind_off	1	231	0.0	1.0
+es	04_res	1	231	0.0	1.0
 es	05_nuclear	1	231	0.0	0.0
 es	06_coal	1	231	0.0	0.0
 es	07_gas	1	231	0.0	0.0
 es	08_non-res	1	231	0.0	0.0
 es	09_hydro_pump	1	231	0.0	0.0
-es	01_solar	1	232	1.0	0.0
-es	02_wind_on	1	232	1.0	0.0
-es	03_wind_off	1	232	1.0	0.0
-es	04_res	1	232	1.0	0.0
+es	01_solar	1	232	0.0	1.0
+es	02_wind_on	1	232	0.0	1.0
+es	03_wind_off	1	232	0.0	1.0
+es	04_res	1	232	0.0	1.0
 es	05_nuclear	1	232	0.0	0.0
 es	06_coal	1	232	0.0	0.0
 es	07_gas	1	232	0.0	0.0
 es	08_non-res	1	232	0.0	0.0
 es	09_hydro_pump	1	232	0.0	0.0
-es	01_solar	1	233	1.0	0.0
-es	02_wind_on	1	233	1.0	0.0
-es	03_wind_off	1	233	1.0	0.0
-es	04_res	1	233	1.0	0.0
+es	01_solar	1	233	0.0	1.0
+es	02_wind_on	1	233	0.0	1.0
+es	03_wind_off	1	233	0.0	1.0
+es	04_res	1	233	0.0	1.0
 es	05_nuclear	1	233	0.0	0.0
 es	06_coal	1	233	0.0	0.0
 es	07_gas	1	233	0.0	0.0
 es	08_non-res	1	233	0.0	0.0
 es	09_hydro_pump	1	233	0.0	0.0
-es	01_solar	1	234	1.0	0.0
-es	02_wind_on	1	234	1.0	0.0
-es	03_wind_off	1	234	1.0	0.0
-es	04_res	1	234	1.0	0.0
+es	01_solar	1	234	0.0	1.0
+es	02_wind_on	1	234	0.0	1.0
+es	03_wind_off	1	234	0.0	1.0
+es	04_res	1	234	0.0	1.0
 es	05_nuclear	1	234	0.0	0.0
 es	06_coal	1	234	0.0	0.0
 es	07_gas	1	234	0.0	0.0
 es	08_non-res	1	234	0.0	0.0
 es	09_hydro_pump	1	234	0.0	0.0
-es	01_solar	1	235	1.0	0.0
-es	02_wind_on	1	235	1.0	0.0
-es	03_wind_off	1	235	1.0	0.0
-es	04_res	1	235	1.0	0.0
+es	01_solar	1	235	0.0	1.0
+es	02_wind_on	1	235	0.0	1.0
+es	03_wind_off	1	235	0.0	1.0
+es	04_res	1	235	0.0	1.0
 es	05_nuclear	1	235	0.0	0.0
 es	06_coal	1	235	0.0	0.0
 es	07_gas	1	235	0.0	0.0
 es	08_non-res	1	235	0.0	0.0
 es	09_hydro_pump	1	235	0.0	0.0
-es	01_solar	1	236	1.0	0.0
-es	02_wind_on	1	236	1.0	0.0
-es	03_wind_off	1	236	1.0	0.0
-es	04_res	1	236	1.0	0.0
+es	01_solar	1	236	0.0	1.0
+es	02_wind_on	1	236	0.0	1.0
+es	03_wind_off	1	236	0.0	1.0
+es	04_res	1	236	0.0	1.0
 es	05_nuclear	1	236	0.0	0.0
 es	06_coal	1	236	0.0	0.0
 es	07_gas	1	236	0.0	0.0
 es	08_non-res	1	236	0.0	0.0
 es	09_hydro_pump	1	236	0.0	0.0
-es	01_solar	1	237	1.0	0.0
-es	02_wind_on	1	237	1.0	0.0
-es	03_wind_off	1	237	1.0	0.0
-es	04_res	1	237	1.0	0.0
+es	01_solar	1	237	0.0	1.0
+es	02_wind_on	1	237	0.0	1.0
+es	03_wind_off	1	237	0.0	1.0
+es	04_res	1	237	0.0	1.0
 es	05_nuclear	1	237	0.0	0.0
 es	06_coal	1	237	0.0	0.0
 es	07_gas	1	237	0.0	0.0
 es	08_non-res	1	237	0.0	0.0
 es	09_hydro_pump	1	237	0.0	0.0
-es	01_solar	1	238	1.0	0.0
-es	02_wind_on	1	238	1.0	0.0
-es	03_wind_off	1	238	1.0	0.0
-es	04_res	1	238	1.0	0.0
+es	01_solar	1	238	0.0	1.0
+es	02_wind_on	1	238	0.0	1.0
+es	03_wind_off	1	238	0.0	1.0
+es	04_res	1	238	0.0	1.0
 es	05_nuclear	1	238	0.0	0.0
 es	06_coal	1	238	0.0	0.0
 es	07_gas	1	238	0.0	0.0
 es	08_non-res	1	238	0.0	0.0
 es	09_hydro_pump	1	238	0.0	0.0
-es	01_solar	1	239	1.0	0.0
-es	02_wind_on	1	239	1.0	0.0
-es	03_wind_off	1	239	1.0	0.0
-es	04_res	1	239	1.0	0.0
+es	01_solar	1	239	0.0	1.0
+es	02_wind_on	1	239	0.0	1.0
+es	03_wind_off	1	239	0.0	1.0
+es	04_res	1	239	0.0	1.0
 es	05_nuclear	1	239	0.0	0.0
 es	06_coal	1	239	0.0	0.0
 es	07_gas	1	239	0.0	0.0
 es	08_non-res	1	239	0.0	0.0
 es	09_hydro_pump	1	239	0.0	0.0
-es	01_solar	1	240	1.0	0.0
-es	02_wind_on	1	240	1.0	0.0
-es	03_wind_off	1	240	1.0	0.0
-es	04_res	1	240	1.0	0.0
+es	01_solar	1	240	0.0	1.0
+es	02_wind_on	1	240	0.0	1.0
+es	03_wind_off	1	240	0.0	1.0
+es	04_res	1	240	0.0	1.0
 es	05_nuclear	1	240	0.0	0.0
 es	06_coal	1	240	0.0	0.0
 es	07_gas	1	240	0.0	0.0
 es	08_non-res	1	240	0.0	0.0
 es	09_hydro_pump	1	240	0.0	0.0
-es	01_solar	1	241	1.0	0.0
-es	02_wind_on	1	241	1.0	0.0
-es	03_wind_off	1	241	1.0	0.0
-es	04_res	1	241	1.0	0.0
+es	01_solar	1	241	0.0	1.0
+es	02_wind_on	1	241	0.0	1.0
+es	03_wind_off	1	241	0.0	1.0
+es	04_res	1	241	0.0	1.0
 es	05_nuclear	1	241	0.0	0.0
 es	06_coal	1	241	0.0	0.0
 es	07_gas	1	241	0.0	0.0
 es	08_non-res	1	241	0.0	0.0
 es	09_hydro_pump	1	241	0.0	0.0
-es	01_solar	1	242	1.0	0.0
-es	02_wind_on	1	242	1.0	0.0
-es	03_wind_off	1	242	1.0	0.0
-es	04_res	1	242	1.0	0.0
+es	01_solar	1	242	0.0	1.0
+es	02_wind_on	1	242	0.0	1.0
+es	03_wind_off	1	242	0.0	1.0
+es	04_res	1	242	0.0	1.0
 es	05_nuclear	1	242	0.0	0.0
 es	06_coal	1	242	0.0	0.0
 es	07_gas	1	242	0.0	0.0
 es	08_non-res	1	242	0.0	0.0
 es	09_hydro_pump	1	242	0.0	0.0
-es	01_solar	1	243	1.0	0.0
-es	02_wind_on	1	243	1.0	0.0
-es	03_wind_off	1	243	1.0	0.0
-es	04_res	1	243	1.0	0.0
+es	01_solar	1	243	0.0	1.0
+es	02_wind_on	1	243	0.0	1.0
+es	03_wind_off	1	243	0.0	1.0
+es	04_res	1	243	0.0	1.0
 es	05_nuclear	1	243	0.0	0.0
 es	06_coal	1	243	0.0	0.0
 es	07_gas	1	243	0.0	0.0
 es	08_non-res	1	243	0.0	0.0
 es	09_hydro_pump	1	243	0.0	0.0
-es	01_solar	1	244	1.0	0.0
-es	02_wind_on	1	244	1.0	0.0
-es	03_wind_off	1	244	1.0	0.0
-es	04_res	1	244	1.0	0.0
+es	01_solar	1	244	0.0	1.0
+es	02_wind_on	1	244	0.0	1.0
+es	03_wind_off	1	244	0.0	1.0
+es	04_res	1	244	0.0	1.0
 es	05_nuclear	1	244	0.0	0.0
 es	06_coal	1	244	0.0	0.0
 es	07_gas	1	244	0.0	0.0
 es	08_non-res	1	244	0.0	0.0
 es	09_hydro_pump	1	244	0.0	0.0
-es	01_solar	1	245	1.0	0.0
-es	02_wind_on	1	245	1.0	0.0
-es	03_wind_off	1	245	1.0	0.0
-es	04_res	1	245	1.0	0.0
+es	01_solar	1	245	0.0	1.0
+es	02_wind_on	1	245	0.0	1.0
+es	03_wind_off	1	245	0.0	1.0
+es	04_res	1	245	0.0	1.0
 es	05_nuclear	1	245	0.0	0.0
 es	06_coal	1	245	0.0	0.0
 es	07_gas	1	245	0.0	0.0
 es	08_non-res	1	245	0.0	0.0
 es	09_hydro_pump	1	245	0.0	0.0
-es	01_solar	1	246	1.0	0.0
-es	02_wind_on	1	246	1.0	0.0
-es	03_wind_off	1	246	1.0	0.0
-es	04_res	1	246	1.0	0.0
+es	01_solar	1	246	0.0	1.0
+es	02_wind_on	1	246	0.0	1.0
+es	03_wind_off	1	246	0.0	1.0
+es	04_res	1	246	0.0	1.0
 es	05_nuclear	1	246	0.0	0.0
 es	06_coal	1	246	0.0	0.0
 es	07_gas	1	246	0.0	0.0
 es	08_non-res	1	246	0.0	0.0
 es	09_hydro_pump	1	246	0.0	0.0
-es	01_solar	1	247	1.0	0.0
-es	02_wind_on	1	247	1.0	0.0
-es	03_wind_off	1	247	1.0	0.0
-es	04_res	1	247	1.0	0.0
+es	01_solar	1	247	0.0	1.0
+es	02_wind_on	1	247	0.0	1.0
+es	03_wind_off	1	247	0.0	1.0
+es	04_res	1	247	0.0	1.0
 es	05_nuclear	1	247	0.0	0.0
 es	06_coal	1	247	0.0	0.0
 es	07_gas	1	247	0.0	0.0
 es	08_non-res	1	247	0.0	0.0
 es	09_hydro_pump	1	247	0.0	0.0
-es	01_solar	1	248	1.0	0.0
-es	02_wind_on	1	248	1.0	0.0
-es	03_wind_off	1	248	1.0	0.0
-es	04_res	1	248	1.0	0.0
+es	01_solar	1	248	0.0	1.0
+es	02_wind_on	1	248	0.0	1.0
+es	03_wind_off	1	248	0.0	1.0
+es	04_res	1	248	0.0	1.0
 es	05_nuclear	1	248	0.0	0.0
 es	06_coal	1	248	0.0	0.0
 es	07_gas	1	248	0.0	0.0
 es	08_non-res	1	248	0.0	0.0
 es	09_hydro_pump	1	248	0.0	0.0
-es	01_solar	1	249	1.0	0.0
-es	02_wind_on	1	249	1.0	0.0
-es	03_wind_off	1	249	1.0	0.0
-es	04_res	1	249	1.0	0.0
+es	01_solar	1	249	0.0	1.0
+es	02_wind_on	1	249	0.0	1.0
+es	03_wind_off	1	249	0.0	1.0
+es	04_res	1	249	0.0	1.0
 es	05_nuclear	1	249	0.0	0.0
 es	06_coal	1	249	0.0	0.0
 es	07_gas	1	249	0.0	0.0
 es	08_non-res	1	249	0.0	0.0
 es	09_hydro_pump	1	249	0.0	0.0
-es	01_solar	1	250	1.0	0.0
-es	02_wind_on	1	250	1.0	0.0
-es	03_wind_off	1	250	1.0	0.0
-es	04_res	1	250	1.0	0.0
-es	05_nuclear	1	250	1.0	0.0
+es	01_solar	1	250	0.0	1.0
+es	02_wind_on	1	250	0.0	1.0
+es	03_wind_off	1	250	0.0	1.0
+es	04_res	1	250	0.0	1.0
+es	05_nuclear	1	250	0.0	1.0
 es	06_coal	1	250	0.0	0.0
 es	07_gas	1	250	0.0	0.0
 es	08_non-res	1	250	0.0	0.0
 es	09_hydro_pump	1	250	0.0	0.0
-es	01_solar	1	251	1.0	0.0
-es	02_wind_on	1	251	1.0	0.0
-es	03_wind_off	1	251	1.0	0.0
-es	04_res	1	251	1.0	0.0
-es	05_nuclear	1	251	1.0	0.0
+es	01_solar	1	251	0.0	1.0
+es	02_wind_on	1	251	0.0	1.0
+es	03_wind_off	1	251	0.0	1.0
+es	04_res	1	251	0.0	1.0
+es	05_nuclear	1	251	0.0	1.0
 es	06_coal	1	251	0.0	0.0
 es	07_gas	1	251	0.0	0.0
 es	08_non-res	1	251	0.0	0.0
 es	09_hydro_pump	1	251	0.0	0.0
-es	01_solar	1	252	1.0	0.0
-es	02_wind_on	1	252	1.0	0.0
-es	03_wind_off	1	252	1.0	0.0
-es	04_res	1	252	1.0	0.0
-es	05_nuclear	1	252	1.0	0.0
+es	01_solar	1	252	0.0	1.0
+es	02_wind_on	1	252	0.0	1.0
+es	03_wind_off	1	252	0.0	1.0
+es	04_res	1	252	0.0	1.0
+es	05_nuclear	1	252	0.0	1.0
 es	06_coal	1	252	0.0	0.0
 es	07_gas	1	252	0.0	0.0
 es	08_non-res	1	252	0.0	0.0
 es	09_hydro_pump	1	252	0.0	0.0
-es	01_solar	1	253	1.0	0.0
-es	02_wind_on	1	253	1.0	0.0
-es	03_wind_off	1	253	1.0	0.0
-es	04_res	1	253	1.0	0.0
-es	05_nuclear	1	253	1.0	0.0
+es	01_solar	1	253	0.0	1.0
+es	02_wind_on	1	253	0.0	1.0
+es	03_wind_off	1	253	0.0	1.0
+es	04_res	1	253	0.0	1.0
+es	05_nuclear	1	253	0.0	1.0
 es	06_coal	1	253	0.0	0.0
 es	07_gas	1	253	0.0	0.0
 es	08_non-res	1	253	0.0	0.0
 es	09_hydro_pump	1	253	0.0	0.0
-es	01_solar	1	254	1.0	0.0
-es	02_wind_on	1	254	1.0	0.0
-es	03_wind_off	1	254	1.0	0.0
-es	04_res	1	254	1.0	0.0
-es	05_nuclear	1	254	1.0	0.0
+es	01_solar	1	254	0.0	1.0
+es	02_wind_on	1	254	0.0	1.0
+es	03_wind_off	1	254	0.0	1.0
+es	04_res	1	254	0.0	1.0
+es	05_nuclear	1	254	0.0	1.0
 es	06_coal	1	254	0.0	0.0
 es	07_gas	1	254	0.0	0.0
 es	08_non-res	1	254	0.0	0.0
 es	09_hydro_pump	1	254	0.0	0.0
-es	01_solar	1	255	1.0	0.0
-es	02_wind_on	1	255	1.0	0.0
-es	03_wind_off	1	255	1.0	0.0
-es	04_res	1	255	1.0	0.0
-es	05_nuclear	1	255	1.0	0.0
+es	01_solar	1	255	0.0	1.0
+es	02_wind_on	1	255	0.0	1.0
+es	03_wind_off	1	255	0.0	1.0
+es	04_res	1	255	0.0	1.0
+es	05_nuclear	1	255	0.0	1.0
 es	06_coal	1	255	0.0	0.0
 es	07_gas	1	255	0.0	0.0
 es	08_non-res	1	255	0.0	0.0
 es	09_hydro_pump	1	255	0.0	0.0
-es	01_solar	1	256	1.0	0.0
-es	02_wind_on	1	256	1.0	0.0
-es	03_wind_off	1	256	1.0	0.0
-es	04_res	1	256	1.0	0.0
-es	05_nuclear	1	256	1.0	0.0
+es	01_solar	1	256	0.0	1.0
+es	02_wind_on	1	256	0.0	1.0
+es	03_wind_off	1	256	0.0	1.0
+es	04_res	1	256	0.0	1.0
+es	05_nuclear	1	256	0.0	1.0
 es	06_coal	1	256	0.0	0.0
 es	07_gas	1	256	0.0	0.0
 es	08_non-res	1	256	0.0	0.0
 es	09_hydro_pump	1	256	0.0	0.0
-es	01_solar	1	257	1.0	0.0
-es	02_wind_on	1	257	1.0	0.0
-es	03_wind_off	1	257	1.0	0.0
-es	04_res	1	257	1.0	0.0
-es	05_nuclear	1	257	1.0	0.0
+es	01_solar	1	257	0.0	1.0
+es	02_wind_on	1	257	0.0	1.0
+es	03_wind_off	1	257	0.0	1.0
+es	04_res	1	257	0.0	1.0
+es	05_nuclear	1	257	0.0	1.0
 es	06_coal	1	257	0.0	0.0
 es	07_gas	1	257	0.0	0.0
 es	08_non-res	1	257	0.0	0.0
 es	09_hydro_pump	1	257	0.0	0.0
-es	01_solar	1	258	1.0	0.0
-es	02_wind_on	1	258	1.0	0.0
-es	03_wind_off	1	258	1.0	0.0
-es	04_res	1	258	1.0	0.0
-es	05_nuclear	1	258	1.0	0.0
+es	01_solar	1	258	0.0	1.0
+es	02_wind_on	1	258	0.0	1.0
+es	03_wind_off	1	258	0.0	1.0
+es	04_res	1	258	0.0	1.0
+es	05_nuclear	1	258	0.0	1.0
 es	06_coal	1	258	0.0	0.0
 es	07_gas	1	258	0.0	0.0
 es	08_non-res	1	258	0.0	0.0
 es	09_hydro_pump	1	258	0.0	0.0
-es	01_solar	1	259	1.0	0.0
-es	02_wind_on	1	259	1.0	0.0
-es	03_wind_off	1	259	1.0	0.0
-es	04_res	1	259	1.0	0.0
-es	05_nuclear	1	259	1.0	0.0
+es	01_solar	1	259	0.0	1.0
+es	02_wind_on	1	259	0.0	1.0
+es	03_wind_off	1	259	0.0	1.0
+es	04_res	1	259	0.0	1.0
+es	05_nuclear	1	259	0.0	1.0
 es	06_coal	1	259	0.0	0.0
 es	07_gas	1	259	0.0	0.0
 es	08_non-res	1	259	0.0	0.0
 es	09_hydro_pump	1	259	0.0	0.0
-es	01_solar	1	260	1.0	0.0
-es	02_wind_on	1	260	1.0	0.0
-es	03_wind_off	1	260	1.0	0.0
-es	04_res	1	260	1.0	0.0
-es	05_nuclear	1	260	1.0	0.0
+es	01_solar	1	260	0.0	1.0
+es	02_wind_on	1	260	0.0	1.0
+es	03_wind_off	1	260	0.0	1.0
+es	04_res	1	260	0.0	1.0
+es	05_nuclear	1	260	0.0	1.0
 es	06_coal	1	260	0.0	0.0
 es	07_gas	1	260	0.0	0.0
 es	08_non-res	1	260	0.0	0.0
 es	09_hydro_pump	1	260	0.0	0.0
-es	01_solar	1	261	1.0	0.0
-es	02_wind_on	1	261	1.0	0.0
-es	03_wind_off	1	261	1.0	0.0
-es	04_res	1	261	1.0	0.0
-es	05_nuclear	1	261	1.0	0.0
+es	01_solar	1	261	0.0	1.0
+es	02_wind_on	1	261	0.0	1.0
+es	03_wind_off	1	261	0.0	1.0
+es	04_res	1	261	0.0	1.0
+es	05_nuclear	1	261	0.0	1.0
 es	06_coal	1	261	0.0	0.0
 es	07_gas	1	261	0.0	0.0
 es	08_non-res	1	261	0.0	0.0
 es	09_hydro_pump	1	261	0.0	0.0
-es	01_solar	1	262	1.0	0.0
-es	02_wind_on	1	262	1.0	0.0
-es	03_wind_off	1	262	1.0	0.0
-es	04_res	1	262	1.0	0.0
-es	05_nuclear	1	262	1.0	0.0
+es	01_solar	1	262	0.0	1.0
+es	02_wind_on	1	262	0.0	1.0
+es	03_wind_off	1	262	0.0	1.0
+es	04_res	1	262	0.0	1.0
+es	05_nuclear	1	262	0.0	1.0
 es	06_coal	1	262	0.0	0.0
 es	07_gas	1	262	0.0	0.0
 es	08_non-res	1	262	0.0	0.0
 es	09_hydro_pump	1	262	0.0	0.0
-es	01_solar	1	263	1.0	0.0
-es	02_wind_on	1	263	1.0	0.0
-es	03_wind_off	1	263	1.0	0.0
-es	04_res	1	263	1.0	0.0
-es	05_nuclear	1	263	1.0	0.0
+es	01_solar	1	263	0.0	1.0
+es	02_wind_on	1	263	0.0	1.0
+es	03_wind_off	1	263	0.0	1.0
+es	04_res	1	263	0.0	1.0
+es	05_nuclear	1	263	0.0	1.0
 es	06_coal	1	263	0.0	0.0
 es	07_gas	1	263	0.0	0.0
 es	08_non-res	1	263	0.0	0.0
 es	09_hydro_pump	1	263	0.0	0.0
-es	01_solar	1	264	1.0	0.0
-es	02_wind_on	1	264	1.0	0.0
-es	03_wind_off	1	264	1.0	0.0
-es	04_res	1	264	1.0	0.0
-es	05_nuclear	1	264	1.0	0.0
+es	01_solar	1	264	0.0	1.0
+es	02_wind_on	1	264	0.0	1.0
+es	03_wind_off	1	264	0.0	1.0
+es	04_res	1	264	0.0	1.0
+es	05_nuclear	1	264	0.0	1.0
 es	06_coal	1	264	0.0	0.0
 es	07_gas	1	264	0.0	0.0
 es	08_non-res	1	264	0.0	0.0
 es	09_hydro_pump	1	264	0.0	0.0
-es	01_solar	1	265	1.0	0.0
-es	02_wind_on	1	265	1.0	0.0
-es	03_wind_off	1	265	1.0	0.0
-es	04_res	1	265	1.0	0.0
-es	05_nuclear	1	265	1.0	0.0
+es	01_solar	1	265	0.0	1.0
+es	02_wind_on	1	265	0.0	1.0
+es	03_wind_off	1	265	0.0	1.0
+es	04_res	1	265	0.0	1.0
+es	05_nuclear	1	265	0.0	1.0
 es	06_coal	1	265	0.0	0.0
 es	07_gas	1	265	0.0	0.0
 es	08_non-res	1	265	0.0	0.0
 es	09_hydro_pump	1	265	0.0	0.0
-es	01_solar	1	266	1.0	0.0
-es	02_wind_on	1	266	1.0	0.0
-es	03_wind_off	1	266	1.0	0.0
-es	04_res	1	266	1.0	0.0
-es	05_nuclear	1	266	1.0	0.0
+es	01_solar	1	266	0.0	1.0
+es	02_wind_on	1	266	0.0	1.0
+es	03_wind_off	1	266	0.0	1.0
+es	04_res	1	266	0.0	1.0
+es	05_nuclear	1	266	0.0	1.0
 es	06_coal	1	266	0.0	0.0
 es	07_gas	1	266	0.0	0.0
 es	08_non-res	1	266	0.0	0.0
 es	09_hydro_pump	1	266	0.0	0.0
-es	01_solar	1	267	1.0	0.0
-es	02_wind_on	1	267	1.0	0.0
-es	03_wind_off	1	267	1.0	0.0
-es	04_res	1	267	1.0	0.0
-es	05_nuclear	1	267	1.0	0.0
+es	01_solar	1	267	0.0	1.0
+es	02_wind_on	1	267	0.0	1.0
+es	03_wind_off	1	267	0.0	1.0
+es	04_res	1	267	0.0	1.0
+es	05_nuclear	1	267	0.0	1.0
 es	06_coal	1	267	0.0	0.0
 es	07_gas	1	267	0.0	0.0
 es	08_non-res	1	267	0.0	0.0
 es	09_hydro_pump	1	267	0.0	0.0
-es	01_solar	1	268	1.0	0.0
-es	02_wind_on	1	268	1.0	0.0
-es	03_wind_off	1	268	1.0	0.0
-es	04_res	1	268	1.0	0.0
-es	05_nuclear	1	268	1.0	0.0
+es	01_solar	1	268	0.0	1.0
+es	02_wind_on	1	268	0.0	1.0
+es	03_wind_off	1	268	0.0	1.0
+es	04_res	1	268	0.0	1.0
+es	05_nuclear	1	268	0.0	1.0
 es	06_coal	1	268	0.0	0.0
 es	07_gas	1	268	0.0	0.0
 es	08_non-res	1	268	0.0	0.0
 es	09_hydro_pump	1	268	0.0	0.0
-es	01_solar	1	269	1.0	0.0
-es	02_wind_on	1	269	1.0	0.0
-es	03_wind_off	1	269	1.0	0.0
-es	04_res	1	269	1.0	0.0
-es	05_nuclear	1	269	1.0	0.0
+es	01_solar	1	269	0.0	1.0
+es	02_wind_on	1	269	0.0	1.0
+es	03_wind_off	1	269	0.0	1.0
+es	04_res	1	269	0.0	1.0
+es	05_nuclear	1	269	0.0	1.0
 es	06_coal	1	269	0.0	0.0
 es	07_gas	1	269	0.0	0.0
 es	08_non-res	1	269	0.0	0.0
 es	09_hydro_pump	1	269	0.0	0.0
-es	01_solar	1	270	1.0	0.0
-es	02_wind_on	1	270	1.0	0.0
-es	03_wind_off	1	270	1.0	0.0
-es	04_res	1	270	1.0	0.0
-es	05_nuclear	1	270	1.0	0.0
-es	06_coal	1	270	1.0	0.0
+es	01_solar	1	270	0.0	1.0
+es	02_wind_on	1	270	0.0	1.0
+es	03_wind_off	1	270	0.0	1.0
+es	04_res	1	270	0.0	1.0
+es	05_nuclear	1	270	0.0	1.0
+es	06_coal	1	270	0.0	1.0
 es	07_gas	1	270	0.0	0.0
 es	08_non-res	1	270	0.0	0.0
 es	09_hydro_pump	1	270	0.0	0.0
-es	01_solar	1	271	1.0	0.0
-es	02_wind_on	1	271	1.0	0.0
-es	03_wind_off	1	271	1.0	0.0
-es	04_res	1	271	1.0	0.0
-es	05_nuclear	1	271	1.0	0.0
-es	06_coal	1	271	1.0	0.0
+es	01_solar	1	271	0.0	1.0
+es	02_wind_on	1	271	0.0	1.0
+es	03_wind_off	1	271	0.0	1.0
+es	04_res	1	271	0.0	1.0
+es	05_nuclear	1	271	0.0	1.0
+es	06_coal	1	271	0.0	1.0
 es	07_gas	1	271	0.0	0.0
 es	08_non-res	1	271	0.0	0.0
 es	09_hydro_pump	1	271	0.0	0.0
-es	01_solar	1	272	1.0	0.0
-es	02_wind_on	1	272	1.0	0.0
-es	03_wind_off	1	272	1.0	0.0
-es	04_res	1	272	1.0	0.0
-es	05_nuclear	1	272	1.0	0.0
-es	06_coal	1	272	1.0	0.0
+es	01_solar	1	272	0.0	1.0
+es	02_wind_on	1	272	0.0	1.0
+es	03_wind_off	1	272	0.0	1.0
+es	04_res	1	272	0.0	1.0
+es	05_nuclear	1	272	0.0	1.0
+es	06_coal	1	272	0.0	1.0
 es	07_gas	1	272	0.0	0.0
 es	08_non-res	1	272	0.0	0.0
 es	09_hydro_pump	1	272	0.0	0.0
-es	01_solar	1	273	1.0	0.0
-es	02_wind_on	1	273	1.0	0.0
-es	03_wind_off	1	273	1.0	0.0
-es	04_res	1	273	1.0	0.0
-es	05_nuclear	1	273	1.0	0.0
-es	06_coal	1	273	1.0	0.0
+es	01_solar	1	273	0.0	1.0
+es	02_wind_on	1	273	0.0	1.0
+es	03_wind_off	1	273	0.0	1.0
+es	04_res	1	273	0.0	1.0
+es	05_nuclear	1	273	0.0	1.0
+es	06_coal	1	273	0.0	1.0
 es	07_gas	1	273	0.0	0.0
 es	08_non-res	1	273	0.0	0.0
 es	09_hydro_pump	1	273	0.0	0.0
-es	01_solar	1	274	1.0	0.0
-es	02_wind_on	1	274	1.0	0.0
-es	03_wind_off	1	274	1.0	0.0
-es	04_res	1	274	1.0	0.0
-es	05_nuclear	1	274	1.0	0.0
-es	06_coal	1	274	1.0	0.0
+es	01_solar	1	274	0.0	1.0
+es	02_wind_on	1	274	0.0	1.0
+es	03_wind_off	1	274	0.0	1.0
+es	04_res	1	274	0.0	1.0
+es	05_nuclear	1	274	0.0	1.0
+es	06_coal	1	274	0.0	1.0
 es	07_gas	1	274	0.0	0.0
 es	08_non-res	1	274	0.0	0.0
 es	09_hydro_pump	1	274	0.0	0.0
-es	01_solar	1	275	1.0	0.0
-es	02_wind_on	1	275	1.0	0.0
-es	03_wind_off	1	275	1.0	0.0
-es	04_res	1	275	1.0	0.0
-es	05_nuclear	1	275	1.0	0.0
-es	06_coal	1	275	1.0	0.0
+es	01_solar	1	275	0.0	1.0
+es	02_wind_on	1	275	0.0	1.0
+es	03_wind_off	1	275	0.0	1.0
+es	04_res	1	275	0.0	1.0
+es	05_nuclear	1	275	0.0	1.0
+es	06_coal	1	275	0.0	1.0
 es	07_gas	1	275	0.0	0.0
 es	08_non-res	1	275	0.0	0.0
 es	09_hydro_pump	1	275	0.0	0.0
-es	01_solar	1	276	1.0	0.0
-es	02_wind_on	1	276	1.0	0.0
-es	03_wind_off	1	276	1.0	0.0
-es	04_res	1	276	1.0	0.0
-es	05_nuclear	1	276	1.0	0.0
-es	06_coal	1	276	1.0	0.0
+es	01_solar	1	276	0.0	1.0
+es	02_wind_on	1	276	0.0	1.0
+es	03_wind_off	1	276	0.0	1.0
+es	04_res	1	276	0.0	1.0
+es	05_nuclear	1	276	0.0	1.0
+es	06_coal	1	276	0.0	1.0
 es	07_gas	1	276	0.0	0.0
 es	08_non-res	1	276	0.0	0.0
 es	09_hydro_pump	1	276	0.0	0.0
-es	01_solar	1	277	1.0	0.0
-es	02_wind_on	1	277	1.0	0.0
-es	03_wind_off	1	277	1.0	0.0
-es	04_res	1	277	1.0	0.0
-es	05_nuclear	1	277	1.0	0.0
-es	06_coal	1	277	1.0	0.0
+es	01_solar	1	277	0.0	1.0
+es	02_wind_on	1	277	0.0	1.0
+es	03_wind_off	1	277	0.0	1.0
+es	04_res	1	277	0.0	1.0
+es	05_nuclear	1	277	0.0	1.0
+es	06_coal	1	277	0.0	1.0
 es	07_gas	1	277	0.0	0.0
 es	08_non-res	1	277	0.0	0.0
 es	09_hydro_pump	1	277	0.0	0.0
-es	01_solar	1	278	1.0	0.0
-es	02_wind_on	1	278	1.0	0.0
-es	03_wind_off	1	278	1.0	0.0
-es	04_res	1	278	1.0	0.0
-es	05_nuclear	1	278	1.0	0.0
-es	06_coal	1	278	1.0	0.0
+es	01_solar	1	278	0.0	1.0
+es	02_wind_on	1	278	0.0	1.0
+es	03_wind_off	1	278	0.0	1.0
+es	04_res	1	278	0.0	1.0
+es	05_nuclear	1	278	0.0	1.0
+es	06_coal	1	278	0.0	1.0
 es	07_gas	1	278	0.0	0.0
 es	08_non-res	1	278	0.0	0.0
 es	09_hydro_pump	1	278	0.0	0.0
-es	01_solar	1	279	1.0	0.0
-es	02_wind_on	1	279	1.0	0.0
-es	03_wind_off	1	279	1.0	0.0
-es	04_res	1	279	1.0	0.0
-es	05_nuclear	1	279	1.0	0.0
-es	06_coal	1	279	1.0	0.0
+es	01_solar	1	279	0.0	1.0
+es	02_wind_on	1	279	0.0	1.0
+es	03_wind_off	1	279	0.0	1.0
+es	04_res	1	279	0.0	1.0
+es	05_nuclear	1	279	0.0	1.0
+es	06_coal	1	279	0.0	1.0
 es	07_gas	1	279	0.0	0.0
 es	08_non-res	1	279	0.0	0.0
 es	09_hydro_pump	1	279	0.0	0.0
-es	01_solar	1	280	1.0	0.0
-es	02_wind_on	1	280	1.0	0.0
-es	03_wind_off	1	280	1.0	0.0
-es	04_res	1	280	1.0	0.0
-es	05_nuclear	1	280	1.0	0.0
-es	06_coal	1	280	1.0	0.0
+es	01_solar	1	280	0.0	1.0
+es	02_wind_on	1	280	0.0	1.0
+es	03_wind_off	1	280	0.0	1.0
+es	04_res	1	280	0.0	1.0
+es	05_nuclear	1	280	0.0	1.0
+es	06_coal	1	280	0.0	1.0
 es	07_gas	1	280	0.0	0.0
 es	08_non-res	1	280	0.0	0.0
 es	09_hydro_pump	1	280	0.0	0.0
-es	01_solar	1	281	1.0	0.0
-es	02_wind_on	1	281	1.0	0.0
-es	03_wind_off	1	281	1.0	0.0
-es	04_res	1	281	1.0	0.0
-es	05_nuclear	1	281	1.0	0.0
-es	06_coal	1	281	1.0	0.0
+es	01_solar	1	281	0.0	1.0
+es	02_wind_on	1	281	0.0	1.0
+es	03_wind_off	1	281	0.0	1.0
+es	04_res	1	281	0.0	1.0
+es	05_nuclear	1	281	0.0	1.0
+es	06_coal	1	281	0.0	1.0
 es	07_gas	1	281	0.0	0.0
 es	08_non-res	1	281	0.0	0.0
 es	09_hydro_pump	1	281	0.0	0.0
-es	01_solar	1	282	1.0	0.0
-es	02_wind_on	1	282	1.0	0.0
-es	03_wind_off	1	282	1.0	0.0
-es	04_res	1	282	1.0	0.0
-es	05_nuclear	1	282	1.0	0.0
-es	06_coal	1	282	1.0	0.0
+es	01_solar	1	282	0.0	1.0
+es	02_wind_on	1	282	0.0	1.0
+es	03_wind_off	1	282	0.0	1.0
+es	04_res	1	282	0.0	1.0
+es	05_nuclear	1	282	0.0	1.0
+es	06_coal	1	282	0.0	1.0
 es	07_gas	1	282	0.0	0.0
 es	08_non-res	1	282	0.0	0.0
 es	09_hydro_pump	1	282	0.0	0.0
-es	01_solar	1	283	1.0	0.0
-es	02_wind_on	1	283	1.0	0.0
-es	03_wind_off	1	283	1.0	0.0
-es	04_res	1	283	1.0	0.0
-es	05_nuclear	1	283	1.0	0.0
-es	06_coal	1	283	1.0	0.0
+es	01_solar	1	283	0.0	1.0
+es	02_wind_on	1	283	0.0	1.0
+es	03_wind_off	1	283	0.0	1.0
+es	04_res	1	283	0.0	1.0
+es	05_nuclear	1	283	0.0	1.0
+es	06_coal	1	283	0.0	1.0
 es	07_gas	1	283	0.0	0.0
 es	08_non-res	1	283	0.0	0.0
 es	09_hydro_pump	1	283	0.0	0.0
-es	01_solar	1	284	1.0	0.0
-es	02_wind_on	1	284	1.0	0.0
-es	03_wind_off	1	284	1.0	0.0
-es	04_res	1	284	1.0	0.0
-es	05_nuclear	1	284	1.0	0.0
-es	06_coal	1	284	1.0	0.0
+es	01_solar	1	284	0.0	1.0
+es	02_wind_on	1	284	0.0	1.0
+es	03_wind_off	1	284	0.0	1.0
+es	04_res	1	284	0.0	1.0
+es	05_nuclear	1	284	0.0	1.0
+es	06_coal	1	284	0.0	1.0
 es	07_gas	1	284	0.0	0.0
 es	08_non-res	1	284	0.0	0.0
 es	09_hydro_pump	1	284	0.0	0.0
-es	01_solar	1	285	1.0	0.0
-es	02_wind_on	1	285	1.0	0.0
-es	03_wind_off	1	285	1.0	0.0
-es	04_res	1	285	1.0	0.0
-es	05_nuclear	1	285	1.0	0.0
-es	06_coal	1	285	1.0	0.0
+es	01_solar	1	285	0.0	1.0
+es	02_wind_on	1	285	0.0	1.0
+es	03_wind_off	1	285	0.0	1.0
+es	04_res	1	285	0.0	1.0
+es	05_nuclear	1	285	0.0	1.0
+es	06_coal	1	285	0.0	1.0
 es	07_gas	1	285	0.0	0.0
 es	08_non-res	1	285	0.0	0.0
 es	09_hydro_pump	1	285	0.0	0.0
-es	01_solar	1	286	1.0	0.0
-es	02_wind_on	1	286	1.0	0.0
-es	03_wind_off	1	286	1.0	0.0
-es	04_res	1	286	1.0	0.0
-es	05_nuclear	1	286	1.0	0.0
-es	06_coal	1	286	1.0	0.0
+es	01_solar	1	286	0.0	1.0
+es	02_wind_on	1	286	0.0	1.0
+es	03_wind_off	1	286	0.0	1.0
+es	04_res	1	286	0.0	1.0
+es	05_nuclear	1	286	0.0	1.0
+es	06_coal	1	286	0.0	1.0
 es	07_gas	1	286	0.0	0.0
 es	08_non-res	1	286	0.0	0.0
 es	09_hydro_pump	1	286	0.0	0.0
-es	01_solar	1	287	1.0	0.0
-es	02_wind_on	1	287	1.0	0.0
-es	03_wind_off	1	287	1.0	0.0
-es	04_res	1	287	1.0	0.0
-es	05_nuclear	1	287	1.0	0.0
-es	06_coal	1	287	1.0	0.0
+es	01_solar	1	287	0.0	1.0
+es	02_wind_on	1	287	0.0	1.0
+es	03_wind_off	1	287	0.0	1.0
+es	04_res	1	287	0.0	1.0
+es	05_nuclear	1	287	0.0	1.0
+es	06_coal	1	287	0.0	1.0
 es	07_gas	1	287	0.0	0.0
 es	08_non-res	1	287	0.0	0.0
 es	09_hydro_pump	1	287	0.0	0.0
-es	01_solar	1	288	1.0	0.0
-es	02_wind_on	1	288	1.0	0.0
-es	03_wind_off	1	288	1.0	0.0
-es	04_res	1	288	1.0	0.0
-es	05_nuclear	1	288	1.0	0.0
-es	06_coal	1	288	1.0	0.0
+es	01_solar	1	288	0.0	1.0
+es	02_wind_on	1	288	0.0	1.0
+es	03_wind_off	1	288	0.0	1.0
+es	04_res	1	288	0.0	1.0
+es	05_nuclear	1	288	0.0	1.0
+es	06_coal	1	288	0.0	1.0
 es	07_gas	1	288	0.0	0.0
 es	08_non-res	1	288	0.0	0.0
 es	09_hydro_pump	1	288	0.0	0.0
-es	01_solar	1	289	1.0	0.0
-es	02_wind_on	1	289	1.0	0.0
-es	03_wind_off	1	289	1.0	0.0
-es	04_res	1	289	1.0	0.0
-es	05_nuclear	1	289	1.0	0.0
-es	06_coal	1	289	1.0	0.0
+es	01_solar	1	289	0.0	1.0
+es	02_wind_on	1	289	0.0	1.0
+es	03_wind_off	1	289	0.0	1.0
+es	04_res	1	289	0.0	1.0
+es	05_nuclear	1	289	0.0	1.0
+es	06_coal	1	289	0.0	1.0
 es	07_gas	1	289	0.0	0.0
 es	08_non-res	1	289	0.0	0.0
 es	09_hydro_pump	1	289	0.0	0.0
-es	01_solar	1	290	1.0	0.0
-es	02_wind_on	1	290	1.0	0.0
-es	03_wind_off	1	290	1.0	0.0
-es	04_res	1	290	1.0	0.0
-es	05_nuclear	1	290	1.0	0.0
-es	06_coal	1	290	1.0	0.0
-es	07_gas	1	290	1.0	0.0
+es	01_solar	1	290	0.0	1.0
+es	02_wind_on	1	290	0.0	1.0
+es	03_wind_off	1	290	0.0	1.0
+es	04_res	1	290	0.0	1.0
+es	05_nuclear	1	290	0.0	1.0
+es	06_coal	1	290	0.0	1.0
+es	07_gas	1	290	0.0	1.0
 es	08_non-res	1	290	0.0	0.0
 es	09_hydro_pump	1	290	0.0	0.0
-es	01_solar	1	291	1.0	0.0
-es	02_wind_on	1	291	1.0	0.0
-es	03_wind_off	1	291	1.0	0.0
-es	04_res	1	291	1.0	0.0
-es	05_nuclear	1	291	1.0	0.0
-es	06_coal	1	291	1.0	0.0
-es	07_gas	1	291	1.0	0.0
+es	01_solar	1	291	0.0	1.0
+es	02_wind_on	1	291	0.0	1.0
+es	03_wind_off	1	291	0.0	1.0
+es	04_res	1	291	0.0	1.0
+es	05_nuclear	1	291	0.0	1.0
+es	06_coal	1	291	0.0	1.0
+es	07_gas	1	291	0.0	1.0
 es	08_non-res	1	291	0.0	0.0
 es	09_hydro_pump	1	291	0.0	0.0
-es	01_solar	1	292	1.0	0.0
-es	02_wind_on	1	292	1.0	0.0
-es	03_wind_off	1	292	1.0	0.0
-es	04_res	1	292	1.0	0.0
-es	05_nuclear	1	292	1.0	0.0
-es	06_coal	1	292	1.0	0.0
-es	07_gas	1	292	1.0	0.0
+es	01_solar	1	292	0.0	1.0
+es	02_wind_on	1	292	0.0	1.0
+es	03_wind_off	1	292	0.0	1.0
+es	04_res	1	292	0.0	1.0
+es	05_nuclear	1	292	0.0	1.0
+es	06_coal	1	292	0.0	1.0
+es	07_gas	1	292	0.0	1.0
 es	08_non-res	1	292	0.0	0.0
 es	09_hydro_pump	1	292	0.0	0.0
-es	01_solar	1	293	1.0	0.0
-es	02_wind_on	1	293	1.0	0.0
-es	03_wind_off	1	293	1.0	0.0
-es	04_res	1	293	1.0	0.0
-es	05_nuclear	1	293	1.0	0.0
-es	06_coal	1	293	1.0	0.0
-es	07_gas	1	293	1.0	0.0
+es	01_solar	1	293	0.0	1.0
+es	02_wind_on	1	293	0.0	1.0
+es	03_wind_off	1	293	0.0	1.0
+es	04_res	1	293	0.0	1.0
+es	05_nuclear	1	293	0.0	1.0
+es	06_coal	1	293	0.0	1.0
+es	07_gas	1	293	0.0	1.0
 es	08_non-res	1	293	0.0	0.0
 es	09_hydro_pump	1	293	0.0	0.0
-es	01_solar	1	294	1.0	0.0
-es	02_wind_on	1	294	1.0	0.0
-es	03_wind_off	1	294	1.0	0.0
-es	04_res	1	294	1.0	0.0
-es	05_nuclear	1	294	1.0	0.0
-es	06_coal	1	294	1.0	0.0
-es	07_gas	1	294	1.0	0.0
+es	01_solar	1	294	0.0	1.0
+es	02_wind_on	1	294	0.0	1.0
+es	03_wind_off	1	294	0.0	1.0
+es	04_res	1	294	0.0	1.0
+es	05_nuclear	1	294	0.0	1.0
+es	06_coal	1	294	0.0	1.0
+es	07_gas	1	294	0.0	1.0
 es	08_non-res	1	294	0.0	0.0
 es	09_hydro_pump	1	294	0.0	0.0
-es	01_solar	1	295	1.0	0.0
-es	02_wind_on	1	295	1.0	0.0
-es	03_wind_off	1	295	1.0	0.0
-es	04_res	1	295	1.0	0.0
-es	05_nuclear	1	295	1.0	0.0
-es	06_coal	1	295	1.0	0.0
-es	07_gas	1	295	1.0	0.0
+es	01_solar	1	295	0.0	1.0
+es	02_wind_on	1	295	0.0	1.0
+es	03_wind_off	1	295	0.0	1.0
+es	04_res	1	295	0.0	1.0
+es	05_nuclear	1	295	0.0	1.0
+es	06_coal	1	295	0.0	1.0
+es	07_gas	1	295	0.0	1.0
 es	08_non-res	1	295	0.0	0.0
 es	09_hydro_pump	1	295	0.0	0.0
-es	01_solar	1	296	1.0	0.0
-es	02_wind_on	1	296	1.0	0.0
-es	03_wind_off	1	296	1.0	0.0
-es	04_res	1	296	1.0	0.0
-es	05_nuclear	1	296	1.0	0.0
-es	06_coal	1	296	1.0	0.0
-es	07_gas	1	296	1.0	0.0
+es	01_solar	1	296	0.0	1.0
+es	02_wind_on	1	296	0.0	1.0
+es	03_wind_off	1	296	0.0	1.0
+es	04_res	1	296	0.0	1.0
+es	05_nuclear	1	296	0.0	1.0
+es	06_coal	1	296	0.0	1.0
+es	07_gas	1	296	0.0	1.0
 es	08_non-res	1	296	0.0	0.0
 es	09_hydro_pump	1	296	0.0	0.0
-es	01_solar	1	297	1.0	0.0
-es	02_wind_on	1	297	1.0	0.0
-es	03_wind_off	1	297	1.0	0.0
-es	04_res	1	297	1.0	0.0
-es	05_nuclear	1	297	1.0	0.0
-es	06_coal	1	297	1.0	0.0
-es	07_gas	1	297	1.0	0.0
+es	01_solar	1	297	0.0	1.0
+es	02_wind_on	1	297	0.0	1.0
+es	03_wind_off	1	297	0.0	1.0
+es	04_res	1	297	0.0	1.0
+es	05_nuclear	1	297	0.0	1.0
+es	06_coal	1	297	0.0	1.0
+es	07_gas	1	297	0.0	1.0
 es	08_non-res	1	297	0.0	0.0
 es	09_hydro_pump	1	297	0.0	0.0
-es	01_solar	1	298	1.0	0.0
-es	02_wind_on	1	298	1.0	0.0
-es	03_wind_off	1	298	1.0	0.0
-es	04_res	1	298	1.0	0.0
-es	05_nuclear	1	298	1.0	0.0
-es	06_coal	1	298	1.0	0.0
-es	07_gas	1	298	1.0	0.0
+es	01_solar	1	298	0.0	1.0
+es	02_wind_on	1	298	0.0	1.0
+es	03_wind_off	1	298	0.0	1.0
+es	04_res	1	298	0.0	1.0
+es	05_nuclear	1	298	0.0	1.0
+es	06_coal	1	298	0.0	1.0
+es	07_gas	1	298	0.0	1.0
 es	08_non-res	1	298	0.0	0.0
 es	09_hydro_pump	1	298	0.0	0.0
-es	01_solar	1	299	1.0	0.0
-es	02_wind_on	1	299	1.0	0.0
-es	03_wind_off	1	299	1.0	0.0
-es	04_res	1	299	1.0	0.0
-es	05_nuclear	1	299	1.0	0.0
-es	06_coal	1	299	1.0	0.0
-es	07_gas	1	299	1.0	0.0
+es	01_solar	1	299	0.0	1.0
+es	02_wind_on	1	299	0.0	1.0
+es	03_wind_off	1	299	0.0	1.0
+es	04_res	1	299	0.0	1.0
+es	05_nuclear	1	299	0.0	1.0
+es	06_coal	1	299	0.0	1.0
+es	07_gas	1	299	0.0	1.0
 es	08_non-res	1	299	0.0	0.0
 es	09_hydro_pump	1	299	0.0	0.0
-es	01_solar	1	300	1.0	0.0
-es	02_wind_on	1	300	1.0	0.0
-es	03_wind_off	1	300	1.0	0.0
-es	04_res	1	300	1.0	0.0
-es	05_nuclear	1	300	1.0	0.0
-es	06_coal	1	300	1.0	0.0
-es	07_gas	1	300	1.0	0.0
+es	01_solar	1	300	0.0	1.0
+es	02_wind_on	1	300	0.0	1.0
+es	03_wind_off	1	300	0.0	1.0
+es	04_res	1	300	0.0	1.0
+es	05_nuclear	1	300	0.0	1.0
+es	06_coal	1	300	0.0	1.0
+es	07_gas	1	300	0.0	1.0
 es	08_non-res	1	300	0.0	0.0
 es	09_hydro_pump	1	300	0.0	0.0
-es	01_solar	1	301	1.0	0.0
-es	02_wind_on	1	301	1.0	0.0
-es	03_wind_off	1	301	1.0	0.0
-es	04_res	1	301	1.0	0.0
-es	05_nuclear	1	301	1.0	0.0
-es	06_coal	1	301	1.0	0.0
-es	07_gas	1	301	1.0	0.0
+es	01_solar	1	301	0.0	1.0
+es	02_wind_on	1	301	0.0	1.0
+es	03_wind_off	1	301	0.0	1.0
+es	04_res	1	301	0.0	1.0
+es	05_nuclear	1	301	0.0	1.0
+es	06_coal	1	301	0.0	1.0
+es	07_gas	1	301	0.0	1.0
 es	08_non-res	1	301	0.0	0.0
 es	09_hydro_pump	1	301	0.0	0.0
-es	01_solar	1	302	1.0	0.0
-es	02_wind_on	1	302	1.0	0.0
-es	03_wind_off	1	302	1.0	0.0
-es	04_res	1	302	1.0	0.0
-es	05_nuclear	1	302	1.0	0.0
-es	06_coal	1	302	1.0	0.0
-es	07_gas	1	302	1.0	0.0
+es	01_solar	1	302	0.0	1.0
+es	02_wind_on	1	302	0.0	1.0
+es	03_wind_off	1	302	0.0	1.0
+es	04_res	1	302	0.0	1.0
+es	05_nuclear	1	302	0.0	1.0
+es	06_coal	1	302	0.0	1.0
+es	07_gas	1	302	0.0	1.0
 es	08_non-res	1	302	0.0	0.0
 es	09_hydro_pump	1	302	0.0	0.0
-es	01_solar	1	303	1.0	0.0
-es	02_wind_on	1	303	1.0	0.0
-es	03_wind_off	1	303	1.0	0.0
-es	04_res	1	303	1.0	0.0
-es	05_nuclear	1	303	1.0	0.0
-es	06_coal	1	303	1.0	0.0
-es	07_gas	1	303	1.0	0.0
+es	01_solar	1	303	0.0	1.0
+es	02_wind_on	1	303	0.0	1.0
+es	03_wind_off	1	303	0.0	1.0
+es	04_res	1	303	0.0	1.0
+es	05_nuclear	1	303	0.0	1.0
+es	06_coal	1	303	0.0	1.0
+es	07_gas	1	303	0.0	1.0
 es	08_non-res	1	303	0.0	0.0
 es	09_hydro_pump	1	303	0.0	0.0
-es	01_solar	1	304	1.0	0.0
-es	02_wind_on	1	304	1.0	0.0
-es	03_wind_off	1	304	1.0	0.0
-es	04_res	1	304	1.0	0.0
-es	05_nuclear	1	304	1.0	0.0
-es	06_coal	1	304	1.0	0.0
-es	07_gas	1	304	1.0	0.0
+es	01_solar	1	304	0.0	1.0
+es	02_wind_on	1	304	0.0	1.0
+es	03_wind_off	1	304	0.0	1.0
+es	04_res	1	304	0.0	1.0
+es	05_nuclear	1	304	0.0	1.0
+es	06_coal	1	304	0.0	1.0
+es	07_gas	1	304	0.0	1.0
 es	08_non-res	1	304	0.0	0.0
 es	09_hydro_pump	1	304	0.0	0.0
-es	01_solar	1	305	1.0	0.0
-es	02_wind_on	1	305	1.0	0.0
-es	03_wind_off	1	305	1.0	0.0
-es	04_res	1	305	1.0	0.0
-es	05_nuclear	1	305	1.0	0.0
-es	06_coal	1	305	1.0	0.0
-es	07_gas	1	305	1.0	0.0
+es	01_solar	1	305	0.0	1.0
+es	02_wind_on	1	305	0.0	1.0
+es	03_wind_off	1	305	0.0	1.0
+es	04_res	1	305	0.0	1.0
+es	05_nuclear	1	305	0.0	1.0
+es	06_coal	1	305	0.0	1.0
+es	07_gas	1	305	0.0	1.0
 es	08_non-res	1	305	0.0	0.0
 es	09_hydro_pump	1	305	0.0	0.0
-es	01_solar	1	306	1.0	0.0
-es	02_wind_on	1	306	1.0	0.0
-es	03_wind_off	1	306	1.0	0.0
-es	04_res	1	306	1.0	0.0
-es	05_nuclear	1	306	1.0	0.0
-es	06_coal	1	306	1.0	0.0
-es	07_gas	1	306	1.0	0.0
+es	01_solar	1	306	0.0	1.0
+es	02_wind_on	1	306	0.0	1.0
+es	03_wind_off	1	306	0.0	1.0
+es	04_res	1	306	0.0	1.0
+es	05_nuclear	1	306	0.0	1.0
+es	06_coal	1	306	0.0	1.0
+es	07_gas	1	306	0.0	1.0
 es	08_non-res	1	306	0.0	0.0
 es	09_hydro_pump	1	306	0.0	0.0
-es	01_solar	1	307	1.0	0.0
-es	02_wind_on	1	307	1.0	0.0
-es	03_wind_off	1	307	1.0	0.0
-es	04_res	1	307	1.0	0.0
-es	05_nuclear	1	307	1.0	0.0
-es	06_coal	1	307	1.0	0.0
-es	07_gas	1	307	1.0	0.0
+es	01_solar	1	307	0.0	1.0
+es	02_wind_on	1	307	0.0	1.0
+es	03_wind_off	1	307	0.0	1.0
+es	04_res	1	307	0.0	1.0
+es	05_nuclear	1	307	0.0	1.0
+es	06_coal	1	307	0.0	1.0
+es	07_gas	1	307	0.0	1.0
 es	08_non-res	1	307	0.0	0.0
 es	09_hydro_pump	1	307	0.0	0.0
-es	01_solar	1	308	1.0	0.0
-es	02_wind_on	1	308	1.0	0.0
-es	03_wind_off	1	308	1.0	0.0
-es	04_res	1	308	1.0	0.0
-es	05_nuclear	1	308	1.0	0.0
-es	06_coal	1	308	1.0	0.0
-es	07_gas	1	308	1.0	0.0
+es	01_solar	1	308	0.0	1.0
+es	02_wind_on	1	308	0.0	1.0
+es	03_wind_off	1	308	0.0	1.0
+es	04_res	1	308	0.0	1.0
+es	05_nuclear	1	308	0.0	1.0
+es	06_coal	1	308	0.0	1.0
+es	07_gas	1	308	0.0	1.0
 es	08_non-res	1	308	0.0	0.0
 es	09_hydro_pump	1	308	0.0	0.0
-es	01_solar	1	309	1.0	0.0
-es	02_wind_on	1	309	1.0	0.0
-es	03_wind_off	1	309	1.0	0.0
-es	04_res	1	309	1.0	0.0
-es	05_nuclear	1	309	1.0	0.0
-es	06_coal	1	309	1.0	0.0
-es	07_gas	1	309	1.0	0.0
+es	01_solar	1	309	0.0	1.0
+es	02_wind_on	1	309	0.0	1.0
+es	03_wind_off	1	309	0.0	1.0
+es	04_res	1	309	0.0	1.0
+es	05_nuclear	1	309	0.0	1.0
+es	06_coal	1	309	0.0	1.0
+es	07_gas	1	309	0.0	1.0
 es	08_non-res	1	309	0.0	0.0
 es	09_hydro_pump	1	309	0.0	0.0
-es	01_solar	1	310	1.0	0.0
-es	02_wind_on	1	310	1.0	0.0
-es	03_wind_off	1	310	1.0	0.0
-es	04_res	1	310	1.0	0.0
-es	05_nuclear	1	310	1.0	0.0
-es	06_coal	1	310	1.0	0.0
-es	07_gas	1	310	1.0	0.0
-es	08_non-res	1	310	1.0	0.0
+es	01_solar	1	310	0.0	1.0
+es	02_wind_on	1	310	0.0	1.0
+es	03_wind_off	1	310	0.0	1.0
+es	04_res	1	310	0.0	1.0
+es	05_nuclear	1	310	0.0	1.0
+es	06_coal	1	310	0.0	1.0
+es	07_gas	1	310	0.0	1.0
+es	08_non-res	1	310	0.0	1.0
 es	09_hydro_pump	1	310	0.0	0.0
-es	01_solar	1	311	1.0	0.0
-es	02_wind_on	1	311	1.0	0.0
-es	03_wind_off	1	311	1.0	0.0
-es	04_res	1	311	1.0	0.0
-es	05_nuclear	1	311	1.0	0.0
-es	06_coal	1	311	1.0	0.0
-es	07_gas	1	311	1.0	0.0
-es	08_non-res	1	311	1.0	0.0
+es	01_solar	1	311	0.0	1.0
+es	02_wind_on	1	311	0.0	1.0
+es	03_wind_off	1	311	0.0	1.0
+es	04_res	1	311	0.0	1.0
+es	05_nuclear	1	311	0.0	1.0
+es	06_coal	1	311	0.0	1.0
+es	07_gas	1	311	0.0	1.0
+es	08_non-res	1	311	0.0	1.0
 es	09_hydro_pump	1	311	0.0	0.0
-es	01_solar	1	312	1.0	0.0
-es	02_wind_on	1	312	1.0	0.0
-es	03_wind_off	1	312	1.0	0.0
-es	04_res	1	312	1.0	0.0
-es	05_nuclear	1	312	1.0	0.0
-es	06_coal	1	312	1.0	0.0
-es	07_gas	1	312	1.0	0.0
-es	08_non-res	1	312	1.0	0.0
+es	01_solar	1	312	0.0	1.0
+es	02_wind_on	1	312	0.0	1.0
+es	03_wind_off	1	312	0.0	1.0
+es	04_res	1	312	0.0	1.0
+es	05_nuclear	1	312	0.0	1.0
+es	06_coal	1	312	0.0	1.0
+es	07_gas	1	312	0.0	1.0
+es	08_non-res	1	312	0.0	1.0
 es	09_hydro_pump	1	312	0.0	0.0
-es	01_solar	1	313	1.0	0.0
-es	02_wind_on	1	313	1.0	0.0
-es	03_wind_off	1	313	1.0	0.0
-es	04_res	1	313	1.0	0.0
-es	05_nuclear	1	313	1.0	0.0
-es	06_coal	1	313	1.0	0.0
-es	07_gas	1	313	1.0	0.0
-es	08_non-res	1	313	1.0	0.0
+es	01_solar	1	313	0.0	1.0
+es	02_wind_on	1	313	0.0	1.0
+es	03_wind_off	1	313	0.0	1.0
+es	04_res	1	313	0.0	1.0
+es	05_nuclear	1	313	0.0	1.0
+es	06_coal	1	313	0.0	1.0
+es	07_gas	1	313	0.0	1.0
+es	08_non-res	1	313	0.0	1.0
 es	09_hydro_pump	1	313	0.0	0.0
-es	01_solar	1	314	1.0	0.0
-es	02_wind_on	1	314	1.0	0.0
-es	03_wind_off	1	314	1.0	0.0
-es	04_res	1	314	1.0	0.0
-es	05_nuclear	1	314	1.0	0.0
-es	06_coal	1	314	1.0	0.0
-es	07_gas	1	314	1.0	0.0
-es	08_non-res	1	314	1.0	0.0
+es	01_solar	1	314	0.0	1.0
+es	02_wind_on	1	314	0.0	1.0
+es	03_wind_off	1	314	0.0	1.0
+es	04_res	1	314	0.0	1.0
+es	05_nuclear	1	314	0.0	1.0
+es	06_coal	1	314	0.0	1.0
+es	07_gas	1	314	0.0	1.0
+es	08_non-res	1	314	0.0	1.0
 es	09_hydro_pump	1	314	0.0	0.0
-es	01_solar	1	315	1.0	0.0
-es	02_wind_on	1	315	1.0	0.0
-es	03_wind_off	1	315	1.0	0.0
-es	04_res	1	315	1.0	0.0
-es	05_nuclear	1	315	1.0	0.0
-es	06_coal	1	315	1.0	0.0
-es	07_gas	1	315	1.0	0.0
-es	08_non-res	1	315	1.0	0.0
+es	01_solar	1	315	0.0	1.0
+es	02_wind_on	1	315	0.0	1.0
+es	03_wind_off	1	315	0.0	1.0
+es	04_res	1	315	0.0	1.0
+es	05_nuclear	1	315	0.0	1.0
+es	06_coal	1	315	0.0	1.0
+es	07_gas	1	315	0.0	1.0
+es	08_non-res	1	315	0.0	1.0
 es	09_hydro_pump	1	315	0.0	0.0
-es	01_solar	1	316	1.0	0.0
-es	02_wind_on	1	316	1.0	0.0
-es	03_wind_off	1	316	1.0	0.0
-es	04_res	1	316	1.0	0.0
-es	05_nuclear	1	316	1.0	0.0
-es	06_coal	1	316	1.0	0.0
-es	07_gas	1	316	1.0	0.0
-es	08_non-res	1	316	1.0	0.0
+es	01_solar	1	316	0.0	1.0
+es	02_wind_on	1	316	0.0	1.0
+es	03_wind_off	1	316	0.0	1.0
+es	04_res	1	316	0.0	1.0
+es	05_nuclear	1	316	0.0	1.0
+es	06_coal	1	316	0.0	1.0
+es	07_gas	1	316	0.0	1.0
+es	08_non-res	1	316	0.0	1.0
 es	09_hydro_pump	1	316	0.0	0.0
-es	01_solar	1	317	1.0	0.0
-es	02_wind_on	1	317	1.0	0.0
-es	03_wind_off	1	317	1.0	0.0
-es	04_res	1	317	1.0	0.0
-es	05_nuclear	1	317	1.0	0.0
-es	06_coal	1	317	1.0	0.0
-es	07_gas	1	317	1.0	0.0
-es	08_non-res	1	317	1.0	0.0
+es	01_solar	1	317	0.0	1.0
+es	02_wind_on	1	317	0.0	1.0
+es	03_wind_off	1	317	0.0	1.0
+es	04_res	1	317	0.0	1.0
+es	05_nuclear	1	317	0.0	1.0
+es	06_coal	1	317	0.0	1.0
+es	07_gas	1	317	0.0	1.0
+es	08_non-res	1	317	0.0	1.0
 es	09_hydro_pump	1	317	0.0	0.0
-es	01_solar	1	318	1.0	0.0
-es	02_wind_on	1	318	1.0	0.0
-es	03_wind_off	1	318	1.0	0.0
-es	04_res	1	318	1.0	0.0
-es	05_nuclear	1	318	1.0	0.0
-es	06_coal	1	318	1.0	0.0
-es	07_gas	1	318	1.0	0.0
-es	08_non-res	1	318	1.0	0.0
+es	01_solar	1	318	0.0	1.0
+es	02_wind_on	1	318	0.0	1.0
+es	03_wind_off	1	318	0.0	1.0
+es	04_res	1	318	0.0	1.0
+es	05_nuclear	1	318	0.0	1.0
+es	06_coal	1	318	0.0	1.0
+es	07_gas	1	318	0.0	1.0
+es	08_non-res	1	318	0.0	1.0
 es	09_hydro_pump	1	318	0.0	0.0
-es	01_solar	1	319	1.0	0.0
-es	02_wind_on	1	319	1.0	0.0
-es	03_wind_off	1	319	1.0	0.0
-es	04_res	1	319	1.0	0.0
-es	05_nuclear	1	319	1.0	0.0
-es	06_coal	1	319	1.0	0.0
-es	07_gas	1	319	1.0	0.0
-es	08_non-res	1	319	1.0	0.0
+es	01_solar	1	319	0.0	1.0
+es	02_wind_on	1	319	0.0	1.0
+es	03_wind_off	1	319	0.0	1.0
+es	04_res	1	319	0.0	1.0
+es	05_nuclear	1	319	0.0	1.0
+es	06_coal	1	319	0.0	1.0
+es	07_gas	1	319	0.0	1.0
+es	08_non-res	1	319	0.0	1.0
 es	09_hydro_pump	1	319	0.0	0.0
-es	01_solar	1	320	1.0	0.0
-es	02_wind_on	1	320	1.0	0.0
-es	03_wind_off	1	320	1.0	0.0
-es	04_res	1	320	1.0	0.0
-es	05_nuclear	1	320	1.0	0.0
-es	06_coal	1	320	1.0	0.0
-es	07_gas	1	320	1.0	0.0
-es	08_non-res	1	320	1.0	0.0
+es	01_solar	1	320	0.0	1.0
+es	02_wind_on	1	320	0.0	1.0
+es	03_wind_off	1	320	0.0	1.0
+es	04_res	1	320	0.0	1.0
+es	05_nuclear	1	320	0.0	1.0
+es	06_coal	1	320	0.0	1.0
+es	07_gas	1	320	0.0	1.0
+es	08_non-res	1	320	0.0	1.0
 es	09_hydro_pump	1	320	0.0	0.0
-es	01_solar	1	321	1.0	0.0
-es	02_wind_on	1	321	1.0	0.0
-es	03_wind_off	1	321	1.0	0.0
-es	04_res	1	321	1.0	0.0
-es	05_nuclear	1	321	1.0	0.0
-es	06_coal	1	321	1.0	0.0
-es	07_gas	1	321	1.0	0.0
-es	08_non-res	1	321	1.0	0.0
+es	01_solar	1	321	0.0	1.0
+es	02_wind_on	1	321	0.0	1.0
+es	03_wind_off	1	321	0.0	1.0
+es	04_res	1	321	0.0	1.0
+es	05_nuclear	1	321	0.0	1.0
+es	06_coal	1	321	0.0	1.0
+es	07_gas	1	321	0.0	1.0
+es	08_non-res	1	321	0.0	1.0
 es	09_hydro_pump	1	321	0.0	0.0
-es	01_solar	1	322	1.0	0.0
-es	02_wind_on	1	322	1.0	0.0
-es	03_wind_off	1	322	1.0	0.0
-es	04_res	1	322	1.0	0.0
-es	05_nuclear	1	322	1.0	0.0
-es	06_coal	1	322	1.0	0.0
-es	07_gas	1	322	1.0	0.0
-es	08_non-res	1	322	1.0	0.0
+es	01_solar	1	322	0.0	1.0
+es	02_wind_on	1	322	0.0	1.0
+es	03_wind_off	1	322	0.0	1.0
+es	04_res	1	322	0.0	1.0
+es	05_nuclear	1	322	0.0	1.0
+es	06_coal	1	322	0.0	1.0
+es	07_gas	1	322	0.0	1.0
+es	08_non-res	1	322	0.0	1.0
 es	09_hydro_pump	1	322	0.0	0.0
-es	01_solar	1	323	1.0	0.0
-es	02_wind_on	1	323	1.0	0.0
-es	03_wind_off	1	323	1.0	0.0
-es	04_res	1	323	1.0	0.0
-es	05_nuclear	1	323	1.0	0.0
-es	06_coal	1	323	1.0	0.0
-es	07_gas	1	323	1.0	0.0
-es	08_non-res	1	323	1.0	0.0
+es	01_solar	1	323	0.0	1.0
+es	02_wind_on	1	323	0.0	1.0
+es	03_wind_off	1	323	0.0	1.0
+es	04_res	1	323	0.0	1.0
+es	05_nuclear	1	323	0.0	1.0
+es	06_coal	1	323	0.0	1.0
+es	07_gas	1	323	0.0	1.0
+es	08_non-res	1	323	0.0	1.0
 es	09_hydro_pump	1	323	0.0	0.0
-es	01_solar	1	324	1.0	0.0
-es	02_wind_on	1	324	1.0	0.0
-es	03_wind_off	1	324	1.0	0.0
-es	04_res	1	324	1.0	0.0
-es	05_nuclear	1	324	1.0	0.0
-es	06_coal	1	324	1.0	0.0
-es	07_gas	1	324	1.0	0.0
-es	08_non-res	1	324	1.0	0.0
+es	01_solar	1	324	0.0	1.0
+es	02_wind_on	1	324	0.0	1.0
+es	03_wind_off	1	324	0.0	1.0
+es	04_res	1	324	0.0	1.0
+es	05_nuclear	1	324	0.0	1.0
+es	06_coal	1	324	0.0	1.0
+es	07_gas	1	324	0.0	1.0
+es	08_non-res	1	324	0.0	1.0
 es	09_hydro_pump	1	324	0.0	0.0
-es	01_solar	1	325	1.0	0.0
-es	02_wind_on	1	325	1.0	0.0
-es	03_wind_off	1	325	1.0	0.0
-es	04_res	1	325	1.0	0.0
-es	05_nuclear	1	325	1.0	0.0
-es	06_coal	1	325	1.0	0.0
-es	07_gas	1	325	1.0	0.0
-es	08_non-res	1	325	1.0	0.0
+es	01_solar	1	325	0.0	1.0
+es	02_wind_on	1	325	0.0	1.0
+es	03_wind_off	1	325	0.0	1.0
+es	04_res	1	325	0.0	1.0
+es	05_nuclear	1	325	0.0	1.0
+es	06_coal	1	325	0.0	1.0
+es	07_gas	1	325	0.0	1.0
+es	08_non-res	1	325	0.0	1.0
 es	09_hydro_pump	1	325	0.0	0.0
-es	01_solar	1	326	1.0	0.0
-es	02_wind_on	1	326	1.0	0.0
-es	03_wind_off	1	326	1.0	0.0
-es	04_res	1	326	1.0	0.0
-es	05_nuclear	1	326	1.0	0.0
-es	06_coal	1	326	1.0	0.0
-es	07_gas	1	326	1.0	0.0
-es	08_non-res	1	326	1.0	0.0
+es	01_solar	1	326	0.0	1.0
+es	02_wind_on	1	326	0.0	1.0
+es	03_wind_off	1	326	0.0	1.0
+es	04_res	1	326	0.0	1.0
+es	05_nuclear	1	326	0.0	1.0
+es	06_coal	1	326	0.0	1.0
+es	07_gas	1	326	0.0	1.0
+es	08_non-res	1	326	0.0	1.0
 es	09_hydro_pump	1	326	0.0	0.0
-es	01_solar	1	327	1.0	0.0
-es	02_wind_on	1	327	1.0	0.0
-es	03_wind_off	1	327	1.0	0.0
-es	04_res	1	327	1.0	0.0
-es	05_nuclear	1	327	1.0	0.0
-es	06_coal	1	327	1.0	0.0
-es	07_gas	1	327	1.0	0.0
-es	08_non-res	1	327	1.0	0.0
+es	01_solar	1	327	0.0	1.0
+es	02_wind_on	1	327	0.0	1.0
+es	03_wind_off	1	327	0.0	1.0
+es	04_res	1	327	0.0	1.0
+es	05_nuclear	1	327	0.0	1.0
+es	06_coal	1	327	0.0	1.0
+es	07_gas	1	327	0.0	1.0
+es	08_non-res	1	327	0.0	1.0
 es	09_hydro_pump	1	327	0.0	0.0
-es	01_solar	1	328	1.0	0.0
-es	02_wind_on	1	328	1.0	0.0
-es	03_wind_off	1	328	1.0	0.0
-es	04_res	1	328	1.0	0.0
-es	05_nuclear	1	328	1.0	0.0
-es	06_coal	1	328	1.0	0.0
-es	07_gas	1	328	1.0	0.0
-es	08_non-res	1	328	1.0	0.0
+es	01_solar	1	328	0.0	1.0
+es	02_wind_on	1	328	0.0	1.0
+es	03_wind_off	1	328	0.0	1.0
+es	04_res	1	328	0.0	1.0
+es	05_nuclear	1	328	0.0	1.0
+es	06_coal	1	328	0.0	1.0
+es	07_gas	1	328	0.0	1.0
+es	08_non-res	1	328	0.0	1.0
 es	09_hydro_pump	1	328	0.0	0.0
-es	01_solar	1	329	1.0	0.0
-es	02_wind_on	1	329	1.0	0.0
-es	03_wind_off	1	329	1.0	0.0
-es	04_res	1	329	1.0	0.0
-es	05_nuclear	1	329	1.0	0.0
-es	06_coal	1	329	1.0	0.0
-es	07_gas	1	329	1.0	0.0
-es	08_non-res	1	329	1.0	0.0
+es	01_solar	1	329	0.0	1.0
+es	02_wind_on	1	329	0.0	1.0
+es	03_wind_off	1	329	0.0	1.0
+es	04_res	1	329	0.0	1.0
+es	05_nuclear	1	329	0.0	1.0
+es	06_coal	1	329	0.0	1.0
+es	07_gas	1	329	0.0	1.0
+es	08_non-res	1	329	0.0	1.0
 es	09_hydro_pump	1	329	0.0	0.0
-es	01_solar	1	330	1.0	0.0
-es	02_wind_on	1	330	1.0	0.0
-es	03_wind_off	1	330	1.0	0.0
-es	04_res	1	330	1.0	0.0
-es	05_nuclear	1	330	1.0	0.0
-es	06_coal	1	330	1.0	0.0
-es	07_gas	1	330	1.0	0.0
-es	08_non-res	1	330	1.0	0.0
-es	09_hydro_pump	1	330	1.0	0.0
-es	01_solar	1	331	1.0	0.0
-es	02_wind_on	1	331	1.0	0.0
-es	03_wind_off	1	331	1.0	0.0
-es	04_res	1	331	1.0	0.0
-es	05_nuclear	1	331	1.0	0.0
-es	06_coal	1	331	1.0	0.0
-es	07_gas	1	331	1.0	0.0
-es	08_non-res	1	331	1.0	0.0
-es	09_hydro_pump	1	331	1.0	0.0
-es	01_solar	1	332	1.0	0.0
-es	02_wind_on	1	332	1.0	0.0
-es	03_wind_off	1	332	1.0	0.0
-es	04_res	1	332	1.0	0.0
-es	05_nuclear	1	332	1.0	0.0
-es	06_coal	1	332	1.0	0.0
-es	07_gas	1	332	1.0	0.0
-es	08_non-res	1	332	1.0	0.0
-es	09_hydro_pump	1	332	1.0	0.0
-es	01_solar	1	333	1.0	0.0
-es	02_wind_on	1	333	1.0	0.0
-es	03_wind_off	1	333	1.0	0.0
-es	04_res	1	333	1.0	0.0
-es	05_nuclear	1	333	1.0	0.0
-es	06_coal	1	333	1.0	0.0
-es	07_gas	1	333	1.0	0.0
-es	08_non-res	1	333	1.0	0.0
-es	09_hydro_pump	1	333	1.0	0.0
-es	01_solar	1	334	1.0	0.0
-es	02_wind_on	1	334	1.0	0.0
-es	03_wind_off	1	334	1.0	0.0
-es	04_res	1	334	1.0	0.0
-es	05_nuclear	1	334	1.0	0.0
-es	06_coal	1	334	1.0	0.0
-es	07_gas	1	334	1.0	0.0
-es	08_non-res	1	334	1.0	0.0
-es	09_hydro_pump	1	334	1.0	0.0
-es	01_solar	1	335	1.0	0.0
-es	02_wind_on	1	335	1.0	0.0
-es	03_wind_off	1	335	1.0	0.0
-es	04_res	1	335	1.0	0.0
-es	05_nuclear	1	335	1.0	0.0
-es	06_coal	1	335	1.0	0.0
-es	07_gas	1	335	1.0	0.0
-es	08_non-res	1	335	1.0	0.0
-es	09_hydro_pump	1	335	1.0	0.0
-es	01_solar	1	336	1.0	0.0
-es	02_wind_on	1	336	1.0	0.0
-es	03_wind_off	1	336	1.0	0.0
-es	04_res	1	336	1.0	0.0
-es	05_nuclear	1	336	1.0	0.0
-es	06_coal	1	336	1.0	0.0
-es	07_gas	1	336	1.0	0.0
-es	08_non-res	1	336	1.0	0.0
-es	09_hydro_pump	1	336	1.0	0.0
+es	01_solar	1	330	0.0	1.0
+es	02_wind_on	1	330	0.0	1.0
+es	03_wind_off	1	330	0.0	1.0
+es	04_res	1	330	0.0	1.0
+es	05_nuclear	1	330	0.0	1.0
+es	06_coal	1	330	0.0	1.0
+es	07_gas	1	330	0.0	1.0
+es	08_non-res	1	330	0.0	1.0
+es	09_hydro_pump	1	330	0.0	1.0
+es	01_solar	1	331	0.0	1.0
+es	02_wind_on	1	331	0.0	1.0
+es	03_wind_off	1	331	0.0	1.0
+es	04_res	1	331	0.0	1.0
+es	05_nuclear	1	331	0.0	1.0
+es	06_coal	1	331	0.0	1.0
+es	07_gas	1	331	0.0	1.0
+es	08_non-res	1	331	0.0	1.0
+es	09_hydro_pump	1	331	0.0	1.0
+es	01_solar	1	332	0.0	1.0
+es	02_wind_on	1	332	0.0	1.0
+es	03_wind_off	1	332	0.0	1.0
+es	04_res	1	332	0.0	1.0
+es	05_nuclear	1	332	0.0	1.0
+es	06_coal	1	332	0.0	1.0
+es	07_gas	1	332	0.0	1.0
+es	08_non-res	1	332	0.0	1.0
+es	09_hydro_pump	1	332	0.0	1.0
+es	01_solar	1	333	0.0	1.0
+es	02_wind_on	1	333	0.0	1.0
+es	03_wind_off	1	333	0.0	1.0
+es	04_res	1	333	0.0	1.0
+es	05_nuclear	1	333	0.0	1.0
+es	06_coal	1	333	0.0	1.0
+es	07_gas	1	333	0.0	1.0
+es	08_non-res	1	333	0.0	1.0
+es	09_hydro_pump	1	333	0.0	1.0
+es	01_solar	1	334	0.0	1.0
+es	02_wind_on	1	334	0.0	1.0
+es	03_wind_off	1	334	0.0	1.0
+es	04_res	1	334	0.0	1.0
+es	05_nuclear	1	334	0.0	1.0
+es	06_coal	1	334	0.0	1.0
+es	07_gas	1	334	0.0	1.0
+es	08_non-res	1	334	0.0	1.0
+es	09_hydro_pump	1	334	0.0	1.0
+es	01_solar	1	335	0.0	1.0
+es	02_wind_on	1	335	0.0	1.0
+es	03_wind_off	1	335	0.0	1.0
+es	04_res	1	335	0.0	1.0
+es	05_nuclear	1	335	0.0	1.0
+es	06_coal	1	335	0.0	1.0
+es	07_gas	1	335	0.0	1.0
+es	08_non-res	1	335	0.0	1.0
+es	09_hydro_pump	1	335	0.0	1.0
+es	01_solar	1	336	0.0	1.0
+es	02_wind_on	1	336	0.0	1.0
+es	03_wind_off	1	336	0.0	1.0
+es	04_res	1	336	0.0	1.0
+es	05_nuclear	1	336	0.0	1.0
+es	06_coal	1	336	0.0	1.0
+es	07_gas	1	336	0.0	1.0
+es	08_non-res	1	336	0.0	1.0
+es	09_hydro_pump	1	336	0.0	1.0
 fr	01_solar	1	1	0.0	0.0
 fr	02_wind_on	1	1	0.0	0.0
 fr	03_wind_off	1	1	0.0	0.0
@@ -6056,7 +6056,7 @@ fr	06_coal	1	1	0.0	0.0
 fr	07_gas	1	1	0.0	0.0
 fr	08_non-res	1	1	0.0	0.0
 fr	09_hydro_pump	1	1	0.0	0.0
-fr	01_solar	1	2	1.0	0.0
+fr	01_solar	1	2	0.0	1.0
 fr	02_wind_on	1	2	0.0	0.0
 fr	03_wind_off	1	2	0.0	0.0
 fr	04_res	1	2	0.0	0.0
@@ -6065,7 +6065,7 @@ fr	06_coal	1	2	0.0	0.0
 fr	07_gas	1	2	0.0	0.0
 fr	08_non-res	1	2	0.0	0.0
 fr	09_hydro_pump	1	2	0.0	0.0
-fr	01_solar	1	3	1.0	0.0
+fr	01_solar	1	3	0.0	1.0
 fr	02_wind_on	1	3	0.0	0.0
 fr	03_wind_off	1	3	0.0	0.0
 fr	04_res	1	3	0.0	0.0
@@ -6074,7 +6074,7 @@ fr	06_coal	1	3	0.0	0.0
 fr	07_gas	1	3	0.0	0.0
 fr	08_non-res	1	3	0.0	0.0
 fr	09_hydro_pump	1	3	0.0	0.0
-fr	01_solar	1	4	1.0	0.0
+fr	01_solar	1	4	0.0	1.0
 fr	02_wind_on	1	4	0.0	0.0
 fr	03_wind_off	1	4	0.0	0.0
 fr	04_res	1	4	0.0	0.0
@@ -6083,7 +6083,7 @@ fr	06_coal	1	4	0.0	0.0
 fr	07_gas	1	4	0.0	0.0
 fr	08_non-res	1	4	0.0	0.0
 fr	09_hydro_pump	1	4	0.0	0.0
-fr	01_solar	1	5	1.0	0.0
+fr	01_solar	1	5	0.0	1.0
 fr	02_wind_on	1	5	0.0	0.0
 fr	03_wind_off	1	5	0.0	0.0
 fr	04_res	1	5	0.0	0.0
@@ -6092,7 +6092,7 @@ fr	06_coal	1	5	0.0	0.0
 fr	07_gas	1	5	0.0	0.0
 fr	08_non-res	1	5	0.0	0.0
 fr	09_hydro_pump	1	5	0.0	0.0
-fr	01_solar	1	6	1.0	0.0
+fr	01_solar	1	6	0.0	1.0
 fr	02_wind_on	1	6	0.0	0.0
 fr	03_wind_off	1	6	0.0	0.0
 fr	04_res	1	6	0.0	0.0
@@ -6101,7 +6101,7 @@ fr	06_coal	1	6	0.0	0.0
 fr	07_gas	1	6	0.0	0.0
 fr	08_non-res	1	6	0.0	0.0
 fr	09_hydro_pump	1	6	0.0	0.0
-fr	01_solar	1	7	1.0	0.0
+fr	01_solar	1	7	0.0	1.0
 fr	02_wind_on	1	7	0.0	0.0
 fr	03_wind_off	1	7	0.0	0.0
 fr	04_res	1	7	0.0	0.0
@@ -6110,7 +6110,7 @@ fr	06_coal	1	7	0.0	0.0
 fr	07_gas	1	7	0.0	0.0
 fr	08_non-res	1	7	0.0	0.0
 fr	09_hydro_pump	1	7	0.0	0.0
-fr	01_solar	1	8	1.0	0.0
+fr	01_solar	1	8	0.0	1.0
 fr	02_wind_on	1	8	0.0	0.0
 fr	03_wind_off	1	8	0.0	0.0
 fr	04_res	1	8	0.0	0.0
@@ -6119,7 +6119,7 @@ fr	06_coal	1	8	0.0	0.0
 fr	07_gas	1	8	0.0	0.0
 fr	08_non-res	1	8	0.0	0.0
 fr	09_hydro_pump	1	8	0.0	0.0
-fr	01_solar	1	9	1.0	0.0
+fr	01_solar	1	9	0.0	1.0
 fr	02_wind_on	1	9	0.0	0.0
 fr	03_wind_off	1	9	0.0	0.0
 fr	04_res	1	9	0.0	0.0
@@ -6128,7 +6128,7 @@ fr	06_coal	1	9	0.0	0.0
 fr	07_gas	1	9	0.0	0.0
 fr	08_non-res	1	9	0.0	0.0
 fr	09_hydro_pump	1	9	0.0	0.0
-fr	01_solar	1	10	1.0	0.0
+fr	01_solar	1	10	0.0	1.0
 fr	02_wind_on	1	10	0.0	0.0
 fr	03_wind_off	1	10	0.0	0.0
 fr	04_res	1	10	0.0	0.0
@@ -6137,7 +6137,7 @@ fr	06_coal	1	10	0.0	0.0
 fr	07_gas	1	10	0.0	0.0
 fr	08_non-res	1	10	0.0	0.0
 fr	09_hydro_pump	1	10	0.0	0.0
-fr	01_solar	1	11	1.0	0.0
+fr	01_solar	1	11	0.0	1.0
 fr	02_wind_on	1	11	0.0	0.0
 fr	03_wind_off	1	11	0.0	0.0
 fr	04_res	1	11	0.0	0.0
@@ -6146,7 +6146,7 @@ fr	06_coal	1	11	0.0	0.0
 fr	07_gas	1	11	0.0	0.0
 fr	08_non-res	1	11	0.0	0.0
 fr	09_hydro_pump	1	11	0.0	0.0
-fr	01_solar	1	12	1.0	0.0
+fr	01_solar	1	12	0.0	1.0
 fr	02_wind_on	1	12	0.0	0.0
 fr	03_wind_off	1	12	0.0	0.0
 fr	04_res	1	12	0.0	0.0
@@ -6155,7 +6155,7 @@ fr	06_coal	1	12	0.0	0.0
 fr	07_gas	1	12	0.0	0.0
 fr	08_non-res	1	12	0.0	0.0
 fr	09_hydro_pump	1	12	0.0	0.0
-fr	01_solar	1	13	1.0	0.0
+fr	01_solar	1	13	0.0	1.0
 fr	02_wind_on	1	13	0.0	0.0
 fr	03_wind_off	1	13	0.0	0.0
 fr	04_res	1	13	0.0	0.0
@@ -6164,7 +6164,7 @@ fr	06_coal	1	13	0.0	0.0
 fr	07_gas	1	13	0.0	0.0
 fr	08_non-res	1	13	0.0	0.0
 fr	09_hydro_pump	1	13	0.0	0.0
-fr	01_solar	1	14	1.0	0.0
+fr	01_solar	1	14	0.0	1.0
 fr	02_wind_on	1	14	0.0	0.0
 fr	03_wind_off	1	14	0.0	0.0
 fr	04_res	1	14	0.0	0.0
@@ -6173,7 +6173,7 @@ fr	06_coal	1	14	0.0	0.0
 fr	07_gas	1	14	0.0	0.0
 fr	08_non-res	1	14	0.0	0.0
 fr	09_hydro_pump	1	14	0.0	0.0
-fr	01_solar	1	15	1.0	0.0
+fr	01_solar	1	15	0.0	1.0
 fr	02_wind_on	1	15	0.0	0.0
 fr	03_wind_off	1	15	0.0	0.0
 fr	04_res	1	15	0.0	0.0
@@ -6182,7 +6182,7 @@ fr	06_coal	1	15	0.0	0.0
 fr	07_gas	1	15	0.0	0.0
 fr	08_non-res	1	15	0.0	0.0
 fr	09_hydro_pump	1	15	0.0	0.0
-fr	01_solar	1	16	1.0	0.0
+fr	01_solar	1	16	0.0	1.0
 fr	02_wind_on	1	16	0.0	0.0
 fr	03_wind_off	1	16	0.0	0.0
 fr	04_res	1	16	0.0	0.0
@@ -6191,7 +6191,7 @@ fr	06_coal	1	16	0.0	0.0
 fr	07_gas	1	16	0.0	0.0
 fr	08_non-res	1	16	0.0	0.0
 fr	09_hydro_pump	1	16	0.0	0.0
-fr	01_solar	1	17	1.0	0.0
+fr	01_solar	1	17	0.0	1.0
 fr	02_wind_on	1	17	0.0	0.0
 fr	03_wind_off	1	17	0.0	0.0
 fr	04_res	1	17	0.0	0.0
@@ -6200,7 +6200,7 @@ fr	06_coal	1	17	0.0	0.0
 fr	07_gas	1	17	0.0	0.0
 fr	08_non-res	1	17	0.0	0.0
 fr	09_hydro_pump	1	17	0.0	0.0
-fr	01_solar	1	18	1.0	0.0
+fr	01_solar	1	18	0.0	1.0
 fr	02_wind_on	1	18	0.0	0.0
 fr	03_wind_off	1	18	0.0	0.0
 fr	04_res	1	18	0.0	0.0
@@ -6209,7 +6209,7 @@ fr	06_coal	1	18	0.0	0.0
 fr	07_gas	1	18	0.0	0.0
 fr	08_non-res	1	18	0.0	0.0
 fr	09_hydro_pump	1	18	0.0	0.0
-fr	01_solar	1	19	1.0	0.0
+fr	01_solar	1	19	0.0	1.0
 fr	02_wind_on	1	19	0.0	0.0
 fr	03_wind_off	1	19	0.0	0.0
 fr	04_res	1	19	0.0	0.0
@@ -6218,7 +6218,7 @@ fr	06_coal	1	19	0.0	0.0
 fr	07_gas	1	19	0.0	0.0
 fr	08_non-res	1	19	0.0	0.0
 fr	09_hydro_pump	1	19	0.0	0.0
-fr	01_solar	1	20	1.0	0.0
+fr	01_solar	1	20	0.0	1.0
 fr	02_wind_on	1	20	0.0	0.0
 fr	03_wind_off	1	20	0.0	0.0
 fr	04_res	1	20	0.0	0.0
@@ -6227,7 +6227,7 @@ fr	06_coal	1	20	0.0	0.0
 fr	07_gas	1	20	0.0	0.0
 fr	08_non-res	1	20	0.0	0.0
 fr	09_hydro_pump	1	20	0.0	0.0
-fr	01_solar	1	21	1.0	0.0
+fr	01_solar	1	21	0.0	1.0
 fr	02_wind_on	1	21	0.0	0.0
 fr	03_wind_off	1	21	0.0	0.0
 fr	04_res	1	21	0.0	0.0
@@ -6236,8 +6236,8 @@ fr	06_coal	1	21	0.0	0.0
 fr	07_gas	1	21	0.0	0.0
 fr	08_non-res	1	21	0.0	0.0
 fr	09_hydro_pump	1	21	0.0	0.0
-fr	01_solar	1	22	1.0	0.0
-fr	02_wind_on	1	22	1.0	0.0
+fr	01_solar	1	22	0.0	1.0
+fr	02_wind_on	1	22	0.0	1.0
 fr	03_wind_off	1	22	0.0	0.0
 fr	04_res	1	22	0.0	0.0
 fr	05_nuclear	1	22	0.0	0.0
@@ -6245,8 +6245,8 @@ fr	06_coal	1	22	0.0	0.0
 fr	07_gas	1	22	0.0	0.0
 fr	08_non-res	1	22	0.0	0.0
 fr	09_hydro_pump	1	22	0.0	0.0
-fr	01_solar	1	23	1.0	0.0
-fr	02_wind_on	1	23	1.0	0.0
+fr	01_solar	1	23	0.0	1.0
+fr	02_wind_on	1	23	0.0	1.0
 fr	03_wind_off	1	23	0.0	0.0
 fr	04_res	1	23	0.0	0.0
 fr	05_nuclear	1	23	0.0	0.0
@@ -6254,8 +6254,8 @@ fr	06_coal	1	23	0.0	0.0
 fr	07_gas	1	23	0.0	0.0
 fr	08_non-res	1	23	0.0	0.0
 fr	09_hydro_pump	1	23	0.0	0.0
-fr	01_solar	1	24	1.0	0.0
-fr	02_wind_on	1	24	1.0	0.0
+fr	01_solar	1	24	0.0	1.0
+fr	02_wind_on	1	24	0.0	1.0
 fr	03_wind_off	1	24	0.0	0.0
 fr	04_res	1	24	0.0	0.0
 fr	05_nuclear	1	24	0.0	0.0
@@ -6263,8 +6263,8 @@ fr	06_coal	1	24	0.0	0.0
 fr	07_gas	1	24	0.0	0.0
 fr	08_non-res	1	24	0.0	0.0
 fr	09_hydro_pump	1	24	0.0	0.0
-fr	01_solar	1	25	1.0	0.0
-fr	02_wind_on	1	25	1.0	0.0
+fr	01_solar	1	25	0.0	1.0
+fr	02_wind_on	1	25	0.0	1.0
 fr	03_wind_off	1	25	0.0	0.0
 fr	04_res	1	25	0.0	0.0
 fr	05_nuclear	1	25	0.0	0.0
@@ -6272,8 +6272,8 @@ fr	06_coal	1	25	0.0	0.0
 fr	07_gas	1	25	0.0	0.0
 fr	08_non-res	1	25	0.0	0.0
 fr	09_hydro_pump	1	25	0.0	0.0
-fr	01_solar	1	26	1.0	0.0
-fr	02_wind_on	1	26	1.0	0.0
+fr	01_solar	1	26	0.0	1.0
+fr	02_wind_on	1	26	0.0	1.0
 fr	03_wind_off	1	26	0.0	0.0
 fr	04_res	1	26	0.0	0.0
 fr	05_nuclear	1	26	0.0	0.0
@@ -6281,8 +6281,8 @@ fr	06_coal	1	26	0.0	0.0
 fr	07_gas	1	26	0.0	0.0
 fr	08_non-res	1	26	0.0	0.0
 fr	09_hydro_pump	1	26	0.0	0.0
-fr	01_solar	1	27	1.0	0.0
-fr	02_wind_on	1	27	1.0	0.0
+fr	01_solar	1	27	0.0	1.0
+fr	02_wind_on	1	27	0.0	1.0
 fr	03_wind_off	1	27	0.0	0.0
 fr	04_res	1	27	0.0	0.0
 fr	05_nuclear	1	27	0.0	0.0
@@ -6290,8 +6290,8 @@ fr	06_coal	1	27	0.0	0.0
 fr	07_gas	1	27	0.0	0.0
 fr	08_non-res	1	27	0.0	0.0
 fr	09_hydro_pump	1	27	0.0	0.0
-fr	01_solar	1	28	1.0	0.0
-fr	02_wind_on	1	28	1.0	0.0
+fr	01_solar	1	28	0.0	1.0
+fr	02_wind_on	1	28	0.0	1.0
 fr	03_wind_off	1	28	0.0	0.0
 fr	04_res	1	28	0.0	0.0
 fr	05_nuclear	1	28	0.0	0.0
@@ -6299,8 +6299,8 @@ fr	06_coal	1	28	0.0	0.0
 fr	07_gas	1	28	0.0	0.0
 fr	08_non-res	1	28	0.0	0.0
 fr	09_hydro_pump	1	28	0.0	0.0
-fr	01_solar	1	29	1.0	0.0
-fr	02_wind_on	1	29	1.0	0.0
+fr	01_solar	1	29	0.0	1.0
+fr	02_wind_on	1	29	0.0	1.0
 fr	03_wind_off	1	29	0.0	0.0
 fr	04_res	1	29	0.0	0.0
 fr	05_nuclear	1	29	0.0	0.0
@@ -6308,8 +6308,8 @@ fr	06_coal	1	29	0.0	0.0
 fr	07_gas	1	29	0.0	0.0
 fr	08_non-res	1	29	0.0	0.0
 fr	09_hydro_pump	1	29	0.0	0.0
-fr	01_solar	1	30	1.0	0.0
-fr	02_wind_on	1	30	1.0	0.0
+fr	01_solar	1	30	0.0	1.0
+fr	02_wind_on	1	30	0.0	1.0
 fr	03_wind_off	1	30	0.0	0.0
 fr	04_res	1	30	0.0	0.0
 fr	05_nuclear	1	30	0.0	0.0
@@ -6317,8 +6317,8 @@ fr	06_coal	1	30	0.0	0.0
 fr	07_gas	1	30	0.0	0.0
 fr	08_non-res	1	30	0.0	0.0
 fr	09_hydro_pump	1	30	0.0	0.0
-fr	01_solar	1	31	1.0	0.0
-fr	02_wind_on	1	31	1.0	0.0
+fr	01_solar	1	31	0.0	1.0
+fr	02_wind_on	1	31	0.0	1.0
 fr	03_wind_off	1	31	0.0	0.0
 fr	04_res	1	31	0.0	0.0
 fr	05_nuclear	1	31	0.0	0.0
@@ -6326,8 +6326,8 @@ fr	06_coal	1	31	0.0	0.0
 fr	07_gas	1	31	0.0	0.0
 fr	08_non-res	1	31	0.0	0.0
 fr	09_hydro_pump	1	31	0.0	0.0
-fr	01_solar	1	32	1.0	0.0
-fr	02_wind_on	1	32	1.0	0.0
+fr	01_solar	1	32	0.0	1.0
+fr	02_wind_on	1	32	0.0	1.0
 fr	03_wind_off	1	32	0.0	0.0
 fr	04_res	1	32	0.0	0.0
 fr	05_nuclear	1	32	0.0	0.0
@@ -6335,8 +6335,8 @@ fr	06_coal	1	32	0.0	0.0
 fr	07_gas	1	32	0.0	0.0
 fr	08_non-res	1	32	0.0	0.0
 fr	09_hydro_pump	1	32	0.0	0.0
-fr	01_solar	1	33	1.0	0.0
-fr	02_wind_on	1	33	1.0	0.0
+fr	01_solar	1	33	0.0	1.0
+fr	02_wind_on	1	33	0.0	1.0
 fr	03_wind_off	1	33	0.0	0.0
 fr	04_res	1	33	0.0	0.0
 fr	05_nuclear	1	33	0.0	0.0
@@ -6344,8 +6344,8 @@ fr	06_coal	1	33	0.0	0.0
 fr	07_gas	1	33	0.0	0.0
 fr	08_non-res	1	33	0.0	0.0
 fr	09_hydro_pump	1	33	0.0	0.0
-fr	01_solar	1	34	1.0	0.0
-fr	02_wind_on	1	34	1.0	0.0
+fr	01_solar	1	34	0.0	1.0
+fr	02_wind_on	1	34	0.0	1.0
 fr	03_wind_off	1	34	0.0	0.0
 fr	04_res	1	34	0.0	0.0
 fr	05_nuclear	1	34	0.0	0.0
@@ -6353,8 +6353,8 @@ fr	06_coal	1	34	0.0	0.0
 fr	07_gas	1	34	0.0	0.0
 fr	08_non-res	1	34	0.0	0.0
 fr	09_hydro_pump	1	34	0.0	0.0
-fr	01_solar	1	35	1.0	0.0
-fr	02_wind_on	1	35	1.0	0.0
+fr	01_solar	1	35	0.0	1.0
+fr	02_wind_on	1	35	0.0	1.0
 fr	03_wind_off	1	35	0.0	0.0
 fr	04_res	1	35	0.0	0.0
 fr	05_nuclear	1	35	0.0	0.0
@@ -6362,8 +6362,8 @@ fr	06_coal	1	35	0.0	0.0
 fr	07_gas	1	35	0.0	0.0
 fr	08_non-res	1	35	0.0	0.0
 fr	09_hydro_pump	1	35	0.0	0.0
-fr	01_solar	1	36	1.0	0.0
-fr	02_wind_on	1	36	1.0	0.0
+fr	01_solar	1	36	0.0	1.0
+fr	02_wind_on	1	36	0.0	1.0
 fr	03_wind_off	1	36	0.0	0.0
 fr	04_res	1	36	0.0	0.0
 fr	05_nuclear	1	36	0.0	0.0
@@ -6371,8 +6371,8 @@ fr	06_coal	1	36	0.0	0.0
 fr	07_gas	1	36	0.0	0.0
 fr	08_non-res	1	36	0.0	0.0
 fr	09_hydro_pump	1	36	0.0	0.0
-fr	01_solar	1	37	1.0	0.0
-fr	02_wind_on	1	37	1.0	0.0
+fr	01_solar	1	37	0.0	1.0
+fr	02_wind_on	1	37	0.0	1.0
 fr	03_wind_off	1	37	0.0	0.0
 fr	04_res	1	37	0.0	0.0
 fr	05_nuclear	1	37	0.0	0.0
@@ -6380,8 +6380,8 @@ fr	06_coal	1	37	0.0	0.0
 fr	07_gas	1	37	0.0	0.0
 fr	08_non-res	1	37	0.0	0.0
 fr	09_hydro_pump	1	37	0.0	0.0
-fr	01_solar	1	38	1.0	0.0
-fr	02_wind_on	1	38	1.0	0.0
+fr	01_solar	1	38	0.0	1.0
+fr	02_wind_on	1	38	0.0	1.0
 fr	03_wind_off	1	38	0.0	0.0
 fr	04_res	1	38	0.0	0.0
 fr	05_nuclear	1	38	0.0	0.0
@@ -6389,8 +6389,8 @@ fr	06_coal	1	38	0.0	0.0
 fr	07_gas	1	38	0.0	0.0
 fr	08_non-res	1	38	0.0	0.0
 fr	09_hydro_pump	1	38	0.0	0.0
-fr	01_solar	1	39	1.0	0.0
-fr	02_wind_on	1	39	1.0	0.0
+fr	01_solar	1	39	0.0	1.0
+fr	02_wind_on	1	39	0.0	1.0
 fr	03_wind_off	1	39	0.0	0.0
 fr	04_res	1	39	0.0	0.0
 fr	05_nuclear	1	39	0.0	0.0
@@ -6398,8 +6398,8 @@ fr	06_coal	1	39	0.0	0.0
 fr	07_gas	1	39	0.0	0.0
 fr	08_non-res	1	39	0.0	0.0
 fr	09_hydro_pump	1	39	0.0	0.0
-fr	01_solar	1	40	1.0	0.0
-fr	02_wind_on	1	40	1.0	0.0
+fr	01_solar	1	40	0.0	1.0
+fr	02_wind_on	1	40	0.0	1.0
 fr	03_wind_off	1	40	0.0	0.0
 fr	04_res	1	40	0.0	0.0
 fr	05_nuclear	1	40	0.0	0.0
@@ -6407,8 +6407,8 @@ fr	06_coal	1	40	0.0	0.0
 fr	07_gas	1	40	0.0	0.0
 fr	08_non-res	1	40	0.0	0.0
 fr	09_hydro_pump	1	40	0.0	0.0
-fr	01_solar	1	41	1.0	0.0
-fr	02_wind_on	1	41	1.0	0.0
+fr	01_solar	1	41	0.0	1.0
+fr	02_wind_on	1	41	0.0	1.0
 fr	03_wind_off	1	41	0.0	0.0
 fr	04_res	1	41	0.0	0.0
 fr	05_nuclear	1	41	0.0	0.0
@@ -6416,1149 +6416,1149 @@ fr	06_coal	1	41	0.0	0.0
 fr	07_gas	1	41	0.0	0.0
 fr	08_non-res	1	41	0.0	0.0
 fr	09_hydro_pump	1	41	0.0	0.0
-fr	01_solar	1	42	1.0	0.0
-fr	02_wind_on	1	42	1.0	0.0
-fr	03_wind_off	1	42	1.0	0.0
+fr	01_solar	1	42	0.0	1.0
+fr	02_wind_on	1	42	0.0	1.0
+fr	03_wind_off	1	42	0.0	1.0
 fr	04_res	1	42	0.0	0.0
 fr	05_nuclear	1	42	0.0	0.0
 fr	06_coal	1	42	0.0	0.0
 fr	07_gas	1	42	0.0	0.0
 fr	08_non-res	1	42	0.0	0.0
 fr	09_hydro_pump	1	42	0.0	0.0
-fr	01_solar	1	43	1.0	0.0
-fr	02_wind_on	1	43	1.0	0.0
-fr	03_wind_off	1	43	1.0	0.0
+fr	01_solar	1	43	0.0	1.0
+fr	02_wind_on	1	43	0.0	1.0
+fr	03_wind_off	1	43	0.0	1.0
 fr	04_res	1	43	0.0	0.0
 fr	05_nuclear	1	43	0.0	0.0
 fr	06_coal	1	43	0.0	0.0
 fr	07_gas	1	43	0.0	0.0
 fr	08_non-res	1	43	0.0	0.0
 fr	09_hydro_pump	1	43	0.0	0.0
-fr	01_solar	1	44	1.0	0.0
-fr	02_wind_on	1	44	1.0	0.0
-fr	03_wind_off	1	44	1.0	0.0
+fr	01_solar	1	44	0.0	1.0
+fr	02_wind_on	1	44	0.0	1.0
+fr	03_wind_off	1	44	0.0	1.0
 fr	04_res	1	44	0.0	0.0
 fr	05_nuclear	1	44	0.0	0.0
 fr	06_coal	1	44	0.0	0.0
 fr	07_gas	1	44	0.0	0.0
 fr	08_non-res	1	44	0.0	0.0
 fr	09_hydro_pump	1	44	0.0	0.0
-fr	01_solar	1	45	1.0	0.0
-fr	02_wind_on	1	45	1.0	0.0
-fr	03_wind_off	1	45	1.0	0.0
+fr	01_solar	1	45	0.0	1.0
+fr	02_wind_on	1	45	0.0	1.0
+fr	03_wind_off	1	45	0.0	1.0
 fr	04_res	1	45	0.0	0.0
 fr	05_nuclear	1	45	0.0	0.0
 fr	06_coal	1	45	0.0	0.0
 fr	07_gas	1	45	0.0	0.0
 fr	08_non-res	1	45	0.0	0.0
 fr	09_hydro_pump	1	45	0.0	0.0
-fr	01_solar	1	46	1.0	0.0
-fr	02_wind_on	1	46	1.0	0.0
-fr	03_wind_off	1	46	1.0	0.0
+fr	01_solar	1	46	0.0	1.0
+fr	02_wind_on	1	46	0.0	1.0
+fr	03_wind_off	1	46	0.0	1.0
 fr	04_res	1	46	0.0	0.0
 fr	05_nuclear	1	46	0.0	0.0
 fr	06_coal	1	46	0.0	0.0
 fr	07_gas	1	46	0.0	0.0
 fr	08_non-res	1	46	0.0	0.0
 fr	09_hydro_pump	1	46	0.0	0.0
-fr	01_solar	1	47	1.0	0.0
-fr	02_wind_on	1	47	1.0	0.0
-fr	03_wind_off	1	47	1.0	0.0
+fr	01_solar	1	47	0.0	1.0
+fr	02_wind_on	1	47	0.0	1.0
+fr	03_wind_off	1	47	0.0	1.0
 fr	04_res	1	47	0.0	0.0
 fr	05_nuclear	1	47	0.0	0.0
 fr	06_coal	1	47	0.0	0.0
 fr	07_gas	1	47	0.0	0.0
 fr	08_non-res	1	47	0.0	0.0
 fr	09_hydro_pump	1	47	0.0	0.0
-fr	01_solar	1	48	1.0	0.0
-fr	02_wind_on	1	48	1.0	0.0
-fr	03_wind_off	1	48	1.0	0.0
+fr	01_solar	1	48	0.0	1.0
+fr	02_wind_on	1	48	0.0	1.0
+fr	03_wind_off	1	48	0.0	1.0
 fr	04_res	1	48	0.0	0.0
 fr	05_nuclear	1	48	0.0	0.0
 fr	06_coal	1	48	0.0	0.0
 fr	07_gas	1	48	0.0	0.0
 fr	08_non-res	1	48	0.0	0.0
 fr	09_hydro_pump	1	48	0.0	0.0
-fr	01_solar	1	49	1.0	0.0
-fr	02_wind_on	1	49	1.0	0.0
-fr	03_wind_off	1	49	1.0	0.0
+fr	01_solar	1	49	0.0	1.0
+fr	02_wind_on	1	49	0.0	1.0
+fr	03_wind_off	1	49	0.0	1.0
 fr	04_res	1	49	0.0	0.0
 fr	05_nuclear	1	49	0.0	0.0
 fr	06_coal	1	49	0.0	0.0
 fr	07_gas	1	49	0.0	0.0
 fr	08_non-res	1	49	0.0	0.0
 fr	09_hydro_pump	1	49	0.0	0.0
-fr	01_solar	1	50	1.0	0.0
-fr	02_wind_on	1	50	1.0	0.0
-fr	03_wind_off	1	50	1.0	0.0
+fr	01_solar	1	50	0.0	1.0
+fr	02_wind_on	1	50	0.0	1.0
+fr	03_wind_off	1	50	0.0	1.0
 fr	04_res	1	50	0.0	0.0
 fr	05_nuclear	1	50	0.0	0.0
 fr	06_coal	1	50	0.0	0.0
 fr	07_gas	1	50	0.0	0.0
 fr	08_non-res	1	50	0.0	0.0
 fr	09_hydro_pump	1	50	0.0	0.0
-fr	01_solar	1	51	1.0	0.0
-fr	02_wind_on	1	51	1.0	0.0
-fr	03_wind_off	1	51	1.0	0.0
+fr	01_solar	1	51	0.0	1.0
+fr	02_wind_on	1	51	0.0	1.0
+fr	03_wind_off	1	51	0.0	1.0
 fr	04_res	1	51	0.0	0.0
 fr	05_nuclear	1	51	0.0	0.0
 fr	06_coal	1	51	0.0	0.0
 fr	07_gas	1	51	0.0	0.0
 fr	08_non-res	1	51	0.0	0.0
 fr	09_hydro_pump	1	51	0.0	0.0
-fr	01_solar	1	52	1.0	0.0
-fr	02_wind_on	1	52	1.0	0.0
-fr	03_wind_off	1	52	1.0	0.0
+fr	01_solar	1	52	0.0	1.0
+fr	02_wind_on	1	52	0.0	1.0
+fr	03_wind_off	1	52	0.0	1.0
 fr	04_res	1	52	0.0	0.0
 fr	05_nuclear	1	52	0.0	0.0
 fr	06_coal	1	52	0.0	0.0
 fr	07_gas	1	52	0.0	0.0
 fr	08_non-res	1	52	0.0	0.0
 fr	09_hydro_pump	1	52	0.0	0.0
-fr	01_solar	1	53	1.0	0.0
-fr	02_wind_on	1	53	1.0	0.0
-fr	03_wind_off	1	53	1.0	0.0
+fr	01_solar	1	53	0.0	1.0
+fr	02_wind_on	1	53	0.0	1.0
+fr	03_wind_off	1	53	0.0	1.0
 fr	04_res	1	53	0.0	0.0
 fr	05_nuclear	1	53	0.0	0.0
 fr	06_coal	1	53	0.0	0.0
 fr	07_gas	1	53	0.0	0.0
 fr	08_non-res	1	53	0.0	0.0
 fr	09_hydro_pump	1	53	0.0	0.0
-fr	01_solar	1	54	1.0	0.0
-fr	02_wind_on	1	54	1.0	0.0
-fr	03_wind_off	1	54	1.0	0.0
+fr	01_solar	1	54	0.0	1.0
+fr	02_wind_on	1	54	0.0	1.0
+fr	03_wind_off	1	54	0.0	1.0
 fr	04_res	1	54	0.0	0.0
 fr	05_nuclear	1	54	0.0	0.0
 fr	06_coal	1	54	0.0	0.0
 fr	07_gas	1	54	0.0	0.0
 fr	08_non-res	1	54	0.0	0.0
 fr	09_hydro_pump	1	54	0.0	0.0
-fr	01_solar	1	55	1.0	0.0
-fr	02_wind_on	1	55	1.0	0.0
-fr	03_wind_off	1	55	1.0	0.0
+fr	01_solar	1	55	0.0	1.0
+fr	02_wind_on	1	55	0.0	1.0
+fr	03_wind_off	1	55	0.0	1.0
 fr	04_res	1	55	0.0	0.0
 fr	05_nuclear	1	55	0.0	0.0
 fr	06_coal	1	55	0.0	0.0
 fr	07_gas	1	55	0.0	0.0
 fr	08_non-res	1	55	0.0	0.0
 fr	09_hydro_pump	1	55	0.0	0.0
-fr	01_solar	1	56	1.0	0.0
-fr	02_wind_on	1	56	1.0	0.0
-fr	03_wind_off	1	56	1.0	0.0
+fr	01_solar	1	56	0.0	1.0
+fr	02_wind_on	1	56	0.0	1.0
+fr	03_wind_off	1	56	0.0	1.0
 fr	04_res	1	56	0.0	0.0
 fr	05_nuclear	1	56	0.0	0.0
 fr	06_coal	1	56	0.0	0.0
 fr	07_gas	1	56	0.0	0.0
 fr	08_non-res	1	56	0.0	0.0
 fr	09_hydro_pump	1	56	0.0	0.0
-fr	01_solar	1	57	1.0	0.0
-fr	02_wind_on	1	57	1.0	0.0
-fr	03_wind_off	1	57	1.0	0.0
+fr	01_solar	1	57	0.0	1.0
+fr	02_wind_on	1	57	0.0	1.0
+fr	03_wind_off	1	57	0.0	1.0
 fr	04_res	1	57	0.0	0.0
 fr	05_nuclear	1	57	0.0	0.0
 fr	06_coal	1	57	0.0	0.0
 fr	07_gas	1	57	0.0	0.0
 fr	08_non-res	1	57	0.0	0.0
 fr	09_hydro_pump	1	57	0.0	0.0
-fr	01_solar	1	58	1.0	0.0
-fr	02_wind_on	1	58	1.0	0.0
-fr	03_wind_off	1	58	1.0	0.0
+fr	01_solar	1	58	0.0	1.0
+fr	02_wind_on	1	58	0.0	1.0
+fr	03_wind_off	1	58	0.0	1.0
 fr	04_res	1	58	0.0	0.0
 fr	05_nuclear	1	58	0.0	0.0
 fr	06_coal	1	58	0.0	0.0
 fr	07_gas	1	58	0.0	0.0
 fr	08_non-res	1	58	0.0	0.0
 fr	09_hydro_pump	1	58	0.0	0.0
-fr	01_solar	1	59	1.0	0.0
-fr	02_wind_on	1	59	1.0	0.0
-fr	03_wind_off	1	59	1.0	0.0
+fr	01_solar	1	59	0.0	1.0
+fr	02_wind_on	1	59	0.0	1.0
+fr	03_wind_off	1	59	0.0	1.0
 fr	04_res	1	59	0.0	0.0
 fr	05_nuclear	1	59	0.0	0.0
 fr	06_coal	1	59	0.0	0.0
 fr	07_gas	1	59	0.0	0.0
 fr	08_non-res	1	59	0.0	0.0
 fr	09_hydro_pump	1	59	0.0	0.0
-fr	01_solar	1	60	1.0	0.0
-fr	02_wind_on	1	60	1.0	0.0
-fr	03_wind_off	1	60	1.0	0.0
+fr	01_solar	1	60	0.0	1.0
+fr	02_wind_on	1	60	0.0	1.0
+fr	03_wind_off	1	60	0.0	1.0
 fr	04_res	1	60	0.0	0.0
 fr	05_nuclear	1	60	0.0	0.0
 fr	06_coal	1	60	0.0	0.0
 fr	07_gas	1	60	0.0	0.0
 fr	08_non-res	1	60	0.0	0.0
 fr	09_hydro_pump	1	60	0.0	0.0
-fr	01_solar	1	61	1.0	0.0
-fr	02_wind_on	1	61	1.0	0.0
-fr	03_wind_off	1	61	1.0	0.0
+fr	01_solar	1	61	0.0	1.0
+fr	02_wind_on	1	61	0.0	1.0
+fr	03_wind_off	1	61	0.0	1.0
 fr	04_res	1	61	0.0	0.0
 fr	05_nuclear	1	61	0.0	0.0
 fr	06_coal	1	61	0.0	0.0
 fr	07_gas	1	61	0.0	0.0
 fr	08_non-res	1	61	0.0	0.0
 fr	09_hydro_pump	1	61	0.0	0.0
-fr	01_solar	1	62	1.0	0.0
-fr	02_wind_on	1	62	1.0	0.0
-fr	03_wind_off	1	62	1.0	0.0
-fr	04_res	1	62	1.0	0.0
+fr	01_solar	1	62	0.0	1.0
+fr	02_wind_on	1	62	0.0	1.0
+fr	03_wind_off	1	62	0.0	1.0
+fr	04_res	1	62	0.0	1.0
 fr	05_nuclear	1	62	0.0	0.0
 fr	06_coal	1	62	0.0	0.0
 fr	07_gas	1	62	0.0	0.0
 fr	08_non-res	1	62	0.0	0.0
 fr	09_hydro_pump	1	62	0.0	0.0
-fr	01_solar	1	63	1.0	0.0
-fr	02_wind_on	1	63	1.0	0.0
-fr	03_wind_off	1	63	1.0	0.0
-fr	04_res	1	63	1.0	0.0
+fr	01_solar	1	63	0.0	1.0
+fr	02_wind_on	1	63	0.0	1.0
+fr	03_wind_off	1	63	0.0	1.0
+fr	04_res	1	63	0.0	1.0
 fr	05_nuclear	1	63	0.0	0.0
 fr	06_coal	1	63	0.0	0.0
 fr	07_gas	1	63	0.0	0.0
 fr	08_non-res	1	63	0.0	0.0
 fr	09_hydro_pump	1	63	0.0	0.0
-fr	01_solar	1	64	1.0	0.0
-fr	02_wind_on	1	64	1.0	0.0
-fr	03_wind_off	1	64	1.0	0.0
-fr	04_res	1	64	1.0	0.0
+fr	01_solar	1	64	0.0	1.0
+fr	02_wind_on	1	64	0.0	1.0
+fr	03_wind_off	1	64	0.0	1.0
+fr	04_res	1	64	0.0	1.0
 fr	05_nuclear	1	64	0.0	0.0
 fr	06_coal	1	64	0.0	0.0
 fr	07_gas	1	64	0.0	0.0
 fr	08_non-res	1	64	0.0	0.0
 fr	09_hydro_pump	1	64	0.0	0.0
-fr	01_solar	1	65	1.0	0.0
-fr	02_wind_on	1	65	1.0	0.0
-fr	03_wind_off	1	65	1.0	0.0
-fr	04_res	1	65	1.0	0.0
+fr	01_solar	1	65	0.0	1.0
+fr	02_wind_on	1	65	0.0	1.0
+fr	03_wind_off	1	65	0.0	1.0
+fr	04_res	1	65	0.0	1.0
 fr	05_nuclear	1	65	0.0	0.0
 fr	06_coal	1	65	0.0	0.0
 fr	07_gas	1	65	0.0	0.0
 fr	08_non-res	1	65	0.0	0.0
 fr	09_hydro_pump	1	65	0.0	0.0
-fr	01_solar	1	66	1.0	0.0
-fr	02_wind_on	1	66	1.0	0.0
-fr	03_wind_off	1	66	1.0	0.0
-fr	04_res	1	66	1.0	0.0
+fr	01_solar	1	66	0.0	1.0
+fr	02_wind_on	1	66	0.0	1.0
+fr	03_wind_off	1	66	0.0	1.0
+fr	04_res	1	66	0.0	1.0
 fr	05_nuclear	1	66	0.0	0.0
 fr	06_coal	1	66	0.0	0.0
 fr	07_gas	1	66	0.0	0.0
 fr	08_non-res	1	66	0.0	0.0
 fr	09_hydro_pump	1	66	0.0	0.0
-fr	01_solar	1	67	1.0	0.0
-fr	02_wind_on	1	67	1.0	0.0
-fr	03_wind_off	1	67	1.0	0.0
-fr	04_res	1	67	1.0	0.0
+fr	01_solar	1	67	0.0	1.0
+fr	02_wind_on	1	67	0.0	1.0
+fr	03_wind_off	1	67	0.0	1.0
+fr	04_res	1	67	0.0	1.0
 fr	05_nuclear	1	67	0.0	0.0
 fr	06_coal	1	67	0.0	0.0
 fr	07_gas	1	67	0.0	0.0
 fr	08_non-res	1	67	0.0	0.0
 fr	09_hydro_pump	1	67	0.0	0.0
-fr	01_solar	1	68	1.0	0.0
-fr	02_wind_on	1	68	1.0	0.0
-fr	03_wind_off	1	68	1.0	0.0
-fr	04_res	1	68	1.0	0.0
+fr	01_solar	1	68	0.0	1.0
+fr	02_wind_on	1	68	0.0	1.0
+fr	03_wind_off	1	68	0.0	1.0
+fr	04_res	1	68	0.0	1.0
 fr	05_nuclear	1	68	0.0	0.0
 fr	06_coal	1	68	0.0	0.0
 fr	07_gas	1	68	0.0	0.0
 fr	08_non-res	1	68	0.0	0.0
 fr	09_hydro_pump	1	68	0.0	0.0
-fr	01_solar	1	69	1.0	0.0
-fr	02_wind_on	1	69	1.0	0.0
-fr	03_wind_off	1	69	1.0	0.0
-fr	04_res	1	69	1.0	0.0
+fr	01_solar	1	69	0.0	1.0
+fr	02_wind_on	1	69	0.0	1.0
+fr	03_wind_off	1	69	0.0	1.0
+fr	04_res	1	69	0.0	1.0
 fr	05_nuclear	1	69	0.0	0.0
 fr	06_coal	1	69	0.0	0.0
 fr	07_gas	1	69	0.0	0.0
 fr	08_non-res	1	69	0.0	0.0
 fr	09_hydro_pump	1	69	0.0	0.0
-fr	01_solar	1	70	1.0	0.0
-fr	02_wind_on	1	70	1.0	0.0
-fr	03_wind_off	1	70	1.0	0.0
-fr	04_res	1	70	1.0	0.0
+fr	01_solar	1	70	0.0	1.0
+fr	02_wind_on	1	70	0.0	1.0
+fr	03_wind_off	1	70	0.0	1.0
+fr	04_res	1	70	0.0	1.0
 fr	05_nuclear	1	70	0.0	0.0
 fr	06_coal	1	70	0.0	0.0
 fr	07_gas	1	70	0.0	0.0
 fr	08_non-res	1	70	0.0	0.0
 fr	09_hydro_pump	1	70	0.0	0.0
-fr	01_solar	1	71	1.0	0.0
-fr	02_wind_on	1	71	1.0	0.0
-fr	03_wind_off	1	71	1.0	0.0
-fr	04_res	1	71	1.0	0.0
+fr	01_solar	1	71	0.0	1.0
+fr	02_wind_on	1	71	0.0	1.0
+fr	03_wind_off	1	71	0.0	1.0
+fr	04_res	1	71	0.0	1.0
 fr	05_nuclear	1	71	0.0	0.0
 fr	06_coal	1	71	0.0	0.0
 fr	07_gas	1	71	0.0	0.0
 fr	08_non-res	1	71	0.0	0.0
 fr	09_hydro_pump	1	71	0.0	0.0
-fr	01_solar	1	72	1.0	0.0
-fr	02_wind_on	1	72	1.0	0.0
-fr	03_wind_off	1	72	1.0	0.0
-fr	04_res	1	72	1.0	0.0
+fr	01_solar	1	72	0.0	1.0
+fr	02_wind_on	1	72	0.0	1.0
+fr	03_wind_off	1	72	0.0	1.0
+fr	04_res	1	72	0.0	1.0
 fr	05_nuclear	1	72	0.0	0.0
 fr	06_coal	1	72	0.0	0.0
 fr	07_gas	1	72	0.0	0.0
 fr	08_non-res	1	72	0.0	0.0
 fr	09_hydro_pump	1	72	0.0	0.0
-fr	01_solar	1	73	1.0	0.0
-fr	02_wind_on	1	73	1.0	0.0
-fr	03_wind_off	1	73	1.0	0.0
-fr	04_res	1	73	1.0	0.0
+fr	01_solar	1	73	0.0	1.0
+fr	02_wind_on	1	73	0.0	1.0
+fr	03_wind_off	1	73	0.0	1.0
+fr	04_res	1	73	0.0	1.0
 fr	05_nuclear	1	73	0.0	0.0
 fr	06_coal	1	73	0.0	0.0
 fr	07_gas	1	73	0.0	0.0
 fr	08_non-res	1	73	0.0	0.0
 fr	09_hydro_pump	1	73	0.0	0.0
-fr	01_solar	1	74	1.0	0.0
-fr	02_wind_on	1	74	1.0	0.0
-fr	03_wind_off	1	74	1.0	0.0
-fr	04_res	1	74	1.0	0.0
+fr	01_solar	1	74	0.0	1.0
+fr	02_wind_on	1	74	0.0	1.0
+fr	03_wind_off	1	74	0.0	1.0
+fr	04_res	1	74	0.0	1.0
 fr	05_nuclear	1	74	0.0	0.0
 fr	06_coal	1	74	0.0	0.0
 fr	07_gas	1	74	0.0	0.0
 fr	08_non-res	1	74	0.0	0.0
 fr	09_hydro_pump	1	74	0.0	0.0
-fr	01_solar	1	75	1.0	0.0
-fr	02_wind_on	1	75	1.0	0.0
-fr	03_wind_off	1	75	1.0	0.0
-fr	04_res	1	75	1.0	0.0
+fr	01_solar	1	75	0.0	1.0
+fr	02_wind_on	1	75	0.0	1.0
+fr	03_wind_off	1	75	0.0	1.0
+fr	04_res	1	75	0.0	1.0
 fr	05_nuclear	1	75	0.0	0.0
 fr	06_coal	1	75	0.0	0.0
 fr	07_gas	1	75	0.0	0.0
 fr	08_non-res	1	75	0.0	0.0
 fr	09_hydro_pump	1	75	0.0	0.0
-fr	01_solar	1	76	1.0	0.0
-fr	02_wind_on	1	76	1.0	0.0
-fr	03_wind_off	1	76	1.0	0.0
-fr	04_res	1	76	1.0	0.0
+fr	01_solar	1	76	0.0	1.0
+fr	02_wind_on	1	76	0.0	1.0
+fr	03_wind_off	1	76	0.0	1.0
+fr	04_res	1	76	0.0	1.0
 fr	05_nuclear	1	76	0.0	0.0
 fr	06_coal	1	76	0.0	0.0
 fr	07_gas	1	76	0.0	0.0
 fr	08_non-res	1	76	0.0	0.0
 fr	09_hydro_pump	1	76	0.0	0.0
-fr	01_solar	1	77	1.0	0.0
-fr	02_wind_on	1	77	1.0	0.0
-fr	03_wind_off	1	77	1.0	0.0
-fr	04_res	1	77	1.0	0.0
+fr	01_solar	1	77	0.0	1.0
+fr	02_wind_on	1	77	0.0	1.0
+fr	03_wind_off	1	77	0.0	1.0
+fr	04_res	1	77	0.0	1.0
 fr	05_nuclear	1	77	0.0	0.0
 fr	06_coal	1	77	0.0	0.0
 fr	07_gas	1	77	0.0	0.0
 fr	08_non-res	1	77	0.0	0.0
 fr	09_hydro_pump	1	77	0.0	0.0
-fr	01_solar	1	78	1.0	0.0
-fr	02_wind_on	1	78	1.0	0.0
-fr	03_wind_off	1	78	1.0	0.0
-fr	04_res	1	78	1.0	0.0
+fr	01_solar	1	78	0.0	1.0
+fr	02_wind_on	1	78	0.0	1.0
+fr	03_wind_off	1	78	0.0	1.0
+fr	04_res	1	78	0.0	1.0
 fr	05_nuclear	1	78	0.0	0.0
 fr	06_coal	1	78	0.0	0.0
 fr	07_gas	1	78	0.0	0.0
 fr	08_non-res	1	78	0.0	0.0
 fr	09_hydro_pump	1	78	0.0	0.0
-fr	01_solar	1	79	1.0	0.0
-fr	02_wind_on	1	79	1.0	0.0
-fr	03_wind_off	1	79	1.0	0.0
-fr	04_res	1	79	1.0	0.0
+fr	01_solar	1	79	0.0	1.0
+fr	02_wind_on	1	79	0.0	1.0
+fr	03_wind_off	1	79	0.0	1.0
+fr	04_res	1	79	0.0	1.0
 fr	05_nuclear	1	79	0.0	0.0
 fr	06_coal	1	79	0.0	0.0
 fr	07_gas	1	79	0.0	0.0
 fr	08_non-res	1	79	0.0	0.0
 fr	09_hydro_pump	1	79	0.0	0.0
-fr	01_solar	1	80	1.0	0.0
-fr	02_wind_on	1	80	1.0	0.0
-fr	03_wind_off	1	80	1.0	0.0
-fr	04_res	1	80	1.0	0.0
+fr	01_solar	1	80	0.0	1.0
+fr	02_wind_on	1	80	0.0	1.0
+fr	03_wind_off	1	80	0.0	1.0
+fr	04_res	1	80	0.0	1.0
 fr	05_nuclear	1	80	0.0	0.0
 fr	06_coal	1	80	0.0	0.0
 fr	07_gas	1	80	0.0	0.0
 fr	08_non-res	1	80	0.0	0.0
 fr	09_hydro_pump	1	80	0.0	0.0
-fr	01_solar	1	81	1.0	0.0
-fr	02_wind_on	1	81	1.0	0.0
-fr	03_wind_off	1	81	1.0	0.0
-fr	04_res	1	81	1.0	0.0
+fr	01_solar	1	81	0.0	1.0
+fr	02_wind_on	1	81	0.0	1.0
+fr	03_wind_off	1	81	0.0	1.0
+fr	04_res	1	81	0.0	1.0
 fr	05_nuclear	1	81	0.0	0.0
 fr	06_coal	1	81	0.0	0.0
 fr	07_gas	1	81	0.0	0.0
 fr	08_non-res	1	81	0.0	0.0
 fr	09_hydro_pump	1	81	0.0	0.0
-fr	01_solar	1	82	1.0	0.0
-fr	02_wind_on	1	82	1.0	0.0
-fr	03_wind_off	1	82	1.0	0.0
-fr	04_res	1	82	1.0	0.0
-fr	05_nuclear	1	82	1.0	0.0
+fr	01_solar	1	82	0.0	1.0
+fr	02_wind_on	1	82	0.0	1.0
+fr	03_wind_off	1	82	0.0	1.0
+fr	04_res	1	82	0.0	1.0
+fr	05_nuclear	1	82	0.0	1.0
 fr	06_coal	1	82	0.0	0.0
 fr	07_gas	1	82	0.0	0.0
 fr	08_non-res	1	82	0.0	0.0
 fr	09_hydro_pump	1	82	0.0	0.0
-fr	01_solar	1	83	1.0	0.0
-fr	02_wind_on	1	83	1.0	0.0
-fr	03_wind_off	1	83	1.0	0.0
-fr	04_res	1	83	1.0	0.0
-fr	05_nuclear	1	83	1.0	0.0
+fr	01_solar	1	83	0.0	1.0
+fr	02_wind_on	1	83	0.0	1.0
+fr	03_wind_off	1	83	0.0	1.0
+fr	04_res	1	83	0.0	1.0
+fr	05_nuclear	1	83	0.0	1.0
 fr	06_coal	1	83	0.0	0.0
 fr	07_gas	1	83	0.0	0.0
 fr	08_non-res	1	83	0.0	0.0
 fr	09_hydro_pump	1	83	0.0	0.0
-fr	01_solar	1	84	1.0	0.0
-fr	02_wind_on	1	84	1.0	0.0
-fr	03_wind_off	1	84	1.0	0.0
-fr	04_res	1	84	1.0	0.0
-fr	05_nuclear	1	84	1.0	0.0
+fr	01_solar	1	84	0.0	1.0
+fr	02_wind_on	1	84	0.0	1.0
+fr	03_wind_off	1	84	0.0	1.0
+fr	04_res	1	84	0.0	1.0
+fr	05_nuclear	1	84	0.0	1.0
 fr	06_coal	1	84	0.0	0.0
 fr	07_gas	1	84	0.0	0.0
 fr	08_non-res	1	84	0.0	0.0
 fr	09_hydro_pump	1	84	0.0	0.0
-fr	01_solar	1	85	1.0	0.0
-fr	02_wind_on	1	85	1.0	0.0
-fr	03_wind_off	1	85	1.0	0.0
-fr	04_res	1	85	1.0	0.0
-fr	05_nuclear	1	85	1.0	0.0
+fr	01_solar	1	85	0.0	1.0
+fr	02_wind_on	1	85	0.0	1.0
+fr	03_wind_off	1	85	0.0	1.0
+fr	04_res	1	85	0.0	1.0
+fr	05_nuclear	1	85	0.0	1.0
 fr	06_coal	1	85	0.0	0.0
 fr	07_gas	1	85	0.0	0.0
 fr	08_non-res	1	85	0.0	0.0
 fr	09_hydro_pump	1	85	0.0	0.0
-fr	01_solar	1	86	1.0	0.0
-fr	02_wind_on	1	86	1.0	0.0
-fr	03_wind_off	1	86	1.0	0.0
-fr	04_res	1	86	1.0	0.0
-fr	05_nuclear	1	86	1.0	0.0
+fr	01_solar	1	86	0.0	1.0
+fr	02_wind_on	1	86	0.0	1.0
+fr	03_wind_off	1	86	0.0	1.0
+fr	04_res	1	86	0.0	1.0
+fr	05_nuclear	1	86	0.0	1.0
 fr	06_coal	1	86	0.0	0.0
 fr	07_gas	1	86	0.0	0.0
 fr	08_non-res	1	86	0.0	0.0
 fr	09_hydro_pump	1	86	0.0	0.0
-fr	01_solar	1	87	1.0	0.0
-fr	02_wind_on	1	87	1.0	0.0
-fr	03_wind_off	1	87	1.0	0.0
-fr	04_res	1	87	1.0	0.0
-fr	05_nuclear	1	87	1.0	0.0
+fr	01_solar	1	87	0.0	1.0
+fr	02_wind_on	1	87	0.0	1.0
+fr	03_wind_off	1	87	0.0	1.0
+fr	04_res	1	87	0.0	1.0
+fr	05_nuclear	1	87	0.0	1.0
 fr	06_coal	1	87	0.0	0.0
 fr	07_gas	1	87	0.0	0.0
 fr	08_non-res	1	87	0.0	0.0
 fr	09_hydro_pump	1	87	0.0	0.0
-fr	01_solar	1	88	1.0	0.0
-fr	02_wind_on	1	88	1.0	0.0
-fr	03_wind_off	1	88	1.0	0.0
-fr	04_res	1	88	1.0	0.0
-fr	05_nuclear	1	88	1.0	0.0
+fr	01_solar	1	88	0.0	1.0
+fr	02_wind_on	1	88	0.0	1.0
+fr	03_wind_off	1	88	0.0	1.0
+fr	04_res	1	88	0.0	1.0
+fr	05_nuclear	1	88	0.0	1.0
 fr	06_coal	1	88	0.0	0.0
 fr	07_gas	1	88	0.0	0.0
 fr	08_non-res	1	88	0.0	0.0
 fr	09_hydro_pump	1	88	0.0	0.0
-fr	01_solar	1	89	1.0	0.0
-fr	02_wind_on	1	89	1.0	0.0
-fr	03_wind_off	1	89	1.0	0.0
-fr	04_res	1	89	1.0	0.0
-fr	05_nuclear	1	89	1.0	0.0
+fr	01_solar	1	89	0.0	1.0
+fr	02_wind_on	1	89	0.0	1.0
+fr	03_wind_off	1	89	0.0	1.0
+fr	04_res	1	89	0.0	1.0
+fr	05_nuclear	1	89	0.0	1.0
 fr	06_coal	1	89	0.0	0.0
 fr	07_gas	1	89	0.0	0.0
 fr	08_non-res	1	89	0.0	0.0
 fr	09_hydro_pump	1	89	0.0	0.0
-fr	01_solar	1	90	1.0	0.0
-fr	02_wind_on	1	90	1.0	0.0
-fr	03_wind_off	1	90	1.0	0.0
-fr	04_res	1	90	1.0	0.0
-fr	05_nuclear	1	90	1.0	0.0
+fr	01_solar	1	90	0.0	1.0
+fr	02_wind_on	1	90	0.0	1.0
+fr	03_wind_off	1	90	0.0	1.0
+fr	04_res	1	90	0.0	1.0
+fr	05_nuclear	1	90	0.0	1.0
 fr	06_coal	1	90	0.0	0.0
 fr	07_gas	1	90	0.0	0.0
 fr	08_non-res	1	90	0.0	0.0
 fr	09_hydro_pump	1	90	0.0	0.0
-fr	01_solar	1	91	1.0	0.0
-fr	02_wind_on	1	91	1.0	0.0
-fr	03_wind_off	1	91	1.0	0.0
-fr	04_res	1	91	1.0	0.0
-fr	05_nuclear	1	91	1.0	0.0
+fr	01_solar	1	91	0.0	1.0
+fr	02_wind_on	1	91	0.0	1.0
+fr	03_wind_off	1	91	0.0	1.0
+fr	04_res	1	91	0.0	1.0
+fr	05_nuclear	1	91	0.0	1.0
 fr	06_coal	1	91	0.0	0.0
 fr	07_gas	1	91	0.0	0.0
 fr	08_non-res	1	91	0.0	0.0
 fr	09_hydro_pump	1	91	0.0	0.0
-fr	01_solar	1	92	1.0	0.0
-fr	02_wind_on	1	92	1.0	0.0
-fr	03_wind_off	1	92	1.0	0.0
-fr	04_res	1	92	1.0	0.0
-fr	05_nuclear	1	92	1.0	0.0
+fr	01_solar	1	92	0.0	1.0
+fr	02_wind_on	1	92	0.0	1.0
+fr	03_wind_off	1	92	0.0	1.0
+fr	04_res	1	92	0.0	1.0
+fr	05_nuclear	1	92	0.0	1.0
 fr	06_coal	1	92	0.0	0.0
 fr	07_gas	1	92	0.0	0.0
 fr	08_non-res	1	92	0.0	0.0
 fr	09_hydro_pump	1	92	0.0	0.0
-fr	01_solar	1	93	1.0	0.0
-fr	02_wind_on	1	93	1.0	0.0
-fr	03_wind_off	1	93	1.0	0.0
-fr	04_res	1	93	1.0	0.0
-fr	05_nuclear	1	93	1.0	0.0
+fr	01_solar	1	93	0.0	1.0
+fr	02_wind_on	1	93	0.0	1.0
+fr	03_wind_off	1	93	0.0	1.0
+fr	04_res	1	93	0.0	1.0
+fr	05_nuclear	1	93	0.0	1.0
 fr	06_coal	1	93	0.0	0.0
 fr	07_gas	1	93	0.0	0.0
 fr	08_non-res	1	93	0.0	0.0
 fr	09_hydro_pump	1	93	0.0	0.0
-fr	01_solar	1	94	1.0	0.0
-fr	02_wind_on	1	94	1.0	0.0
-fr	03_wind_off	1	94	1.0	0.0
-fr	04_res	1	94	1.0	0.0
-fr	05_nuclear	1	94	1.0	0.0
+fr	01_solar	1	94	0.0	1.0
+fr	02_wind_on	1	94	0.0	1.0
+fr	03_wind_off	1	94	0.0	1.0
+fr	04_res	1	94	0.0	1.0
+fr	05_nuclear	1	94	0.0	1.0
 fr	06_coal	1	94	0.0	0.0
 fr	07_gas	1	94	0.0	0.0
 fr	08_non-res	1	94	0.0	0.0
 fr	09_hydro_pump	1	94	0.0	0.0
-fr	01_solar	1	95	1.0	0.0
-fr	02_wind_on	1	95	1.0	0.0
-fr	03_wind_off	1	95	1.0	0.0
-fr	04_res	1	95	1.0	0.0
-fr	05_nuclear	1	95	1.0	0.0
+fr	01_solar	1	95	0.0	1.0
+fr	02_wind_on	1	95	0.0	1.0
+fr	03_wind_off	1	95	0.0	1.0
+fr	04_res	1	95	0.0	1.0
+fr	05_nuclear	1	95	0.0	1.0
 fr	06_coal	1	95	0.0	0.0
 fr	07_gas	1	95	0.0	0.0
 fr	08_non-res	1	95	0.0	0.0
 fr	09_hydro_pump	1	95	0.0	0.0
-fr	01_solar	1	96	1.0	0.0
-fr	02_wind_on	1	96	1.0	0.0
-fr	03_wind_off	1	96	1.0	0.0
-fr	04_res	1	96	1.0	0.0
-fr	05_nuclear	1	96	1.0	0.0
+fr	01_solar	1	96	0.0	1.0
+fr	02_wind_on	1	96	0.0	1.0
+fr	03_wind_off	1	96	0.0	1.0
+fr	04_res	1	96	0.0	1.0
+fr	05_nuclear	1	96	0.0	1.0
 fr	06_coal	1	96	0.0	0.0
 fr	07_gas	1	96	0.0	0.0
 fr	08_non-res	1	96	0.0	0.0
 fr	09_hydro_pump	1	96	0.0	0.0
-fr	01_solar	1	97	1.0	0.0
-fr	02_wind_on	1	97	1.0	0.0
-fr	03_wind_off	1	97	1.0	0.0
-fr	04_res	1	97	1.0	0.0
-fr	05_nuclear	1	97	1.0	0.0
+fr	01_solar	1	97	0.0	1.0
+fr	02_wind_on	1	97	0.0	1.0
+fr	03_wind_off	1	97	0.0	1.0
+fr	04_res	1	97	0.0	1.0
+fr	05_nuclear	1	97	0.0	1.0
 fr	06_coal	1	97	0.0	0.0
 fr	07_gas	1	97	0.0	0.0
 fr	08_non-res	1	97	0.0	0.0
 fr	09_hydro_pump	1	97	0.0	0.0
-fr	01_solar	1	98	1.0	0.0
-fr	02_wind_on	1	98	1.0	0.0
-fr	03_wind_off	1	98	1.0	0.0
-fr	04_res	1	98	1.0	0.0
-fr	05_nuclear	1	98	1.0	0.0
+fr	01_solar	1	98	0.0	1.0
+fr	02_wind_on	1	98	0.0	1.0
+fr	03_wind_off	1	98	0.0	1.0
+fr	04_res	1	98	0.0	1.0
+fr	05_nuclear	1	98	0.0	1.0
 fr	06_coal	1	98	0.0	0.0
 fr	07_gas	1	98	0.0	0.0
 fr	08_non-res	1	98	0.0	0.0
 fr	09_hydro_pump	1	98	0.0	0.0
-fr	01_solar	1	99	1.0	0.0
-fr	02_wind_on	1	99	1.0	0.0
-fr	03_wind_off	1	99	1.0	0.0
-fr	04_res	1	99	1.0	0.0
-fr	05_nuclear	1	99	1.0	0.0
+fr	01_solar	1	99	0.0	1.0
+fr	02_wind_on	1	99	0.0	1.0
+fr	03_wind_off	1	99	0.0	1.0
+fr	04_res	1	99	0.0	1.0
+fr	05_nuclear	1	99	0.0	1.0
 fr	06_coal	1	99	0.0	0.0
 fr	07_gas	1	99	0.0	0.0
 fr	08_non-res	1	99	0.0	0.0
 fr	09_hydro_pump	1	99	0.0	0.0
-fr	01_solar	1	100	1.0	0.0
-fr	02_wind_on	1	100	1.0	0.0
-fr	03_wind_off	1	100	1.0	0.0
-fr	04_res	1	100	1.0	0.0
-fr	05_nuclear	1	100	1.0	0.0
+fr	01_solar	1	100	0.0	1.0
+fr	02_wind_on	1	100	0.0	1.0
+fr	03_wind_off	1	100	0.0	1.0
+fr	04_res	1	100	0.0	1.0
+fr	05_nuclear	1	100	0.0	1.0
 fr	06_coal	1	100	0.0	0.0
 fr	07_gas	1	100	0.0	0.0
 fr	08_non-res	1	100	0.0	0.0
 fr	09_hydro_pump	1	100	0.0	0.0
-fr	01_solar	1	101	1.0	0.0
-fr	02_wind_on	1	101	1.0	0.0
-fr	03_wind_off	1	101	1.0	0.0
-fr	04_res	1	101	1.0	0.0
-fr	05_nuclear	1	101	1.0	0.0
+fr	01_solar	1	101	0.0	1.0
+fr	02_wind_on	1	101	0.0	1.0
+fr	03_wind_off	1	101	0.0	1.0
+fr	04_res	1	101	0.0	1.0
+fr	05_nuclear	1	101	0.0	1.0
 fr	06_coal	1	101	0.0	0.0
 fr	07_gas	1	101	0.0	0.0
 fr	08_non-res	1	101	0.0	0.0
 fr	09_hydro_pump	1	101	0.0	0.0
-fr	01_solar	1	102	1.0	0.0
-fr	02_wind_on	1	102	1.0	0.0
-fr	03_wind_off	1	102	1.0	0.0
-fr	04_res	1	102	1.0	0.0
-fr	05_nuclear	1	102	1.0	0.0
-fr	06_coal	1	102	1.0	0.0
+fr	01_solar	1	102	0.0	1.0
+fr	02_wind_on	1	102	0.0	1.0
+fr	03_wind_off	1	102	0.0	1.0
+fr	04_res	1	102	0.0	1.0
+fr	05_nuclear	1	102	0.0	1.0
+fr	06_coal	1	102	0.0	1.0
 fr	07_gas	1	102	0.0	0.0
 fr	08_non-res	1	102	0.0	0.0
 fr	09_hydro_pump	1	102	0.0	0.0
-fr	01_solar	1	103	1.0	0.0
-fr	02_wind_on	1	103	1.0	0.0
-fr	03_wind_off	1	103	1.0	0.0
-fr	04_res	1	103	1.0	0.0
-fr	05_nuclear	1	103	1.0	0.0
-fr	06_coal	1	103	1.0	0.0
+fr	01_solar	1	103	0.0	1.0
+fr	02_wind_on	1	103	0.0	1.0
+fr	03_wind_off	1	103	0.0	1.0
+fr	04_res	1	103	0.0	1.0
+fr	05_nuclear	1	103	0.0	1.0
+fr	06_coal	1	103	0.0	1.0
 fr	07_gas	1	103	0.0	0.0
 fr	08_non-res	1	103	0.0	0.0
 fr	09_hydro_pump	1	103	0.0	0.0
-fr	01_solar	1	104	1.0	0.0
-fr	02_wind_on	1	104	1.0	0.0
-fr	03_wind_off	1	104	1.0	0.0
-fr	04_res	1	104	1.0	0.0
-fr	05_nuclear	1	104	1.0	0.0
-fr	06_coal	1	104	1.0	0.0
+fr	01_solar	1	104	0.0	1.0
+fr	02_wind_on	1	104	0.0	1.0
+fr	03_wind_off	1	104	0.0	1.0
+fr	04_res	1	104	0.0	1.0
+fr	05_nuclear	1	104	0.0	1.0
+fr	06_coal	1	104	0.0	1.0
 fr	07_gas	1	104	0.0	0.0
 fr	08_non-res	1	104	0.0	0.0
 fr	09_hydro_pump	1	104	0.0	0.0
-fr	01_solar	1	105	1.0	0.0
-fr	02_wind_on	1	105	1.0	0.0
-fr	03_wind_off	1	105	1.0	0.0
-fr	04_res	1	105	1.0	0.0
-fr	05_nuclear	1	105	1.0	0.0
-fr	06_coal	1	105	1.0	0.0
+fr	01_solar	1	105	0.0	1.0
+fr	02_wind_on	1	105	0.0	1.0
+fr	03_wind_off	1	105	0.0	1.0
+fr	04_res	1	105	0.0	1.0
+fr	05_nuclear	1	105	0.0	1.0
+fr	06_coal	1	105	0.0	1.0
 fr	07_gas	1	105	0.0	0.0
 fr	08_non-res	1	105	0.0	0.0
 fr	09_hydro_pump	1	105	0.0	0.0
-fr	01_solar	1	106	1.0	0.0
-fr	02_wind_on	1	106	1.0	0.0
-fr	03_wind_off	1	106	1.0	0.0
-fr	04_res	1	106	1.0	0.0
-fr	05_nuclear	1	106	1.0	0.0
-fr	06_coal	1	106	1.0	0.0
+fr	01_solar	1	106	0.0	1.0
+fr	02_wind_on	1	106	0.0	1.0
+fr	03_wind_off	1	106	0.0	1.0
+fr	04_res	1	106	0.0	1.0
+fr	05_nuclear	1	106	0.0	1.0
+fr	06_coal	1	106	0.0	1.0
 fr	07_gas	1	106	0.0	0.0
 fr	08_non-res	1	106	0.0	0.0
 fr	09_hydro_pump	1	106	0.0	0.0
-fr	01_solar	1	107	1.0	0.0
-fr	02_wind_on	1	107	1.0	0.0
-fr	03_wind_off	1	107	1.0	0.0
-fr	04_res	1	107	1.0	0.0
-fr	05_nuclear	1	107	1.0	0.0
-fr	06_coal	1	107	1.0	0.0
+fr	01_solar	1	107	0.0	1.0
+fr	02_wind_on	1	107	0.0	1.0
+fr	03_wind_off	1	107	0.0	1.0
+fr	04_res	1	107	0.0	1.0
+fr	05_nuclear	1	107	0.0	1.0
+fr	06_coal	1	107	0.0	1.0
 fr	07_gas	1	107	0.0	0.0
 fr	08_non-res	1	107	0.0	0.0
 fr	09_hydro_pump	1	107	0.0	0.0
-fr	01_solar	1	108	1.0	0.0
-fr	02_wind_on	1	108	1.0	0.0
-fr	03_wind_off	1	108	1.0	0.0
-fr	04_res	1	108	1.0	0.0
-fr	05_nuclear	1	108	1.0	0.0
-fr	06_coal	1	108	1.0	0.0
+fr	01_solar	1	108	0.0	1.0
+fr	02_wind_on	1	108	0.0	1.0
+fr	03_wind_off	1	108	0.0	1.0
+fr	04_res	1	108	0.0	1.0
+fr	05_nuclear	1	108	0.0	1.0
+fr	06_coal	1	108	0.0	1.0
 fr	07_gas	1	108	0.0	0.0
 fr	08_non-res	1	108	0.0	0.0
 fr	09_hydro_pump	1	108	0.0	0.0
-fr	01_solar	1	109	1.0	0.0
-fr	02_wind_on	1	109	1.0	0.0
-fr	03_wind_off	1	109	1.0	0.0
-fr	04_res	1	109	1.0	0.0
-fr	05_nuclear	1	109	1.0	0.0
-fr	06_coal	1	109	1.0	0.0
+fr	01_solar	1	109	0.0	1.0
+fr	02_wind_on	1	109	0.0	1.0
+fr	03_wind_off	1	109	0.0	1.0
+fr	04_res	1	109	0.0	1.0
+fr	05_nuclear	1	109	0.0	1.0
+fr	06_coal	1	109	0.0	1.0
 fr	07_gas	1	109	0.0	0.0
 fr	08_non-res	1	109	0.0	0.0
 fr	09_hydro_pump	1	109	0.0	0.0
-fr	01_solar	1	110	1.0	0.0
-fr	02_wind_on	1	110	1.0	0.0
-fr	03_wind_off	1	110	1.0	0.0
-fr	04_res	1	110	1.0	0.0
-fr	05_nuclear	1	110	1.0	0.0
-fr	06_coal	1	110	1.0	0.0
+fr	01_solar	1	110	0.0	1.0
+fr	02_wind_on	1	110	0.0	1.0
+fr	03_wind_off	1	110	0.0	1.0
+fr	04_res	1	110	0.0	1.0
+fr	05_nuclear	1	110	0.0	1.0
+fr	06_coal	1	110	0.0	1.0
 fr	07_gas	1	110	0.0	0.0
 fr	08_non-res	1	110	0.0	0.0
 fr	09_hydro_pump	1	110	0.0	0.0
-fr	01_solar	1	111	1.0	0.0
-fr	02_wind_on	1	111	1.0	0.0
-fr	03_wind_off	1	111	1.0	0.0
-fr	04_res	1	111	1.0	0.0
-fr	05_nuclear	1	111	1.0	0.0
-fr	06_coal	1	111	1.0	0.0
+fr	01_solar	1	111	0.0	1.0
+fr	02_wind_on	1	111	0.0	1.0
+fr	03_wind_off	1	111	0.0	1.0
+fr	04_res	1	111	0.0	1.0
+fr	05_nuclear	1	111	0.0	1.0
+fr	06_coal	1	111	0.0	1.0
 fr	07_gas	1	111	0.0	0.0
 fr	08_non-res	1	111	0.0	0.0
 fr	09_hydro_pump	1	111	0.0	0.0
-fr	01_solar	1	112	1.0	0.0
-fr	02_wind_on	1	112	1.0	0.0
-fr	03_wind_off	1	112	1.0	0.0
-fr	04_res	1	112	1.0	0.0
-fr	05_nuclear	1	112	1.0	0.0
-fr	06_coal	1	112	1.0	0.0
+fr	01_solar	1	112	0.0	1.0
+fr	02_wind_on	1	112	0.0	1.0
+fr	03_wind_off	1	112	0.0	1.0
+fr	04_res	1	112	0.0	1.0
+fr	05_nuclear	1	112	0.0	1.0
+fr	06_coal	1	112	0.0	1.0
 fr	07_gas	1	112	0.0	0.0
 fr	08_non-res	1	112	0.0	0.0
 fr	09_hydro_pump	1	112	0.0	0.0
-fr	01_solar	1	113	1.0	0.0
-fr	02_wind_on	1	113	1.0	0.0
-fr	03_wind_off	1	113	1.0	0.0
-fr	04_res	1	113	1.0	0.0
-fr	05_nuclear	1	113	1.0	0.0
-fr	06_coal	1	113	1.0	0.0
+fr	01_solar	1	113	0.0	1.0
+fr	02_wind_on	1	113	0.0	1.0
+fr	03_wind_off	1	113	0.0	1.0
+fr	04_res	1	113	0.0	1.0
+fr	05_nuclear	1	113	0.0	1.0
+fr	06_coal	1	113	0.0	1.0
 fr	07_gas	1	113	0.0	0.0
 fr	08_non-res	1	113	0.0	0.0
 fr	09_hydro_pump	1	113	0.0	0.0
-fr	01_solar	1	114	1.0	0.0
-fr	02_wind_on	1	114	1.0	0.0
-fr	03_wind_off	1	114	1.0	0.0
-fr	04_res	1	114	1.0	0.0
-fr	05_nuclear	1	114	1.0	0.0
-fr	06_coal	1	114	1.0	0.0
+fr	01_solar	1	114	0.0	1.0
+fr	02_wind_on	1	114	0.0	1.0
+fr	03_wind_off	1	114	0.0	1.0
+fr	04_res	1	114	0.0	1.0
+fr	05_nuclear	1	114	0.0	1.0
+fr	06_coal	1	114	0.0	1.0
 fr	07_gas	1	114	0.0	0.0
 fr	08_non-res	1	114	0.0	0.0
 fr	09_hydro_pump	1	114	0.0	0.0
-fr	01_solar	1	115	1.0	0.0
-fr	02_wind_on	1	115	1.0	0.0
-fr	03_wind_off	1	115	1.0	0.0
-fr	04_res	1	115	1.0	0.0
-fr	05_nuclear	1	115	1.0	0.0
-fr	06_coal	1	115	1.0	0.0
+fr	01_solar	1	115	0.0	1.0
+fr	02_wind_on	1	115	0.0	1.0
+fr	03_wind_off	1	115	0.0	1.0
+fr	04_res	1	115	0.0	1.0
+fr	05_nuclear	1	115	0.0	1.0
+fr	06_coal	1	115	0.0	1.0
 fr	07_gas	1	115	0.0	0.0
 fr	08_non-res	1	115	0.0	0.0
 fr	09_hydro_pump	1	115	0.0	0.0
-fr	01_solar	1	116	1.0	0.0
-fr	02_wind_on	1	116	1.0	0.0
-fr	03_wind_off	1	116	1.0	0.0
-fr	04_res	1	116	1.0	0.0
-fr	05_nuclear	1	116	1.0	0.0
-fr	06_coal	1	116	1.0	0.0
+fr	01_solar	1	116	0.0	1.0
+fr	02_wind_on	1	116	0.0	1.0
+fr	03_wind_off	1	116	0.0	1.0
+fr	04_res	1	116	0.0	1.0
+fr	05_nuclear	1	116	0.0	1.0
+fr	06_coal	1	116	0.0	1.0
 fr	07_gas	1	116	0.0	0.0
 fr	08_non-res	1	116	0.0	0.0
 fr	09_hydro_pump	1	116	0.0	0.0
-fr	01_solar	1	117	1.0	0.0
-fr	02_wind_on	1	117	1.0	0.0
-fr	03_wind_off	1	117	1.0	0.0
-fr	04_res	1	117	1.0	0.0
-fr	05_nuclear	1	117	1.0	0.0
-fr	06_coal	1	117	1.0	0.0
+fr	01_solar	1	117	0.0	1.0
+fr	02_wind_on	1	117	0.0	1.0
+fr	03_wind_off	1	117	0.0	1.0
+fr	04_res	1	117	0.0	1.0
+fr	05_nuclear	1	117	0.0	1.0
+fr	06_coal	1	117	0.0	1.0
 fr	07_gas	1	117	0.0	0.0
 fr	08_non-res	1	117	0.0	0.0
 fr	09_hydro_pump	1	117	0.0	0.0
-fr	01_solar	1	118	1.0	0.0
-fr	02_wind_on	1	118	1.0	0.0
-fr	03_wind_off	1	118	1.0	0.0
-fr	04_res	1	118	1.0	0.0
-fr	05_nuclear	1	118	1.0	0.0
-fr	06_coal	1	118	1.0	0.0
+fr	01_solar	1	118	0.0	1.0
+fr	02_wind_on	1	118	0.0	1.0
+fr	03_wind_off	1	118	0.0	1.0
+fr	04_res	1	118	0.0	1.0
+fr	05_nuclear	1	118	0.0	1.0
+fr	06_coal	1	118	0.0	1.0
 fr	07_gas	1	118	0.0	0.0
 fr	08_non-res	1	118	0.0	0.0
 fr	09_hydro_pump	1	118	0.0	0.0
-fr	01_solar	1	119	1.0	0.0
-fr	02_wind_on	1	119	1.0	0.0
-fr	03_wind_off	1	119	1.0	0.0
-fr	04_res	1	119	1.0	0.0
-fr	05_nuclear	1	119	1.0	0.0
-fr	06_coal	1	119	1.0	0.0
+fr	01_solar	1	119	0.0	1.0
+fr	02_wind_on	1	119	0.0	1.0
+fr	03_wind_off	1	119	0.0	1.0
+fr	04_res	1	119	0.0	1.0
+fr	05_nuclear	1	119	0.0	1.0
+fr	06_coal	1	119	0.0	1.0
 fr	07_gas	1	119	0.0	0.0
 fr	08_non-res	1	119	0.0	0.0
 fr	09_hydro_pump	1	119	0.0	0.0
-fr	01_solar	1	120	1.0	0.0
-fr	02_wind_on	1	120	1.0	0.0
-fr	03_wind_off	1	120	1.0	0.0
-fr	04_res	1	120	1.0	0.0
-fr	05_nuclear	1	120	1.0	0.0
-fr	06_coal	1	120	1.0	0.0
+fr	01_solar	1	120	0.0	1.0
+fr	02_wind_on	1	120	0.0	1.0
+fr	03_wind_off	1	120	0.0	1.0
+fr	04_res	1	120	0.0	1.0
+fr	05_nuclear	1	120	0.0	1.0
+fr	06_coal	1	120	0.0	1.0
 fr	07_gas	1	120	0.0	0.0
 fr	08_non-res	1	120	0.0	0.0
 fr	09_hydro_pump	1	120	0.0	0.0
-fr	01_solar	1	121	1.0	0.0
-fr	02_wind_on	1	121	1.0	0.0
-fr	03_wind_off	1	121	1.0	0.0
-fr	04_res	1	121	1.0	0.0
-fr	05_nuclear	1	121	1.0	0.0
-fr	06_coal	1	121	1.0	0.0
+fr	01_solar	1	121	0.0	1.0
+fr	02_wind_on	1	121	0.0	1.0
+fr	03_wind_off	1	121	0.0	1.0
+fr	04_res	1	121	0.0	1.0
+fr	05_nuclear	1	121	0.0	1.0
+fr	06_coal	1	121	0.0	1.0
 fr	07_gas	1	121	0.0	0.0
 fr	08_non-res	1	121	0.0	0.0
 fr	09_hydro_pump	1	121	0.0	0.0
-fr	01_solar	1	122	1.0	0.0
-fr	02_wind_on	1	122	1.0	0.0
-fr	03_wind_off	1	122	1.0	0.0
-fr	04_res	1	122	1.0	0.0
-fr	05_nuclear	1	122	1.0	0.0
-fr	06_coal	1	122	1.0	0.0
-fr	07_gas	1	122	1.0	0.0
+fr	01_solar	1	122	0.0	1.0
+fr	02_wind_on	1	122	0.0	1.0
+fr	03_wind_off	1	122	0.0	1.0
+fr	04_res	1	122	0.0	1.0
+fr	05_nuclear	1	122	0.0	1.0
+fr	06_coal	1	122	0.0	1.0
+fr	07_gas	1	122	0.0	1.0
 fr	08_non-res	1	122	0.0	0.0
 fr	09_hydro_pump	1	122	0.0	0.0
-fr	01_solar	1	123	1.0	0.0
-fr	02_wind_on	1	123	1.0	0.0
-fr	03_wind_off	1	123	1.0	0.0
-fr	04_res	1	123	1.0	0.0
-fr	05_nuclear	1	123	1.0	0.0
-fr	06_coal	1	123	1.0	0.0
-fr	07_gas	1	123	1.0	0.0
+fr	01_solar	1	123	0.0	1.0
+fr	02_wind_on	1	123	0.0	1.0
+fr	03_wind_off	1	123	0.0	1.0
+fr	04_res	1	123	0.0	1.0
+fr	05_nuclear	1	123	0.0	1.0
+fr	06_coal	1	123	0.0	1.0
+fr	07_gas	1	123	0.0	1.0
 fr	08_non-res	1	123	0.0	0.0
 fr	09_hydro_pump	1	123	0.0	0.0
-fr	01_solar	1	124	1.0	0.0
-fr	02_wind_on	1	124	1.0	0.0
-fr	03_wind_off	1	124	1.0	0.0
-fr	04_res	1	124	1.0	0.0
-fr	05_nuclear	1	124	1.0	0.0
-fr	06_coal	1	124	1.0	0.0
-fr	07_gas	1	124	1.0	0.0
+fr	01_solar	1	124	0.0	1.0
+fr	02_wind_on	1	124	0.0	1.0
+fr	03_wind_off	1	124	0.0	1.0
+fr	04_res	1	124	0.0	1.0
+fr	05_nuclear	1	124	0.0	1.0
+fr	06_coal	1	124	0.0	1.0
+fr	07_gas	1	124	0.0	1.0
 fr	08_non-res	1	124	0.0	0.0
 fr	09_hydro_pump	1	124	0.0	0.0
-fr	01_solar	1	125	1.0	0.0
-fr	02_wind_on	1	125	1.0	0.0
-fr	03_wind_off	1	125	1.0	0.0
-fr	04_res	1	125	1.0	0.0
-fr	05_nuclear	1	125	1.0	0.0
-fr	06_coal	1	125	1.0	0.0
-fr	07_gas	1	125	1.0	0.0
+fr	01_solar	1	125	0.0	1.0
+fr	02_wind_on	1	125	0.0	1.0
+fr	03_wind_off	1	125	0.0	1.0
+fr	04_res	1	125	0.0	1.0
+fr	05_nuclear	1	125	0.0	1.0
+fr	06_coal	1	125	0.0	1.0
+fr	07_gas	1	125	0.0	1.0
 fr	08_non-res	1	125	0.0	0.0
 fr	09_hydro_pump	1	125	0.0	0.0
-fr	01_solar	1	126	1.0	0.0
-fr	02_wind_on	1	126	1.0	0.0
-fr	03_wind_off	1	126	1.0	0.0
-fr	04_res	1	126	1.0	0.0
-fr	05_nuclear	1	126	1.0	0.0
-fr	06_coal	1	126	1.0	0.0
-fr	07_gas	1	126	1.0	0.0
+fr	01_solar	1	126	0.0	1.0
+fr	02_wind_on	1	126	0.0	1.0
+fr	03_wind_off	1	126	0.0	1.0
+fr	04_res	1	126	0.0	1.0
+fr	05_nuclear	1	126	0.0	1.0
+fr	06_coal	1	126	0.0	1.0
+fr	07_gas	1	126	0.0	1.0
 fr	08_non-res	1	126	0.0	0.0
 fr	09_hydro_pump	1	126	0.0	0.0
-fr	01_solar	1	127	1.0	0.0
-fr	02_wind_on	1	127	1.0	0.0
-fr	03_wind_off	1	127	1.0	0.0
-fr	04_res	1	127	1.0	0.0
-fr	05_nuclear	1	127	1.0	0.0
-fr	06_coal	1	127	1.0	0.0
-fr	07_gas	1	127	1.0	0.0
+fr	01_solar	1	127	0.0	1.0
+fr	02_wind_on	1	127	0.0	1.0
+fr	03_wind_off	1	127	0.0	1.0
+fr	04_res	1	127	0.0	1.0
+fr	05_nuclear	1	127	0.0	1.0
+fr	06_coal	1	127	0.0	1.0
+fr	07_gas	1	127	0.0	1.0
 fr	08_non-res	1	127	0.0	0.0
 fr	09_hydro_pump	1	127	0.0	0.0
-fr	01_solar	1	128	1.0	0.0
-fr	02_wind_on	1	128	1.0	0.0
-fr	03_wind_off	1	128	1.0	0.0
-fr	04_res	1	128	1.0	0.0
-fr	05_nuclear	1	128	1.0	0.0
-fr	06_coal	1	128	1.0	0.0
-fr	07_gas	1	128	1.0	0.0
+fr	01_solar	1	128	0.0	1.0
+fr	02_wind_on	1	128	0.0	1.0
+fr	03_wind_off	1	128	0.0	1.0
+fr	04_res	1	128	0.0	1.0
+fr	05_nuclear	1	128	0.0	1.0
+fr	06_coal	1	128	0.0	1.0
+fr	07_gas	1	128	0.0	1.0
 fr	08_non-res	1	128	0.0	0.0
 fr	09_hydro_pump	1	128	0.0	0.0
-fr	01_solar	1	129	1.0	0.0
-fr	02_wind_on	1	129	1.0	0.0
-fr	03_wind_off	1	129	1.0	0.0
-fr	04_res	1	129	1.0	0.0
-fr	05_nuclear	1	129	1.0	0.0
-fr	06_coal	1	129	1.0	0.0
-fr	07_gas	1	129	1.0	0.0
+fr	01_solar	1	129	0.0	1.0
+fr	02_wind_on	1	129	0.0	1.0
+fr	03_wind_off	1	129	0.0	1.0
+fr	04_res	1	129	0.0	1.0
+fr	05_nuclear	1	129	0.0	1.0
+fr	06_coal	1	129	0.0	1.0
+fr	07_gas	1	129	0.0	1.0
 fr	08_non-res	1	129	0.0	0.0
 fr	09_hydro_pump	1	129	0.0	0.0
-fr	01_solar	1	130	1.0	0.0
-fr	02_wind_on	1	130	1.0	0.0
-fr	03_wind_off	1	130	1.0	0.0
-fr	04_res	1	130	1.0	0.0
-fr	05_nuclear	1	130	1.0	0.0
-fr	06_coal	1	130	1.0	0.0
-fr	07_gas	1	130	1.0	0.0
+fr	01_solar	1	130	0.0	1.0
+fr	02_wind_on	1	130	0.0	1.0
+fr	03_wind_off	1	130	0.0	1.0
+fr	04_res	1	130	0.0	1.0
+fr	05_nuclear	1	130	0.0	1.0
+fr	06_coal	1	130	0.0	1.0
+fr	07_gas	1	130	0.0	1.0
 fr	08_non-res	1	130	0.0	0.0
 fr	09_hydro_pump	1	130	0.0	0.0
-fr	01_solar	1	131	1.0	0.0
-fr	02_wind_on	1	131	1.0	0.0
-fr	03_wind_off	1	131	1.0	0.0
-fr	04_res	1	131	1.0	0.0
-fr	05_nuclear	1	131	1.0	0.0
-fr	06_coal	1	131	1.0	0.0
-fr	07_gas	1	131	1.0	0.0
+fr	01_solar	1	131	0.0	1.0
+fr	02_wind_on	1	131	0.0	1.0
+fr	03_wind_off	1	131	0.0	1.0
+fr	04_res	1	131	0.0	1.0
+fr	05_nuclear	1	131	0.0	1.0
+fr	06_coal	1	131	0.0	1.0
+fr	07_gas	1	131	0.0	1.0
 fr	08_non-res	1	131	0.0	0.0
 fr	09_hydro_pump	1	131	0.0	0.0
-fr	01_solar	1	132	1.0	0.0
-fr	02_wind_on	1	132	1.0	0.0
-fr	03_wind_off	1	132	1.0	0.0
-fr	04_res	1	132	1.0	0.0
-fr	05_nuclear	1	132	1.0	0.0
-fr	06_coal	1	132	1.0	0.0
-fr	07_gas	1	132	1.0	0.0
+fr	01_solar	1	132	0.0	1.0
+fr	02_wind_on	1	132	0.0	1.0
+fr	03_wind_off	1	132	0.0	1.0
+fr	04_res	1	132	0.0	1.0
+fr	05_nuclear	1	132	0.0	1.0
+fr	06_coal	1	132	0.0	1.0
+fr	07_gas	1	132	0.0	1.0
 fr	08_non-res	1	132	0.0	0.0
 fr	09_hydro_pump	1	132	0.0	0.0
-fr	01_solar	1	133	1.0	0.0
-fr	02_wind_on	1	133	1.0	0.0
-fr	03_wind_off	1	133	1.0	0.0
-fr	04_res	1	133	1.0	0.0
-fr	05_nuclear	1	133	1.0	0.0
-fr	06_coal	1	133	1.0	0.0
-fr	07_gas	1	133	1.0	0.0
+fr	01_solar	1	133	0.0	1.0
+fr	02_wind_on	1	133	0.0	1.0
+fr	03_wind_off	1	133	0.0	1.0
+fr	04_res	1	133	0.0	1.0
+fr	05_nuclear	1	133	0.0	1.0
+fr	06_coal	1	133	0.0	1.0
+fr	07_gas	1	133	0.0	1.0
 fr	08_non-res	1	133	0.0	0.0
 fr	09_hydro_pump	1	133	0.0	0.0
-fr	01_solar	1	134	1.0	0.0
-fr	02_wind_on	1	134	1.0	0.0
-fr	03_wind_off	1	134	1.0	0.0
-fr	04_res	1	134	1.0	0.0
-fr	05_nuclear	1	134	1.0	0.0
-fr	06_coal	1	134	1.0	0.0
-fr	07_gas	1	134	1.0	0.0
+fr	01_solar	1	134	0.0	1.0
+fr	02_wind_on	1	134	0.0	1.0
+fr	03_wind_off	1	134	0.0	1.0
+fr	04_res	1	134	0.0	1.0
+fr	05_nuclear	1	134	0.0	1.0
+fr	06_coal	1	134	0.0	1.0
+fr	07_gas	1	134	0.0	1.0
 fr	08_non-res	1	134	0.0	0.0
 fr	09_hydro_pump	1	134	0.0	0.0
-fr	01_solar	1	135	1.0	0.0
-fr	02_wind_on	1	135	1.0	0.0
-fr	03_wind_off	1	135	1.0	0.0
-fr	04_res	1	135	1.0	0.0
-fr	05_nuclear	1	135	1.0	0.0
-fr	06_coal	1	135	1.0	0.0
-fr	07_gas	1	135	1.0	0.0
+fr	01_solar	1	135	0.0	1.0
+fr	02_wind_on	1	135	0.0	1.0
+fr	03_wind_off	1	135	0.0	1.0
+fr	04_res	1	135	0.0	1.0
+fr	05_nuclear	1	135	0.0	1.0
+fr	06_coal	1	135	0.0	1.0
+fr	07_gas	1	135	0.0	1.0
 fr	08_non-res	1	135	0.0	0.0
 fr	09_hydro_pump	1	135	0.0	0.0
-fr	01_solar	1	136	1.0	0.0
-fr	02_wind_on	1	136	1.0	0.0
-fr	03_wind_off	1	136	1.0	0.0
-fr	04_res	1	136	1.0	0.0
-fr	05_nuclear	1	136	1.0	0.0
-fr	06_coal	1	136	1.0	0.0
-fr	07_gas	1	136	1.0	0.0
+fr	01_solar	1	136	0.0	1.0
+fr	02_wind_on	1	136	0.0	1.0
+fr	03_wind_off	1	136	0.0	1.0
+fr	04_res	1	136	0.0	1.0
+fr	05_nuclear	1	136	0.0	1.0
+fr	06_coal	1	136	0.0	1.0
+fr	07_gas	1	136	0.0	1.0
 fr	08_non-res	1	136	0.0	0.0
 fr	09_hydro_pump	1	136	0.0	0.0
-fr	01_solar	1	137	1.0	0.0
-fr	02_wind_on	1	137	1.0	0.0
-fr	03_wind_off	1	137	1.0	0.0
-fr	04_res	1	137	1.0	0.0
-fr	05_nuclear	1	137	1.0	0.0
-fr	06_coal	1	137	1.0	0.0
-fr	07_gas	1	137	1.0	0.0
+fr	01_solar	1	137	0.0	1.0
+fr	02_wind_on	1	137	0.0	1.0
+fr	03_wind_off	1	137	0.0	1.0
+fr	04_res	1	137	0.0	1.0
+fr	05_nuclear	1	137	0.0	1.0
+fr	06_coal	1	137	0.0	1.0
+fr	07_gas	1	137	0.0	1.0
 fr	08_non-res	1	137	0.0	0.0
 fr	09_hydro_pump	1	137	0.0	0.0
-fr	01_solar	1	138	1.0	0.0
-fr	02_wind_on	1	138	1.0	0.0
-fr	03_wind_off	1	138	1.0	0.0
-fr	04_res	1	138	1.0	0.0
-fr	05_nuclear	1	138	1.0	0.0
-fr	06_coal	1	138	1.0	0.0
-fr	07_gas	1	138	1.0	0.0
+fr	01_solar	1	138	0.0	1.0
+fr	02_wind_on	1	138	0.0	1.0
+fr	03_wind_off	1	138	0.0	1.0
+fr	04_res	1	138	0.0	1.0
+fr	05_nuclear	1	138	0.0	1.0
+fr	06_coal	1	138	0.0	1.0
+fr	07_gas	1	138	0.0	1.0
 fr	08_non-res	1	138	0.0	0.0
 fr	09_hydro_pump	1	138	0.0	0.0
-fr	01_solar	1	139	1.0	0.0
-fr	02_wind_on	1	139	1.0	0.0
-fr	03_wind_off	1	139	1.0	0.0
-fr	04_res	1	139	1.0	0.0
-fr	05_nuclear	1	139	1.0	0.0
-fr	06_coal	1	139	1.0	0.0
-fr	07_gas	1	139	1.0	0.0
+fr	01_solar	1	139	0.0	1.0
+fr	02_wind_on	1	139	0.0	1.0
+fr	03_wind_off	1	139	0.0	1.0
+fr	04_res	1	139	0.0	1.0
+fr	05_nuclear	1	139	0.0	1.0
+fr	06_coal	1	139	0.0	1.0
+fr	07_gas	1	139	0.0	1.0
 fr	08_non-res	1	139	0.0	0.0
 fr	09_hydro_pump	1	139	0.0	0.0
-fr	01_solar	1	140	1.0	0.0
-fr	02_wind_on	1	140	1.0	0.0
-fr	03_wind_off	1	140	1.0	0.0
-fr	04_res	1	140	1.0	0.0
-fr	05_nuclear	1	140	1.0	0.0
-fr	06_coal	1	140	1.0	0.0
-fr	07_gas	1	140	1.0	0.0
+fr	01_solar	1	140	0.0	1.0
+fr	02_wind_on	1	140	0.0	1.0
+fr	03_wind_off	1	140	0.0	1.0
+fr	04_res	1	140	0.0	1.0
+fr	05_nuclear	1	140	0.0	1.0
+fr	06_coal	1	140	0.0	1.0
+fr	07_gas	1	140	0.0	1.0
 fr	08_non-res	1	140	0.0	0.0
 fr	09_hydro_pump	1	140	0.0	0.0
-fr	01_solar	1	141	1.0	0.0
-fr	02_wind_on	1	141	1.0	0.0
-fr	03_wind_off	1	141	1.0	0.0
-fr	04_res	1	141	1.0	0.0
-fr	05_nuclear	1	141	1.0	0.0
-fr	06_coal	1	141	1.0	0.0
-fr	07_gas	1	141	1.0	0.0
+fr	01_solar	1	141	0.0	1.0
+fr	02_wind_on	1	141	0.0	1.0
+fr	03_wind_off	1	141	0.0	1.0
+fr	04_res	1	141	0.0	1.0
+fr	05_nuclear	1	141	0.0	1.0
+fr	06_coal	1	141	0.0	1.0
+fr	07_gas	1	141	0.0	1.0
 fr	08_non-res	1	141	0.0	0.0
 fr	09_hydro_pump	1	141	0.0	0.0
-fr	01_solar	1	142	1.0	0.0
-fr	02_wind_on	1	142	1.0	0.0
-fr	03_wind_off	1	142	1.0	0.0
-fr	04_res	1	142	1.0	0.0
-fr	05_nuclear	1	142	1.0	0.0
-fr	06_coal	1	142	1.0	0.0
-fr	07_gas	1	142	1.0	0.0
-fr	08_non-res	1	142	1.0	0.0
+fr	01_solar	1	142	0.0	1.0
+fr	02_wind_on	1	142	0.0	1.0
+fr	03_wind_off	1	142	0.0	1.0
+fr	04_res	1	142	0.0	1.0
+fr	05_nuclear	1	142	0.0	1.0
+fr	06_coal	1	142	0.0	1.0
+fr	07_gas	1	142	0.0	1.0
+fr	08_non-res	1	142	0.0	1.0
 fr	09_hydro_pump	1	142	0.0	0.0
-fr	01_solar	1	143	1.0	0.0
-fr	02_wind_on	1	143	1.0	0.0
-fr	03_wind_off	1	143	1.0	0.0
-fr	04_res	1	143	1.0	0.0
-fr	05_nuclear	1	143	1.0	0.0
-fr	06_coal	1	143	1.0	0.0
-fr	07_gas	1	143	1.0	0.0
-fr	08_non-res	1	143	1.0	0.0
+fr	01_solar	1	143	0.0	1.0
+fr	02_wind_on	1	143	0.0	1.0
+fr	03_wind_off	1	143	0.0	1.0
+fr	04_res	1	143	0.0	1.0
+fr	05_nuclear	1	143	0.0	1.0
+fr	06_coal	1	143	0.0	1.0
+fr	07_gas	1	143	0.0	1.0
+fr	08_non-res	1	143	0.0	1.0
 fr	09_hydro_pump	1	143	0.0	0.0
-fr	01_solar	1	144	1.0	0.0
-fr	02_wind_on	1	144	1.0	0.0
-fr	03_wind_off	1	144	1.0	0.0
-fr	04_res	1	144	1.0	0.0
-fr	05_nuclear	1	144	1.0	0.0
-fr	06_coal	1	144	1.0	0.0
-fr	07_gas	1	144	1.0	0.0
-fr	08_non-res	1	144	1.0	0.0
+fr	01_solar	1	144	0.0	1.0
+fr	02_wind_on	1	144	0.0	1.0
+fr	03_wind_off	1	144	0.0	1.0
+fr	04_res	1	144	0.0	1.0
+fr	05_nuclear	1	144	0.0	1.0
+fr	06_coal	1	144	0.0	1.0
+fr	07_gas	1	144	0.0	1.0
+fr	08_non-res	1	144	0.0	1.0
 fr	09_hydro_pump	1	144	0.0	0.0
-fr	01_solar	1	145	1.0	0.0
-fr	02_wind_on	1	145	1.0	0.0
-fr	03_wind_off	1	145	1.0	0.0
-fr	04_res	1	145	1.0	0.0
-fr	05_nuclear	1	145	1.0	0.0
-fr	06_coal	1	145	1.0	0.0
-fr	07_gas	1	145	1.0	0.0
-fr	08_non-res	1	145	1.0	0.0
+fr	01_solar	1	145	0.0	1.0
+fr	02_wind_on	1	145	0.0	1.0
+fr	03_wind_off	1	145	0.0	1.0
+fr	04_res	1	145	0.0	1.0
+fr	05_nuclear	1	145	0.0	1.0
+fr	06_coal	1	145	0.0	1.0
+fr	07_gas	1	145	0.0	1.0
+fr	08_non-res	1	145	0.0	1.0
 fr	09_hydro_pump	1	145	0.0	0.0
-fr	01_solar	1	146	1.0	0.0
-fr	02_wind_on	1	146	1.0	0.0
-fr	03_wind_off	1	146	1.0	0.0
-fr	04_res	1	146	1.0	0.0
-fr	05_nuclear	1	146	1.0	0.0
-fr	06_coal	1	146	1.0	0.0
-fr	07_gas	1	146	1.0	0.0
-fr	08_non-res	1	146	1.0	0.0
+fr	01_solar	1	146	0.0	1.0
+fr	02_wind_on	1	146	0.0	1.0
+fr	03_wind_off	1	146	0.0	1.0
+fr	04_res	1	146	0.0	1.0
+fr	05_nuclear	1	146	0.0	1.0
+fr	06_coal	1	146	0.0	1.0
+fr	07_gas	1	146	0.0	1.0
+fr	08_non-res	1	146	0.0	1.0
 fr	09_hydro_pump	1	146	0.0	0.0
-fr	01_solar	1	147	1.0	0.0
-fr	02_wind_on	1	147	1.0	0.0
-fr	03_wind_off	1	147	1.0	0.0
-fr	04_res	1	147	1.0	0.0
-fr	05_nuclear	1	147	1.0	0.0
-fr	06_coal	1	147	1.0	0.0
-fr	07_gas	1	147	1.0	0.0
-fr	08_non-res	1	147	1.0	0.0
+fr	01_solar	1	147	0.0	1.0
+fr	02_wind_on	1	147	0.0	1.0
+fr	03_wind_off	1	147	0.0	1.0
+fr	04_res	1	147	0.0	1.0
+fr	05_nuclear	1	147	0.0	1.0
+fr	06_coal	1	147	0.0	1.0
+fr	07_gas	1	147	0.0	1.0
+fr	08_non-res	1	147	0.0	1.0
 fr	09_hydro_pump	1	147	0.0	0.0
-fr	01_solar	1	148	1.0	0.0
-fr	02_wind_on	1	148	1.0	0.0
-fr	03_wind_off	1	148	1.0	0.0
-fr	04_res	1	148	1.0	0.0
-fr	05_nuclear	1	148	1.0	0.0
-fr	06_coal	1	148	1.0	0.0
-fr	07_gas	1	148	1.0	0.0
-fr	08_non-res	1	148	1.0	0.0
+fr	01_solar	1	148	0.0	1.0
+fr	02_wind_on	1	148	0.0	1.0
+fr	03_wind_off	1	148	0.0	1.0
+fr	04_res	1	148	0.0	1.0
+fr	05_nuclear	1	148	0.0	1.0
+fr	06_coal	1	148	0.0	1.0
+fr	07_gas	1	148	0.0	1.0
+fr	08_non-res	1	148	0.0	1.0
 fr	09_hydro_pump	1	148	0.0	0.0
-fr	01_solar	1	149	1.0	0.0
-fr	02_wind_on	1	149	1.0	0.0
-fr	03_wind_off	1	149	1.0	0.0
-fr	04_res	1	149	1.0	0.0
-fr	05_nuclear	1	149	1.0	0.0
-fr	06_coal	1	149	1.0	0.0
-fr	07_gas	1	149	1.0	0.0
-fr	08_non-res	1	149	1.0	0.0
+fr	01_solar	1	149	0.0	1.0
+fr	02_wind_on	1	149	0.0	1.0
+fr	03_wind_off	1	149	0.0	1.0
+fr	04_res	1	149	0.0	1.0
+fr	05_nuclear	1	149	0.0	1.0
+fr	06_coal	1	149	0.0	1.0
+fr	07_gas	1	149	0.0	1.0
+fr	08_non-res	1	149	0.0	1.0
 fr	09_hydro_pump	1	149	0.0	0.0
-fr	01_solar	1	150	1.0	0.0
-fr	02_wind_on	1	150	1.0	0.0
-fr	03_wind_off	1	150	1.0	0.0
-fr	04_res	1	150	1.0	0.0
-fr	05_nuclear	1	150	1.0	0.0
-fr	06_coal	1	150	1.0	0.0
-fr	07_gas	1	150	1.0	0.0
-fr	08_non-res	1	150	1.0	0.0
+fr	01_solar	1	150	0.0	1.0
+fr	02_wind_on	1	150	0.0	1.0
+fr	03_wind_off	1	150	0.0	1.0
+fr	04_res	1	150	0.0	1.0
+fr	05_nuclear	1	150	0.0	1.0
+fr	06_coal	1	150	0.0	1.0
+fr	07_gas	1	150	0.0	1.0
+fr	08_non-res	1	150	0.0	1.0
 fr	09_hydro_pump	1	150	0.0	0.0
-fr	01_solar	1	151	1.0	0.0
-fr	02_wind_on	1	151	1.0	0.0
-fr	03_wind_off	1	151	1.0	0.0
-fr	04_res	1	151	1.0	0.0
-fr	05_nuclear	1	151	1.0	0.0
-fr	06_coal	1	151	1.0	0.0
-fr	07_gas	1	151	1.0	0.0
-fr	08_non-res	1	151	1.0	0.0
+fr	01_solar	1	151	0.0	1.0
+fr	02_wind_on	1	151	0.0	1.0
+fr	03_wind_off	1	151	0.0	1.0
+fr	04_res	1	151	0.0	1.0
+fr	05_nuclear	1	151	0.0	1.0
+fr	06_coal	1	151	0.0	1.0
+fr	07_gas	1	151	0.0	1.0
+fr	08_non-res	1	151	0.0	1.0
 fr	09_hydro_pump	1	151	0.0	0.0
-fr	01_solar	1	152	1.0	0.0
-fr	02_wind_on	1	152	1.0	0.0
-fr	03_wind_off	1	152	1.0	0.0
-fr	04_res	1	152	1.0	0.0
-fr	05_nuclear	1	152	1.0	0.0
-fr	06_coal	1	152	1.0	0.0
-fr	07_gas	1	152	1.0	0.0
-fr	08_non-res	1	152	1.0	0.0
+fr	01_solar	1	152	0.0	1.0
+fr	02_wind_on	1	152	0.0	1.0
+fr	03_wind_off	1	152	0.0	1.0
+fr	04_res	1	152	0.0	1.0
+fr	05_nuclear	1	152	0.0	1.0
+fr	06_coal	1	152	0.0	1.0
+fr	07_gas	1	152	0.0	1.0
+fr	08_non-res	1	152	0.0	1.0
 fr	09_hydro_pump	1	152	0.0	0.0
-fr	01_solar	1	153	1.0	0.0
-fr	02_wind_on	1	153	1.0	0.0
-fr	03_wind_off	1	153	1.0	0.0
-fr	04_res	1	153	1.0	0.0
-fr	05_nuclear	1	153	1.0	0.0
-fr	06_coal	1	153	1.0	0.0
-fr	07_gas	1	153	1.0	0.0
-fr	08_non-res	1	153	1.0	0.0
+fr	01_solar	1	153	0.0	1.0
+fr	02_wind_on	1	153	0.0	1.0
+fr	03_wind_off	1	153	0.0	1.0
+fr	04_res	1	153	0.0	1.0
+fr	05_nuclear	1	153	0.0	1.0
+fr	06_coal	1	153	0.0	1.0
+fr	07_gas	1	153	0.0	1.0
+fr	08_non-res	1	153	0.0	1.0
 fr	09_hydro_pump	1	153	0.0	0.0
-fr	01_solar	1	154	1.0	0.0
-fr	02_wind_on	1	154	1.0	0.0
-fr	03_wind_off	1	154	1.0	0.0
-fr	04_res	1	154	1.0	0.0
-fr	05_nuclear	1	154	1.0	0.0
-fr	06_coal	1	154	1.0	0.0
-fr	07_gas	1	154	1.0	0.0
-fr	08_non-res	1	154	1.0	0.0
+fr	01_solar	1	154	0.0	1.0
+fr	02_wind_on	1	154	0.0	1.0
+fr	03_wind_off	1	154	0.0	1.0
+fr	04_res	1	154	0.0	1.0
+fr	05_nuclear	1	154	0.0	1.0
+fr	06_coal	1	154	0.0	1.0
+fr	07_gas	1	154	0.0	1.0
+fr	08_non-res	1	154	0.0	1.0
 fr	09_hydro_pump	1	154	0.0	0.0
-fr	01_solar	1	155	1.0	0.0
-fr	02_wind_on	1	155	1.0	0.0
-fr	03_wind_off	1	155	1.0	0.0
-fr	04_res	1	155	1.0	0.0
-fr	05_nuclear	1	155	1.0	0.0
-fr	06_coal	1	155	1.0	0.0
-fr	07_gas	1	155	1.0	0.0
-fr	08_non-res	1	155	1.0	0.0
+fr	01_solar	1	155	0.0	1.0
+fr	02_wind_on	1	155	0.0	1.0
+fr	03_wind_off	1	155	0.0	1.0
+fr	04_res	1	155	0.0	1.0
+fr	05_nuclear	1	155	0.0	1.0
+fr	06_coal	1	155	0.0	1.0
+fr	07_gas	1	155	0.0	1.0
+fr	08_non-res	1	155	0.0	1.0
 fr	09_hydro_pump	1	155	0.0	0.0
-fr	01_solar	1	156	1.0	0.0
-fr	02_wind_on	1	156	1.0	0.0
-fr	03_wind_off	1	156	1.0	0.0
-fr	04_res	1	156	1.0	0.0
-fr	05_nuclear	1	156	1.0	0.0
-fr	06_coal	1	156	1.0	0.0
-fr	07_gas	1	156	1.0	0.0
-fr	08_non-res	1	156	1.0	0.0
+fr	01_solar	1	156	0.0	1.0
+fr	02_wind_on	1	156	0.0	1.0
+fr	03_wind_off	1	156	0.0	1.0
+fr	04_res	1	156	0.0	1.0
+fr	05_nuclear	1	156	0.0	1.0
+fr	06_coal	1	156	0.0	1.0
+fr	07_gas	1	156	0.0	1.0
+fr	08_non-res	1	156	0.0	1.0
 fr	09_hydro_pump	1	156	0.0	0.0
-fr	01_solar	1	157	1.0	0.0
-fr	02_wind_on	1	157	1.0	0.0
-fr	03_wind_off	1	157	1.0	0.0
-fr	04_res	1	157	1.0	0.0
-fr	05_nuclear	1	157	1.0	0.0
-fr	06_coal	1	157	1.0	0.0
-fr	07_gas	1	157	1.0	0.0
-fr	08_non-res	1	157	1.0	0.0
+fr	01_solar	1	157	0.0	1.0
+fr	02_wind_on	1	157	0.0	1.0
+fr	03_wind_off	1	157	0.0	1.0
+fr	04_res	1	157	0.0	1.0
+fr	05_nuclear	1	157	0.0	1.0
+fr	06_coal	1	157	0.0	1.0
+fr	07_gas	1	157	0.0	1.0
+fr	08_non-res	1	157	0.0	1.0
 fr	09_hydro_pump	1	157	0.0	0.0
-fr	01_solar	1	158	1.0	0.0
-fr	02_wind_on	1	158	1.0	0.0
-fr	03_wind_off	1	158	1.0	0.0
-fr	04_res	1	158	1.0	0.0
-fr	05_nuclear	1	158	1.0	0.0
-fr	06_coal	1	158	1.0	0.0
-fr	07_gas	1	158	1.0	0.0
-fr	08_non-res	1	158	1.0	0.0
+fr	01_solar	1	158	0.0	1.0
+fr	02_wind_on	1	158	0.0	1.0
+fr	03_wind_off	1	158	0.0	1.0
+fr	04_res	1	158	0.0	1.0
+fr	05_nuclear	1	158	0.0	1.0
+fr	06_coal	1	158	0.0	1.0
+fr	07_gas	1	158	0.0	1.0
+fr	08_non-res	1	158	0.0	1.0
 fr	09_hydro_pump	1	158	0.0	0.0
-fr	01_solar	1	159	1.0	0.0
-fr	02_wind_on	1	159	1.0	0.0
-fr	03_wind_off	1	159	1.0	0.0
-fr	04_res	1	159	1.0	0.0
-fr	05_nuclear	1	159	1.0	0.0
-fr	06_coal	1	159	1.0	0.0
-fr	07_gas	1	159	1.0	0.0
-fr	08_non-res	1	159	1.0	0.0
+fr	01_solar	1	159	0.0	1.0
+fr	02_wind_on	1	159	0.0	1.0
+fr	03_wind_off	1	159	0.0	1.0
+fr	04_res	1	159	0.0	1.0
+fr	05_nuclear	1	159	0.0	1.0
+fr	06_coal	1	159	0.0	1.0
+fr	07_gas	1	159	0.0	1.0
+fr	08_non-res	1	159	0.0	1.0
 fr	09_hydro_pump	1	159	0.0	0.0
-fr	01_solar	1	160	1.0	0.0
-fr	02_wind_on	1	160	1.0	0.0
-fr	03_wind_off	1	160	1.0	0.0
-fr	04_res	1	160	1.0	0.0
-fr	05_nuclear	1	160	1.0	0.0
-fr	06_coal	1	160	1.0	0.0
-fr	07_gas	1	160	1.0	0.0
-fr	08_non-res	1	160	1.0	0.0
+fr	01_solar	1	160	0.0	1.0
+fr	02_wind_on	1	160	0.0	1.0
+fr	03_wind_off	1	160	0.0	1.0
+fr	04_res	1	160	0.0	1.0
+fr	05_nuclear	1	160	0.0	1.0
+fr	06_coal	1	160	0.0	1.0
+fr	07_gas	1	160	0.0	1.0
+fr	08_non-res	1	160	0.0	1.0
 fr	09_hydro_pump	1	160	0.0	0.0
-fr	01_solar	1	161	1.0	0.0
-fr	02_wind_on	1	161	1.0	0.0
-fr	03_wind_off	1	161	1.0	0.0
-fr	04_res	1	161	1.0	0.0
-fr	05_nuclear	1	161	1.0	0.0
-fr	06_coal	1	161	1.0	0.0
-fr	07_gas	1	161	1.0	0.0
-fr	08_non-res	1	161	1.0	0.0
+fr	01_solar	1	161	0.0	1.0
+fr	02_wind_on	1	161	0.0	1.0
+fr	03_wind_off	1	161	0.0	1.0
+fr	04_res	1	161	0.0	1.0
+fr	05_nuclear	1	161	0.0	1.0
+fr	06_coal	1	161	0.0	1.0
+fr	07_gas	1	161	0.0	1.0
+fr	08_non-res	1	161	0.0	1.0
 fr	09_hydro_pump	1	161	0.0	0.0
-fr	01_solar	1	162	1.0	0.0
-fr	02_wind_on	1	162	1.0	0.0
-fr	03_wind_off	1	162	1.0	0.0
-fr	04_res	1	162	1.0	0.0
-fr	05_nuclear	1	162	1.0	0.0
-fr	06_coal	1	162	1.0	0.0
-fr	07_gas	1	162	1.0	0.0
-fr	08_non-res	1	162	1.0	0.0
-fr	09_hydro_pump	1	162	1.0	0.0
-fr	01_solar	1	163	1.0	0.0
-fr	02_wind_on	1	163	1.0	0.0
-fr	03_wind_off	1	163	1.0	0.0
-fr	04_res	1	163	1.0	0.0
-fr	05_nuclear	1	163	1.0	0.0
-fr	06_coal	1	163	1.0	0.0
-fr	07_gas	1	163	1.0	0.0
-fr	08_non-res	1	163	1.0	0.0
-fr	09_hydro_pump	1	163	1.0	0.0
-fr	01_solar	1	164	1.0	0.0
-fr	02_wind_on	1	164	1.0	0.0
-fr	03_wind_off	1	164	1.0	0.0
-fr	04_res	1	164	1.0	0.0
-fr	05_nuclear	1	164	1.0	0.0
-fr	06_coal	1	164	1.0	0.0
-fr	07_gas	1	164	1.0	0.0
-fr	08_non-res	1	164	1.0	0.0
-fr	09_hydro_pump	1	164	1.0	0.0
-fr	01_solar	1	165	1.0	0.0
-fr	02_wind_on	1	165	1.0	0.0
-fr	03_wind_off	1	165	1.0	0.0
-fr	04_res	1	165	1.0	0.0
-fr	05_nuclear	1	165	1.0	0.0
-fr	06_coal	1	165	1.0	0.0
-fr	07_gas	1	165	1.0	0.0
-fr	08_non-res	1	165	1.0	0.0
-fr	09_hydro_pump	1	165	1.0	0.0
-fr	01_solar	1	166	1.0	0.0
-fr	02_wind_on	1	166	1.0	0.0
-fr	03_wind_off	1	166	1.0	0.0
-fr	04_res	1	166	1.0	0.0
-fr	05_nuclear	1	166	1.0	0.0
-fr	06_coal	1	166	1.0	0.0
-fr	07_gas	1	166	1.0	0.0
-fr	08_non-res	1	166	1.0	0.0
-fr	09_hydro_pump	1	166	1.0	0.0
-fr	01_solar	1	167	1.0	0.0
-fr	02_wind_on	1	167	1.0	0.0
-fr	03_wind_off	1	167	1.0	0.0
-fr	04_res	1	167	1.0	0.0
-fr	05_nuclear	1	167	1.0	0.0
-fr	06_coal	1	167	1.0	0.0
-fr	07_gas	1	167	1.0	0.0
-fr	08_non-res	1	167	1.0	0.0
-fr	09_hydro_pump	1	167	1.0	0.0
-fr	01_solar	1	168	1.0	0.0
-fr	02_wind_on	1	168	1.0	0.0
-fr	03_wind_off	1	168	1.0	0.0
-fr	04_res	1	168	1.0	0.0
-fr	05_nuclear	1	168	1.0	0.0
-fr	06_coal	1	168	1.0	0.0
-fr	07_gas	1	168	1.0	0.0
-fr	08_non-res	1	168	1.0	0.0
-fr	09_hydro_pump	1	168	1.0	0.0
+fr	01_solar	1	162	0.0	1.0
+fr	02_wind_on	1	162	0.0	1.0
+fr	03_wind_off	1	162	0.0	1.0
+fr	04_res	1	162	0.0	1.0
+fr	05_nuclear	1	162	0.0	1.0
+fr	06_coal	1	162	0.0	1.0
+fr	07_gas	1	162	0.0	1.0
+fr	08_non-res	1	162	0.0	1.0
+fr	09_hydro_pump	1	162	0.0	1.0
+fr	01_solar	1	163	0.0	1.0
+fr	02_wind_on	1	163	0.0	1.0
+fr	03_wind_off	1	163	0.0	1.0
+fr	04_res	1	163	0.0	1.0
+fr	05_nuclear	1	163	0.0	1.0
+fr	06_coal	1	163	0.0	1.0
+fr	07_gas	1	163	0.0	1.0
+fr	08_non-res	1	163	0.0	1.0
+fr	09_hydro_pump	1	163	0.0	1.0
+fr	01_solar	1	164	0.0	1.0
+fr	02_wind_on	1	164	0.0	1.0
+fr	03_wind_off	1	164	0.0	1.0
+fr	04_res	1	164	0.0	1.0
+fr	05_nuclear	1	164	0.0	1.0
+fr	06_coal	1	164	0.0	1.0
+fr	07_gas	1	164	0.0	1.0
+fr	08_non-res	1	164	0.0	1.0
+fr	09_hydro_pump	1	164	0.0	1.0
+fr	01_solar	1	165	0.0	1.0
+fr	02_wind_on	1	165	0.0	1.0
+fr	03_wind_off	1	165	0.0	1.0
+fr	04_res	1	165	0.0	1.0
+fr	05_nuclear	1	165	0.0	1.0
+fr	06_coal	1	165	0.0	1.0
+fr	07_gas	1	165	0.0	1.0
+fr	08_non-res	1	165	0.0	1.0
+fr	09_hydro_pump	1	165	0.0	1.0
+fr	01_solar	1	166	0.0	1.0
+fr	02_wind_on	1	166	0.0	1.0
+fr	03_wind_off	1	166	0.0	1.0
+fr	04_res	1	166	0.0	1.0
+fr	05_nuclear	1	166	0.0	1.0
+fr	06_coal	1	166	0.0	1.0
+fr	07_gas	1	166	0.0	1.0
+fr	08_non-res	1	166	0.0	1.0
+fr	09_hydro_pump	1	166	0.0	1.0
+fr	01_solar	1	167	0.0	1.0
+fr	02_wind_on	1	167	0.0	1.0
+fr	03_wind_off	1	167	0.0	1.0
+fr	04_res	1	167	0.0	1.0
+fr	05_nuclear	1	167	0.0	1.0
+fr	06_coal	1	167	0.0	1.0
+fr	07_gas	1	167	0.0	1.0
+fr	08_non-res	1	167	0.0	1.0
+fr	09_hydro_pump	1	167	0.0	1.0
+fr	01_solar	1	168	0.0	1.0
+fr	02_wind_on	1	168	0.0	1.0
+fr	03_wind_off	1	168	0.0	1.0
+fr	04_res	1	168	0.0	1.0
+fr	05_nuclear	1	168	0.0	1.0
+fr	06_coal	1	168	0.0	1.0
+fr	07_gas	1	168	0.0	1.0
+fr	08_non-res	1	168	0.0	1.0
+fr	09_hydro_pump	1	168	0.0	1.0
 fr	01_solar	1	169	0.0	0.0
 fr	02_wind_on	1	169	0.0	0.0
 fr	03_wind_off	1	169	0.0	0.0
@@ -7568,7 +7568,7 @@ fr	06_coal	1	169	0.0	0.0
 fr	07_gas	1	169	0.0	0.0
 fr	08_non-res	1	169	0.0	0.0
 fr	09_hydro_pump	1	169	0.0	0.0
-fr	01_solar	1	170	1.0	0.0
+fr	01_solar	1	170	0.0	1.0
 fr	02_wind_on	1	170	0.0	0.0
 fr	03_wind_off	1	170	0.0	0.0
 fr	04_res	1	170	0.0	0.0
@@ -7577,7 +7577,7 @@ fr	06_coal	1	170	0.0	0.0
 fr	07_gas	1	170	0.0	0.0
 fr	08_non-res	1	170	0.0	0.0
 fr	09_hydro_pump	1	170	0.0	0.0
-fr	01_solar	1	171	1.0	0.0
+fr	01_solar	1	171	0.0	1.0
 fr	02_wind_on	1	171	0.0	0.0
 fr	03_wind_off	1	171	0.0	0.0
 fr	04_res	1	171	0.0	0.0
@@ -7586,7 +7586,7 @@ fr	06_coal	1	171	0.0	0.0
 fr	07_gas	1	171	0.0	0.0
 fr	08_non-res	1	171	0.0	0.0
 fr	09_hydro_pump	1	171	0.0	0.0
-fr	01_solar	1	172	1.0	0.0
+fr	01_solar	1	172	0.0	1.0
 fr	02_wind_on	1	172	0.0	0.0
 fr	03_wind_off	1	172	0.0	0.0
 fr	04_res	1	172	0.0	0.0
@@ -7595,7 +7595,7 @@ fr	06_coal	1	172	0.0	0.0
 fr	07_gas	1	172	0.0	0.0
 fr	08_non-res	1	172	0.0	0.0
 fr	09_hydro_pump	1	172	0.0	0.0
-fr	01_solar	1	173	1.0	0.0
+fr	01_solar	1	173	0.0	1.0
 fr	02_wind_on	1	173	0.0	0.0
 fr	03_wind_off	1	173	0.0	0.0
 fr	04_res	1	173	0.0	0.0
@@ -7604,7 +7604,7 @@ fr	06_coal	1	173	0.0	0.0
 fr	07_gas	1	173	0.0	0.0
 fr	08_non-res	1	173	0.0	0.0
 fr	09_hydro_pump	1	173	0.0	0.0
-fr	01_solar	1	174	1.0	0.0
+fr	01_solar	1	174	0.0	1.0
 fr	02_wind_on	1	174	0.0	0.0
 fr	03_wind_off	1	174	0.0	0.0
 fr	04_res	1	174	0.0	0.0
@@ -7613,7 +7613,7 @@ fr	06_coal	1	174	0.0	0.0
 fr	07_gas	1	174	0.0	0.0
 fr	08_non-res	1	174	0.0	0.0
 fr	09_hydro_pump	1	174	0.0	0.0
-fr	01_solar	1	175	1.0	0.0
+fr	01_solar	1	175	0.0	1.0
 fr	02_wind_on	1	175	0.0	0.0
 fr	03_wind_off	1	175	0.0	0.0
 fr	04_res	1	175	0.0	0.0
@@ -7622,7 +7622,7 @@ fr	06_coal	1	175	0.0	0.0
 fr	07_gas	1	175	0.0	0.0
 fr	08_non-res	1	175	0.0	0.0
 fr	09_hydro_pump	1	175	0.0	0.0
-fr	01_solar	1	176	1.0	0.0
+fr	01_solar	1	176	0.0	1.0
 fr	02_wind_on	1	176	0.0	0.0
 fr	03_wind_off	1	176	0.0	0.0
 fr	04_res	1	176	0.0	0.0
@@ -7631,7 +7631,7 @@ fr	06_coal	1	176	0.0	0.0
 fr	07_gas	1	176	0.0	0.0
 fr	08_non-res	1	176	0.0	0.0
 fr	09_hydro_pump	1	176	0.0	0.0
-fr	01_solar	1	177	1.0	0.0
+fr	01_solar	1	177	0.0	1.0
 fr	02_wind_on	1	177	0.0	0.0
 fr	03_wind_off	1	177	0.0	0.0
 fr	04_res	1	177	0.0	0.0
@@ -7640,7 +7640,7 @@ fr	06_coal	1	177	0.0	0.0
 fr	07_gas	1	177	0.0	0.0
 fr	08_non-res	1	177	0.0	0.0
 fr	09_hydro_pump	1	177	0.0	0.0
-fr	01_solar	1	178	1.0	0.0
+fr	01_solar	1	178	0.0	1.0
 fr	02_wind_on	1	178	0.0	0.0
 fr	03_wind_off	1	178	0.0	0.0
 fr	04_res	1	178	0.0	0.0
@@ -7649,7 +7649,7 @@ fr	06_coal	1	178	0.0	0.0
 fr	07_gas	1	178	0.0	0.0
 fr	08_non-res	1	178	0.0	0.0
 fr	09_hydro_pump	1	178	0.0	0.0
-fr	01_solar	1	179	1.0	0.0
+fr	01_solar	1	179	0.0	1.0
 fr	02_wind_on	1	179	0.0	0.0
 fr	03_wind_off	1	179	0.0	0.0
 fr	04_res	1	179	0.0	0.0
@@ -7658,7 +7658,7 @@ fr	06_coal	1	179	0.0	0.0
 fr	07_gas	1	179	0.0	0.0
 fr	08_non-res	1	179	0.0	0.0
 fr	09_hydro_pump	1	179	0.0	0.0
-fr	01_solar	1	180	1.0	0.0
+fr	01_solar	1	180	0.0	1.0
 fr	02_wind_on	1	180	0.0	0.0
 fr	03_wind_off	1	180	0.0	0.0
 fr	04_res	1	180	0.0	0.0
@@ -7667,7 +7667,7 @@ fr	06_coal	1	180	0.0	0.0
 fr	07_gas	1	180	0.0	0.0
 fr	08_non-res	1	180	0.0	0.0
 fr	09_hydro_pump	1	180	0.0	0.0
-fr	01_solar	1	181	1.0	0.0
+fr	01_solar	1	181	0.0	1.0
 fr	02_wind_on	1	181	0.0	0.0
 fr	03_wind_off	1	181	0.0	0.0
 fr	04_res	1	181	0.0	0.0
@@ -7676,7 +7676,7 @@ fr	06_coal	1	181	0.0	0.0
 fr	07_gas	1	181	0.0	0.0
 fr	08_non-res	1	181	0.0	0.0
 fr	09_hydro_pump	1	181	0.0	0.0
-fr	01_solar	1	182	1.0	0.0
+fr	01_solar	1	182	0.0	1.0
 fr	02_wind_on	1	182	0.0	0.0
 fr	03_wind_off	1	182	0.0	0.0
 fr	04_res	1	182	0.0	0.0
@@ -7685,7 +7685,7 @@ fr	06_coal	1	182	0.0	0.0
 fr	07_gas	1	182	0.0	0.0
 fr	08_non-res	1	182	0.0	0.0
 fr	09_hydro_pump	1	182	0.0	0.0
-fr	01_solar	1	183	1.0	0.0
+fr	01_solar	1	183	0.0	1.0
 fr	02_wind_on	1	183	0.0	0.0
 fr	03_wind_off	1	183	0.0	0.0
 fr	04_res	1	183	0.0	0.0
@@ -7694,7 +7694,7 @@ fr	06_coal	1	183	0.0	0.0
 fr	07_gas	1	183	0.0	0.0
 fr	08_non-res	1	183	0.0	0.0
 fr	09_hydro_pump	1	183	0.0	0.0
-fr	01_solar	1	184	1.0	0.0
+fr	01_solar	1	184	0.0	1.0
 fr	02_wind_on	1	184	0.0	0.0
 fr	03_wind_off	1	184	0.0	0.0
 fr	04_res	1	184	0.0	0.0
@@ -7703,7 +7703,7 @@ fr	06_coal	1	184	0.0	0.0
 fr	07_gas	1	184	0.0	0.0
 fr	08_non-res	1	184	0.0	0.0
 fr	09_hydro_pump	1	184	0.0	0.0
-fr	01_solar	1	185	1.0	0.0
+fr	01_solar	1	185	0.0	1.0
 fr	02_wind_on	1	185	0.0	0.0
 fr	03_wind_off	1	185	0.0	0.0
 fr	04_res	1	185	0.0	0.0
@@ -7712,7 +7712,7 @@ fr	06_coal	1	185	0.0	0.0
 fr	07_gas	1	185	0.0	0.0
 fr	08_non-res	1	185	0.0	0.0
 fr	09_hydro_pump	1	185	0.0	0.0
-fr	01_solar	1	186	1.0	0.0
+fr	01_solar	1	186	0.0	1.0
 fr	02_wind_on	1	186	0.0	0.0
 fr	03_wind_off	1	186	0.0	0.0
 fr	04_res	1	186	0.0	0.0
@@ -7721,7 +7721,7 @@ fr	06_coal	1	186	0.0	0.0
 fr	07_gas	1	186	0.0	0.0
 fr	08_non-res	1	186	0.0	0.0
 fr	09_hydro_pump	1	186	0.0	0.0
-fr	01_solar	1	187	1.0	0.0
+fr	01_solar	1	187	0.0	1.0
 fr	02_wind_on	1	187	0.0	0.0
 fr	03_wind_off	1	187	0.0	0.0
 fr	04_res	1	187	0.0	0.0
@@ -7730,7 +7730,7 @@ fr	06_coal	1	187	0.0	0.0
 fr	07_gas	1	187	0.0	0.0
 fr	08_non-res	1	187	0.0	0.0
 fr	09_hydro_pump	1	187	0.0	0.0
-fr	01_solar	1	188	1.0	0.0
+fr	01_solar	1	188	0.0	1.0
 fr	02_wind_on	1	188	0.0	0.0
 fr	03_wind_off	1	188	0.0	0.0
 fr	04_res	1	188	0.0	0.0
@@ -7739,7 +7739,7 @@ fr	06_coal	1	188	0.0	0.0
 fr	07_gas	1	188	0.0	0.0
 fr	08_non-res	1	188	0.0	0.0
 fr	09_hydro_pump	1	188	0.0	0.0
-fr	01_solar	1	189	1.0	0.0
+fr	01_solar	1	189	0.0	1.0
 fr	02_wind_on	1	189	0.0	0.0
 fr	03_wind_off	1	189	0.0	0.0
 fr	04_res	1	189	0.0	0.0
@@ -7748,8 +7748,8 @@ fr	06_coal	1	189	0.0	0.0
 fr	07_gas	1	189	0.0	0.0
 fr	08_non-res	1	189	0.0	0.0
 fr	09_hydro_pump	1	189	0.0	0.0
-fr	01_solar	1	190	1.0	0.0
-fr	02_wind_on	1	190	1.0	0.0
+fr	01_solar	1	190	0.0	1.0
+fr	02_wind_on	1	190	0.0	1.0
 fr	03_wind_off	1	190	0.0	0.0
 fr	04_res	1	190	0.0	0.0
 fr	05_nuclear	1	190	0.0	0.0
@@ -7757,8 +7757,8 @@ fr	06_coal	1	190	0.0	0.0
 fr	07_gas	1	190	0.0	0.0
 fr	08_non-res	1	190	0.0	0.0
 fr	09_hydro_pump	1	190	0.0	0.0
-fr	01_solar	1	191	1.0	0.0
-fr	02_wind_on	1	191	1.0	0.0
+fr	01_solar	1	191	0.0	1.0
+fr	02_wind_on	1	191	0.0	1.0
 fr	03_wind_off	1	191	0.0	0.0
 fr	04_res	1	191	0.0	0.0
 fr	05_nuclear	1	191	0.0	0.0
@@ -7766,8 +7766,8 @@ fr	06_coal	1	191	0.0	0.0
 fr	07_gas	1	191	0.0	0.0
 fr	08_non-res	1	191	0.0	0.0
 fr	09_hydro_pump	1	191	0.0	0.0
-fr	01_solar	1	192	1.0	0.0
-fr	02_wind_on	1	192	1.0	0.0
+fr	01_solar	1	192	0.0	1.0
+fr	02_wind_on	1	192	0.0	1.0
 fr	03_wind_off	1	192	0.0	0.0
 fr	04_res	1	192	0.0	0.0
 fr	05_nuclear	1	192	0.0	0.0
@@ -7775,8 +7775,8 @@ fr	06_coal	1	192	0.0	0.0
 fr	07_gas	1	192	0.0	0.0
 fr	08_non-res	1	192	0.0	0.0
 fr	09_hydro_pump	1	192	0.0	0.0
-fr	01_solar	1	193	1.0	0.0
-fr	02_wind_on	1	193	1.0	0.0
+fr	01_solar	1	193	0.0	1.0
+fr	02_wind_on	1	193	0.0	1.0
 fr	03_wind_off	1	193	0.0	0.0
 fr	04_res	1	193	0.0	0.0
 fr	05_nuclear	1	193	0.0	0.0
@@ -7784,8 +7784,8 @@ fr	06_coal	1	193	0.0	0.0
 fr	07_gas	1	193	0.0	0.0
 fr	08_non-res	1	193	0.0	0.0
 fr	09_hydro_pump	1	193	0.0	0.0
-fr	01_solar	1	194	1.0	0.0
-fr	02_wind_on	1	194	1.0	0.0
+fr	01_solar	1	194	0.0	1.0
+fr	02_wind_on	1	194	0.0	1.0
 fr	03_wind_off	1	194	0.0	0.0
 fr	04_res	1	194	0.0	0.0
 fr	05_nuclear	1	194	0.0	0.0
@@ -7793,8 +7793,8 @@ fr	06_coal	1	194	0.0	0.0
 fr	07_gas	1	194	0.0	0.0
 fr	08_non-res	1	194	0.0	0.0
 fr	09_hydro_pump	1	194	0.0	0.0
-fr	01_solar	1	195	1.0	0.0
-fr	02_wind_on	1	195	1.0	0.0
+fr	01_solar	1	195	0.0	1.0
+fr	02_wind_on	1	195	0.0	1.0
 fr	03_wind_off	1	195	0.0	0.0
 fr	04_res	1	195	0.0	0.0
 fr	05_nuclear	1	195	0.0	0.0
@@ -7802,8 +7802,8 @@ fr	06_coal	1	195	0.0	0.0
 fr	07_gas	1	195	0.0	0.0
 fr	08_non-res	1	195	0.0	0.0
 fr	09_hydro_pump	1	195	0.0	0.0
-fr	01_solar	1	196	1.0	0.0
-fr	02_wind_on	1	196	1.0	0.0
+fr	01_solar	1	196	0.0	1.0
+fr	02_wind_on	1	196	0.0	1.0
 fr	03_wind_off	1	196	0.0	0.0
 fr	04_res	1	196	0.0	0.0
 fr	05_nuclear	1	196	0.0	0.0
@@ -7811,8 +7811,8 @@ fr	06_coal	1	196	0.0	0.0
 fr	07_gas	1	196	0.0	0.0
 fr	08_non-res	1	196	0.0	0.0
 fr	09_hydro_pump	1	196	0.0	0.0
-fr	01_solar	1	197	1.0	0.0
-fr	02_wind_on	1	197	1.0	0.0
+fr	01_solar	1	197	0.0	1.0
+fr	02_wind_on	1	197	0.0	1.0
 fr	03_wind_off	1	197	0.0	0.0
 fr	04_res	1	197	0.0	0.0
 fr	05_nuclear	1	197	0.0	0.0
@@ -7820,8 +7820,8 @@ fr	06_coal	1	197	0.0	0.0
 fr	07_gas	1	197	0.0	0.0
 fr	08_non-res	1	197	0.0	0.0
 fr	09_hydro_pump	1	197	0.0	0.0
-fr	01_solar	1	198	1.0	0.0
-fr	02_wind_on	1	198	1.0	0.0
+fr	01_solar	1	198	0.0	1.0
+fr	02_wind_on	1	198	0.0	1.0
 fr	03_wind_off	1	198	0.0	0.0
 fr	04_res	1	198	0.0	0.0
 fr	05_nuclear	1	198	0.0	0.0
@@ -7829,8 +7829,8 @@ fr	06_coal	1	198	0.0	0.0
 fr	07_gas	1	198	0.0	0.0
 fr	08_non-res	1	198	0.0	0.0
 fr	09_hydro_pump	1	198	0.0	0.0
-fr	01_solar	1	199	1.0	0.0
-fr	02_wind_on	1	199	1.0	0.0
+fr	01_solar	1	199	0.0	1.0
+fr	02_wind_on	1	199	0.0	1.0
 fr	03_wind_off	1	199	0.0	0.0
 fr	04_res	1	199	0.0	0.0
 fr	05_nuclear	1	199	0.0	0.0
@@ -7838,8 +7838,8 @@ fr	06_coal	1	199	0.0	0.0
 fr	07_gas	1	199	0.0	0.0
 fr	08_non-res	1	199	0.0	0.0
 fr	09_hydro_pump	1	199	0.0	0.0
-fr	01_solar	1	200	1.0	0.0
-fr	02_wind_on	1	200	1.0	0.0
+fr	01_solar	1	200	0.0	1.0
+fr	02_wind_on	1	200	0.0	1.0
 fr	03_wind_off	1	200	0.0	0.0
 fr	04_res	1	200	0.0	0.0
 fr	05_nuclear	1	200	0.0	0.0
@@ -7847,8 +7847,8 @@ fr	06_coal	1	200	0.0	0.0
 fr	07_gas	1	200	0.0	0.0
 fr	08_non-res	1	200	0.0	0.0
 fr	09_hydro_pump	1	200	0.0	0.0
-fr	01_solar	1	201	1.0	0.0
-fr	02_wind_on	1	201	1.0	0.0
+fr	01_solar	1	201	0.0	1.0
+fr	02_wind_on	1	201	0.0	1.0
 fr	03_wind_off	1	201	0.0	0.0
 fr	04_res	1	201	0.0	0.0
 fr	05_nuclear	1	201	0.0	0.0
@@ -7856,8 +7856,8 @@ fr	06_coal	1	201	0.0	0.0
 fr	07_gas	1	201	0.0	0.0
 fr	08_non-res	1	201	0.0	0.0
 fr	09_hydro_pump	1	201	0.0	0.0
-fr	01_solar	1	202	1.0	0.0
-fr	02_wind_on	1	202	1.0	0.0
+fr	01_solar	1	202	0.0	1.0
+fr	02_wind_on	1	202	0.0	1.0
 fr	03_wind_off	1	202	0.0	0.0
 fr	04_res	1	202	0.0	0.0
 fr	05_nuclear	1	202	0.0	0.0
@@ -7865,8 +7865,8 @@ fr	06_coal	1	202	0.0	0.0
 fr	07_gas	1	202	0.0	0.0
 fr	08_non-res	1	202	0.0	0.0
 fr	09_hydro_pump	1	202	0.0	0.0
-fr	01_solar	1	203	1.0	0.0
-fr	02_wind_on	1	203	1.0	0.0
+fr	01_solar	1	203	0.0	1.0
+fr	02_wind_on	1	203	0.0	1.0
 fr	03_wind_off	1	203	0.0	0.0
 fr	04_res	1	203	0.0	0.0
 fr	05_nuclear	1	203	0.0	0.0
@@ -7874,8 +7874,8 @@ fr	06_coal	1	203	0.0	0.0
 fr	07_gas	1	203	0.0	0.0
 fr	08_non-res	1	203	0.0	0.0
 fr	09_hydro_pump	1	203	0.0	0.0
-fr	01_solar	1	204	1.0	0.0
-fr	02_wind_on	1	204	1.0	0.0
+fr	01_solar	1	204	0.0	1.0
+fr	02_wind_on	1	204	0.0	1.0
 fr	03_wind_off	1	204	0.0	0.0
 fr	04_res	1	204	0.0	0.0
 fr	05_nuclear	1	204	0.0	0.0
@@ -7883,8 +7883,8 @@ fr	06_coal	1	204	0.0	0.0
 fr	07_gas	1	204	0.0	0.0
 fr	08_non-res	1	204	0.0	0.0
 fr	09_hydro_pump	1	204	0.0	0.0
-fr	01_solar	1	205	1.0	0.0
-fr	02_wind_on	1	205	1.0	0.0
+fr	01_solar	1	205	0.0	1.0
+fr	02_wind_on	1	205	0.0	1.0
 fr	03_wind_off	1	205	0.0	0.0
 fr	04_res	1	205	0.0	0.0
 fr	05_nuclear	1	205	0.0	0.0
@@ -7892,8 +7892,8 @@ fr	06_coal	1	205	0.0	0.0
 fr	07_gas	1	205	0.0	0.0
 fr	08_non-res	1	205	0.0	0.0
 fr	09_hydro_pump	1	205	0.0	0.0
-fr	01_solar	1	206	1.0	0.0
-fr	02_wind_on	1	206	1.0	0.0
+fr	01_solar	1	206	0.0	1.0
+fr	02_wind_on	1	206	0.0	1.0
 fr	03_wind_off	1	206	0.0	0.0
 fr	04_res	1	206	0.0	0.0
 fr	05_nuclear	1	206	0.0	0.0
@@ -7901,8 +7901,8 @@ fr	06_coal	1	206	0.0	0.0
 fr	07_gas	1	206	0.0	0.0
 fr	08_non-res	1	206	0.0	0.0
 fr	09_hydro_pump	1	206	0.0	0.0
-fr	01_solar	1	207	1.0	0.0
-fr	02_wind_on	1	207	1.0	0.0
+fr	01_solar	1	207	0.0	1.0
+fr	02_wind_on	1	207	0.0	1.0
 fr	03_wind_off	1	207	0.0	0.0
 fr	04_res	1	207	0.0	0.0
 fr	05_nuclear	1	207	0.0	0.0
@@ -7910,8 +7910,8 @@ fr	06_coal	1	207	0.0	0.0
 fr	07_gas	1	207	0.0	0.0
 fr	08_non-res	1	207	0.0	0.0
 fr	09_hydro_pump	1	207	0.0	0.0
-fr	01_solar	1	208	1.0	0.0
-fr	02_wind_on	1	208	1.0	0.0
+fr	01_solar	1	208	0.0	1.0
+fr	02_wind_on	1	208	0.0	1.0
 fr	03_wind_off	1	208	0.0	0.0
 fr	04_res	1	208	0.0	0.0
 fr	05_nuclear	1	208	0.0	0.0
@@ -7919,8 +7919,8 @@ fr	06_coal	1	208	0.0	0.0
 fr	07_gas	1	208	0.0	0.0
 fr	08_non-res	1	208	0.0	0.0
 fr	09_hydro_pump	1	208	0.0	0.0
-fr	01_solar	1	209	1.0	0.0
-fr	02_wind_on	1	209	1.0	0.0
+fr	01_solar	1	209	0.0	1.0
+fr	02_wind_on	1	209	0.0	1.0
 fr	03_wind_off	1	209	0.0	0.0
 fr	04_res	1	209	0.0	0.0
 fr	05_nuclear	1	209	0.0	0.0
@@ -7928,1149 +7928,1149 @@ fr	06_coal	1	209	0.0	0.0
 fr	07_gas	1	209	0.0	0.0
 fr	08_non-res	1	209	0.0	0.0
 fr	09_hydro_pump	1	209	0.0	0.0
-fr	01_solar	1	210	1.0	0.0
-fr	02_wind_on	1	210	1.0	0.0
-fr	03_wind_off	1	210	1.0	0.0
+fr	01_solar	1	210	0.0	1.0
+fr	02_wind_on	1	210	0.0	1.0
+fr	03_wind_off	1	210	0.0	1.0
 fr	04_res	1	210	0.0	0.0
 fr	05_nuclear	1	210	0.0	0.0
 fr	06_coal	1	210	0.0	0.0
 fr	07_gas	1	210	0.0	0.0
 fr	08_non-res	1	210	0.0	0.0
 fr	09_hydro_pump	1	210	0.0	0.0
-fr	01_solar	1	211	1.0	0.0
-fr	02_wind_on	1	211	1.0	0.0
-fr	03_wind_off	1	211	1.0	0.0
+fr	01_solar	1	211	0.0	1.0
+fr	02_wind_on	1	211	0.0	1.0
+fr	03_wind_off	1	211	0.0	1.0
 fr	04_res	1	211	0.0	0.0
 fr	05_nuclear	1	211	0.0	0.0
 fr	06_coal	1	211	0.0	0.0
 fr	07_gas	1	211	0.0	0.0
 fr	08_non-res	1	211	0.0	0.0
 fr	09_hydro_pump	1	211	0.0	0.0
-fr	01_solar	1	212	1.0	0.0
-fr	02_wind_on	1	212	1.0	0.0
-fr	03_wind_off	1	212	1.0	0.0
+fr	01_solar	1	212	0.0	1.0
+fr	02_wind_on	1	212	0.0	1.0
+fr	03_wind_off	1	212	0.0	1.0
 fr	04_res	1	212	0.0	0.0
 fr	05_nuclear	1	212	0.0	0.0
 fr	06_coal	1	212	0.0	0.0
 fr	07_gas	1	212	0.0	0.0
 fr	08_non-res	1	212	0.0	0.0
 fr	09_hydro_pump	1	212	0.0	0.0
-fr	01_solar	1	213	1.0	0.0
-fr	02_wind_on	1	213	1.0	0.0
-fr	03_wind_off	1	213	1.0	0.0
+fr	01_solar	1	213	0.0	1.0
+fr	02_wind_on	1	213	0.0	1.0
+fr	03_wind_off	1	213	0.0	1.0
 fr	04_res	1	213	0.0	0.0
 fr	05_nuclear	1	213	0.0	0.0
 fr	06_coal	1	213	0.0	0.0
 fr	07_gas	1	213	0.0	0.0
 fr	08_non-res	1	213	0.0	0.0
 fr	09_hydro_pump	1	213	0.0	0.0
-fr	01_solar	1	214	1.0	0.0
-fr	02_wind_on	1	214	1.0	0.0
-fr	03_wind_off	1	214	1.0	0.0
+fr	01_solar	1	214	0.0	1.0
+fr	02_wind_on	1	214	0.0	1.0
+fr	03_wind_off	1	214	0.0	1.0
 fr	04_res	1	214	0.0	0.0
 fr	05_nuclear	1	214	0.0	0.0
 fr	06_coal	1	214	0.0	0.0
 fr	07_gas	1	214	0.0	0.0
 fr	08_non-res	1	214	0.0	0.0
 fr	09_hydro_pump	1	214	0.0	0.0
-fr	01_solar	1	215	1.0	0.0
-fr	02_wind_on	1	215	1.0	0.0
-fr	03_wind_off	1	215	1.0	0.0
+fr	01_solar	1	215	0.0	1.0
+fr	02_wind_on	1	215	0.0	1.0
+fr	03_wind_off	1	215	0.0	1.0
 fr	04_res	1	215	0.0	0.0
 fr	05_nuclear	1	215	0.0	0.0
 fr	06_coal	1	215	0.0	0.0
 fr	07_gas	1	215	0.0	0.0
 fr	08_non-res	1	215	0.0	0.0
 fr	09_hydro_pump	1	215	0.0	0.0
-fr	01_solar	1	216	1.0	0.0
-fr	02_wind_on	1	216	1.0	0.0
-fr	03_wind_off	1	216	1.0	0.0
+fr	01_solar	1	216	0.0	1.0
+fr	02_wind_on	1	216	0.0	1.0
+fr	03_wind_off	1	216	0.0	1.0
 fr	04_res	1	216	0.0	0.0
 fr	05_nuclear	1	216	0.0	0.0
 fr	06_coal	1	216	0.0	0.0
 fr	07_gas	1	216	0.0	0.0
 fr	08_non-res	1	216	0.0	0.0
 fr	09_hydro_pump	1	216	0.0	0.0
-fr	01_solar	1	217	1.0	0.0
-fr	02_wind_on	1	217	1.0	0.0
-fr	03_wind_off	1	217	1.0	0.0
+fr	01_solar	1	217	0.0	1.0
+fr	02_wind_on	1	217	0.0	1.0
+fr	03_wind_off	1	217	0.0	1.0
 fr	04_res	1	217	0.0	0.0
 fr	05_nuclear	1	217	0.0	0.0
 fr	06_coal	1	217	0.0	0.0
 fr	07_gas	1	217	0.0	0.0
 fr	08_non-res	1	217	0.0	0.0
 fr	09_hydro_pump	1	217	0.0	0.0
-fr	01_solar	1	218	1.0	0.0
-fr	02_wind_on	1	218	1.0	0.0
-fr	03_wind_off	1	218	1.0	0.0
+fr	01_solar	1	218	0.0	1.0
+fr	02_wind_on	1	218	0.0	1.0
+fr	03_wind_off	1	218	0.0	1.0
 fr	04_res	1	218	0.0	0.0
 fr	05_nuclear	1	218	0.0	0.0
 fr	06_coal	1	218	0.0	0.0
 fr	07_gas	1	218	0.0	0.0
 fr	08_non-res	1	218	0.0	0.0
 fr	09_hydro_pump	1	218	0.0	0.0
-fr	01_solar	1	219	1.0	0.0
-fr	02_wind_on	1	219	1.0	0.0
-fr	03_wind_off	1	219	1.0	0.0
+fr	01_solar	1	219	0.0	1.0
+fr	02_wind_on	1	219	0.0	1.0
+fr	03_wind_off	1	219	0.0	1.0
 fr	04_res	1	219	0.0	0.0
 fr	05_nuclear	1	219	0.0	0.0
 fr	06_coal	1	219	0.0	0.0
 fr	07_gas	1	219	0.0	0.0
 fr	08_non-res	1	219	0.0	0.0
 fr	09_hydro_pump	1	219	0.0	0.0
-fr	01_solar	1	220	1.0	0.0
-fr	02_wind_on	1	220	1.0	0.0
-fr	03_wind_off	1	220	1.0	0.0
+fr	01_solar	1	220	0.0	1.0
+fr	02_wind_on	1	220	0.0	1.0
+fr	03_wind_off	1	220	0.0	1.0
 fr	04_res	1	220	0.0	0.0
 fr	05_nuclear	1	220	0.0	0.0
 fr	06_coal	1	220	0.0	0.0
 fr	07_gas	1	220	0.0	0.0
 fr	08_non-res	1	220	0.0	0.0
 fr	09_hydro_pump	1	220	0.0	0.0
-fr	01_solar	1	221	1.0	0.0
-fr	02_wind_on	1	221	1.0	0.0
-fr	03_wind_off	1	221	1.0	0.0
+fr	01_solar	1	221	0.0	1.0
+fr	02_wind_on	1	221	0.0	1.0
+fr	03_wind_off	1	221	0.0	1.0
 fr	04_res	1	221	0.0	0.0
 fr	05_nuclear	1	221	0.0	0.0
 fr	06_coal	1	221	0.0	0.0
 fr	07_gas	1	221	0.0	0.0
 fr	08_non-res	1	221	0.0	0.0
 fr	09_hydro_pump	1	221	0.0	0.0
-fr	01_solar	1	222	1.0	0.0
-fr	02_wind_on	1	222	1.0	0.0
-fr	03_wind_off	1	222	1.0	0.0
+fr	01_solar	1	222	0.0	1.0
+fr	02_wind_on	1	222	0.0	1.0
+fr	03_wind_off	1	222	0.0	1.0
 fr	04_res	1	222	0.0	0.0
 fr	05_nuclear	1	222	0.0	0.0
 fr	06_coal	1	222	0.0	0.0
 fr	07_gas	1	222	0.0	0.0
 fr	08_non-res	1	222	0.0	0.0
 fr	09_hydro_pump	1	222	0.0	0.0
-fr	01_solar	1	223	1.0	0.0
-fr	02_wind_on	1	223	1.0	0.0
-fr	03_wind_off	1	223	1.0	0.0
+fr	01_solar	1	223	0.0	1.0
+fr	02_wind_on	1	223	0.0	1.0
+fr	03_wind_off	1	223	0.0	1.0
 fr	04_res	1	223	0.0	0.0
 fr	05_nuclear	1	223	0.0	0.0
 fr	06_coal	1	223	0.0	0.0
 fr	07_gas	1	223	0.0	0.0
 fr	08_non-res	1	223	0.0	0.0
 fr	09_hydro_pump	1	223	0.0	0.0
-fr	01_solar	1	224	1.0	0.0
-fr	02_wind_on	1	224	1.0	0.0
-fr	03_wind_off	1	224	1.0	0.0
+fr	01_solar	1	224	0.0	1.0
+fr	02_wind_on	1	224	0.0	1.0
+fr	03_wind_off	1	224	0.0	1.0
 fr	04_res	1	224	0.0	0.0
 fr	05_nuclear	1	224	0.0	0.0
 fr	06_coal	1	224	0.0	0.0
 fr	07_gas	1	224	0.0	0.0
 fr	08_non-res	1	224	0.0	0.0
 fr	09_hydro_pump	1	224	0.0	0.0
-fr	01_solar	1	225	1.0	0.0
-fr	02_wind_on	1	225	1.0	0.0
-fr	03_wind_off	1	225	1.0	0.0
+fr	01_solar	1	225	0.0	1.0
+fr	02_wind_on	1	225	0.0	1.0
+fr	03_wind_off	1	225	0.0	1.0
 fr	04_res	1	225	0.0	0.0
 fr	05_nuclear	1	225	0.0	0.0
 fr	06_coal	1	225	0.0	0.0
 fr	07_gas	1	225	0.0	0.0
 fr	08_non-res	1	225	0.0	0.0
 fr	09_hydro_pump	1	225	0.0	0.0
-fr	01_solar	1	226	1.0	0.0
-fr	02_wind_on	1	226	1.0	0.0
-fr	03_wind_off	1	226	1.0	0.0
+fr	01_solar	1	226	0.0	1.0
+fr	02_wind_on	1	226	0.0	1.0
+fr	03_wind_off	1	226	0.0	1.0
 fr	04_res	1	226	0.0	0.0
 fr	05_nuclear	1	226	0.0	0.0
 fr	06_coal	1	226	0.0	0.0
 fr	07_gas	1	226	0.0	0.0
 fr	08_non-res	1	226	0.0	0.0
 fr	09_hydro_pump	1	226	0.0	0.0
-fr	01_solar	1	227	1.0	0.0
-fr	02_wind_on	1	227	1.0	0.0
-fr	03_wind_off	1	227	1.0	0.0
+fr	01_solar	1	227	0.0	1.0
+fr	02_wind_on	1	227	0.0	1.0
+fr	03_wind_off	1	227	0.0	1.0
 fr	04_res	1	227	0.0	0.0
 fr	05_nuclear	1	227	0.0	0.0
 fr	06_coal	1	227	0.0	0.0
 fr	07_gas	1	227	0.0	0.0
 fr	08_non-res	1	227	0.0	0.0
 fr	09_hydro_pump	1	227	0.0	0.0
-fr	01_solar	1	228	1.0	0.0
-fr	02_wind_on	1	228	1.0	0.0
-fr	03_wind_off	1	228	1.0	0.0
+fr	01_solar	1	228	0.0	1.0
+fr	02_wind_on	1	228	0.0	1.0
+fr	03_wind_off	1	228	0.0	1.0
 fr	04_res	1	228	0.0	0.0
 fr	05_nuclear	1	228	0.0	0.0
 fr	06_coal	1	228	0.0	0.0
 fr	07_gas	1	228	0.0	0.0
 fr	08_non-res	1	228	0.0	0.0
 fr	09_hydro_pump	1	228	0.0	0.0
-fr	01_solar	1	229	1.0	0.0
-fr	02_wind_on	1	229	1.0	0.0
-fr	03_wind_off	1	229	1.0	0.0
+fr	01_solar	1	229	0.0	1.0
+fr	02_wind_on	1	229	0.0	1.0
+fr	03_wind_off	1	229	0.0	1.0
 fr	04_res	1	229	0.0	0.0
 fr	05_nuclear	1	229	0.0	0.0
 fr	06_coal	1	229	0.0	0.0
 fr	07_gas	1	229	0.0	0.0
 fr	08_non-res	1	229	0.0	0.0
 fr	09_hydro_pump	1	229	0.0	0.0
-fr	01_solar	1	230	1.0	0.0
-fr	02_wind_on	1	230	1.0	0.0
-fr	03_wind_off	1	230	1.0	0.0
-fr	04_res	1	230	1.0	0.0
+fr	01_solar	1	230	0.0	1.0
+fr	02_wind_on	1	230	0.0	1.0
+fr	03_wind_off	1	230	0.0	1.0
+fr	04_res	1	230	0.0	1.0
 fr	05_nuclear	1	230	0.0	0.0
 fr	06_coal	1	230	0.0	0.0
 fr	07_gas	1	230	0.0	0.0
 fr	08_non-res	1	230	0.0	0.0
 fr	09_hydro_pump	1	230	0.0	0.0
-fr	01_solar	1	231	1.0	0.0
-fr	02_wind_on	1	231	1.0	0.0
-fr	03_wind_off	1	231	1.0	0.0
-fr	04_res	1	231	1.0	0.0
+fr	01_solar	1	231	0.0	1.0
+fr	02_wind_on	1	231	0.0	1.0
+fr	03_wind_off	1	231	0.0	1.0
+fr	04_res	1	231	0.0	1.0
 fr	05_nuclear	1	231	0.0	0.0
 fr	06_coal	1	231	0.0	0.0
 fr	07_gas	1	231	0.0	0.0
 fr	08_non-res	1	231	0.0	0.0
 fr	09_hydro_pump	1	231	0.0	0.0
-fr	01_solar	1	232	1.0	0.0
-fr	02_wind_on	1	232	1.0	0.0
-fr	03_wind_off	1	232	1.0	0.0
-fr	04_res	1	232	1.0	0.0
+fr	01_solar	1	232	0.0	1.0
+fr	02_wind_on	1	232	0.0	1.0
+fr	03_wind_off	1	232	0.0	1.0
+fr	04_res	1	232	0.0	1.0
 fr	05_nuclear	1	232	0.0	0.0
 fr	06_coal	1	232	0.0	0.0
 fr	07_gas	1	232	0.0	0.0
 fr	08_non-res	1	232	0.0	0.0
 fr	09_hydro_pump	1	232	0.0	0.0
-fr	01_solar	1	233	1.0	0.0
-fr	02_wind_on	1	233	1.0	0.0
-fr	03_wind_off	1	233	1.0	0.0
-fr	04_res	1	233	1.0	0.0
+fr	01_solar	1	233	0.0	1.0
+fr	02_wind_on	1	233	0.0	1.0
+fr	03_wind_off	1	233	0.0	1.0
+fr	04_res	1	233	0.0	1.0
 fr	05_nuclear	1	233	0.0	0.0
 fr	06_coal	1	233	0.0	0.0
 fr	07_gas	1	233	0.0	0.0
 fr	08_non-res	1	233	0.0	0.0
 fr	09_hydro_pump	1	233	0.0	0.0
-fr	01_solar	1	234	1.0	0.0
-fr	02_wind_on	1	234	1.0	0.0
-fr	03_wind_off	1	234	1.0	0.0
-fr	04_res	1	234	1.0	0.0
+fr	01_solar	1	234	0.0	1.0
+fr	02_wind_on	1	234	0.0	1.0
+fr	03_wind_off	1	234	0.0	1.0
+fr	04_res	1	234	0.0	1.0
 fr	05_nuclear	1	234	0.0	0.0
 fr	06_coal	1	234	0.0	0.0
 fr	07_gas	1	234	0.0	0.0
 fr	08_non-res	1	234	0.0	0.0
 fr	09_hydro_pump	1	234	0.0	0.0
-fr	01_solar	1	235	1.0	0.0
-fr	02_wind_on	1	235	1.0	0.0
-fr	03_wind_off	1	235	1.0	0.0
-fr	04_res	1	235	1.0	0.0
+fr	01_solar	1	235	0.0	1.0
+fr	02_wind_on	1	235	0.0	1.0
+fr	03_wind_off	1	235	0.0	1.0
+fr	04_res	1	235	0.0	1.0
 fr	05_nuclear	1	235	0.0	0.0
 fr	06_coal	1	235	0.0	0.0
 fr	07_gas	1	235	0.0	0.0
 fr	08_non-res	1	235	0.0	0.0
 fr	09_hydro_pump	1	235	0.0	0.0
-fr	01_solar	1	236	1.0	0.0
-fr	02_wind_on	1	236	1.0	0.0
-fr	03_wind_off	1	236	1.0	0.0
-fr	04_res	1	236	1.0	0.0
+fr	01_solar	1	236	0.0	1.0
+fr	02_wind_on	1	236	0.0	1.0
+fr	03_wind_off	1	236	0.0	1.0
+fr	04_res	1	236	0.0	1.0
 fr	05_nuclear	1	236	0.0	0.0
 fr	06_coal	1	236	0.0	0.0
 fr	07_gas	1	236	0.0	0.0
 fr	08_non-res	1	236	0.0	0.0
 fr	09_hydro_pump	1	236	0.0	0.0
-fr	01_solar	1	237	1.0	0.0
-fr	02_wind_on	1	237	1.0	0.0
-fr	03_wind_off	1	237	1.0	0.0
-fr	04_res	1	237	1.0	0.0
+fr	01_solar	1	237	0.0	1.0
+fr	02_wind_on	1	237	0.0	1.0
+fr	03_wind_off	1	237	0.0	1.0
+fr	04_res	1	237	0.0	1.0
 fr	05_nuclear	1	237	0.0	0.0
 fr	06_coal	1	237	0.0	0.0
 fr	07_gas	1	237	0.0	0.0
 fr	08_non-res	1	237	0.0	0.0
 fr	09_hydro_pump	1	237	0.0	0.0
-fr	01_solar	1	238	1.0	0.0
-fr	02_wind_on	1	238	1.0	0.0
-fr	03_wind_off	1	238	1.0	0.0
-fr	04_res	1	238	1.0	0.0
+fr	01_solar	1	238	0.0	1.0
+fr	02_wind_on	1	238	0.0	1.0
+fr	03_wind_off	1	238	0.0	1.0
+fr	04_res	1	238	0.0	1.0
 fr	05_nuclear	1	238	0.0	0.0
 fr	06_coal	1	238	0.0	0.0
 fr	07_gas	1	238	0.0	0.0
 fr	08_non-res	1	238	0.0	0.0
 fr	09_hydro_pump	1	238	0.0	0.0
-fr	01_solar	1	239	1.0	0.0
-fr	02_wind_on	1	239	1.0	0.0
-fr	03_wind_off	1	239	1.0	0.0
-fr	04_res	1	239	1.0	0.0
+fr	01_solar	1	239	0.0	1.0
+fr	02_wind_on	1	239	0.0	1.0
+fr	03_wind_off	1	239	0.0	1.0
+fr	04_res	1	239	0.0	1.0
 fr	05_nuclear	1	239	0.0	0.0
 fr	06_coal	1	239	0.0	0.0
 fr	07_gas	1	239	0.0	0.0
 fr	08_non-res	1	239	0.0	0.0
 fr	09_hydro_pump	1	239	0.0	0.0
-fr	01_solar	1	240	1.0	0.0
-fr	02_wind_on	1	240	1.0	0.0
-fr	03_wind_off	1	240	1.0	0.0
-fr	04_res	1	240	1.0	0.0
+fr	01_solar	1	240	0.0	1.0
+fr	02_wind_on	1	240	0.0	1.0
+fr	03_wind_off	1	240	0.0	1.0
+fr	04_res	1	240	0.0	1.0
 fr	05_nuclear	1	240	0.0	0.0
 fr	06_coal	1	240	0.0	0.0
 fr	07_gas	1	240	0.0	0.0
 fr	08_non-res	1	240	0.0	0.0
 fr	09_hydro_pump	1	240	0.0	0.0
-fr	01_solar	1	241	1.0	0.0
-fr	02_wind_on	1	241	1.0	0.0
-fr	03_wind_off	1	241	1.0	0.0
-fr	04_res	1	241	1.0	0.0
+fr	01_solar	1	241	0.0	1.0
+fr	02_wind_on	1	241	0.0	1.0
+fr	03_wind_off	1	241	0.0	1.0
+fr	04_res	1	241	0.0	1.0
 fr	05_nuclear	1	241	0.0	0.0
 fr	06_coal	1	241	0.0	0.0
 fr	07_gas	1	241	0.0	0.0
 fr	08_non-res	1	241	0.0	0.0
 fr	09_hydro_pump	1	241	0.0	0.0
-fr	01_solar	1	242	1.0	0.0
-fr	02_wind_on	1	242	1.0	0.0
-fr	03_wind_off	1	242	1.0	0.0
-fr	04_res	1	242	1.0	0.0
+fr	01_solar	1	242	0.0	1.0
+fr	02_wind_on	1	242	0.0	1.0
+fr	03_wind_off	1	242	0.0	1.0
+fr	04_res	1	242	0.0	1.0
 fr	05_nuclear	1	242	0.0	0.0
 fr	06_coal	1	242	0.0	0.0
 fr	07_gas	1	242	0.0	0.0
 fr	08_non-res	1	242	0.0	0.0
 fr	09_hydro_pump	1	242	0.0	0.0
-fr	01_solar	1	243	1.0	0.0
-fr	02_wind_on	1	243	1.0	0.0
-fr	03_wind_off	1	243	1.0	0.0
-fr	04_res	1	243	1.0	0.0
+fr	01_solar	1	243	0.0	1.0
+fr	02_wind_on	1	243	0.0	1.0
+fr	03_wind_off	1	243	0.0	1.0
+fr	04_res	1	243	0.0	1.0
 fr	05_nuclear	1	243	0.0	0.0
 fr	06_coal	1	243	0.0	0.0
 fr	07_gas	1	243	0.0	0.0
 fr	08_non-res	1	243	0.0	0.0
 fr	09_hydro_pump	1	243	0.0	0.0
-fr	01_solar	1	244	1.0	0.0
-fr	02_wind_on	1	244	1.0	0.0
-fr	03_wind_off	1	244	1.0	0.0
-fr	04_res	1	244	1.0	0.0
+fr	01_solar	1	244	0.0	1.0
+fr	02_wind_on	1	244	0.0	1.0
+fr	03_wind_off	1	244	0.0	1.0
+fr	04_res	1	244	0.0	1.0
 fr	05_nuclear	1	244	0.0	0.0
 fr	06_coal	1	244	0.0	0.0
 fr	07_gas	1	244	0.0	0.0
 fr	08_non-res	1	244	0.0	0.0
 fr	09_hydro_pump	1	244	0.0	0.0
-fr	01_solar	1	245	1.0	0.0
-fr	02_wind_on	1	245	1.0	0.0
-fr	03_wind_off	1	245	1.0	0.0
-fr	04_res	1	245	1.0	0.0
+fr	01_solar	1	245	0.0	1.0
+fr	02_wind_on	1	245	0.0	1.0
+fr	03_wind_off	1	245	0.0	1.0
+fr	04_res	1	245	0.0	1.0
 fr	05_nuclear	1	245	0.0	0.0
 fr	06_coal	1	245	0.0	0.0
 fr	07_gas	1	245	0.0	0.0
 fr	08_non-res	1	245	0.0	0.0
 fr	09_hydro_pump	1	245	0.0	0.0
-fr	01_solar	1	246	1.0	0.0
-fr	02_wind_on	1	246	1.0	0.0
-fr	03_wind_off	1	246	1.0	0.0
-fr	04_res	1	246	1.0	0.0
+fr	01_solar	1	246	0.0	1.0
+fr	02_wind_on	1	246	0.0	1.0
+fr	03_wind_off	1	246	0.0	1.0
+fr	04_res	1	246	0.0	1.0
 fr	05_nuclear	1	246	0.0	0.0
 fr	06_coal	1	246	0.0	0.0
 fr	07_gas	1	246	0.0	0.0
 fr	08_non-res	1	246	0.0	0.0
 fr	09_hydro_pump	1	246	0.0	0.0
-fr	01_solar	1	247	1.0	0.0
-fr	02_wind_on	1	247	1.0	0.0
-fr	03_wind_off	1	247	1.0	0.0
-fr	04_res	1	247	1.0	0.0
+fr	01_solar	1	247	0.0	1.0
+fr	02_wind_on	1	247	0.0	1.0
+fr	03_wind_off	1	247	0.0	1.0
+fr	04_res	1	247	0.0	1.0
 fr	05_nuclear	1	247	0.0	0.0
 fr	06_coal	1	247	0.0	0.0
 fr	07_gas	1	247	0.0	0.0
 fr	08_non-res	1	247	0.0	0.0
 fr	09_hydro_pump	1	247	0.0	0.0
-fr	01_solar	1	248	1.0	0.0
-fr	02_wind_on	1	248	1.0	0.0
-fr	03_wind_off	1	248	1.0	0.0
-fr	04_res	1	248	1.0	0.0
+fr	01_solar	1	248	0.0	1.0
+fr	02_wind_on	1	248	0.0	1.0
+fr	03_wind_off	1	248	0.0	1.0
+fr	04_res	1	248	0.0	1.0
 fr	05_nuclear	1	248	0.0	0.0
 fr	06_coal	1	248	0.0	0.0
 fr	07_gas	1	248	0.0	0.0
 fr	08_non-res	1	248	0.0	0.0
 fr	09_hydro_pump	1	248	0.0	0.0
-fr	01_solar	1	249	1.0	0.0
-fr	02_wind_on	1	249	1.0	0.0
-fr	03_wind_off	1	249	1.0	0.0
-fr	04_res	1	249	1.0	0.0
+fr	01_solar	1	249	0.0	1.0
+fr	02_wind_on	1	249	0.0	1.0
+fr	03_wind_off	1	249	0.0	1.0
+fr	04_res	1	249	0.0	1.0
 fr	05_nuclear	1	249	0.0	0.0
 fr	06_coal	1	249	0.0	0.0
 fr	07_gas	1	249	0.0	0.0
 fr	08_non-res	1	249	0.0	0.0
 fr	09_hydro_pump	1	249	0.0	0.0
-fr	01_solar	1	250	1.0	0.0
-fr	02_wind_on	1	250	1.0	0.0
-fr	03_wind_off	1	250	1.0	0.0
-fr	04_res	1	250	1.0	0.0
-fr	05_nuclear	1	250	1.0	0.0
+fr	01_solar	1	250	0.0	1.0
+fr	02_wind_on	1	250	0.0	1.0
+fr	03_wind_off	1	250	0.0	1.0
+fr	04_res	1	250	0.0	1.0
+fr	05_nuclear	1	250	0.0	1.0
 fr	06_coal	1	250	0.0	0.0
 fr	07_gas	1	250	0.0	0.0
 fr	08_non-res	1	250	0.0	0.0
 fr	09_hydro_pump	1	250	0.0	0.0
-fr	01_solar	1	251	1.0	0.0
-fr	02_wind_on	1	251	1.0	0.0
-fr	03_wind_off	1	251	1.0	0.0
-fr	04_res	1	251	1.0	0.0
-fr	05_nuclear	1	251	1.0	0.0
+fr	01_solar	1	251	0.0	1.0
+fr	02_wind_on	1	251	0.0	1.0
+fr	03_wind_off	1	251	0.0	1.0
+fr	04_res	1	251	0.0	1.0
+fr	05_nuclear	1	251	0.0	1.0
 fr	06_coal	1	251	0.0	0.0
 fr	07_gas	1	251	0.0	0.0
 fr	08_non-res	1	251	0.0	0.0
 fr	09_hydro_pump	1	251	0.0	0.0
-fr	01_solar	1	252	1.0	0.0
-fr	02_wind_on	1	252	1.0	0.0
-fr	03_wind_off	1	252	1.0	0.0
-fr	04_res	1	252	1.0	0.0
-fr	05_nuclear	1	252	1.0	0.0
+fr	01_solar	1	252	0.0	1.0
+fr	02_wind_on	1	252	0.0	1.0
+fr	03_wind_off	1	252	0.0	1.0
+fr	04_res	1	252	0.0	1.0
+fr	05_nuclear	1	252	0.0	1.0
 fr	06_coal	1	252	0.0	0.0
 fr	07_gas	1	252	0.0	0.0
 fr	08_non-res	1	252	0.0	0.0
 fr	09_hydro_pump	1	252	0.0	0.0
-fr	01_solar	1	253	1.0	0.0
-fr	02_wind_on	1	253	1.0	0.0
-fr	03_wind_off	1	253	1.0	0.0
-fr	04_res	1	253	1.0	0.0
-fr	05_nuclear	1	253	1.0	0.0
+fr	01_solar	1	253	0.0	1.0
+fr	02_wind_on	1	253	0.0	1.0
+fr	03_wind_off	1	253	0.0	1.0
+fr	04_res	1	253	0.0	1.0
+fr	05_nuclear	1	253	0.0	1.0
 fr	06_coal	1	253	0.0	0.0
 fr	07_gas	1	253	0.0	0.0
 fr	08_non-res	1	253	0.0	0.0
 fr	09_hydro_pump	1	253	0.0	0.0
-fr	01_solar	1	254	1.0	0.0
-fr	02_wind_on	1	254	1.0	0.0
-fr	03_wind_off	1	254	1.0	0.0
-fr	04_res	1	254	1.0	0.0
-fr	05_nuclear	1	254	1.0	0.0
+fr	01_solar	1	254	0.0	1.0
+fr	02_wind_on	1	254	0.0	1.0
+fr	03_wind_off	1	254	0.0	1.0
+fr	04_res	1	254	0.0	1.0
+fr	05_nuclear	1	254	0.0	1.0
 fr	06_coal	1	254	0.0	0.0
 fr	07_gas	1	254	0.0	0.0
 fr	08_non-res	1	254	0.0	0.0
 fr	09_hydro_pump	1	254	0.0	0.0
-fr	01_solar	1	255	1.0	0.0
-fr	02_wind_on	1	255	1.0	0.0
-fr	03_wind_off	1	255	1.0	0.0
-fr	04_res	1	255	1.0	0.0
-fr	05_nuclear	1	255	1.0	0.0
+fr	01_solar	1	255	0.0	1.0
+fr	02_wind_on	1	255	0.0	1.0
+fr	03_wind_off	1	255	0.0	1.0
+fr	04_res	1	255	0.0	1.0
+fr	05_nuclear	1	255	0.0	1.0
 fr	06_coal	1	255	0.0	0.0
 fr	07_gas	1	255	0.0	0.0
 fr	08_non-res	1	255	0.0	0.0
 fr	09_hydro_pump	1	255	0.0	0.0
-fr	01_solar	1	256	1.0	0.0
-fr	02_wind_on	1	256	1.0	0.0
-fr	03_wind_off	1	256	1.0	0.0
-fr	04_res	1	256	1.0	0.0
-fr	05_nuclear	1	256	1.0	0.0
+fr	01_solar	1	256	0.0	1.0
+fr	02_wind_on	1	256	0.0	1.0
+fr	03_wind_off	1	256	0.0	1.0
+fr	04_res	1	256	0.0	1.0
+fr	05_nuclear	1	256	0.0	1.0
 fr	06_coal	1	256	0.0	0.0
 fr	07_gas	1	256	0.0	0.0
 fr	08_non-res	1	256	0.0	0.0
 fr	09_hydro_pump	1	256	0.0	0.0
-fr	01_solar	1	257	1.0	0.0
-fr	02_wind_on	1	257	1.0	0.0
-fr	03_wind_off	1	257	1.0	0.0
-fr	04_res	1	257	1.0	0.0
-fr	05_nuclear	1	257	1.0	0.0
+fr	01_solar	1	257	0.0	1.0
+fr	02_wind_on	1	257	0.0	1.0
+fr	03_wind_off	1	257	0.0	1.0
+fr	04_res	1	257	0.0	1.0
+fr	05_nuclear	1	257	0.0	1.0
 fr	06_coal	1	257	0.0	0.0
 fr	07_gas	1	257	0.0	0.0
 fr	08_non-res	1	257	0.0	0.0
 fr	09_hydro_pump	1	257	0.0	0.0
-fr	01_solar	1	258	1.0	0.0
-fr	02_wind_on	1	258	1.0	0.0
-fr	03_wind_off	1	258	1.0	0.0
-fr	04_res	1	258	1.0	0.0
-fr	05_nuclear	1	258	1.0	0.0
+fr	01_solar	1	258	0.0	1.0
+fr	02_wind_on	1	258	0.0	1.0
+fr	03_wind_off	1	258	0.0	1.0
+fr	04_res	1	258	0.0	1.0
+fr	05_nuclear	1	258	0.0	1.0
 fr	06_coal	1	258	0.0	0.0
 fr	07_gas	1	258	0.0	0.0
 fr	08_non-res	1	258	0.0	0.0
 fr	09_hydro_pump	1	258	0.0	0.0
-fr	01_solar	1	259	1.0	0.0
-fr	02_wind_on	1	259	1.0	0.0
-fr	03_wind_off	1	259	1.0	0.0
-fr	04_res	1	259	1.0	0.0
-fr	05_nuclear	1	259	1.0	0.0
+fr	01_solar	1	259	0.0	1.0
+fr	02_wind_on	1	259	0.0	1.0
+fr	03_wind_off	1	259	0.0	1.0
+fr	04_res	1	259	0.0	1.0
+fr	05_nuclear	1	259	0.0	1.0
 fr	06_coal	1	259	0.0	0.0
 fr	07_gas	1	259	0.0	0.0
 fr	08_non-res	1	259	0.0	0.0
 fr	09_hydro_pump	1	259	0.0	0.0
-fr	01_solar	1	260	1.0	0.0
-fr	02_wind_on	1	260	1.0	0.0
-fr	03_wind_off	1	260	1.0	0.0
-fr	04_res	1	260	1.0	0.0
-fr	05_nuclear	1	260	1.0	0.0
+fr	01_solar	1	260	0.0	1.0
+fr	02_wind_on	1	260	0.0	1.0
+fr	03_wind_off	1	260	0.0	1.0
+fr	04_res	1	260	0.0	1.0
+fr	05_nuclear	1	260	0.0	1.0
 fr	06_coal	1	260	0.0	0.0
 fr	07_gas	1	260	0.0	0.0
 fr	08_non-res	1	260	0.0	0.0
 fr	09_hydro_pump	1	260	0.0	0.0
-fr	01_solar	1	261	1.0	0.0
-fr	02_wind_on	1	261	1.0	0.0
-fr	03_wind_off	1	261	1.0	0.0
-fr	04_res	1	261	1.0	0.0
-fr	05_nuclear	1	261	1.0	0.0
+fr	01_solar	1	261	0.0	1.0
+fr	02_wind_on	1	261	0.0	1.0
+fr	03_wind_off	1	261	0.0	1.0
+fr	04_res	1	261	0.0	1.0
+fr	05_nuclear	1	261	0.0	1.0
 fr	06_coal	1	261	0.0	0.0
 fr	07_gas	1	261	0.0	0.0
 fr	08_non-res	1	261	0.0	0.0
 fr	09_hydro_pump	1	261	0.0	0.0
-fr	01_solar	1	262	1.0	0.0
-fr	02_wind_on	1	262	1.0	0.0
-fr	03_wind_off	1	262	1.0	0.0
-fr	04_res	1	262	1.0	0.0
-fr	05_nuclear	1	262	1.0	0.0
+fr	01_solar	1	262	0.0	1.0
+fr	02_wind_on	1	262	0.0	1.0
+fr	03_wind_off	1	262	0.0	1.0
+fr	04_res	1	262	0.0	1.0
+fr	05_nuclear	1	262	0.0	1.0
 fr	06_coal	1	262	0.0	0.0
 fr	07_gas	1	262	0.0	0.0
 fr	08_non-res	1	262	0.0	0.0
 fr	09_hydro_pump	1	262	0.0	0.0
-fr	01_solar	1	263	1.0	0.0
-fr	02_wind_on	1	263	1.0	0.0
-fr	03_wind_off	1	263	1.0	0.0
-fr	04_res	1	263	1.0	0.0
-fr	05_nuclear	1	263	1.0	0.0
+fr	01_solar	1	263	0.0	1.0
+fr	02_wind_on	1	263	0.0	1.0
+fr	03_wind_off	1	263	0.0	1.0
+fr	04_res	1	263	0.0	1.0
+fr	05_nuclear	1	263	0.0	1.0
 fr	06_coal	1	263	0.0	0.0
 fr	07_gas	1	263	0.0	0.0
 fr	08_non-res	1	263	0.0	0.0
 fr	09_hydro_pump	1	263	0.0	0.0
-fr	01_solar	1	264	1.0	0.0
-fr	02_wind_on	1	264	1.0	0.0
-fr	03_wind_off	1	264	1.0	0.0
-fr	04_res	1	264	1.0	0.0
-fr	05_nuclear	1	264	1.0	0.0
+fr	01_solar	1	264	0.0	1.0
+fr	02_wind_on	1	264	0.0	1.0
+fr	03_wind_off	1	264	0.0	1.0
+fr	04_res	1	264	0.0	1.0
+fr	05_nuclear	1	264	0.0	1.0
 fr	06_coal	1	264	0.0	0.0
 fr	07_gas	1	264	0.0	0.0
 fr	08_non-res	1	264	0.0	0.0
 fr	09_hydro_pump	1	264	0.0	0.0
-fr	01_solar	1	265	1.0	0.0
-fr	02_wind_on	1	265	1.0	0.0
-fr	03_wind_off	1	265	1.0	0.0
-fr	04_res	1	265	1.0	0.0
-fr	05_nuclear	1	265	1.0	0.0
+fr	01_solar	1	265	0.0	1.0
+fr	02_wind_on	1	265	0.0	1.0
+fr	03_wind_off	1	265	0.0	1.0
+fr	04_res	1	265	0.0	1.0
+fr	05_nuclear	1	265	0.0	1.0
 fr	06_coal	1	265	0.0	0.0
 fr	07_gas	1	265	0.0	0.0
 fr	08_non-res	1	265	0.0	0.0
 fr	09_hydro_pump	1	265	0.0	0.0
-fr	01_solar	1	266	1.0	0.0
-fr	02_wind_on	1	266	1.0	0.0
-fr	03_wind_off	1	266	1.0	0.0
-fr	04_res	1	266	1.0	0.0
-fr	05_nuclear	1	266	1.0	0.0
+fr	01_solar	1	266	0.0	1.0
+fr	02_wind_on	1	266	0.0	1.0
+fr	03_wind_off	1	266	0.0	1.0
+fr	04_res	1	266	0.0	1.0
+fr	05_nuclear	1	266	0.0	1.0
 fr	06_coal	1	266	0.0	0.0
 fr	07_gas	1	266	0.0	0.0
 fr	08_non-res	1	266	0.0	0.0
 fr	09_hydro_pump	1	266	0.0	0.0
-fr	01_solar	1	267	1.0	0.0
-fr	02_wind_on	1	267	1.0	0.0
-fr	03_wind_off	1	267	1.0	0.0
-fr	04_res	1	267	1.0	0.0
-fr	05_nuclear	1	267	1.0	0.0
+fr	01_solar	1	267	0.0	1.0
+fr	02_wind_on	1	267	0.0	1.0
+fr	03_wind_off	1	267	0.0	1.0
+fr	04_res	1	267	0.0	1.0
+fr	05_nuclear	1	267	0.0	1.0
 fr	06_coal	1	267	0.0	0.0
 fr	07_gas	1	267	0.0	0.0
 fr	08_non-res	1	267	0.0	0.0
 fr	09_hydro_pump	1	267	0.0	0.0
-fr	01_solar	1	268	1.0	0.0
-fr	02_wind_on	1	268	1.0	0.0
-fr	03_wind_off	1	268	1.0	0.0
-fr	04_res	1	268	1.0	0.0
-fr	05_nuclear	1	268	1.0	0.0
+fr	01_solar	1	268	0.0	1.0
+fr	02_wind_on	1	268	0.0	1.0
+fr	03_wind_off	1	268	0.0	1.0
+fr	04_res	1	268	0.0	1.0
+fr	05_nuclear	1	268	0.0	1.0
 fr	06_coal	1	268	0.0	0.0
 fr	07_gas	1	268	0.0	0.0
 fr	08_non-res	1	268	0.0	0.0
 fr	09_hydro_pump	1	268	0.0	0.0
-fr	01_solar	1	269	1.0	0.0
-fr	02_wind_on	1	269	1.0	0.0
-fr	03_wind_off	1	269	1.0	0.0
-fr	04_res	1	269	1.0	0.0
-fr	05_nuclear	1	269	1.0	0.0
+fr	01_solar	1	269	0.0	1.0
+fr	02_wind_on	1	269	0.0	1.0
+fr	03_wind_off	1	269	0.0	1.0
+fr	04_res	1	269	0.0	1.0
+fr	05_nuclear	1	269	0.0	1.0
 fr	06_coal	1	269	0.0	0.0
 fr	07_gas	1	269	0.0	0.0
 fr	08_non-res	1	269	0.0	0.0
 fr	09_hydro_pump	1	269	0.0	0.0
-fr	01_solar	1	270	1.0	0.0
-fr	02_wind_on	1	270	1.0	0.0
-fr	03_wind_off	1	270	1.0	0.0
-fr	04_res	1	270	1.0	0.0
-fr	05_nuclear	1	270	1.0	0.0
-fr	06_coal	1	270	1.0	0.0
+fr	01_solar	1	270	0.0	1.0
+fr	02_wind_on	1	270	0.0	1.0
+fr	03_wind_off	1	270	0.0	1.0
+fr	04_res	1	270	0.0	1.0
+fr	05_nuclear	1	270	0.0	1.0
+fr	06_coal	1	270	0.0	1.0
 fr	07_gas	1	270	0.0	0.0
 fr	08_non-res	1	270	0.0	0.0
 fr	09_hydro_pump	1	270	0.0	0.0
-fr	01_solar	1	271	1.0	0.0
-fr	02_wind_on	1	271	1.0	0.0
-fr	03_wind_off	1	271	1.0	0.0
-fr	04_res	1	271	1.0	0.0
-fr	05_nuclear	1	271	1.0	0.0
-fr	06_coal	1	271	1.0	0.0
+fr	01_solar	1	271	0.0	1.0
+fr	02_wind_on	1	271	0.0	1.0
+fr	03_wind_off	1	271	0.0	1.0
+fr	04_res	1	271	0.0	1.0
+fr	05_nuclear	1	271	0.0	1.0
+fr	06_coal	1	271	0.0	1.0
 fr	07_gas	1	271	0.0	0.0
 fr	08_non-res	1	271	0.0	0.0
 fr	09_hydro_pump	1	271	0.0	0.0
-fr	01_solar	1	272	1.0	0.0
-fr	02_wind_on	1	272	1.0	0.0
-fr	03_wind_off	1	272	1.0	0.0
-fr	04_res	1	272	1.0	0.0
-fr	05_nuclear	1	272	1.0	0.0
-fr	06_coal	1	272	1.0	0.0
+fr	01_solar	1	272	0.0	1.0
+fr	02_wind_on	1	272	0.0	1.0
+fr	03_wind_off	1	272	0.0	1.0
+fr	04_res	1	272	0.0	1.0
+fr	05_nuclear	1	272	0.0	1.0
+fr	06_coal	1	272	0.0	1.0
 fr	07_gas	1	272	0.0	0.0
 fr	08_non-res	1	272	0.0	0.0
 fr	09_hydro_pump	1	272	0.0	0.0
-fr	01_solar	1	273	1.0	0.0
-fr	02_wind_on	1	273	1.0	0.0
-fr	03_wind_off	1	273	1.0	0.0
-fr	04_res	1	273	1.0	0.0
-fr	05_nuclear	1	273	1.0	0.0
-fr	06_coal	1	273	1.0	0.0
+fr	01_solar	1	273	0.0	1.0
+fr	02_wind_on	1	273	0.0	1.0
+fr	03_wind_off	1	273	0.0	1.0
+fr	04_res	1	273	0.0	1.0
+fr	05_nuclear	1	273	0.0	1.0
+fr	06_coal	1	273	0.0	1.0
 fr	07_gas	1	273	0.0	0.0
 fr	08_non-res	1	273	0.0	0.0
 fr	09_hydro_pump	1	273	0.0	0.0
-fr	01_solar	1	274	1.0	0.0
-fr	02_wind_on	1	274	1.0	0.0
-fr	03_wind_off	1	274	1.0	0.0
-fr	04_res	1	274	1.0	0.0
-fr	05_nuclear	1	274	1.0	0.0
-fr	06_coal	1	274	1.0	0.0
+fr	01_solar	1	274	0.0	1.0
+fr	02_wind_on	1	274	0.0	1.0
+fr	03_wind_off	1	274	0.0	1.0
+fr	04_res	1	274	0.0	1.0
+fr	05_nuclear	1	274	0.0	1.0
+fr	06_coal	1	274	0.0	1.0
 fr	07_gas	1	274	0.0	0.0
 fr	08_non-res	1	274	0.0	0.0
 fr	09_hydro_pump	1	274	0.0	0.0
-fr	01_solar	1	275	1.0	0.0
-fr	02_wind_on	1	275	1.0	0.0
-fr	03_wind_off	1	275	1.0	0.0
-fr	04_res	1	275	1.0	0.0
-fr	05_nuclear	1	275	1.0	0.0
-fr	06_coal	1	275	1.0	0.0
+fr	01_solar	1	275	0.0	1.0
+fr	02_wind_on	1	275	0.0	1.0
+fr	03_wind_off	1	275	0.0	1.0
+fr	04_res	1	275	0.0	1.0
+fr	05_nuclear	1	275	0.0	1.0
+fr	06_coal	1	275	0.0	1.0
 fr	07_gas	1	275	0.0	0.0
 fr	08_non-res	1	275	0.0	0.0
 fr	09_hydro_pump	1	275	0.0	0.0
-fr	01_solar	1	276	1.0	0.0
-fr	02_wind_on	1	276	1.0	0.0
-fr	03_wind_off	1	276	1.0	0.0
-fr	04_res	1	276	1.0	0.0
-fr	05_nuclear	1	276	1.0	0.0
-fr	06_coal	1	276	1.0	0.0
+fr	01_solar	1	276	0.0	1.0
+fr	02_wind_on	1	276	0.0	1.0
+fr	03_wind_off	1	276	0.0	1.0
+fr	04_res	1	276	0.0	1.0
+fr	05_nuclear	1	276	0.0	1.0
+fr	06_coal	1	276	0.0	1.0
 fr	07_gas	1	276	0.0	0.0
 fr	08_non-res	1	276	0.0	0.0
 fr	09_hydro_pump	1	276	0.0	0.0
-fr	01_solar	1	277	1.0	0.0
-fr	02_wind_on	1	277	1.0	0.0
-fr	03_wind_off	1	277	1.0	0.0
-fr	04_res	1	277	1.0	0.0
-fr	05_nuclear	1	277	1.0	0.0
-fr	06_coal	1	277	1.0	0.0
+fr	01_solar	1	277	0.0	1.0
+fr	02_wind_on	1	277	0.0	1.0
+fr	03_wind_off	1	277	0.0	1.0
+fr	04_res	1	277	0.0	1.0
+fr	05_nuclear	1	277	0.0	1.0
+fr	06_coal	1	277	0.0	1.0
 fr	07_gas	1	277	0.0	0.0
 fr	08_non-res	1	277	0.0	0.0
 fr	09_hydro_pump	1	277	0.0	0.0
-fr	01_solar	1	278	1.0	0.0
-fr	02_wind_on	1	278	1.0	0.0
-fr	03_wind_off	1	278	1.0	0.0
-fr	04_res	1	278	1.0	0.0
-fr	05_nuclear	1	278	1.0	0.0
-fr	06_coal	1	278	1.0	0.0
+fr	01_solar	1	278	0.0	1.0
+fr	02_wind_on	1	278	0.0	1.0
+fr	03_wind_off	1	278	0.0	1.0
+fr	04_res	1	278	0.0	1.0
+fr	05_nuclear	1	278	0.0	1.0
+fr	06_coal	1	278	0.0	1.0
 fr	07_gas	1	278	0.0	0.0
 fr	08_non-res	1	278	0.0	0.0
 fr	09_hydro_pump	1	278	0.0	0.0
-fr	01_solar	1	279	1.0	0.0
-fr	02_wind_on	1	279	1.0	0.0
-fr	03_wind_off	1	279	1.0	0.0
-fr	04_res	1	279	1.0	0.0
-fr	05_nuclear	1	279	1.0	0.0
-fr	06_coal	1	279	1.0	0.0
+fr	01_solar	1	279	0.0	1.0
+fr	02_wind_on	1	279	0.0	1.0
+fr	03_wind_off	1	279	0.0	1.0
+fr	04_res	1	279	0.0	1.0
+fr	05_nuclear	1	279	0.0	1.0
+fr	06_coal	1	279	0.0	1.0
 fr	07_gas	1	279	0.0	0.0
 fr	08_non-res	1	279	0.0	0.0
 fr	09_hydro_pump	1	279	0.0	0.0
-fr	01_solar	1	280	1.0	0.0
-fr	02_wind_on	1	280	1.0	0.0
-fr	03_wind_off	1	280	1.0	0.0
-fr	04_res	1	280	1.0	0.0
-fr	05_nuclear	1	280	1.0	0.0
-fr	06_coal	1	280	1.0	0.0
+fr	01_solar	1	280	0.0	1.0
+fr	02_wind_on	1	280	0.0	1.0
+fr	03_wind_off	1	280	0.0	1.0
+fr	04_res	1	280	0.0	1.0
+fr	05_nuclear	1	280	0.0	1.0
+fr	06_coal	1	280	0.0	1.0
 fr	07_gas	1	280	0.0	0.0
 fr	08_non-res	1	280	0.0	0.0
 fr	09_hydro_pump	1	280	0.0	0.0
-fr	01_solar	1	281	1.0	0.0
-fr	02_wind_on	1	281	1.0	0.0
-fr	03_wind_off	1	281	1.0	0.0
-fr	04_res	1	281	1.0	0.0
-fr	05_nuclear	1	281	1.0	0.0
-fr	06_coal	1	281	1.0	0.0
+fr	01_solar	1	281	0.0	1.0
+fr	02_wind_on	1	281	0.0	1.0
+fr	03_wind_off	1	281	0.0	1.0
+fr	04_res	1	281	0.0	1.0
+fr	05_nuclear	1	281	0.0	1.0
+fr	06_coal	1	281	0.0	1.0
 fr	07_gas	1	281	0.0	0.0
 fr	08_non-res	1	281	0.0	0.0
 fr	09_hydro_pump	1	281	0.0	0.0
-fr	01_solar	1	282	1.0	0.0
-fr	02_wind_on	1	282	1.0	0.0
-fr	03_wind_off	1	282	1.0	0.0
-fr	04_res	1	282	1.0	0.0
-fr	05_nuclear	1	282	1.0	0.0
-fr	06_coal	1	282	1.0	0.0
+fr	01_solar	1	282	0.0	1.0
+fr	02_wind_on	1	282	0.0	1.0
+fr	03_wind_off	1	282	0.0	1.0
+fr	04_res	1	282	0.0	1.0
+fr	05_nuclear	1	282	0.0	1.0
+fr	06_coal	1	282	0.0	1.0
 fr	07_gas	1	282	0.0	0.0
 fr	08_non-res	1	282	0.0	0.0
 fr	09_hydro_pump	1	282	0.0	0.0
-fr	01_solar	1	283	1.0	0.0
-fr	02_wind_on	1	283	1.0	0.0
-fr	03_wind_off	1	283	1.0	0.0
-fr	04_res	1	283	1.0	0.0
-fr	05_nuclear	1	283	1.0	0.0
-fr	06_coal	1	283	1.0	0.0
+fr	01_solar	1	283	0.0	1.0
+fr	02_wind_on	1	283	0.0	1.0
+fr	03_wind_off	1	283	0.0	1.0
+fr	04_res	1	283	0.0	1.0
+fr	05_nuclear	1	283	0.0	1.0
+fr	06_coal	1	283	0.0	1.0
 fr	07_gas	1	283	0.0	0.0
 fr	08_non-res	1	283	0.0	0.0
 fr	09_hydro_pump	1	283	0.0	0.0
-fr	01_solar	1	284	1.0	0.0
-fr	02_wind_on	1	284	1.0	0.0
-fr	03_wind_off	1	284	1.0	0.0
-fr	04_res	1	284	1.0	0.0
-fr	05_nuclear	1	284	1.0	0.0
-fr	06_coal	1	284	1.0	0.0
+fr	01_solar	1	284	0.0	1.0
+fr	02_wind_on	1	284	0.0	1.0
+fr	03_wind_off	1	284	0.0	1.0
+fr	04_res	1	284	0.0	1.0
+fr	05_nuclear	1	284	0.0	1.0
+fr	06_coal	1	284	0.0	1.0
 fr	07_gas	1	284	0.0	0.0
 fr	08_non-res	1	284	0.0	0.0
 fr	09_hydro_pump	1	284	0.0	0.0
-fr	01_solar	1	285	1.0	0.0
-fr	02_wind_on	1	285	1.0	0.0
-fr	03_wind_off	1	285	1.0	0.0
-fr	04_res	1	285	1.0	0.0
-fr	05_nuclear	1	285	1.0	0.0
-fr	06_coal	1	285	1.0	0.0
+fr	01_solar	1	285	0.0	1.0
+fr	02_wind_on	1	285	0.0	1.0
+fr	03_wind_off	1	285	0.0	1.0
+fr	04_res	1	285	0.0	1.0
+fr	05_nuclear	1	285	0.0	1.0
+fr	06_coal	1	285	0.0	1.0
 fr	07_gas	1	285	0.0	0.0
 fr	08_non-res	1	285	0.0	0.0
 fr	09_hydro_pump	1	285	0.0	0.0
-fr	01_solar	1	286	1.0	0.0
-fr	02_wind_on	1	286	1.0	0.0
-fr	03_wind_off	1	286	1.0	0.0
-fr	04_res	1	286	1.0	0.0
-fr	05_nuclear	1	286	1.0	0.0
-fr	06_coal	1	286	1.0	0.0
+fr	01_solar	1	286	0.0	1.0
+fr	02_wind_on	1	286	0.0	1.0
+fr	03_wind_off	1	286	0.0	1.0
+fr	04_res	1	286	0.0	1.0
+fr	05_nuclear	1	286	0.0	1.0
+fr	06_coal	1	286	0.0	1.0
 fr	07_gas	1	286	0.0	0.0
 fr	08_non-res	1	286	0.0	0.0
 fr	09_hydro_pump	1	286	0.0	0.0
-fr	01_solar	1	287	1.0	0.0
-fr	02_wind_on	1	287	1.0	0.0
-fr	03_wind_off	1	287	1.0	0.0
-fr	04_res	1	287	1.0	0.0
-fr	05_nuclear	1	287	1.0	0.0
-fr	06_coal	1	287	1.0	0.0
+fr	01_solar	1	287	0.0	1.0
+fr	02_wind_on	1	287	0.0	1.0
+fr	03_wind_off	1	287	0.0	1.0
+fr	04_res	1	287	0.0	1.0
+fr	05_nuclear	1	287	0.0	1.0
+fr	06_coal	1	287	0.0	1.0
 fr	07_gas	1	287	0.0	0.0
 fr	08_non-res	1	287	0.0	0.0
 fr	09_hydro_pump	1	287	0.0	0.0
-fr	01_solar	1	288	1.0	0.0
-fr	02_wind_on	1	288	1.0	0.0
-fr	03_wind_off	1	288	1.0	0.0
-fr	04_res	1	288	1.0	0.0
-fr	05_nuclear	1	288	1.0	0.0
-fr	06_coal	1	288	1.0	0.0
+fr	01_solar	1	288	0.0	1.0
+fr	02_wind_on	1	288	0.0	1.0
+fr	03_wind_off	1	288	0.0	1.0
+fr	04_res	1	288	0.0	1.0
+fr	05_nuclear	1	288	0.0	1.0
+fr	06_coal	1	288	0.0	1.0
 fr	07_gas	1	288	0.0	0.0
 fr	08_non-res	1	288	0.0	0.0
 fr	09_hydro_pump	1	288	0.0	0.0
-fr	01_solar	1	289	1.0	0.0
-fr	02_wind_on	1	289	1.0	0.0
-fr	03_wind_off	1	289	1.0	0.0
-fr	04_res	1	289	1.0	0.0
-fr	05_nuclear	1	289	1.0	0.0
-fr	06_coal	1	289	1.0	0.0
+fr	01_solar	1	289	0.0	1.0
+fr	02_wind_on	1	289	0.0	1.0
+fr	03_wind_off	1	289	0.0	1.0
+fr	04_res	1	289	0.0	1.0
+fr	05_nuclear	1	289	0.0	1.0
+fr	06_coal	1	289	0.0	1.0
 fr	07_gas	1	289	0.0	0.0
 fr	08_non-res	1	289	0.0	0.0
 fr	09_hydro_pump	1	289	0.0	0.0
-fr	01_solar	1	290	1.0	0.0
-fr	02_wind_on	1	290	1.0	0.0
-fr	03_wind_off	1	290	1.0	0.0
-fr	04_res	1	290	1.0	0.0
-fr	05_nuclear	1	290	1.0	0.0
-fr	06_coal	1	290	1.0	0.0
-fr	07_gas	1	290	1.0	0.0
+fr	01_solar	1	290	0.0	1.0
+fr	02_wind_on	1	290	0.0	1.0
+fr	03_wind_off	1	290	0.0	1.0
+fr	04_res	1	290	0.0	1.0
+fr	05_nuclear	1	290	0.0	1.0
+fr	06_coal	1	290	0.0	1.0
+fr	07_gas	1	290	0.0	1.0
 fr	08_non-res	1	290	0.0	0.0
 fr	09_hydro_pump	1	290	0.0	0.0
-fr	01_solar	1	291	1.0	0.0
-fr	02_wind_on	1	291	1.0	0.0
-fr	03_wind_off	1	291	1.0	0.0
-fr	04_res	1	291	1.0	0.0
-fr	05_nuclear	1	291	1.0	0.0
-fr	06_coal	1	291	1.0	0.0
-fr	07_gas	1	291	1.0	0.0
+fr	01_solar	1	291	0.0	1.0
+fr	02_wind_on	1	291	0.0	1.0
+fr	03_wind_off	1	291	0.0	1.0
+fr	04_res	1	291	0.0	1.0
+fr	05_nuclear	1	291	0.0	1.0
+fr	06_coal	1	291	0.0	1.0
+fr	07_gas	1	291	0.0	1.0
 fr	08_non-res	1	291	0.0	0.0
 fr	09_hydro_pump	1	291	0.0	0.0
-fr	01_solar	1	292	1.0	0.0
-fr	02_wind_on	1	292	1.0	0.0
-fr	03_wind_off	1	292	1.0	0.0
-fr	04_res	1	292	1.0	0.0
-fr	05_nuclear	1	292	1.0	0.0
-fr	06_coal	1	292	1.0	0.0
-fr	07_gas	1	292	1.0	0.0
+fr	01_solar	1	292	0.0	1.0
+fr	02_wind_on	1	292	0.0	1.0
+fr	03_wind_off	1	292	0.0	1.0
+fr	04_res	1	292	0.0	1.0
+fr	05_nuclear	1	292	0.0	1.0
+fr	06_coal	1	292	0.0	1.0
+fr	07_gas	1	292	0.0	1.0
 fr	08_non-res	1	292	0.0	0.0
 fr	09_hydro_pump	1	292	0.0	0.0
-fr	01_solar	1	293	1.0	0.0
-fr	02_wind_on	1	293	1.0	0.0
-fr	03_wind_off	1	293	1.0	0.0
-fr	04_res	1	293	1.0	0.0
-fr	05_nuclear	1	293	1.0	0.0
-fr	06_coal	1	293	1.0	0.0
-fr	07_gas	1	293	1.0	0.0
+fr	01_solar	1	293	0.0	1.0
+fr	02_wind_on	1	293	0.0	1.0
+fr	03_wind_off	1	293	0.0	1.0
+fr	04_res	1	293	0.0	1.0
+fr	05_nuclear	1	293	0.0	1.0
+fr	06_coal	1	293	0.0	1.0
+fr	07_gas	1	293	0.0	1.0
 fr	08_non-res	1	293	0.0	0.0
 fr	09_hydro_pump	1	293	0.0	0.0
-fr	01_solar	1	294	1.0	0.0
-fr	02_wind_on	1	294	1.0	0.0
-fr	03_wind_off	1	294	1.0	0.0
-fr	04_res	1	294	1.0	0.0
-fr	05_nuclear	1	294	1.0	0.0
-fr	06_coal	1	294	1.0	0.0
-fr	07_gas	1	294	1.0	0.0
+fr	01_solar	1	294	0.0	1.0
+fr	02_wind_on	1	294	0.0	1.0
+fr	03_wind_off	1	294	0.0	1.0
+fr	04_res	1	294	0.0	1.0
+fr	05_nuclear	1	294	0.0	1.0
+fr	06_coal	1	294	0.0	1.0
+fr	07_gas	1	294	0.0	1.0
 fr	08_non-res	1	294	0.0	0.0
 fr	09_hydro_pump	1	294	0.0	0.0
-fr	01_solar	1	295	1.0	0.0
-fr	02_wind_on	1	295	1.0	0.0
-fr	03_wind_off	1	295	1.0	0.0
-fr	04_res	1	295	1.0	0.0
-fr	05_nuclear	1	295	1.0	0.0
-fr	06_coal	1	295	1.0	0.0
-fr	07_gas	1	295	1.0	0.0
+fr	01_solar	1	295	0.0	1.0
+fr	02_wind_on	1	295	0.0	1.0
+fr	03_wind_off	1	295	0.0	1.0
+fr	04_res	1	295	0.0	1.0
+fr	05_nuclear	1	295	0.0	1.0
+fr	06_coal	1	295	0.0	1.0
+fr	07_gas	1	295	0.0	1.0
 fr	08_non-res	1	295	0.0	0.0
 fr	09_hydro_pump	1	295	0.0	0.0
-fr	01_solar	1	296	1.0	0.0
-fr	02_wind_on	1	296	1.0	0.0
-fr	03_wind_off	1	296	1.0	0.0
-fr	04_res	1	296	1.0	0.0
-fr	05_nuclear	1	296	1.0	0.0
-fr	06_coal	1	296	1.0	0.0
-fr	07_gas	1	296	1.0	0.0
+fr	01_solar	1	296	0.0	1.0
+fr	02_wind_on	1	296	0.0	1.0
+fr	03_wind_off	1	296	0.0	1.0
+fr	04_res	1	296	0.0	1.0
+fr	05_nuclear	1	296	0.0	1.0
+fr	06_coal	1	296	0.0	1.0
+fr	07_gas	1	296	0.0	1.0
 fr	08_non-res	1	296	0.0	0.0
 fr	09_hydro_pump	1	296	0.0	0.0
-fr	01_solar	1	297	1.0	0.0
-fr	02_wind_on	1	297	1.0	0.0
-fr	03_wind_off	1	297	1.0	0.0
-fr	04_res	1	297	1.0	0.0
-fr	05_nuclear	1	297	1.0	0.0
-fr	06_coal	1	297	1.0	0.0
-fr	07_gas	1	297	1.0	0.0
+fr	01_solar	1	297	0.0	1.0
+fr	02_wind_on	1	297	0.0	1.0
+fr	03_wind_off	1	297	0.0	1.0
+fr	04_res	1	297	0.0	1.0
+fr	05_nuclear	1	297	0.0	1.0
+fr	06_coal	1	297	0.0	1.0
+fr	07_gas	1	297	0.0	1.0
 fr	08_non-res	1	297	0.0	0.0
 fr	09_hydro_pump	1	297	0.0	0.0
-fr	01_solar	1	298	1.0	0.0
-fr	02_wind_on	1	298	1.0	0.0
-fr	03_wind_off	1	298	1.0	0.0
-fr	04_res	1	298	1.0	0.0
-fr	05_nuclear	1	298	1.0	0.0
-fr	06_coal	1	298	1.0	0.0
-fr	07_gas	1	298	1.0	0.0
+fr	01_solar	1	298	0.0	1.0
+fr	02_wind_on	1	298	0.0	1.0
+fr	03_wind_off	1	298	0.0	1.0
+fr	04_res	1	298	0.0	1.0
+fr	05_nuclear	1	298	0.0	1.0
+fr	06_coal	1	298	0.0	1.0
+fr	07_gas	1	298	0.0	1.0
 fr	08_non-res	1	298	0.0	0.0
 fr	09_hydro_pump	1	298	0.0	0.0
-fr	01_solar	1	299	1.0	0.0
-fr	02_wind_on	1	299	1.0	0.0
-fr	03_wind_off	1	299	1.0	0.0
-fr	04_res	1	299	1.0	0.0
-fr	05_nuclear	1	299	1.0	0.0
-fr	06_coal	1	299	1.0	0.0
-fr	07_gas	1	299	1.0	0.0
+fr	01_solar	1	299	0.0	1.0
+fr	02_wind_on	1	299	0.0	1.0
+fr	03_wind_off	1	299	0.0	1.0
+fr	04_res	1	299	0.0	1.0
+fr	05_nuclear	1	299	0.0	1.0
+fr	06_coal	1	299	0.0	1.0
+fr	07_gas	1	299	0.0	1.0
 fr	08_non-res	1	299	0.0	0.0
 fr	09_hydro_pump	1	299	0.0	0.0
-fr	01_solar	1	300	1.0	0.0
-fr	02_wind_on	1	300	1.0	0.0
-fr	03_wind_off	1	300	1.0	0.0
-fr	04_res	1	300	1.0	0.0
-fr	05_nuclear	1	300	1.0	0.0
-fr	06_coal	1	300	1.0	0.0
-fr	07_gas	1	300	1.0	0.0
+fr	01_solar	1	300	0.0	1.0
+fr	02_wind_on	1	300	0.0	1.0
+fr	03_wind_off	1	300	0.0	1.0
+fr	04_res	1	300	0.0	1.0
+fr	05_nuclear	1	300	0.0	1.0
+fr	06_coal	1	300	0.0	1.0
+fr	07_gas	1	300	0.0	1.0
 fr	08_non-res	1	300	0.0	0.0
 fr	09_hydro_pump	1	300	0.0	0.0
-fr	01_solar	1	301	1.0	0.0
-fr	02_wind_on	1	301	1.0	0.0
-fr	03_wind_off	1	301	1.0	0.0
-fr	04_res	1	301	1.0	0.0
-fr	05_nuclear	1	301	1.0	0.0
-fr	06_coal	1	301	1.0	0.0
-fr	07_gas	1	301	1.0	0.0
+fr	01_solar	1	301	0.0	1.0
+fr	02_wind_on	1	301	0.0	1.0
+fr	03_wind_off	1	301	0.0	1.0
+fr	04_res	1	301	0.0	1.0
+fr	05_nuclear	1	301	0.0	1.0
+fr	06_coal	1	301	0.0	1.0
+fr	07_gas	1	301	0.0	1.0
 fr	08_non-res	1	301	0.0	0.0
 fr	09_hydro_pump	1	301	0.0	0.0
-fr	01_solar	1	302	1.0	0.0
-fr	02_wind_on	1	302	1.0	0.0
-fr	03_wind_off	1	302	1.0	0.0
-fr	04_res	1	302	1.0	0.0
-fr	05_nuclear	1	302	1.0	0.0
-fr	06_coal	1	302	1.0	0.0
-fr	07_gas	1	302	1.0	0.0
+fr	01_solar	1	302	0.0	1.0
+fr	02_wind_on	1	302	0.0	1.0
+fr	03_wind_off	1	302	0.0	1.0
+fr	04_res	1	302	0.0	1.0
+fr	05_nuclear	1	302	0.0	1.0
+fr	06_coal	1	302	0.0	1.0
+fr	07_gas	1	302	0.0	1.0
 fr	08_non-res	1	302	0.0	0.0
 fr	09_hydro_pump	1	302	0.0	0.0
-fr	01_solar	1	303	1.0	0.0
-fr	02_wind_on	1	303	1.0	0.0
-fr	03_wind_off	1	303	1.0	0.0
-fr	04_res	1	303	1.0	0.0
-fr	05_nuclear	1	303	1.0	0.0
-fr	06_coal	1	303	1.0	0.0
-fr	07_gas	1	303	1.0	0.0
+fr	01_solar	1	303	0.0	1.0
+fr	02_wind_on	1	303	0.0	1.0
+fr	03_wind_off	1	303	0.0	1.0
+fr	04_res	1	303	0.0	1.0
+fr	05_nuclear	1	303	0.0	1.0
+fr	06_coal	1	303	0.0	1.0
+fr	07_gas	1	303	0.0	1.0
 fr	08_non-res	1	303	0.0	0.0
 fr	09_hydro_pump	1	303	0.0	0.0
-fr	01_solar	1	304	1.0	0.0
-fr	02_wind_on	1	304	1.0	0.0
-fr	03_wind_off	1	304	1.0	0.0
-fr	04_res	1	304	1.0	0.0
-fr	05_nuclear	1	304	1.0	0.0
-fr	06_coal	1	304	1.0	0.0
-fr	07_gas	1	304	1.0	0.0
+fr	01_solar	1	304	0.0	1.0
+fr	02_wind_on	1	304	0.0	1.0
+fr	03_wind_off	1	304	0.0	1.0
+fr	04_res	1	304	0.0	1.0
+fr	05_nuclear	1	304	0.0	1.0
+fr	06_coal	1	304	0.0	1.0
+fr	07_gas	1	304	0.0	1.0
 fr	08_non-res	1	304	0.0	0.0
 fr	09_hydro_pump	1	304	0.0	0.0
-fr	01_solar	1	305	1.0	0.0
-fr	02_wind_on	1	305	1.0	0.0
-fr	03_wind_off	1	305	1.0	0.0
-fr	04_res	1	305	1.0	0.0
-fr	05_nuclear	1	305	1.0	0.0
-fr	06_coal	1	305	1.0	0.0
-fr	07_gas	1	305	1.0	0.0
+fr	01_solar	1	305	0.0	1.0
+fr	02_wind_on	1	305	0.0	1.0
+fr	03_wind_off	1	305	0.0	1.0
+fr	04_res	1	305	0.0	1.0
+fr	05_nuclear	1	305	0.0	1.0
+fr	06_coal	1	305	0.0	1.0
+fr	07_gas	1	305	0.0	1.0
 fr	08_non-res	1	305	0.0	0.0
 fr	09_hydro_pump	1	305	0.0	0.0
-fr	01_solar	1	306	1.0	0.0
-fr	02_wind_on	1	306	1.0	0.0
-fr	03_wind_off	1	306	1.0	0.0
-fr	04_res	1	306	1.0	0.0
-fr	05_nuclear	1	306	1.0	0.0
-fr	06_coal	1	306	1.0	0.0
-fr	07_gas	1	306	1.0	0.0
+fr	01_solar	1	306	0.0	1.0
+fr	02_wind_on	1	306	0.0	1.0
+fr	03_wind_off	1	306	0.0	1.0
+fr	04_res	1	306	0.0	1.0
+fr	05_nuclear	1	306	0.0	1.0
+fr	06_coal	1	306	0.0	1.0
+fr	07_gas	1	306	0.0	1.0
 fr	08_non-res	1	306	0.0	0.0
 fr	09_hydro_pump	1	306	0.0	0.0
-fr	01_solar	1	307	1.0	0.0
-fr	02_wind_on	1	307	1.0	0.0
-fr	03_wind_off	1	307	1.0	0.0
-fr	04_res	1	307	1.0	0.0
-fr	05_nuclear	1	307	1.0	0.0
-fr	06_coal	1	307	1.0	0.0
-fr	07_gas	1	307	1.0	0.0
+fr	01_solar	1	307	0.0	1.0
+fr	02_wind_on	1	307	0.0	1.0
+fr	03_wind_off	1	307	0.0	1.0
+fr	04_res	1	307	0.0	1.0
+fr	05_nuclear	1	307	0.0	1.0
+fr	06_coal	1	307	0.0	1.0
+fr	07_gas	1	307	0.0	1.0
 fr	08_non-res	1	307	0.0	0.0
 fr	09_hydro_pump	1	307	0.0	0.0
-fr	01_solar	1	308	1.0	0.0
-fr	02_wind_on	1	308	1.0	0.0
-fr	03_wind_off	1	308	1.0	0.0
-fr	04_res	1	308	1.0	0.0
-fr	05_nuclear	1	308	1.0	0.0
-fr	06_coal	1	308	1.0	0.0
-fr	07_gas	1	308	1.0	0.0
+fr	01_solar	1	308	0.0	1.0
+fr	02_wind_on	1	308	0.0	1.0
+fr	03_wind_off	1	308	0.0	1.0
+fr	04_res	1	308	0.0	1.0
+fr	05_nuclear	1	308	0.0	1.0
+fr	06_coal	1	308	0.0	1.0
+fr	07_gas	1	308	0.0	1.0
 fr	08_non-res	1	308	0.0	0.0
 fr	09_hydro_pump	1	308	0.0	0.0
-fr	01_solar	1	309	1.0	0.0
-fr	02_wind_on	1	309	1.0	0.0
-fr	03_wind_off	1	309	1.0	0.0
-fr	04_res	1	309	1.0	0.0
-fr	05_nuclear	1	309	1.0	0.0
-fr	06_coal	1	309	1.0	0.0
-fr	07_gas	1	309	1.0	0.0
+fr	01_solar	1	309	0.0	1.0
+fr	02_wind_on	1	309	0.0	1.0
+fr	03_wind_off	1	309	0.0	1.0
+fr	04_res	1	309	0.0	1.0
+fr	05_nuclear	1	309	0.0	1.0
+fr	06_coal	1	309	0.0	1.0
+fr	07_gas	1	309	0.0	1.0
 fr	08_non-res	1	309	0.0	0.0
 fr	09_hydro_pump	1	309	0.0	0.0
-fr	01_solar	1	310	1.0	0.0
-fr	02_wind_on	1	310	1.0	0.0
-fr	03_wind_off	1	310	1.0	0.0
-fr	04_res	1	310	1.0	0.0
-fr	05_nuclear	1	310	1.0	0.0
-fr	06_coal	1	310	1.0	0.0
-fr	07_gas	1	310	1.0	0.0
-fr	08_non-res	1	310	1.0	0.0
+fr	01_solar	1	310	0.0	1.0
+fr	02_wind_on	1	310	0.0	1.0
+fr	03_wind_off	1	310	0.0	1.0
+fr	04_res	1	310	0.0	1.0
+fr	05_nuclear	1	310	0.0	1.0
+fr	06_coal	1	310	0.0	1.0
+fr	07_gas	1	310	0.0	1.0
+fr	08_non-res	1	310	0.0	1.0
 fr	09_hydro_pump	1	310	0.0	0.0
-fr	01_solar	1	311	1.0	0.0
-fr	02_wind_on	1	311	1.0	0.0
-fr	03_wind_off	1	311	1.0	0.0
-fr	04_res	1	311	1.0	0.0
-fr	05_nuclear	1	311	1.0	0.0
-fr	06_coal	1	311	1.0	0.0
-fr	07_gas	1	311	1.0	0.0
-fr	08_non-res	1	311	1.0	0.0
+fr	01_solar	1	311	0.0	1.0
+fr	02_wind_on	1	311	0.0	1.0
+fr	03_wind_off	1	311	0.0	1.0
+fr	04_res	1	311	0.0	1.0
+fr	05_nuclear	1	311	0.0	1.0
+fr	06_coal	1	311	0.0	1.0
+fr	07_gas	1	311	0.0	1.0
+fr	08_non-res	1	311	0.0	1.0
 fr	09_hydro_pump	1	311	0.0	0.0
-fr	01_solar	1	312	1.0	0.0
-fr	02_wind_on	1	312	1.0	0.0
-fr	03_wind_off	1	312	1.0	0.0
-fr	04_res	1	312	1.0	0.0
-fr	05_nuclear	1	312	1.0	0.0
-fr	06_coal	1	312	1.0	0.0
-fr	07_gas	1	312	1.0	0.0
-fr	08_non-res	1	312	1.0	0.0
+fr	01_solar	1	312	0.0	1.0
+fr	02_wind_on	1	312	0.0	1.0
+fr	03_wind_off	1	312	0.0	1.0
+fr	04_res	1	312	0.0	1.0
+fr	05_nuclear	1	312	0.0	1.0
+fr	06_coal	1	312	0.0	1.0
+fr	07_gas	1	312	0.0	1.0
+fr	08_non-res	1	312	0.0	1.0
 fr	09_hydro_pump	1	312	0.0	0.0
-fr	01_solar	1	313	1.0	0.0
-fr	02_wind_on	1	313	1.0	0.0
-fr	03_wind_off	1	313	1.0	0.0
-fr	04_res	1	313	1.0	0.0
-fr	05_nuclear	1	313	1.0	0.0
-fr	06_coal	1	313	1.0	0.0
-fr	07_gas	1	313	1.0	0.0
-fr	08_non-res	1	313	1.0	0.0
+fr	01_solar	1	313	0.0	1.0
+fr	02_wind_on	1	313	0.0	1.0
+fr	03_wind_off	1	313	0.0	1.0
+fr	04_res	1	313	0.0	1.0
+fr	05_nuclear	1	313	0.0	1.0
+fr	06_coal	1	313	0.0	1.0
+fr	07_gas	1	313	0.0	1.0
+fr	08_non-res	1	313	0.0	1.0
 fr	09_hydro_pump	1	313	0.0	0.0
-fr	01_solar	1	314	1.0	0.0
-fr	02_wind_on	1	314	1.0	0.0
-fr	03_wind_off	1	314	1.0	0.0
-fr	04_res	1	314	1.0	0.0
-fr	05_nuclear	1	314	1.0	0.0
-fr	06_coal	1	314	1.0	0.0
-fr	07_gas	1	314	1.0	0.0
-fr	08_non-res	1	314	1.0	0.0
+fr	01_solar	1	314	0.0	1.0
+fr	02_wind_on	1	314	0.0	1.0
+fr	03_wind_off	1	314	0.0	1.0
+fr	04_res	1	314	0.0	1.0
+fr	05_nuclear	1	314	0.0	1.0
+fr	06_coal	1	314	0.0	1.0
+fr	07_gas	1	314	0.0	1.0
+fr	08_non-res	1	314	0.0	1.0
 fr	09_hydro_pump	1	314	0.0	0.0
-fr	01_solar	1	315	1.0	0.0
-fr	02_wind_on	1	315	1.0	0.0
-fr	03_wind_off	1	315	1.0	0.0
-fr	04_res	1	315	1.0	0.0
-fr	05_nuclear	1	315	1.0	0.0
-fr	06_coal	1	315	1.0	0.0
-fr	07_gas	1	315	1.0	0.0
-fr	08_non-res	1	315	1.0	0.0
+fr	01_solar	1	315	0.0	1.0
+fr	02_wind_on	1	315	0.0	1.0
+fr	03_wind_off	1	315	0.0	1.0
+fr	04_res	1	315	0.0	1.0
+fr	05_nuclear	1	315	0.0	1.0
+fr	06_coal	1	315	0.0	1.0
+fr	07_gas	1	315	0.0	1.0
+fr	08_non-res	1	315	0.0	1.0
 fr	09_hydro_pump	1	315	0.0	0.0
-fr	01_solar	1	316	1.0	0.0
-fr	02_wind_on	1	316	1.0	0.0
-fr	03_wind_off	1	316	1.0	0.0
-fr	04_res	1	316	1.0	0.0
-fr	05_nuclear	1	316	1.0	0.0
-fr	06_coal	1	316	1.0	0.0
-fr	07_gas	1	316	1.0	0.0
-fr	08_non-res	1	316	1.0	0.0
+fr	01_solar	1	316	0.0	1.0
+fr	02_wind_on	1	316	0.0	1.0
+fr	03_wind_off	1	316	0.0	1.0
+fr	04_res	1	316	0.0	1.0
+fr	05_nuclear	1	316	0.0	1.0
+fr	06_coal	1	316	0.0	1.0
+fr	07_gas	1	316	0.0	1.0
+fr	08_non-res	1	316	0.0	1.0
 fr	09_hydro_pump	1	316	0.0	0.0
-fr	01_solar	1	317	1.0	0.0
-fr	02_wind_on	1	317	1.0	0.0
-fr	03_wind_off	1	317	1.0	0.0
-fr	04_res	1	317	1.0	0.0
-fr	05_nuclear	1	317	1.0	0.0
-fr	06_coal	1	317	1.0	0.0
-fr	07_gas	1	317	1.0	0.0
-fr	08_non-res	1	317	1.0	0.0
+fr	01_solar	1	317	0.0	1.0
+fr	02_wind_on	1	317	0.0	1.0
+fr	03_wind_off	1	317	0.0	1.0
+fr	04_res	1	317	0.0	1.0
+fr	05_nuclear	1	317	0.0	1.0
+fr	06_coal	1	317	0.0	1.0
+fr	07_gas	1	317	0.0	1.0
+fr	08_non-res	1	317	0.0	1.0
 fr	09_hydro_pump	1	317	0.0	0.0
-fr	01_solar	1	318	1.0	0.0
-fr	02_wind_on	1	318	1.0	0.0
-fr	03_wind_off	1	318	1.0	0.0
-fr	04_res	1	318	1.0	0.0
-fr	05_nuclear	1	318	1.0	0.0
-fr	06_coal	1	318	1.0	0.0
-fr	07_gas	1	318	1.0	0.0
-fr	08_non-res	1	318	1.0	0.0
+fr	01_solar	1	318	0.0	1.0
+fr	02_wind_on	1	318	0.0	1.0
+fr	03_wind_off	1	318	0.0	1.0
+fr	04_res	1	318	0.0	1.0
+fr	05_nuclear	1	318	0.0	1.0
+fr	06_coal	1	318	0.0	1.0
+fr	07_gas	1	318	0.0	1.0
+fr	08_non-res	1	318	0.0	1.0
 fr	09_hydro_pump	1	318	0.0	0.0
-fr	01_solar	1	319	1.0	0.0
-fr	02_wind_on	1	319	1.0	0.0
-fr	03_wind_off	1	319	1.0	0.0
-fr	04_res	1	319	1.0	0.0
-fr	05_nuclear	1	319	1.0	0.0
-fr	06_coal	1	319	1.0	0.0
-fr	07_gas	1	319	1.0	0.0
-fr	08_non-res	1	319	1.0	0.0
+fr	01_solar	1	319	0.0	1.0
+fr	02_wind_on	1	319	0.0	1.0
+fr	03_wind_off	1	319	0.0	1.0
+fr	04_res	1	319	0.0	1.0
+fr	05_nuclear	1	319	0.0	1.0
+fr	06_coal	1	319	0.0	1.0
+fr	07_gas	1	319	0.0	1.0
+fr	08_non-res	1	319	0.0	1.0
 fr	09_hydro_pump	1	319	0.0	0.0
-fr	01_solar	1	320	1.0	0.0
-fr	02_wind_on	1	320	1.0	0.0
-fr	03_wind_off	1	320	1.0	0.0
-fr	04_res	1	320	1.0	0.0
-fr	05_nuclear	1	320	1.0	0.0
-fr	06_coal	1	320	1.0	0.0
-fr	07_gas	1	320	1.0	0.0
-fr	08_non-res	1	320	1.0	0.0
+fr	01_solar	1	320	0.0	1.0
+fr	02_wind_on	1	320	0.0	1.0
+fr	03_wind_off	1	320	0.0	1.0
+fr	04_res	1	320	0.0	1.0
+fr	05_nuclear	1	320	0.0	1.0
+fr	06_coal	1	320	0.0	1.0
+fr	07_gas	1	320	0.0	1.0
+fr	08_non-res	1	320	0.0	1.0
 fr	09_hydro_pump	1	320	0.0	0.0
-fr	01_solar	1	321	1.0	0.0
-fr	02_wind_on	1	321	1.0	0.0
-fr	03_wind_off	1	321	1.0	0.0
-fr	04_res	1	321	1.0	0.0
-fr	05_nuclear	1	321	1.0	0.0
-fr	06_coal	1	321	1.0	0.0
-fr	07_gas	1	321	1.0	0.0
-fr	08_non-res	1	321	1.0	0.0
+fr	01_solar	1	321	0.0	1.0
+fr	02_wind_on	1	321	0.0	1.0
+fr	03_wind_off	1	321	0.0	1.0
+fr	04_res	1	321	0.0	1.0
+fr	05_nuclear	1	321	0.0	1.0
+fr	06_coal	1	321	0.0	1.0
+fr	07_gas	1	321	0.0	1.0
+fr	08_non-res	1	321	0.0	1.0
 fr	09_hydro_pump	1	321	0.0	0.0
-fr	01_solar	1	322	1.0	0.0
-fr	02_wind_on	1	322	1.0	0.0
-fr	03_wind_off	1	322	1.0	0.0
-fr	04_res	1	322	1.0	0.0
-fr	05_nuclear	1	322	1.0	0.0
-fr	06_coal	1	322	1.0	0.0
-fr	07_gas	1	322	1.0	0.0
-fr	08_non-res	1	322	1.0	0.0
+fr	01_solar	1	322	0.0	1.0
+fr	02_wind_on	1	322	0.0	1.0
+fr	03_wind_off	1	322	0.0	1.0
+fr	04_res	1	322	0.0	1.0
+fr	05_nuclear	1	322	0.0	1.0
+fr	06_coal	1	322	0.0	1.0
+fr	07_gas	1	322	0.0	1.0
+fr	08_non-res	1	322	0.0	1.0
 fr	09_hydro_pump	1	322	0.0	0.0
-fr	01_solar	1	323	1.0	0.0
-fr	02_wind_on	1	323	1.0	0.0
-fr	03_wind_off	1	323	1.0	0.0
-fr	04_res	1	323	1.0	0.0
-fr	05_nuclear	1	323	1.0	0.0
-fr	06_coal	1	323	1.0	0.0
-fr	07_gas	1	323	1.0	0.0
-fr	08_non-res	1	323	1.0	0.0
+fr	01_solar	1	323	0.0	1.0
+fr	02_wind_on	1	323	0.0	1.0
+fr	03_wind_off	1	323	0.0	1.0
+fr	04_res	1	323	0.0	1.0
+fr	05_nuclear	1	323	0.0	1.0
+fr	06_coal	1	323	0.0	1.0
+fr	07_gas	1	323	0.0	1.0
+fr	08_non-res	1	323	0.0	1.0
 fr	09_hydro_pump	1	323	0.0	0.0
-fr	01_solar	1	324	1.0	0.0
-fr	02_wind_on	1	324	1.0	0.0
-fr	03_wind_off	1	324	1.0	0.0
-fr	04_res	1	324	1.0	0.0
-fr	05_nuclear	1	324	1.0	0.0
-fr	06_coal	1	324	1.0	0.0
-fr	07_gas	1	324	1.0	0.0
-fr	08_non-res	1	324	1.0	0.0
+fr	01_solar	1	324	0.0	1.0
+fr	02_wind_on	1	324	0.0	1.0
+fr	03_wind_off	1	324	0.0	1.0
+fr	04_res	1	324	0.0	1.0
+fr	05_nuclear	1	324	0.0	1.0
+fr	06_coal	1	324	0.0	1.0
+fr	07_gas	1	324	0.0	1.0
+fr	08_non-res	1	324	0.0	1.0
 fr	09_hydro_pump	1	324	0.0	0.0
-fr	01_solar	1	325	1.0	0.0
-fr	02_wind_on	1	325	1.0	0.0
-fr	03_wind_off	1	325	1.0	0.0
-fr	04_res	1	325	1.0	0.0
-fr	05_nuclear	1	325	1.0	0.0
-fr	06_coal	1	325	1.0	0.0
-fr	07_gas	1	325	1.0	0.0
-fr	08_non-res	1	325	1.0	0.0
+fr	01_solar	1	325	0.0	1.0
+fr	02_wind_on	1	325	0.0	1.0
+fr	03_wind_off	1	325	0.0	1.0
+fr	04_res	1	325	0.0	1.0
+fr	05_nuclear	1	325	0.0	1.0
+fr	06_coal	1	325	0.0	1.0
+fr	07_gas	1	325	0.0	1.0
+fr	08_non-res	1	325	0.0	1.0
 fr	09_hydro_pump	1	325	0.0	0.0
-fr	01_solar	1	326	1.0	0.0
-fr	02_wind_on	1	326	1.0	0.0
-fr	03_wind_off	1	326	1.0	0.0
-fr	04_res	1	326	1.0	0.0
-fr	05_nuclear	1	326	1.0	0.0
-fr	06_coal	1	326	1.0	0.0
-fr	07_gas	1	326	1.0	0.0
-fr	08_non-res	1	326	1.0	0.0
+fr	01_solar	1	326	0.0	1.0
+fr	02_wind_on	1	326	0.0	1.0
+fr	03_wind_off	1	326	0.0	1.0
+fr	04_res	1	326	0.0	1.0
+fr	05_nuclear	1	326	0.0	1.0
+fr	06_coal	1	326	0.0	1.0
+fr	07_gas	1	326	0.0	1.0
+fr	08_non-res	1	326	0.0	1.0
 fr	09_hydro_pump	1	326	0.0	0.0
-fr	01_solar	1	327	1.0	0.0
-fr	02_wind_on	1	327	1.0	0.0
-fr	03_wind_off	1	327	1.0	0.0
-fr	04_res	1	327	1.0	0.0
-fr	05_nuclear	1	327	1.0	0.0
-fr	06_coal	1	327	1.0	0.0
-fr	07_gas	1	327	1.0	0.0
-fr	08_non-res	1	327	1.0	0.0
+fr	01_solar	1	327	0.0	1.0
+fr	02_wind_on	1	327	0.0	1.0
+fr	03_wind_off	1	327	0.0	1.0
+fr	04_res	1	327	0.0	1.0
+fr	05_nuclear	1	327	0.0	1.0
+fr	06_coal	1	327	0.0	1.0
+fr	07_gas	1	327	0.0	1.0
+fr	08_non-res	1	327	0.0	1.0
 fr	09_hydro_pump	1	327	0.0	0.0
-fr	01_solar	1	328	1.0	0.0
-fr	02_wind_on	1	328	1.0	0.0
-fr	03_wind_off	1	328	1.0	0.0
-fr	04_res	1	328	1.0	0.0
-fr	05_nuclear	1	328	1.0	0.0
-fr	06_coal	1	328	1.0	0.0
-fr	07_gas	1	328	1.0	0.0
-fr	08_non-res	1	328	1.0	0.0
+fr	01_solar	1	328	0.0	1.0
+fr	02_wind_on	1	328	0.0	1.0
+fr	03_wind_off	1	328	0.0	1.0
+fr	04_res	1	328	0.0	1.0
+fr	05_nuclear	1	328	0.0	1.0
+fr	06_coal	1	328	0.0	1.0
+fr	07_gas	1	328	0.0	1.0
+fr	08_non-res	1	328	0.0	1.0
 fr	09_hydro_pump	1	328	0.0	0.0
-fr	01_solar	1	329	1.0	0.0
-fr	02_wind_on	1	329	1.0	0.0
-fr	03_wind_off	1	329	1.0	0.0
-fr	04_res	1	329	1.0	0.0
-fr	05_nuclear	1	329	1.0	0.0
-fr	06_coal	1	329	1.0	0.0
-fr	07_gas	1	329	1.0	0.0
-fr	08_non-res	1	329	1.0	0.0
+fr	01_solar	1	329	0.0	1.0
+fr	02_wind_on	1	329	0.0	1.0
+fr	03_wind_off	1	329	0.0	1.0
+fr	04_res	1	329	0.0	1.0
+fr	05_nuclear	1	329	0.0	1.0
+fr	06_coal	1	329	0.0	1.0
+fr	07_gas	1	329	0.0	1.0
+fr	08_non-res	1	329	0.0	1.0
 fr	09_hydro_pump	1	329	0.0	0.0
-fr	01_solar	1	330	1.0	0.0
-fr	02_wind_on	1	330	1.0	0.0
-fr	03_wind_off	1	330	1.0	0.0
-fr	04_res	1	330	1.0	0.0
-fr	05_nuclear	1	330	1.0	0.0
-fr	06_coal	1	330	1.0	0.0
-fr	07_gas	1	330	1.0	0.0
-fr	08_non-res	1	330	1.0	0.0
-fr	09_hydro_pump	1	330	1.0	0.0
-fr	01_solar	1	331	1.0	0.0
-fr	02_wind_on	1	331	1.0	0.0
-fr	03_wind_off	1	331	1.0	0.0
-fr	04_res	1	331	1.0	0.0
-fr	05_nuclear	1	331	1.0	0.0
-fr	06_coal	1	331	1.0	0.0
-fr	07_gas	1	331	1.0	0.0
-fr	08_non-res	1	331	1.0	0.0
-fr	09_hydro_pump	1	331	1.0	0.0
-fr	01_solar	1	332	1.0	0.0
-fr	02_wind_on	1	332	1.0	0.0
-fr	03_wind_off	1	332	1.0	0.0
-fr	04_res	1	332	1.0	0.0
-fr	05_nuclear	1	332	1.0	0.0
-fr	06_coal	1	332	1.0	0.0
-fr	07_gas	1	332	1.0	0.0
-fr	08_non-res	1	332	1.0	0.0
-fr	09_hydro_pump	1	332	1.0	0.0
-fr	01_solar	1	333	1.0	0.0
-fr	02_wind_on	1	333	1.0	0.0
-fr	03_wind_off	1	333	1.0	0.0
-fr	04_res	1	333	1.0	0.0
-fr	05_nuclear	1	333	1.0	0.0
-fr	06_coal	1	333	1.0	0.0
-fr	07_gas	1	333	1.0	0.0
-fr	08_non-res	1	333	1.0	0.0
-fr	09_hydro_pump	1	333	1.0	0.0
-fr	01_solar	1	334	1.0	0.0
-fr	02_wind_on	1	334	1.0	0.0
-fr	03_wind_off	1	334	1.0	0.0
-fr	04_res	1	334	1.0	0.0
-fr	05_nuclear	1	334	1.0	0.0
-fr	06_coal	1	334	1.0	0.0
-fr	07_gas	1	334	1.0	0.0
-fr	08_non-res	1	334	1.0	0.0
-fr	09_hydro_pump	1	334	1.0	0.0
-fr	01_solar	1	335	1.0	0.0
-fr	02_wind_on	1	335	1.0	0.0
-fr	03_wind_off	1	335	1.0	0.0
-fr	04_res	1	335	1.0	0.0
-fr	05_nuclear	1	335	1.0	0.0
-fr	06_coal	1	335	1.0	0.0
-fr	07_gas	1	335	1.0	0.0
-fr	08_non-res	1	335	1.0	0.0
-fr	09_hydro_pump	1	335	1.0	0.0
-fr	01_solar	1	336	1.0	0.0
-fr	02_wind_on	1	336	1.0	0.0
-fr	03_wind_off	1	336	1.0	0.0
-fr	04_res	1	336	1.0	0.0
-fr	05_nuclear	1	336	1.0	0.0
-fr	06_coal	1	336	1.0	0.0
-fr	07_gas	1	336	1.0	0.0
-fr	08_non-res	1	336	1.0	0.0
-fr	09_hydro_pump	1	336	1.0	0.0
+fr	01_solar	1	330	0.0	1.0
+fr	02_wind_on	1	330	0.0	1.0
+fr	03_wind_off	1	330	0.0	1.0
+fr	04_res	1	330	0.0	1.0
+fr	05_nuclear	1	330	0.0	1.0
+fr	06_coal	1	330	0.0	1.0
+fr	07_gas	1	330	0.0	1.0
+fr	08_non-res	1	330	0.0	1.0
+fr	09_hydro_pump	1	330	0.0	1.0
+fr	01_solar	1	331	0.0	1.0
+fr	02_wind_on	1	331	0.0	1.0
+fr	03_wind_off	1	331	0.0	1.0
+fr	04_res	1	331	0.0	1.0
+fr	05_nuclear	1	331	0.0	1.0
+fr	06_coal	1	331	0.0	1.0
+fr	07_gas	1	331	0.0	1.0
+fr	08_non-res	1	331	0.0	1.0
+fr	09_hydro_pump	1	331	0.0	1.0
+fr	01_solar	1	332	0.0	1.0
+fr	02_wind_on	1	332	0.0	1.0
+fr	03_wind_off	1	332	0.0	1.0
+fr	04_res	1	332	0.0	1.0
+fr	05_nuclear	1	332	0.0	1.0
+fr	06_coal	1	332	0.0	1.0
+fr	07_gas	1	332	0.0	1.0
+fr	08_non-res	1	332	0.0	1.0
+fr	09_hydro_pump	1	332	0.0	1.0
+fr	01_solar	1	333	0.0	1.0
+fr	02_wind_on	1	333	0.0	1.0
+fr	03_wind_off	1	333	0.0	1.0
+fr	04_res	1	333	0.0	1.0
+fr	05_nuclear	1	333	0.0	1.0
+fr	06_coal	1	333	0.0	1.0
+fr	07_gas	1	333	0.0	1.0
+fr	08_non-res	1	333	0.0	1.0
+fr	09_hydro_pump	1	333	0.0	1.0
+fr	01_solar	1	334	0.0	1.0
+fr	02_wind_on	1	334	0.0	1.0
+fr	03_wind_off	1	334	0.0	1.0
+fr	04_res	1	334	0.0	1.0
+fr	05_nuclear	1	334	0.0	1.0
+fr	06_coal	1	334	0.0	1.0
+fr	07_gas	1	334	0.0	1.0
+fr	08_non-res	1	334	0.0	1.0
+fr	09_hydro_pump	1	334	0.0	1.0
+fr	01_solar	1	335	0.0	1.0
+fr	02_wind_on	1	335	0.0	1.0
+fr	03_wind_off	1	335	0.0	1.0
+fr	04_res	1	335	0.0	1.0
+fr	05_nuclear	1	335	0.0	1.0
+fr	06_coal	1	335	0.0	1.0
+fr	07_gas	1	335	0.0	1.0
+fr	08_non-res	1	335	0.0	1.0
+fr	09_hydro_pump	1	335	0.0	1.0
+fr	01_solar	1	336	0.0	1.0
+fr	02_wind_on	1	336	0.0	1.0
+fr	03_wind_off	1	336	0.0	1.0
+fr	04_res	1	336	0.0	1.0
+fr	05_nuclear	1	336	0.0	1.0
+fr	06_coal	1	336	0.0	1.0
+fr	07_gas	1	336	0.0	1.0
+fr	08_non-res	1	336	0.0	1.0
+fr	09_hydro_pump	1	336	0.0	1.0
 it	01_solar	1	1	0.0	0.0
 it	02_wind_on	1	1	0.0	0.0
 it	03_wind_off	1	1	0.0	0.0
@@ -9080,7 +9080,7 @@ it	06_coal	1	1	0.0	0.0
 it	07_gas	1	1	0.0	0.0
 it	08_non-res	1	1	0.0	0.0
 it	09_hydro_pump	1	1	0.0	0.0
-it	01_solar	1	2	1.0	0.0
+it	01_solar	1	2	0.0	1.0
 it	02_wind_on	1	2	0.0	0.0
 it	03_wind_off	1	2	0.0	0.0
 it	04_res	1	2	0.0	0.0
@@ -9089,7 +9089,7 @@ it	06_coal	1	2	0.0	0.0
 it	07_gas	1	2	0.0	0.0
 it	08_non-res	1	2	0.0	0.0
 it	09_hydro_pump	1	2	0.0	0.0
-it	01_solar	1	3	1.0	0.0
+it	01_solar	1	3	0.0	1.0
 it	02_wind_on	1	3	0.0	0.0
 it	03_wind_off	1	3	0.0	0.0
 it	04_res	1	3	0.0	0.0
@@ -9098,7 +9098,7 @@ it	06_coal	1	3	0.0	0.0
 it	07_gas	1	3	0.0	0.0
 it	08_non-res	1	3	0.0	0.0
 it	09_hydro_pump	1	3	0.0	0.0
-it	01_solar	1	4	1.0	0.0
+it	01_solar	1	4	0.0	1.0
 it	02_wind_on	1	4	0.0	0.0
 it	03_wind_off	1	4	0.0	0.0
 it	04_res	1	4	0.0	0.0
@@ -9107,7 +9107,7 @@ it	06_coal	1	4	0.0	0.0
 it	07_gas	1	4	0.0	0.0
 it	08_non-res	1	4	0.0	0.0
 it	09_hydro_pump	1	4	0.0	0.0
-it	01_solar	1	5	1.0	0.0
+it	01_solar	1	5	0.0	1.0
 it	02_wind_on	1	5	0.0	0.0
 it	03_wind_off	1	5	0.0	0.0
 it	04_res	1	5	0.0	0.0
@@ -9116,7 +9116,7 @@ it	06_coal	1	5	0.0	0.0
 it	07_gas	1	5	0.0	0.0
 it	08_non-res	1	5	0.0	0.0
 it	09_hydro_pump	1	5	0.0	0.0
-it	01_solar	1	6	1.0	0.0
+it	01_solar	1	6	0.0	1.0
 it	02_wind_on	1	6	0.0	0.0
 it	03_wind_off	1	6	0.0	0.0
 it	04_res	1	6	0.0	0.0
@@ -9125,7 +9125,7 @@ it	06_coal	1	6	0.0	0.0
 it	07_gas	1	6	0.0	0.0
 it	08_non-res	1	6	0.0	0.0
 it	09_hydro_pump	1	6	0.0	0.0
-it	01_solar	1	7	1.0	0.0
+it	01_solar	1	7	0.0	1.0
 it	02_wind_on	1	7	0.0	0.0
 it	03_wind_off	1	7	0.0	0.0
 it	04_res	1	7	0.0	0.0
@@ -9134,7 +9134,7 @@ it	06_coal	1	7	0.0	0.0
 it	07_gas	1	7	0.0	0.0
 it	08_non-res	1	7	0.0	0.0
 it	09_hydro_pump	1	7	0.0	0.0
-it	01_solar	1	8	1.0	0.0
+it	01_solar	1	8	0.0	1.0
 it	02_wind_on	1	8	0.0	0.0
 it	03_wind_off	1	8	0.0	0.0
 it	04_res	1	8	0.0	0.0
@@ -9143,7 +9143,7 @@ it	06_coal	1	8	0.0	0.0
 it	07_gas	1	8	0.0	0.0
 it	08_non-res	1	8	0.0	0.0
 it	09_hydro_pump	1	8	0.0	0.0
-it	01_solar	1	9	1.0	0.0
+it	01_solar	1	9	0.0	1.0
 it	02_wind_on	1	9	0.0	0.0
 it	03_wind_off	1	9	0.0	0.0
 it	04_res	1	9	0.0	0.0
@@ -9152,7 +9152,7 @@ it	06_coal	1	9	0.0	0.0
 it	07_gas	1	9	0.0	0.0
 it	08_non-res	1	9	0.0	0.0
 it	09_hydro_pump	1	9	0.0	0.0
-it	01_solar	1	10	1.0	0.0
+it	01_solar	1	10	0.0	1.0
 it	02_wind_on	1	10	0.0	0.0
 it	03_wind_off	1	10	0.0	0.0
 it	04_res	1	10	0.0	0.0
@@ -9161,7 +9161,7 @@ it	06_coal	1	10	0.0	0.0
 it	07_gas	1	10	0.0	0.0
 it	08_non-res	1	10	0.0	0.0
 it	09_hydro_pump	1	10	0.0	0.0
-it	01_solar	1	11	1.0	0.0
+it	01_solar	1	11	0.0	1.0
 it	02_wind_on	1	11	0.0	0.0
 it	03_wind_off	1	11	0.0	0.0
 it	04_res	1	11	0.0	0.0
@@ -9170,7 +9170,7 @@ it	06_coal	1	11	0.0	0.0
 it	07_gas	1	11	0.0	0.0
 it	08_non-res	1	11	0.0	0.0
 it	09_hydro_pump	1	11	0.0	0.0
-it	01_solar	1	12	1.0	0.0
+it	01_solar	1	12	0.0	1.0
 it	02_wind_on	1	12	0.0	0.0
 it	03_wind_off	1	12	0.0	0.0
 it	04_res	1	12	0.0	0.0
@@ -9179,7 +9179,7 @@ it	06_coal	1	12	0.0	0.0
 it	07_gas	1	12	0.0	0.0
 it	08_non-res	1	12	0.0	0.0
 it	09_hydro_pump	1	12	0.0	0.0
-it	01_solar	1	13	1.0	0.0
+it	01_solar	1	13	0.0	1.0
 it	02_wind_on	1	13	0.0	0.0
 it	03_wind_off	1	13	0.0	0.0
 it	04_res	1	13	0.0	0.0
@@ -9188,7 +9188,7 @@ it	06_coal	1	13	0.0	0.0
 it	07_gas	1	13	0.0	0.0
 it	08_non-res	1	13	0.0	0.0
 it	09_hydro_pump	1	13	0.0	0.0
-it	01_solar	1	14	1.0	0.0
+it	01_solar	1	14	0.0	1.0
 it	02_wind_on	1	14	0.0	0.0
 it	03_wind_off	1	14	0.0	0.0
 it	04_res	1	14	0.0	0.0
@@ -9197,7 +9197,7 @@ it	06_coal	1	14	0.0	0.0
 it	07_gas	1	14	0.0	0.0
 it	08_non-res	1	14	0.0	0.0
 it	09_hydro_pump	1	14	0.0	0.0
-it	01_solar	1	15	1.0	0.0
+it	01_solar	1	15	0.0	1.0
 it	02_wind_on	1	15	0.0	0.0
 it	03_wind_off	1	15	0.0	0.0
 it	04_res	1	15	0.0	0.0
@@ -9206,7 +9206,7 @@ it	06_coal	1	15	0.0	0.0
 it	07_gas	1	15	0.0	0.0
 it	08_non-res	1	15	0.0	0.0
 it	09_hydro_pump	1	15	0.0	0.0
-it	01_solar	1	16	1.0	0.0
+it	01_solar	1	16	0.0	1.0
 it	02_wind_on	1	16	0.0	0.0
 it	03_wind_off	1	16	0.0	0.0
 it	04_res	1	16	0.0	0.0
@@ -9215,7 +9215,7 @@ it	06_coal	1	16	0.0	0.0
 it	07_gas	1	16	0.0	0.0
 it	08_non-res	1	16	0.0	0.0
 it	09_hydro_pump	1	16	0.0	0.0
-it	01_solar	1	17	1.0	0.0
+it	01_solar	1	17	0.0	1.0
 it	02_wind_on	1	17	0.0	0.0
 it	03_wind_off	1	17	0.0	0.0
 it	04_res	1	17	0.0	0.0
@@ -9224,7 +9224,7 @@ it	06_coal	1	17	0.0	0.0
 it	07_gas	1	17	0.0	0.0
 it	08_non-res	1	17	0.0	0.0
 it	09_hydro_pump	1	17	0.0	0.0
-it	01_solar	1	18	1.0	0.0
+it	01_solar	1	18	0.0	1.0
 it	02_wind_on	1	18	0.0	0.0
 it	03_wind_off	1	18	0.0	0.0
 it	04_res	1	18	0.0	0.0
@@ -9233,7 +9233,7 @@ it	06_coal	1	18	0.0	0.0
 it	07_gas	1	18	0.0	0.0
 it	08_non-res	1	18	0.0	0.0
 it	09_hydro_pump	1	18	0.0	0.0
-it	01_solar	1	19	1.0	0.0
+it	01_solar	1	19	0.0	1.0
 it	02_wind_on	1	19	0.0	0.0
 it	03_wind_off	1	19	0.0	0.0
 it	04_res	1	19	0.0	0.0
@@ -9242,7 +9242,7 @@ it	06_coal	1	19	0.0	0.0
 it	07_gas	1	19	0.0	0.0
 it	08_non-res	1	19	0.0	0.0
 it	09_hydro_pump	1	19	0.0	0.0
-it	01_solar	1	20	1.0	0.0
+it	01_solar	1	20	0.0	1.0
 it	02_wind_on	1	20	0.0	0.0
 it	03_wind_off	1	20	0.0	0.0
 it	04_res	1	20	0.0	0.0
@@ -9251,7 +9251,7 @@ it	06_coal	1	20	0.0	0.0
 it	07_gas	1	20	0.0	0.0
 it	08_non-res	1	20	0.0	0.0
 it	09_hydro_pump	1	20	0.0	0.0
-it	01_solar	1	21	1.0	0.0
+it	01_solar	1	21	0.0	1.0
 it	02_wind_on	1	21	0.0	0.0
 it	03_wind_off	1	21	0.0	0.0
 it	04_res	1	21	0.0	0.0
@@ -9260,8 +9260,8 @@ it	06_coal	1	21	0.0	0.0
 it	07_gas	1	21	0.0	0.0
 it	08_non-res	1	21	0.0	0.0
 it	09_hydro_pump	1	21	0.0	0.0
-it	01_solar	1	22	1.0	0.0
-it	02_wind_on	1	22	1.0	0.0
+it	01_solar	1	22	0.0	1.0
+it	02_wind_on	1	22	0.0	1.0
 it	03_wind_off	1	22	0.0	0.0
 it	04_res	1	22	0.0	0.0
 it	05_nuclear	1	22	0.0	0.0
@@ -9269,8 +9269,8 @@ it	06_coal	1	22	0.0	0.0
 it	07_gas	1	22	0.0	0.0
 it	08_non-res	1	22	0.0	0.0
 it	09_hydro_pump	1	22	0.0	0.0
-it	01_solar	1	23	1.0	0.0
-it	02_wind_on	1	23	1.0	0.0
+it	01_solar	1	23	0.0	1.0
+it	02_wind_on	1	23	0.0	1.0
 it	03_wind_off	1	23	0.0	0.0
 it	04_res	1	23	0.0	0.0
 it	05_nuclear	1	23	0.0	0.0
@@ -9278,8 +9278,8 @@ it	06_coal	1	23	0.0	0.0
 it	07_gas	1	23	0.0	0.0
 it	08_non-res	1	23	0.0	0.0
 it	09_hydro_pump	1	23	0.0	0.0
-it	01_solar	1	24	1.0	0.0
-it	02_wind_on	1	24	1.0	0.0
+it	01_solar	1	24	0.0	1.0
+it	02_wind_on	1	24	0.0	1.0
 it	03_wind_off	1	24	0.0	0.0
 it	04_res	1	24	0.0	0.0
 it	05_nuclear	1	24	0.0	0.0
@@ -9287,8 +9287,8 @@ it	06_coal	1	24	0.0	0.0
 it	07_gas	1	24	0.0	0.0
 it	08_non-res	1	24	0.0	0.0
 it	09_hydro_pump	1	24	0.0	0.0
-it	01_solar	1	25	1.0	0.0
-it	02_wind_on	1	25	1.0	0.0
+it	01_solar	1	25	0.0	1.0
+it	02_wind_on	1	25	0.0	1.0
 it	03_wind_off	1	25	0.0	0.0
 it	04_res	1	25	0.0	0.0
 it	05_nuclear	1	25	0.0	0.0
@@ -9296,8 +9296,8 @@ it	06_coal	1	25	0.0	0.0
 it	07_gas	1	25	0.0	0.0
 it	08_non-res	1	25	0.0	0.0
 it	09_hydro_pump	1	25	0.0	0.0
-it	01_solar	1	26	1.0	0.0
-it	02_wind_on	1	26	1.0	0.0
+it	01_solar	1	26	0.0	1.0
+it	02_wind_on	1	26	0.0	1.0
 it	03_wind_off	1	26	0.0	0.0
 it	04_res	1	26	0.0	0.0
 it	05_nuclear	1	26	0.0	0.0
@@ -9305,8 +9305,8 @@ it	06_coal	1	26	0.0	0.0
 it	07_gas	1	26	0.0	0.0
 it	08_non-res	1	26	0.0	0.0
 it	09_hydro_pump	1	26	0.0	0.0
-it	01_solar	1	27	1.0	0.0
-it	02_wind_on	1	27	1.0	0.0
+it	01_solar	1	27	0.0	1.0
+it	02_wind_on	1	27	0.0	1.0
 it	03_wind_off	1	27	0.0	0.0
 it	04_res	1	27	0.0	0.0
 it	05_nuclear	1	27	0.0	0.0
@@ -9314,8 +9314,8 @@ it	06_coal	1	27	0.0	0.0
 it	07_gas	1	27	0.0	0.0
 it	08_non-res	1	27	0.0	0.0
 it	09_hydro_pump	1	27	0.0	0.0
-it	01_solar	1	28	1.0	0.0
-it	02_wind_on	1	28	1.0	0.0
+it	01_solar	1	28	0.0	1.0
+it	02_wind_on	1	28	0.0	1.0
 it	03_wind_off	1	28	0.0	0.0
 it	04_res	1	28	0.0	0.0
 it	05_nuclear	1	28	0.0	0.0
@@ -9323,8 +9323,8 @@ it	06_coal	1	28	0.0	0.0
 it	07_gas	1	28	0.0	0.0
 it	08_non-res	1	28	0.0	0.0
 it	09_hydro_pump	1	28	0.0	0.0
-it	01_solar	1	29	1.0	0.0
-it	02_wind_on	1	29	1.0	0.0
+it	01_solar	1	29	0.0	1.0
+it	02_wind_on	1	29	0.0	1.0
 it	03_wind_off	1	29	0.0	0.0
 it	04_res	1	29	0.0	0.0
 it	05_nuclear	1	29	0.0	0.0
@@ -9332,8 +9332,8 @@ it	06_coal	1	29	0.0	0.0
 it	07_gas	1	29	0.0	0.0
 it	08_non-res	1	29	0.0	0.0
 it	09_hydro_pump	1	29	0.0	0.0
-it	01_solar	1	30	1.0	0.0
-it	02_wind_on	1	30	1.0	0.0
+it	01_solar	1	30	0.0	1.0
+it	02_wind_on	1	30	0.0	1.0
 it	03_wind_off	1	30	0.0	0.0
 it	04_res	1	30	0.0	0.0
 it	05_nuclear	1	30	0.0	0.0
@@ -9341,8 +9341,8 @@ it	06_coal	1	30	0.0	0.0
 it	07_gas	1	30	0.0	0.0
 it	08_non-res	1	30	0.0	0.0
 it	09_hydro_pump	1	30	0.0	0.0
-it	01_solar	1	31	1.0	0.0
-it	02_wind_on	1	31	1.0	0.0
+it	01_solar	1	31	0.0	1.0
+it	02_wind_on	1	31	0.0	1.0
 it	03_wind_off	1	31	0.0	0.0
 it	04_res	1	31	0.0	0.0
 it	05_nuclear	1	31	0.0	0.0
@@ -9350,8 +9350,8 @@ it	06_coal	1	31	0.0	0.0
 it	07_gas	1	31	0.0	0.0
 it	08_non-res	1	31	0.0	0.0
 it	09_hydro_pump	1	31	0.0	0.0
-it	01_solar	1	32	1.0	0.0
-it	02_wind_on	1	32	1.0	0.0
+it	01_solar	1	32	0.0	1.0
+it	02_wind_on	1	32	0.0	1.0
 it	03_wind_off	1	32	0.0	0.0
 it	04_res	1	32	0.0	0.0
 it	05_nuclear	1	32	0.0	0.0
@@ -9359,8 +9359,8 @@ it	06_coal	1	32	0.0	0.0
 it	07_gas	1	32	0.0	0.0
 it	08_non-res	1	32	0.0	0.0
 it	09_hydro_pump	1	32	0.0	0.0
-it	01_solar	1	33	1.0	0.0
-it	02_wind_on	1	33	1.0	0.0
+it	01_solar	1	33	0.0	1.0
+it	02_wind_on	1	33	0.0	1.0
 it	03_wind_off	1	33	0.0	0.0
 it	04_res	1	33	0.0	0.0
 it	05_nuclear	1	33	0.0	0.0
@@ -9368,8 +9368,8 @@ it	06_coal	1	33	0.0	0.0
 it	07_gas	1	33	0.0	0.0
 it	08_non-res	1	33	0.0	0.0
 it	09_hydro_pump	1	33	0.0	0.0
-it	01_solar	1	34	1.0	0.0
-it	02_wind_on	1	34	1.0	0.0
+it	01_solar	1	34	0.0	1.0
+it	02_wind_on	1	34	0.0	1.0
 it	03_wind_off	1	34	0.0	0.0
 it	04_res	1	34	0.0	0.0
 it	05_nuclear	1	34	0.0	0.0
@@ -9377,8 +9377,8 @@ it	06_coal	1	34	0.0	0.0
 it	07_gas	1	34	0.0	0.0
 it	08_non-res	1	34	0.0	0.0
 it	09_hydro_pump	1	34	0.0	0.0
-it	01_solar	1	35	1.0	0.0
-it	02_wind_on	1	35	1.0	0.0
+it	01_solar	1	35	0.0	1.0
+it	02_wind_on	1	35	0.0	1.0
 it	03_wind_off	1	35	0.0	0.0
 it	04_res	1	35	0.0	0.0
 it	05_nuclear	1	35	0.0	0.0
@@ -9386,8 +9386,8 @@ it	06_coal	1	35	0.0	0.0
 it	07_gas	1	35	0.0	0.0
 it	08_non-res	1	35	0.0	0.0
 it	09_hydro_pump	1	35	0.0	0.0
-it	01_solar	1	36	1.0	0.0
-it	02_wind_on	1	36	1.0	0.0
+it	01_solar	1	36	0.0	1.0
+it	02_wind_on	1	36	0.0	1.0
 it	03_wind_off	1	36	0.0	0.0
 it	04_res	1	36	0.0	0.0
 it	05_nuclear	1	36	0.0	0.0
@@ -9395,8 +9395,8 @@ it	06_coal	1	36	0.0	0.0
 it	07_gas	1	36	0.0	0.0
 it	08_non-res	1	36	0.0	0.0
 it	09_hydro_pump	1	36	0.0	0.0
-it	01_solar	1	37	1.0	0.0
-it	02_wind_on	1	37	1.0	0.0
+it	01_solar	1	37	0.0	1.0
+it	02_wind_on	1	37	0.0	1.0
 it	03_wind_off	1	37	0.0	0.0
 it	04_res	1	37	0.0	0.0
 it	05_nuclear	1	37	0.0	0.0
@@ -9404,8 +9404,8 @@ it	06_coal	1	37	0.0	0.0
 it	07_gas	1	37	0.0	0.0
 it	08_non-res	1	37	0.0	0.0
 it	09_hydro_pump	1	37	0.0	0.0
-it	01_solar	1	38	1.0	0.0
-it	02_wind_on	1	38	1.0	0.0
+it	01_solar	1	38	0.0	1.0
+it	02_wind_on	1	38	0.0	1.0
 it	03_wind_off	1	38	0.0	0.0
 it	04_res	1	38	0.0	0.0
 it	05_nuclear	1	38	0.0	0.0
@@ -9413,8 +9413,8 @@ it	06_coal	1	38	0.0	0.0
 it	07_gas	1	38	0.0	0.0
 it	08_non-res	1	38	0.0	0.0
 it	09_hydro_pump	1	38	0.0	0.0
-it	01_solar	1	39	1.0	0.0
-it	02_wind_on	1	39	1.0	0.0
+it	01_solar	1	39	0.0	1.0
+it	02_wind_on	1	39	0.0	1.0
 it	03_wind_off	1	39	0.0	0.0
 it	04_res	1	39	0.0	0.0
 it	05_nuclear	1	39	0.0	0.0
@@ -9422,8 +9422,8 @@ it	06_coal	1	39	0.0	0.0
 it	07_gas	1	39	0.0	0.0
 it	08_non-res	1	39	0.0	0.0
 it	09_hydro_pump	1	39	0.0	0.0
-it	01_solar	1	40	1.0	0.0
-it	02_wind_on	1	40	1.0	0.0
+it	01_solar	1	40	0.0	1.0
+it	02_wind_on	1	40	0.0	1.0
 it	03_wind_off	1	40	0.0	0.0
 it	04_res	1	40	0.0	0.0
 it	05_nuclear	1	40	0.0	0.0
@@ -9431,8 +9431,8 @@ it	06_coal	1	40	0.0	0.0
 it	07_gas	1	40	0.0	0.0
 it	08_non-res	1	40	0.0	0.0
 it	09_hydro_pump	1	40	0.0	0.0
-it	01_solar	1	41	1.0	0.0
-it	02_wind_on	1	41	1.0	0.0
+it	01_solar	1	41	0.0	1.0
+it	02_wind_on	1	41	0.0	1.0
 it	03_wind_off	1	41	0.0	0.0
 it	04_res	1	41	0.0	0.0
 it	05_nuclear	1	41	0.0	0.0
@@ -9440,1149 +9440,1149 @@ it	06_coal	1	41	0.0	0.0
 it	07_gas	1	41	0.0	0.0
 it	08_non-res	1	41	0.0	0.0
 it	09_hydro_pump	1	41	0.0	0.0
-it	01_solar	1	42	1.0	0.0
-it	02_wind_on	1	42	1.0	0.0
-it	03_wind_off	1	42	1.0	0.0
+it	01_solar	1	42	0.0	1.0
+it	02_wind_on	1	42	0.0	1.0
+it	03_wind_off	1	42	0.0	1.0
 it	04_res	1	42	0.0	0.0
 it	05_nuclear	1	42	0.0	0.0
 it	06_coal	1	42	0.0	0.0
 it	07_gas	1	42	0.0	0.0
 it	08_non-res	1	42	0.0	0.0
 it	09_hydro_pump	1	42	0.0	0.0
-it	01_solar	1	43	1.0	0.0
-it	02_wind_on	1	43	1.0	0.0
-it	03_wind_off	1	43	1.0	0.0
+it	01_solar	1	43	0.0	1.0
+it	02_wind_on	1	43	0.0	1.0
+it	03_wind_off	1	43	0.0	1.0
 it	04_res	1	43	0.0	0.0
 it	05_nuclear	1	43	0.0	0.0
 it	06_coal	1	43	0.0	0.0
 it	07_gas	1	43	0.0	0.0
 it	08_non-res	1	43	0.0	0.0
 it	09_hydro_pump	1	43	0.0	0.0
-it	01_solar	1	44	1.0	0.0
-it	02_wind_on	1	44	1.0	0.0
-it	03_wind_off	1	44	1.0	0.0
+it	01_solar	1	44	0.0	1.0
+it	02_wind_on	1	44	0.0	1.0
+it	03_wind_off	1	44	0.0	1.0
 it	04_res	1	44	0.0	0.0
 it	05_nuclear	1	44	0.0	0.0
 it	06_coal	1	44	0.0	0.0
 it	07_gas	1	44	0.0	0.0
 it	08_non-res	1	44	0.0	0.0
 it	09_hydro_pump	1	44	0.0	0.0
-it	01_solar	1	45	1.0	0.0
-it	02_wind_on	1	45	1.0	0.0
-it	03_wind_off	1	45	1.0	0.0
+it	01_solar	1	45	0.0	1.0
+it	02_wind_on	1	45	0.0	1.0
+it	03_wind_off	1	45	0.0	1.0
 it	04_res	1	45	0.0	0.0
 it	05_nuclear	1	45	0.0	0.0
 it	06_coal	1	45	0.0	0.0
 it	07_gas	1	45	0.0	0.0
 it	08_non-res	1	45	0.0	0.0
 it	09_hydro_pump	1	45	0.0	0.0
-it	01_solar	1	46	1.0	0.0
-it	02_wind_on	1	46	1.0	0.0
-it	03_wind_off	1	46	1.0	0.0
+it	01_solar	1	46	0.0	1.0
+it	02_wind_on	1	46	0.0	1.0
+it	03_wind_off	1	46	0.0	1.0
 it	04_res	1	46	0.0	0.0
 it	05_nuclear	1	46	0.0	0.0
 it	06_coal	1	46	0.0	0.0
 it	07_gas	1	46	0.0	0.0
 it	08_non-res	1	46	0.0	0.0
 it	09_hydro_pump	1	46	0.0	0.0
-it	01_solar	1	47	1.0	0.0
-it	02_wind_on	1	47	1.0	0.0
-it	03_wind_off	1	47	1.0	0.0
+it	01_solar	1	47	0.0	1.0
+it	02_wind_on	1	47	0.0	1.0
+it	03_wind_off	1	47	0.0	1.0
 it	04_res	1	47	0.0	0.0
 it	05_nuclear	1	47	0.0	0.0
 it	06_coal	1	47	0.0	0.0
 it	07_gas	1	47	0.0	0.0
 it	08_non-res	1	47	0.0	0.0
 it	09_hydro_pump	1	47	0.0	0.0
-it	01_solar	1	48	1.0	0.0
-it	02_wind_on	1	48	1.0	0.0
-it	03_wind_off	1	48	1.0	0.0
+it	01_solar	1	48	0.0	1.0
+it	02_wind_on	1	48	0.0	1.0
+it	03_wind_off	1	48	0.0	1.0
 it	04_res	1	48	0.0	0.0
 it	05_nuclear	1	48	0.0	0.0
 it	06_coal	1	48	0.0	0.0
 it	07_gas	1	48	0.0	0.0
 it	08_non-res	1	48	0.0	0.0
 it	09_hydro_pump	1	48	0.0	0.0
-it	01_solar	1	49	1.0	0.0
-it	02_wind_on	1	49	1.0	0.0
-it	03_wind_off	1	49	1.0	0.0
+it	01_solar	1	49	0.0	1.0
+it	02_wind_on	1	49	0.0	1.0
+it	03_wind_off	1	49	0.0	1.0
 it	04_res	1	49	0.0	0.0
 it	05_nuclear	1	49	0.0	0.0
 it	06_coal	1	49	0.0	0.0
 it	07_gas	1	49	0.0	0.0
 it	08_non-res	1	49	0.0	0.0
 it	09_hydro_pump	1	49	0.0	0.0
-it	01_solar	1	50	1.0	0.0
-it	02_wind_on	1	50	1.0	0.0
-it	03_wind_off	1	50	1.0	0.0
+it	01_solar	1	50	0.0	1.0
+it	02_wind_on	1	50	0.0	1.0
+it	03_wind_off	1	50	0.0	1.0
 it	04_res	1	50	0.0	0.0
 it	05_nuclear	1	50	0.0	0.0
 it	06_coal	1	50	0.0	0.0
 it	07_gas	1	50	0.0	0.0
 it	08_non-res	1	50	0.0	0.0
 it	09_hydro_pump	1	50	0.0	0.0
-it	01_solar	1	51	1.0	0.0
-it	02_wind_on	1	51	1.0	0.0
-it	03_wind_off	1	51	1.0	0.0
+it	01_solar	1	51	0.0	1.0
+it	02_wind_on	1	51	0.0	1.0
+it	03_wind_off	1	51	0.0	1.0
 it	04_res	1	51	0.0	0.0
 it	05_nuclear	1	51	0.0	0.0
 it	06_coal	1	51	0.0	0.0
 it	07_gas	1	51	0.0	0.0
 it	08_non-res	1	51	0.0	0.0
 it	09_hydro_pump	1	51	0.0	0.0
-it	01_solar	1	52	1.0	0.0
-it	02_wind_on	1	52	1.0	0.0
-it	03_wind_off	1	52	1.0	0.0
+it	01_solar	1	52	0.0	1.0
+it	02_wind_on	1	52	0.0	1.0
+it	03_wind_off	1	52	0.0	1.0
 it	04_res	1	52	0.0	0.0
 it	05_nuclear	1	52	0.0	0.0
 it	06_coal	1	52	0.0	0.0
 it	07_gas	1	52	0.0	0.0
 it	08_non-res	1	52	0.0	0.0
 it	09_hydro_pump	1	52	0.0	0.0
-it	01_solar	1	53	1.0	0.0
-it	02_wind_on	1	53	1.0	0.0
-it	03_wind_off	1	53	1.0	0.0
+it	01_solar	1	53	0.0	1.0
+it	02_wind_on	1	53	0.0	1.0
+it	03_wind_off	1	53	0.0	1.0
 it	04_res	1	53	0.0	0.0
 it	05_nuclear	1	53	0.0	0.0
 it	06_coal	1	53	0.0	0.0
 it	07_gas	1	53	0.0	0.0
 it	08_non-res	1	53	0.0	0.0
 it	09_hydro_pump	1	53	0.0	0.0
-it	01_solar	1	54	1.0	0.0
-it	02_wind_on	1	54	1.0	0.0
-it	03_wind_off	1	54	1.0	0.0
+it	01_solar	1	54	0.0	1.0
+it	02_wind_on	1	54	0.0	1.0
+it	03_wind_off	1	54	0.0	1.0
 it	04_res	1	54	0.0	0.0
 it	05_nuclear	1	54	0.0	0.0
 it	06_coal	1	54	0.0	0.0
 it	07_gas	1	54	0.0	0.0
 it	08_non-res	1	54	0.0	0.0
 it	09_hydro_pump	1	54	0.0	0.0
-it	01_solar	1	55	1.0	0.0
-it	02_wind_on	1	55	1.0	0.0
-it	03_wind_off	1	55	1.0	0.0
+it	01_solar	1	55	0.0	1.0
+it	02_wind_on	1	55	0.0	1.0
+it	03_wind_off	1	55	0.0	1.0
 it	04_res	1	55	0.0	0.0
 it	05_nuclear	1	55	0.0	0.0
 it	06_coal	1	55	0.0	0.0
 it	07_gas	1	55	0.0	0.0
 it	08_non-res	1	55	0.0	0.0
 it	09_hydro_pump	1	55	0.0	0.0
-it	01_solar	1	56	1.0	0.0
-it	02_wind_on	1	56	1.0	0.0
-it	03_wind_off	1	56	1.0	0.0
+it	01_solar	1	56	0.0	1.0
+it	02_wind_on	1	56	0.0	1.0
+it	03_wind_off	1	56	0.0	1.0
 it	04_res	1	56	0.0	0.0
 it	05_nuclear	1	56	0.0	0.0
 it	06_coal	1	56	0.0	0.0
 it	07_gas	1	56	0.0	0.0
 it	08_non-res	1	56	0.0	0.0
 it	09_hydro_pump	1	56	0.0	0.0
-it	01_solar	1	57	1.0	0.0
-it	02_wind_on	1	57	1.0	0.0
-it	03_wind_off	1	57	1.0	0.0
+it	01_solar	1	57	0.0	1.0
+it	02_wind_on	1	57	0.0	1.0
+it	03_wind_off	1	57	0.0	1.0
 it	04_res	1	57	0.0	0.0
 it	05_nuclear	1	57	0.0	0.0
 it	06_coal	1	57	0.0	0.0
 it	07_gas	1	57	0.0	0.0
 it	08_non-res	1	57	0.0	0.0
 it	09_hydro_pump	1	57	0.0	0.0
-it	01_solar	1	58	1.0	0.0
-it	02_wind_on	1	58	1.0	0.0
-it	03_wind_off	1	58	1.0	0.0
+it	01_solar	1	58	0.0	1.0
+it	02_wind_on	1	58	0.0	1.0
+it	03_wind_off	1	58	0.0	1.0
 it	04_res	1	58	0.0	0.0
 it	05_nuclear	1	58	0.0	0.0
 it	06_coal	1	58	0.0	0.0
 it	07_gas	1	58	0.0	0.0
 it	08_non-res	1	58	0.0	0.0
 it	09_hydro_pump	1	58	0.0	0.0
-it	01_solar	1	59	1.0	0.0
-it	02_wind_on	1	59	1.0	0.0
-it	03_wind_off	1	59	1.0	0.0
+it	01_solar	1	59	0.0	1.0
+it	02_wind_on	1	59	0.0	1.0
+it	03_wind_off	1	59	0.0	1.0
 it	04_res	1	59	0.0	0.0
 it	05_nuclear	1	59	0.0	0.0
 it	06_coal	1	59	0.0	0.0
 it	07_gas	1	59	0.0	0.0
 it	08_non-res	1	59	0.0	0.0
 it	09_hydro_pump	1	59	0.0	0.0
-it	01_solar	1	60	1.0	0.0
-it	02_wind_on	1	60	1.0	0.0
-it	03_wind_off	1	60	1.0	0.0
+it	01_solar	1	60	0.0	1.0
+it	02_wind_on	1	60	0.0	1.0
+it	03_wind_off	1	60	0.0	1.0
 it	04_res	1	60	0.0	0.0
 it	05_nuclear	1	60	0.0	0.0
 it	06_coal	1	60	0.0	0.0
 it	07_gas	1	60	0.0	0.0
 it	08_non-res	1	60	0.0	0.0
 it	09_hydro_pump	1	60	0.0	0.0
-it	01_solar	1	61	1.0	0.0
-it	02_wind_on	1	61	1.0	0.0
-it	03_wind_off	1	61	1.0	0.0
+it	01_solar	1	61	0.0	1.0
+it	02_wind_on	1	61	0.0	1.0
+it	03_wind_off	1	61	0.0	1.0
 it	04_res	1	61	0.0	0.0
 it	05_nuclear	1	61	0.0	0.0
 it	06_coal	1	61	0.0	0.0
 it	07_gas	1	61	0.0	0.0
 it	08_non-res	1	61	0.0	0.0
 it	09_hydro_pump	1	61	0.0	0.0
-it	01_solar	1	62	1.0	0.0
-it	02_wind_on	1	62	1.0	0.0
-it	03_wind_off	1	62	1.0	0.0
-it	04_res	1	62	1.0	0.0
+it	01_solar	1	62	0.0	1.0
+it	02_wind_on	1	62	0.0	1.0
+it	03_wind_off	1	62	0.0	1.0
+it	04_res	1	62	0.0	1.0
 it	05_nuclear	1	62	0.0	0.0
 it	06_coal	1	62	0.0	0.0
 it	07_gas	1	62	0.0	0.0
 it	08_non-res	1	62	0.0	0.0
 it	09_hydro_pump	1	62	0.0	0.0
-it	01_solar	1	63	1.0	0.0
-it	02_wind_on	1	63	1.0	0.0
-it	03_wind_off	1	63	1.0	0.0
-it	04_res	1	63	1.0	0.0
+it	01_solar	1	63	0.0	1.0
+it	02_wind_on	1	63	0.0	1.0
+it	03_wind_off	1	63	0.0	1.0
+it	04_res	1	63	0.0	1.0
 it	05_nuclear	1	63	0.0	0.0
 it	06_coal	1	63	0.0	0.0
 it	07_gas	1	63	0.0	0.0
 it	08_non-res	1	63	0.0	0.0
 it	09_hydro_pump	1	63	0.0	0.0
-it	01_solar	1	64	1.0	0.0
-it	02_wind_on	1	64	1.0	0.0
-it	03_wind_off	1	64	1.0	0.0
-it	04_res	1	64	1.0	0.0
+it	01_solar	1	64	0.0	1.0
+it	02_wind_on	1	64	0.0	1.0
+it	03_wind_off	1	64	0.0	1.0
+it	04_res	1	64	0.0	1.0
 it	05_nuclear	1	64	0.0	0.0
 it	06_coal	1	64	0.0	0.0
 it	07_gas	1	64	0.0	0.0
 it	08_non-res	1	64	0.0	0.0
 it	09_hydro_pump	1	64	0.0	0.0
-it	01_solar	1	65	1.0	0.0
-it	02_wind_on	1	65	1.0	0.0
-it	03_wind_off	1	65	1.0	0.0
-it	04_res	1	65	1.0	0.0
+it	01_solar	1	65	0.0	1.0
+it	02_wind_on	1	65	0.0	1.0
+it	03_wind_off	1	65	0.0	1.0
+it	04_res	1	65	0.0	1.0
 it	05_nuclear	1	65	0.0	0.0
 it	06_coal	1	65	0.0	0.0
 it	07_gas	1	65	0.0	0.0
 it	08_non-res	1	65	0.0	0.0
 it	09_hydro_pump	1	65	0.0	0.0
-it	01_solar	1	66	1.0	0.0
-it	02_wind_on	1	66	1.0	0.0
-it	03_wind_off	1	66	1.0	0.0
-it	04_res	1	66	1.0	0.0
+it	01_solar	1	66	0.0	1.0
+it	02_wind_on	1	66	0.0	1.0
+it	03_wind_off	1	66	0.0	1.0
+it	04_res	1	66	0.0	1.0
 it	05_nuclear	1	66	0.0	0.0
 it	06_coal	1	66	0.0	0.0
 it	07_gas	1	66	0.0	0.0
 it	08_non-res	1	66	0.0	0.0
 it	09_hydro_pump	1	66	0.0	0.0
-it	01_solar	1	67	1.0	0.0
-it	02_wind_on	1	67	1.0	0.0
-it	03_wind_off	1	67	1.0	0.0
-it	04_res	1	67	1.0	0.0
+it	01_solar	1	67	0.0	1.0
+it	02_wind_on	1	67	0.0	1.0
+it	03_wind_off	1	67	0.0	1.0
+it	04_res	1	67	0.0	1.0
 it	05_nuclear	1	67	0.0	0.0
 it	06_coal	1	67	0.0	0.0
 it	07_gas	1	67	0.0	0.0
 it	08_non-res	1	67	0.0	0.0
 it	09_hydro_pump	1	67	0.0	0.0
-it	01_solar	1	68	1.0	0.0
-it	02_wind_on	1	68	1.0	0.0
-it	03_wind_off	1	68	1.0	0.0
-it	04_res	1	68	1.0	0.0
+it	01_solar	1	68	0.0	1.0
+it	02_wind_on	1	68	0.0	1.0
+it	03_wind_off	1	68	0.0	1.0
+it	04_res	1	68	0.0	1.0
 it	05_nuclear	1	68	0.0	0.0
 it	06_coal	1	68	0.0	0.0
 it	07_gas	1	68	0.0	0.0
 it	08_non-res	1	68	0.0	0.0
 it	09_hydro_pump	1	68	0.0	0.0
-it	01_solar	1	69	1.0	0.0
-it	02_wind_on	1	69	1.0	0.0
-it	03_wind_off	1	69	1.0	0.0
-it	04_res	1	69	1.0	0.0
+it	01_solar	1	69	0.0	1.0
+it	02_wind_on	1	69	0.0	1.0
+it	03_wind_off	1	69	0.0	1.0
+it	04_res	1	69	0.0	1.0
 it	05_nuclear	1	69	0.0	0.0
 it	06_coal	1	69	0.0	0.0
 it	07_gas	1	69	0.0	0.0
 it	08_non-res	1	69	0.0	0.0
 it	09_hydro_pump	1	69	0.0	0.0
-it	01_solar	1	70	1.0	0.0
-it	02_wind_on	1	70	1.0	0.0
-it	03_wind_off	1	70	1.0	0.0
-it	04_res	1	70	1.0	0.0
+it	01_solar	1	70	0.0	1.0
+it	02_wind_on	1	70	0.0	1.0
+it	03_wind_off	1	70	0.0	1.0
+it	04_res	1	70	0.0	1.0
 it	05_nuclear	1	70	0.0	0.0
 it	06_coal	1	70	0.0	0.0
 it	07_gas	1	70	0.0	0.0
 it	08_non-res	1	70	0.0	0.0
 it	09_hydro_pump	1	70	0.0	0.0
-it	01_solar	1	71	1.0	0.0
-it	02_wind_on	1	71	1.0	0.0
-it	03_wind_off	1	71	1.0	0.0
-it	04_res	1	71	1.0	0.0
+it	01_solar	1	71	0.0	1.0
+it	02_wind_on	1	71	0.0	1.0
+it	03_wind_off	1	71	0.0	1.0
+it	04_res	1	71	0.0	1.0
 it	05_nuclear	1	71	0.0	0.0
 it	06_coal	1	71	0.0	0.0
 it	07_gas	1	71	0.0	0.0
 it	08_non-res	1	71	0.0	0.0
 it	09_hydro_pump	1	71	0.0	0.0
-it	01_solar	1	72	1.0	0.0
-it	02_wind_on	1	72	1.0	0.0
-it	03_wind_off	1	72	1.0	0.0
-it	04_res	1	72	1.0	0.0
+it	01_solar	1	72	0.0	1.0
+it	02_wind_on	1	72	0.0	1.0
+it	03_wind_off	1	72	0.0	1.0
+it	04_res	1	72	0.0	1.0
 it	05_nuclear	1	72	0.0	0.0
 it	06_coal	1	72	0.0	0.0
 it	07_gas	1	72	0.0	0.0
 it	08_non-res	1	72	0.0	0.0
 it	09_hydro_pump	1	72	0.0	0.0
-it	01_solar	1	73	1.0	0.0
-it	02_wind_on	1	73	1.0	0.0
-it	03_wind_off	1	73	1.0	0.0
-it	04_res	1	73	1.0	0.0
+it	01_solar	1	73	0.0	1.0
+it	02_wind_on	1	73	0.0	1.0
+it	03_wind_off	1	73	0.0	1.0
+it	04_res	1	73	0.0	1.0
 it	05_nuclear	1	73	0.0	0.0
 it	06_coal	1	73	0.0	0.0
 it	07_gas	1	73	0.0	0.0
 it	08_non-res	1	73	0.0	0.0
 it	09_hydro_pump	1	73	0.0	0.0
-it	01_solar	1	74	1.0	0.0
-it	02_wind_on	1	74	1.0	0.0
-it	03_wind_off	1	74	1.0	0.0
-it	04_res	1	74	1.0	0.0
+it	01_solar	1	74	0.0	1.0
+it	02_wind_on	1	74	0.0	1.0
+it	03_wind_off	1	74	0.0	1.0
+it	04_res	1	74	0.0	1.0
 it	05_nuclear	1	74	0.0	0.0
 it	06_coal	1	74	0.0	0.0
 it	07_gas	1	74	0.0	0.0
 it	08_non-res	1	74	0.0	0.0
 it	09_hydro_pump	1	74	0.0	0.0
-it	01_solar	1	75	1.0	0.0
-it	02_wind_on	1	75	1.0	0.0
-it	03_wind_off	1	75	1.0	0.0
-it	04_res	1	75	1.0	0.0
+it	01_solar	1	75	0.0	1.0
+it	02_wind_on	1	75	0.0	1.0
+it	03_wind_off	1	75	0.0	1.0
+it	04_res	1	75	0.0	1.0
 it	05_nuclear	1	75	0.0	0.0
 it	06_coal	1	75	0.0	0.0
 it	07_gas	1	75	0.0	0.0
 it	08_non-res	1	75	0.0	0.0
 it	09_hydro_pump	1	75	0.0	0.0
-it	01_solar	1	76	1.0	0.0
-it	02_wind_on	1	76	1.0	0.0
-it	03_wind_off	1	76	1.0	0.0
-it	04_res	1	76	1.0	0.0
+it	01_solar	1	76	0.0	1.0
+it	02_wind_on	1	76	0.0	1.0
+it	03_wind_off	1	76	0.0	1.0
+it	04_res	1	76	0.0	1.0
 it	05_nuclear	1	76	0.0	0.0
 it	06_coal	1	76	0.0	0.0
 it	07_gas	1	76	0.0	0.0
 it	08_non-res	1	76	0.0	0.0
 it	09_hydro_pump	1	76	0.0	0.0
-it	01_solar	1	77	1.0	0.0
-it	02_wind_on	1	77	1.0	0.0
-it	03_wind_off	1	77	1.0	0.0
-it	04_res	1	77	1.0	0.0
+it	01_solar	1	77	0.0	1.0
+it	02_wind_on	1	77	0.0	1.0
+it	03_wind_off	1	77	0.0	1.0
+it	04_res	1	77	0.0	1.0
 it	05_nuclear	1	77	0.0	0.0
 it	06_coal	1	77	0.0	0.0
 it	07_gas	1	77	0.0	0.0
 it	08_non-res	1	77	0.0	0.0
 it	09_hydro_pump	1	77	0.0	0.0
-it	01_solar	1	78	1.0	0.0
-it	02_wind_on	1	78	1.0	0.0
-it	03_wind_off	1	78	1.0	0.0
-it	04_res	1	78	1.0	0.0
+it	01_solar	1	78	0.0	1.0
+it	02_wind_on	1	78	0.0	1.0
+it	03_wind_off	1	78	0.0	1.0
+it	04_res	1	78	0.0	1.0
 it	05_nuclear	1	78	0.0	0.0
 it	06_coal	1	78	0.0	0.0
 it	07_gas	1	78	0.0	0.0
 it	08_non-res	1	78	0.0	0.0
 it	09_hydro_pump	1	78	0.0	0.0
-it	01_solar	1	79	1.0	0.0
-it	02_wind_on	1	79	1.0	0.0
-it	03_wind_off	1	79	1.0	0.0
-it	04_res	1	79	1.0	0.0
+it	01_solar	1	79	0.0	1.0
+it	02_wind_on	1	79	0.0	1.0
+it	03_wind_off	1	79	0.0	1.0
+it	04_res	1	79	0.0	1.0
 it	05_nuclear	1	79	0.0	0.0
 it	06_coal	1	79	0.0	0.0
 it	07_gas	1	79	0.0	0.0
 it	08_non-res	1	79	0.0	0.0
 it	09_hydro_pump	1	79	0.0	0.0
-it	01_solar	1	80	1.0	0.0
-it	02_wind_on	1	80	1.0	0.0
-it	03_wind_off	1	80	1.0	0.0
-it	04_res	1	80	1.0	0.0
+it	01_solar	1	80	0.0	1.0
+it	02_wind_on	1	80	0.0	1.0
+it	03_wind_off	1	80	0.0	1.0
+it	04_res	1	80	0.0	1.0
 it	05_nuclear	1	80	0.0	0.0
 it	06_coal	1	80	0.0	0.0
 it	07_gas	1	80	0.0	0.0
 it	08_non-res	1	80	0.0	0.0
 it	09_hydro_pump	1	80	0.0	0.0
-it	01_solar	1	81	1.0	0.0
-it	02_wind_on	1	81	1.0	0.0
-it	03_wind_off	1	81	1.0	0.0
-it	04_res	1	81	1.0	0.0
+it	01_solar	1	81	0.0	1.0
+it	02_wind_on	1	81	0.0	1.0
+it	03_wind_off	1	81	0.0	1.0
+it	04_res	1	81	0.0	1.0
 it	05_nuclear	1	81	0.0	0.0
 it	06_coal	1	81	0.0	0.0
 it	07_gas	1	81	0.0	0.0
 it	08_non-res	1	81	0.0	0.0
 it	09_hydro_pump	1	81	0.0	0.0
-it	01_solar	1	82	1.0	0.0
-it	02_wind_on	1	82	1.0	0.0
-it	03_wind_off	1	82	1.0	0.0
-it	04_res	1	82	1.0	0.0
-it	05_nuclear	1	82	1.0	0.0
+it	01_solar	1	82	0.0	1.0
+it	02_wind_on	1	82	0.0	1.0
+it	03_wind_off	1	82	0.0	1.0
+it	04_res	1	82	0.0	1.0
+it	05_nuclear	1	82	0.0	1.0
 it	06_coal	1	82	0.0	0.0
 it	07_gas	1	82	0.0	0.0
 it	08_non-res	1	82	0.0	0.0
 it	09_hydro_pump	1	82	0.0	0.0
-it	01_solar	1	83	1.0	0.0
-it	02_wind_on	1	83	1.0	0.0
-it	03_wind_off	1	83	1.0	0.0
-it	04_res	1	83	1.0	0.0
-it	05_nuclear	1	83	1.0	0.0
+it	01_solar	1	83	0.0	1.0
+it	02_wind_on	1	83	0.0	1.0
+it	03_wind_off	1	83	0.0	1.0
+it	04_res	1	83	0.0	1.0
+it	05_nuclear	1	83	0.0	1.0
 it	06_coal	1	83	0.0	0.0
 it	07_gas	1	83	0.0	0.0
 it	08_non-res	1	83	0.0	0.0
 it	09_hydro_pump	1	83	0.0	0.0
-it	01_solar	1	84	1.0	0.0
-it	02_wind_on	1	84	1.0	0.0
-it	03_wind_off	1	84	1.0	0.0
-it	04_res	1	84	1.0	0.0
-it	05_nuclear	1	84	1.0	0.0
+it	01_solar	1	84	0.0	1.0
+it	02_wind_on	1	84	0.0	1.0
+it	03_wind_off	1	84	0.0	1.0
+it	04_res	1	84	0.0	1.0
+it	05_nuclear	1	84	0.0	1.0
 it	06_coal	1	84	0.0	0.0
 it	07_gas	1	84	0.0	0.0
 it	08_non-res	1	84	0.0	0.0
 it	09_hydro_pump	1	84	0.0	0.0
-it	01_solar	1	85	1.0	0.0
-it	02_wind_on	1	85	1.0	0.0
-it	03_wind_off	1	85	1.0	0.0
-it	04_res	1	85	1.0	0.0
-it	05_nuclear	1	85	1.0	0.0
+it	01_solar	1	85	0.0	1.0
+it	02_wind_on	1	85	0.0	1.0
+it	03_wind_off	1	85	0.0	1.0
+it	04_res	1	85	0.0	1.0
+it	05_nuclear	1	85	0.0	1.0
 it	06_coal	1	85	0.0	0.0
 it	07_gas	1	85	0.0	0.0
 it	08_non-res	1	85	0.0	0.0
 it	09_hydro_pump	1	85	0.0	0.0
-it	01_solar	1	86	1.0	0.0
-it	02_wind_on	1	86	1.0	0.0
-it	03_wind_off	1	86	1.0	0.0
-it	04_res	1	86	1.0	0.0
-it	05_nuclear	1	86	1.0	0.0
+it	01_solar	1	86	0.0	1.0
+it	02_wind_on	1	86	0.0	1.0
+it	03_wind_off	1	86	0.0	1.0
+it	04_res	1	86	0.0	1.0
+it	05_nuclear	1	86	0.0	1.0
 it	06_coal	1	86	0.0	0.0
 it	07_gas	1	86	0.0	0.0
 it	08_non-res	1	86	0.0	0.0
 it	09_hydro_pump	1	86	0.0	0.0
-it	01_solar	1	87	1.0	0.0
-it	02_wind_on	1	87	1.0	0.0
-it	03_wind_off	1	87	1.0	0.0
-it	04_res	1	87	1.0	0.0
-it	05_nuclear	1	87	1.0	0.0
+it	01_solar	1	87	0.0	1.0
+it	02_wind_on	1	87	0.0	1.0
+it	03_wind_off	1	87	0.0	1.0
+it	04_res	1	87	0.0	1.0
+it	05_nuclear	1	87	0.0	1.0
 it	06_coal	1	87	0.0	0.0
 it	07_gas	1	87	0.0	0.0
 it	08_non-res	1	87	0.0	0.0
 it	09_hydro_pump	1	87	0.0	0.0
-it	01_solar	1	88	1.0	0.0
-it	02_wind_on	1	88	1.0	0.0
-it	03_wind_off	1	88	1.0	0.0
-it	04_res	1	88	1.0	0.0
-it	05_nuclear	1	88	1.0	0.0
+it	01_solar	1	88	0.0	1.0
+it	02_wind_on	1	88	0.0	1.0
+it	03_wind_off	1	88	0.0	1.0
+it	04_res	1	88	0.0	1.0
+it	05_nuclear	1	88	0.0	1.0
 it	06_coal	1	88	0.0	0.0
 it	07_gas	1	88	0.0	0.0
 it	08_non-res	1	88	0.0	0.0
 it	09_hydro_pump	1	88	0.0	0.0
-it	01_solar	1	89	1.0	0.0
-it	02_wind_on	1	89	1.0	0.0
-it	03_wind_off	1	89	1.0	0.0
-it	04_res	1	89	1.0	0.0
-it	05_nuclear	1	89	1.0	0.0
+it	01_solar	1	89	0.0	1.0
+it	02_wind_on	1	89	0.0	1.0
+it	03_wind_off	1	89	0.0	1.0
+it	04_res	1	89	0.0	1.0
+it	05_nuclear	1	89	0.0	1.0
 it	06_coal	1	89	0.0	0.0
 it	07_gas	1	89	0.0	0.0
 it	08_non-res	1	89	0.0	0.0
 it	09_hydro_pump	1	89	0.0	0.0
-it	01_solar	1	90	1.0	0.0
-it	02_wind_on	1	90	1.0	0.0
-it	03_wind_off	1	90	1.0	0.0
-it	04_res	1	90	1.0	0.0
-it	05_nuclear	1	90	1.0	0.0
+it	01_solar	1	90	0.0	1.0
+it	02_wind_on	1	90	0.0	1.0
+it	03_wind_off	1	90	0.0	1.0
+it	04_res	1	90	0.0	1.0
+it	05_nuclear	1	90	0.0	1.0
 it	06_coal	1	90	0.0	0.0
 it	07_gas	1	90	0.0	0.0
 it	08_non-res	1	90	0.0	0.0
 it	09_hydro_pump	1	90	0.0	0.0
-it	01_solar	1	91	1.0	0.0
-it	02_wind_on	1	91	1.0	0.0
-it	03_wind_off	1	91	1.0	0.0
-it	04_res	1	91	1.0	0.0
-it	05_nuclear	1	91	1.0	0.0
+it	01_solar	1	91	0.0	1.0
+it	02_wind_on	1	91	0.0	1.0
+it	03_wind_off	1	91	0.0	1.0
+it	04_res	1	91	0.0	1.0
+it	05_nuclear	1	91	0.0	1.0
 it	06_coal	1	91	0.0	0.0
 it	07_gas	1	91	0.0	0.0
 it	08_non-res	1	91	0.0	0.0
 it	09_hydro_pump	1	91	0.0	0.0
-it	01_solar	1	92	1.0	0.0
-it	02_wind_on	1	92	1.0	0.0
-it	03_wind_off	1	92	1.0	0.0
-it	04_res	1	92	1.0	0.0
-it	05_nuclear	1	92	1.0	0.0
+it	01_solar	1	92	0.0	1.0
+it	02_wind_on	1	92	0.0	1.0
+it	03_wind_off	1	92	0.0	1.0
+it	04_res	1	92	0.0	1.0
+it	05_nuclear	1	92	0.0	1.0
 it	06_coal	1	92	0.0	0.0
 it	07_gas	1	92	0.0	0.0
 it	08_non-res	1	92	0.0	0.0
 it	09_hydro_pump	1	92	0.0	0.0
-it	01_solar	1	93	1.0	0.0
-it	02_wind_on	1	93	1.0	0.0
-it	03_wind_off	1	93	1.0	0.0
-it	04_res	1	93	1.0	0.0
-it	05_nuclear	1	93	1.0	0.0
+it	01_solar	1	93	0.0	1.0
+it	02_wind_on	1	93	0.0	1.0
+it	03_wind_off	1	93	0.0	1.0
+it	04_res	1	93	0.0	1.0
+it	05_nuclear	1	93	0.0	1.0
 it	06_coal	1	93	0.0	0.0
 it	07_gas	1	93	0.0	0.0
 it	08_non-res	1	93	0.0	0.0
 it	09_hydro_pump	1	93	0.0	0.0
-it	01_solar	1	94	1.0	0.0
-it	02_wind_on	1	94	1.0	0.0
-it	03_wind_off	1	94	1.0	0.0
-it	04_res	1	94	1.0	0.0
-it	05_nuclear	1	94	1.0	0.0
+it	01_solar	1	94	0.0	1.0
+it	02_wind_on	1	94	0.0	1.0
+it	03_wind_off	1	94	0.0	1.0
+it	04_res	1	94	0.0	1.0
+it	05_nuclear	1	94	0.0	1.0
 it	06_coal	1	94	0.0	0.0
 it	07_gas	1	94	0.0	0.0
 it	08_non-res	1	94	0.0	0.0
 it	09_hydro_pump	1	94	0.0	0.0
-it	01_solar	1	95	1.0	0.0
-it	02_wind_on	1	95	1.0	0.0
-it	03_wind_off	1	95	1.0	0.0
-it	04_res	1	95	1.0	0.0
-it	05_nuclear	1	95	1.0	0.0
+it	01_solar	1	95	0.0	1.0
+it	02_wind_on	1	95	0.0	1.0
+it	03_wind_off	1	95	0.0	1.0
+it	04_res	1	95	0.0	1.0
+it	05_nuclear	1	95	0.0	1.0
 it	06_coal	1	95	0.0	0.0
 it	07_gas	1	95	0.0	0.0
 it	08_non-res	1	95	0.0	0.0
 it	09_hydro_pump	1	95	0.0	0.0
-it	01_solar	1	96	1.0	0.0
-it	02_wind_on	1	96	1.0	0.0
-it	03_wind_off	1	96	1.0	0.0
-it	04_res	1	96	1.0	0.0
-it	05_nuclear	1	96	1.0	0.0
+it	01_solar	1	96	0.0	1.0
+it	02_wind_on	1	96	0.0	1.0
+it	03_wind_off	1	96	0.0	1.0
+it	04_res	1	96	0.0	1.0
+it	05_nuclear	1	96	0.0	1.0
 it	06_coal	1	96	0.0	0.0
 it	07_gas	1	96	0.0	0.0
 it	08_non-res	1	96	0.0	0.0
 it	09_hydro_pump	1	96	0.0	0.0
-it	01_solar	1	97	1.0	0.0
-it	02_wind_on	1	97	1.0	0.0
-it	03_wind_off	1	97	1.0	0.0
-it	04_res	1	97	1.0	0.0
-it	05_nuclear	1	97	1.0	0.0
+it	01_solar	1	97	0.0	1.0
+it	02_wind_on	1	97	0.0	1.0
+it	03_wind_off	1	97	0.0	1.0
+it	04_res	1	97	0.0	1.0
+it	05_nuclear	1	97	0.0	1.0
 it	06_coal	1	97	0.0	0.0
 it	07_gas	1	97	0.0	0.0
 it	08_non-res	1	97	0.0	0.0
 it	09_hydro_pump	1	97	0.0	0.0
-it	01_solar	1	98	1.0	0.0
-it	02_wind_on	1	98	1.0	0.0
-it	03_wind_off	1	98	1.0	0.0
-it	04_res	1	98	1.0	0.0
-it	05_nuclear	1	98	1.0	0.0
+it	01_solar	1	98	0.0	1.0
+it	02_wind_on	1	98	0.0	1.0
+it	03_wind_off	1	98	0.0	1.0
+it	04_res	1	98	0.0	1.0
+it	05_nuclear	1	98	0.0	1.0
 it	06_coal	1	98	0.0	0.0
 it	07_gas	1	98	0.0	0.0
 it	08_non-res	1	98	0.0	0.0
 it	09_hydro_pump	1	98	0.0	0.0
-it	01_solar	1	99	1.0	0.0
-it	02_wind_on	1	99	1.0	0.0
-it	03_wind_off	1	99	1.0	0.0
-it	04_res	1	99	1.0	0.0
-it	05_nuclear	1	99	1.0	0.0
+it	01_solar	1	99	0.0	1.0
+it	02_wind_on	1	99	0.0	1.0
+it	03_wind_off	1	99	0.0	1.0
+it	04_res	1	99	0.0	1.0
+it	05_nuclear	1	99	0.0	1.0
 it	06_coal	1	99	0.0	0.0
 it	07_gas	1	99	0.0	0.0
 it	08_non-res	1	99	0.0	0.0
 it	09_hydro_pump	1	99	0.0	0.0
-it	01_solar	1	100	1.0	0.0
-it	02_wind_on	1	100	1.0	0.0
-it	03_wind_off	1	100	1.0	0.0
-it	04_res	1	100	1.0	0.0
-it	05_nuclear	1	100	1.0	0.0
+it	01_solar	1	100	0.0	1.0
+it	02_wind_on	1	100	0.0	1.0
+it	03_wind_off	1	100	0.0	1.0
+it	04_res	1	100	0.0	1.0
+it	05_nuclear	1	100	0.0	1.0
 it	06_coal	1	100	0.0	0.0
 it	07_gas	1	100	0.0	0.0
 it	08_non-res	1	100	0.0	0.0
 it	09_hydro_pump	1	100	0.0	0.0
-it	01_solar	1	101	1.0	0.0
-it	02_wind_on	1	101	1.0	0.0
-it	03_wind_off	1	101	1.0	0.0
-it	04_res	1	101	1.0	0.0
-it	05_nuclear	1	101	1.0	0.0
+it	01_solar	1	101	0.0	1.0
+it	02_wind_on	1	101	0.0	1.0
+it	03_wind_off	1	101	0.0	1.0
+it	04_res	1	101	0.0	1.0
+it	05_nuclear	1	101	0.0	1.0
 it	06_coal	1	101	0.0	0.0
 it	07_gas	1	101	0.0	0.0
 it	08_non-res	1	101	0.0	0.0
 it	09_hydro_pump	1	101	0.0	0.0
-it	01_solar	1	102	1.0	0.0
-it	02_wind_on	1	102	1.0	0.0
-it	03_wind_off	1	102	1.0	0.0
-it	04_res	1	102	1.0	0.0
-it	05_nuclear	1	102	1.0	0.0
-it	06_coal	1	102	1.0	0.0
+it	01_solar	1	102	0.0	1.0
+it	02_wind_on	1	102	0.0	1.0
+it	03_wind_off	1	102	0.0	1.0
+it	04_res	1	102	0.0	1.0
+it	05_nuclear	1	102	0.0	1.0
+it	06_coal	1	102	0.0	1.0
 it	07_gas	1	102	0.0	0.0
 it	08_non-res	1	102	0.0	0.0
 it	09_hydro_pump	1	102	0.0	0.0
-it	01_solar	1	103	1.0	0.0
-it	02_wind_on	1	103	1.0	0.0
-it	03_wind_off	1	103	1.0	0.0
-it	04_res	1	103	1.0	0.0
-it	05_nuclear	1	103	1.0	0.0
-it	06_coal	1	103	1.0	0.0
+it	01_solar	1	103	0.0	1.0
+it	02_wind_on	1	103	0.0	1.0
+it	03_wind_off	1	103	0.0	1.0
+it	04_res	1	103	0.0	1.0
+it	05_nuclear	1	103	0.0	1.0
+it	06_coal	1	103	0.0	1.0
 it	07_gas	1	103	0.0	0.0
 it	08_non-res	1	103	0.0	0.0
 it	09_hydro_pump	1	103	0.0	0.0
-it	01_solar	1	104	1.0	0.0
-it	02_wind_on	1	104	1.0	0.0
-it	03_wind_off	1	104	1.0	0.0
-it	04_res	1	104	1.0	0.0
-it	05_nuclear	1	104	1.0	0.0
-it	06_coal	1	104	1.0	0.0
+it	01_solar	1	104	0.0	1.0
+it	02_wind_on	1	104	0.0	1.0
+it	03_wind_off	1	104	0.0	1.0
+it	04_res	1	104	0.0	1.0
+it	05_nuclear	1	104	0.0	1.0
+it	06_coal	1	104	0.0	1.0
 it	07_gas	1	104	0.0	0.0
 it	08_non-res	1	104	0.0	0.0
 it	09_hydro_pump	1	104	0.0	0.0
-it	01_solar	1	105	1.0	0.0
-it	02_wind_on	1	105	1.0	0.0
-it	03_wind_off	1	105	1.0	0.0
-it	04_res	1	105	1.0	0.0
-it	05_nuclear	1	105	1.0	0.0
-it	06_coal	1	105	1.0	0.0
+it	01_solar	1	105	0.0	1.0
+it	02_wind_on	1	105	0.0	1.0
+it	03_wind_off	1	105	0.0	1.0
+it	04_res	1	105	0.0	1.0
+it	05_nuclear	1	105	0.0	1.0
+it	06_coal	1	105	0.0	1.0
 it	07_gas	1	105	0.0	0.0
 it	08_non-res	1	105	0.0	0.0
 it	09_hydro_pump	1	105	0.0	0.0
-it	01_solar	1	106	1.0	0.0
-it	02_wind_on	1	106	1.0	0.0
-it	03_wind_off	1	106	1.0	0.0
-it	04_res	1	106	1.0	0.0
-it	05_nuclear	1	106	1.0	0.0
-it	06_coal	1	106	1.0	0.0
+it	01_solar	1	106	0.0	1.0
+it	02_wind_on	1	106	0.0	1.0
+it	03_wind_off	1	106	0.0	1.0
+it	04_res	1	106	0.0	1.0
+it	05_nuclear	1	106	0.0	1.0
+it	06_coal	1	106	0.0	1.0
 it	07_gas	1	106	0.0	0.0
 it	08_non-res	1	106	0.0	0.0
 it	09_hydro_pump	1	106	0.0	0.0
-it	01_solar	1	107	1.0	0.0
-it	02_wind_on	1	107	1.0	0.0
-it	03_wind_off	1	107	1.0	0.0
-it	04_res	1	107	1.0	0.0
-it	05_nuclear	1	107	1.0	0.0
-it	06_coal	1	107	1.0	0.0
+it	01_solar	1	107	0.0	1.0
+it	02_wind_on	1	107	0.0	1.0
+it	03_wind_off	1	107	0.0	1.0
+it	04_res	1	107	0.0	1.0
+it	05_nuclear	1	107	0.0	1.0
+it	06_coal	1	107	0.0	1.0
 it	07_gas	1	107	0.0	0.0
 it	08_non-res	1	107	0.0	0.0
 it	09_hydro_pump	1	107	0.0	0.0
-it	01_solar	1	108	1.0	0.0
-it	02_wind_on	1	108	1.0	0.0
-it	03_wind_off	1	108	1.0	0.0
-it	04_res	1	108	1.0	0.0
-it	05_nuclear	1	108	1.0	0.0
-it	06_coal	1	108	1.0	0.0
+it	01_solar	1	108	0.0	1.0
+it	02_wind_on	1	108	0.0	1.0
+it	03_wind_off	1	108	0.0	1.0
+it	04_res	1	108	0.0	1.0
+it	05_nuclear	1	108	0.0	1.0
+it	06_coal	1	108	0.0	1.0
 it	07_gas	1	108	0.0	0.0
 it	08_non-res	1	108	0.0	0.0
 it	09_hydro_pump	1	108	0.0	0.0
-it	01_solar	1	109	1.0	0.0
-it	02_wind_on	1	109	1.0	0.0
-it	03_wind_off	1	109	1.0	0.0
-it	04_res	1	109	1.0	0.0
-it	05_nuclear	1	109	1.0	0.0
-it	06_coal	1	109	1.0	0.0
+it	01_solar	1	109	0.0	1.0
+it	02_wind_on	1	109	0.0	1.0
+it	03_wind_off	1	109	0.0	1.0
+it	04_res	1	109	0.0	1.0
+it	05_nuclear	1	109	0.0	1.0
+it	06_coal	1	109	0.0	1.0
 it	07_gas	1	109	0.0	0.0
 it	08_non-res	1	109	0.0	0.0
 it	09_hydro_pump	1	109	0.0	0.0
-it	01_solar	1	110	1.0	0.0
-it	02_wind_on	1	110	1.0	0.0
-it	03_wind_off	1	110	1.0	0.0
-it	04_res	1	110	1.0	0.0
-it	05_nuclear	1	110	1.0	0.0
-it	06_coal	1	110	1.0	0.0
+it	01_solar	1	110	0.0	1.0
+it	02_wind_on	1	110	0.0	1.0
+it	03_wind_off	1	110	0.0	1.0
+it	04_res	1	110	0.0	1.0
+it	05_nuclear	1	110	0.0	1.0
+it	06_coal	1	110	0.0	1.0
 it	07_gas	1	110	0.0	0.0
 it	08_non-res	1	110	0.0	0.0
 it	09_hydro_pump	1	110	0.0	0.0
-it	01_solar	1	111	1.0	0.0
-it	02_wind_on	1	111	1.0	0.0
-it	03_wind_off	1	111	1.0	0.0
-it	04_res	1	111	1.0	0.0
-it	05_nuclear	1	111	1.0	0.0
-it	06_coal	1	111	1.0	0.0
+it	01_solar	1	111	0.0	1.0
+it	02_wind_on	1	111	0.0	1.0
+it	03_wind_off	1	111	0.0	1.0
+it	04_res	1	111	0.0	1.0
+it	05_nuclear	1	111	0.0	1.0
+it	06_coal	1	111	0.0	1.0
 it	07_gas	1	111	0.0	0.0
 it	08_non-res	1	111	0.0	0.0
 it	09_hydro_pump	1	111	0.0	0.0
-it	01_solar	1	112	1.0	0.0
-it	02_wind_on	1	112	1.0	0.0
-it	03_wind_off	1	112	1.0	0.0
-it	04_res	1	112	1.0	0.0
-it	05_nuclear	1	112	1.0	0.0
-it	06_coal	1	112	1.0	0.0
+it	01_solar	1	112	0.0	1.0
+it	02_wind_on	1	112	0.0	1.0
+it	03_wind_off	1	112	0.0	1.0
+it	04_res	1	112	0.0	1.0
+it	05_nuclear	1	112	0.0	1.0
+it	06_coal	1	112	0.0	1.0
 it	07_gas	1	112	0.0	0.0
 it	08_non-res	1	112	0.0	0.0
 it	09_hydro_pump	1	112	0.0	0.0
-it	01_solar	1	113	1.0	0.0
-it	02_wind_on	1	113	1.0	0.0
-it	03_wind_off	1	113	1.0	0.0
-it	04_res	1	113	1.0	0.0
-it	05_nuclear	1	113	1.0	0.0
-it	06_coal	1	113	1.0	0.0
+it	01_solar	1	113	0.0	1.0
+it	02_wind_on	1	113	0.0	1.0
+it	03_wind_off	1	113	0.0	1.0
+it	04_res	1	113	0.0	1.0
+it	05_nuclear	1	113	0.0	1.0
+it	06_coal	1	113	0.0	1.0
 it	07_gas	1	113	0.0	0.0
 it	08_non-res	1	113	0.0	0.0
 it	09_hydro_pump	1	113	0.0	0.0
-it	01_solar	1	114	1.0	0.0
-it	02_wind_on	1	114	1.0	0.0
-it	03_wind_off	1	114	1.0	0.0
-it	04_res	1	114	1.0	0.0
-it	05_nuclear	1	114	1.0	0.0
-it	06_coal	1	114	1.0	0.0
+it	01_solar	1	114	0.0	1.0
+it	02_wind_on	1	114	0.0	1.0
+it	03_wind_off	1	114	0.0	1.0
+it	04_res	1	114	0.0	1.0
+it	05_nuclear	1	114	0.0	1.0
+it	06_coal	1	114	0.0	1.0
 it	07_gas	1	114	0.0	0.0
 it	08_non-res	1	114	0.0	0.0
 it	09_hydro_pump	1	114	0.0	0.0
-it	01_solar	1	115	1.0	0.0
-it	02_wind_on	1	115	1.0	0.0
-it	03_wind_off	1	115	1.0	0.0
-it	04_res	1	115	1.0	0.0
-it	05_nuclear	1	115	1.0	0.0
-it	06_coal	1	115	1.0	0.0
+it	01_solar	1	115	0.0	1.0
+it	02_wind_on	1	115	0.0	1.0
+it	03_wind_off	1	115	0.0	1.0
+it	04_res	1	115	0.0	1.0
+it	05_nuclear	1	115	0.0	1.0
+it	06_coal	1	115	0.0	1.0
 it	07_gas	1	115	0.0	0.0
 it	08_non-res	1	115	0.0	0.0
 it	09_hydro_pump	1	115	0.0	0.0
-it	01_solar	1	116	1.0	0.0
-it	02_wind_on	1	116	1.0	0.0
-it	03_wind_off	1	116	1.0	0.0
-it	04_res	1	116	1.0	0.0
-it	05_nuclear	1	116	1.0	0.0
-it	06_coal	1	116	1.0	0.0
+it	01_solar	1	116	0.0	1.0
+it	02_wind_on	1	116	0.0	1.0
+it	03_wind_off	1	116	0.0	1.0
+it	04_res	1	116	0.0	1.0
+it	05_nuclear	1	116	0.0	1.0
+it	06_coal	1	116	0.0	1.0
 it	07_gas	1	116	0.0	0.0
 it	08_non-res	1	116	0.0	0.0
 it	09_hydro_pump	1	116	0.0	0.0
-it	01_solar	1	117	1.0	0.0
-it	02_wind_on	1	117	1.0	0.0
-it	03_wind_off	1	117	1.0	0.0
-it	04_res	1	117	1.0	0.0
-it	05_nuclear	1	117	1.0	0.0
-it	06_coal	1	117	1.0	0.0
+it	01_solar	1	117	0.0	1.0
+it	02_wind_on	1	117	0.0	1.0
+it	03_wind_off	1	117	0.0	1.0
+it	04_res	1	117	0.0	1.0
+it	05_nuclear	1	117	0.0	1.0
+it	06_coal	1	117	0.0	1.0
 it	07_gas	1	117	0.0	0.0
 it	08_non-res	1	117	0.0	0.0
 it	09_hydro_pump	1	117	0.0	0.0
-it	01_solar	1	118	1.0	0.0
-it	02_wind_on	1	118	1.0	0.0
-it	03_wind_off	1	118	1.0	0.0
-it	04_res	1	118	1.0	0.0
-it	05_nuclear	1	118	1.0	0.0
-it	06_coal	1	118	1.0	0.0
+it	01_solar	1	118	0.0	1.0
+it	02_wind_on	1	118	0.0	1.0
+it	03_wind_off	1	118	0.0	1.0
+it	04_res	1	118	0.0	1.0
+it	05_nuclear	1	118	0.0	1.0
+it	06_coal	1	118	0.0	1.0
 it	07_gas	1	118	0.0	0.0
 it	08_non-res	1	118	0.0	0.0
 it	09_hydro_pump	1	118	0.0	0.0
-it	01_solar	1	119	1.0	0.0
-it	02_wind_on	1	119	1.0	0.0
-it	03_wind_off	1	119	1.0	0.0
-it	04_res	1	119	1.0	0.0
-it	05_nuclear	1	119	1.0	0.0
-it	06_coal	1	119	1.0	0.0
+it	01_solar	1	119	0.0	1.0
+it	02_wind_on	1	119	0.0	1.0
+it	03_wind_off	1	119	0.0	1.0
+it	04_res	1	119	0.0	1.0
+it	05_nuclear	1	119	0.0	1.0
+it	06_coal	1	119	0.0	1.0
 it	07_gas	1	119	0.0	0.0
 it	08_non-res	1	119	0.0	0.0
 it	09_hydro_pump	1	119	0.0	0.0
-it	01_solar	1	120	1.0	0.0
-it	02_wind_on	1	120	1.0	0.0
-it	03_wind_off	1	120	1.0	0.0
-it	04_res	1	120	1.0	0.0
-it	05_nuclear	1	120	1.0	0.0
-it	06_coal	1	120	1.0	0.0
+it	01_solar	1	120	0.0	1.0
+it	02_wind_on	1	120	0.0	1.0
+it	03_wind_off	1	120	0.0	1.0
+it	04_res	1	120	0.0	1.0
+it	05_nuclear	1	120	0.0	1.0
+it	06_coal	1	120	0.0	1.0
 it	07_gas	1	120	0.0	0.0
 it	08_non-res	1	120	0.0	0.0
 it	09_hydro_pump	1	120	0.0	0.0
-it	01_solar	1	121	1.0	0.0
-it	02_wind_on	1	121	1.0	0.0
-it	03_wind_off	1	121	1.0	0.0
-it	04_res	1	121	1.0	0.0
-it	05_nuclear	1	121	1.0	0.0
-it	06_coal	1	121	1.0	0.0
+it	01_solar	1	121	0.0	1.0
+it	02_wind_on	1	121	0.0	1.0
+it	03_wind_off	1	121	0.0	1.0
+it	04_res	1	121	0.0	1.0
+it	05_nuclear	1	121	0.0	1.0
+it	06_coal	1	121	0.0	1.0
 it	07_gas	1	121	0.0	0.0
 it	08_non-res	1	121	0.0	0.0
 it	09_hydro_pump	1	121	0.0	0.0
-it	01_solar	1	122	1.0	0.0
-it	02_wind_on	1	122	1.0	0.0
-it	03_wind_off	1	122	1.0	0.0
-it	04_res	1	122	1.0	0.0
-it	05_nuclear	1	122	1.0	0.0
-it	06_coal	1	122	1.0	0.0
-it	07_gas	1	122	1.0	0.0
+it	01_solar	1	122	0.0	1.0
+it	02_wind_on	1	122	0.0	1.0
+it	03_wind_off	1	122	0.0	1.0
+it	04_res	1	122	0.0	1.0
+it	05_nuclear	1	122	0.0	1.0
+it	06_coal	1	122	0.0	1.0
+it	07_gas	1	122	0.0	1.0
 it	08_non-res	1	122	0.0	0.0
 it	09_hydro_pump	1	122	0.0	0.0
-it	01_solar	1	123	1.0	0.0
-it	02_wind_on	1	123	1.0	0.0
-it	03_wind_off	1	123	1.0	0.0
-it	04_res	1	123	1.0	0.0
-it	05_nuclear	1	123	1.0	0.0
-it	06_coal	1	123	1.0	0.0
-it	07_gas	1	123	1.0	0.0
+it	01_solar	1	123	0.0	1.0
+it	02_wind_on	1	123	0.0	1.0
+it	03_wind_off	1	123	0.0	1.0
+it	04_res	1	123	0.0	1.0
+it	05_nuclear	1	123	0.0	1.0
+it	06_coal	1	123	0.0	1.0
+it	07_gas	1	123	0.0	1.0
 it	08_non-res	1	123	0.0	0.0
 it	09_hydro_pump	1	123	0.0	0.0
-it	01_solar	1	124	1.0	0.0
-it	02_wind_on	1	124	1.0	0.0
-it	03_wind_off	1	124	1.0	0.0
-it	04_res	1	124	1.0	0.0
-it	05_nuclear	1	124	1.0	0.0
-it	06_coal	1	124	1.0	0.0
-it	07_gas	1	124	1.0	0.0
+it	01_solar	1	124	0.0	1.0
+it	02_wind_on	1	124	0.0	1.0
+it	03_wind_off	1	124	0.0	1.0
+it	04_res	1	124	0.0	1.0
+it	05_nuclear	1	124	0.0	1.0
+it	06_coal	1	124	0.0	1.0
+it	07_gas	1	124	0.0	1.0
 it	08_non-res	1	124	0.0	0.0
 it	09_hydro_pump	1	124	0.0	0.0
-it	01_solar	1	125	1.0	0.0
-it	02_wind_on	1	125	1.0	0.0
-it	03_wind_off	1	125	1.0	0.0
-it	04_res	1	125	1.0	0.0
-it	05_nuclear	1	125	1.0	0.0
-it	06_coal	1	125	1.0	0.0
-it	07_gas	1	125	1.0	0.0
+it	01_solar	1	125	0.0	1.0
+it	02_wind_on	1	125	0.0	1.0
+it	03_wind_off	1	125	0.0	1.0
+it	04_res	1	125	0.0	1.0
+it	05_nuclear	1	125	0.0	1.0
+it	06_coal	1	125	0.0	1.0
+it	07_gas	1	125	0.0	1.0
 it	08_non-res	1	125	0.0	0.0
 it	09_hydro_pump	1	125	0.0	0.0
-it	01_solar	1	126	1.0	0.0
-it	02_wind_on	1	126	1.0	0.0
-it	03_wind_off	1	126	1.0	0.0
-it	04_res	1	126	1.0	0.0
-it	05_nuclear	1	126	1.0	0.0
-it	06_coal	1	126	1.0	0.0
-it	07_gas	1	126	1.0	0.0
+it	01_solar	1	126	0.0	1.0
+it	02_wind_on	1	126	0.0	1.0
+it	03_wind_off	1	126	0.0	1.0
+it	04_res	1	126	0.0	1.0
+it	05_nuclear	1	126	0.0	1.0
+it	06_coal	1	126	0.0	1.0
+it	07_gas	1	126	0.0	1.0
 it	08_non-res	1	126	0.0	0.0
 it	09_hydro_pump	1	126	0.0	0.0
-it	01_solar	1	127	1.0	0.0
-it	02_wind_on	1	127	1.0	0.0
-it	03_wind_off	1	127	1.0	0.0
-it	04_res	1	127	1.0	0.0
-it	05_nuclear	1	127	1.0	0.0
-it	06_coal	1	127	1.0	0.0
-it	07_gas	1	127	1.0	0.0
+it	01_solar	1	127	0.0	1.0
+it	02_wind_on	1	127	0.0	1.0
+it	03_wind_off	1	127	0.0	1.0
+it	04_res	1	127	0.0	1.0
+it	05_nuclear	1	127	0.0	1.0
+it	06_coal	1	127	0.0	1.0
+it	07_gas	1	127	0.0	1.0
 it	08_non-res	1	127	0.0	0.0
 it	09_hydro_pump	1	127	0.0	0.0
-it	01_solar	1	128	1.0	0.0
-it	02_wind_on	1	128	1.0	0.0
-it	03_wind_off	1	128	1.0	0.0
-it	04_res	1	128	1.0	0.0
-it	05_nuclear	1	128	1.0	0.0
-it	06_coal	1	128	1.0	0.0
-it	07_gas	1	128	1.0	0.0
+it	01_solar	1	128	0.0	1.0
+it	02_wind_on	1	128	0.0	1.0
+it	03_wind_off	1	128	0.0	1.0
+it	04_res	1	128	0.0	1.0
+it	05_nuclear	1	128	0.0	1.0
+it	06_coal	1	128	0.0	1.0
+it	07_gas	1	128	0.0	1.0
 it	08_non-res	1	128	0.0	0.0
 it	09_hydro_pump	1	128	0.0	0.0
-it	01_solar	1	129	1.0	0.0
-it	02_wind_on	1	129	1.0	0.0
-it	03_wind_off	1	129	1.0	0.0
-it	04_res	1	129	1.0	0.0
-it	05_nuclear	1	129	1.0	0.0
-it	06_coal	1	129	1.0	0.0
-it	07_gas	1	129	1.0	0.0
+it	01_solar	1	129	0.0	1.0
+it	02_wind_on	1	129	0.0	1.0
+it	03_wind_off	1	129	0.0	1.0
+it	04_res	1	129	0.0	1.0
+it	05_nuclear	1	129	0.0	1.0
+it	06_coal	1	129	0.0	1.0
+it	07_gas	1	129	0.0	1.0
 it	08_non-res	1	129	0.0	0.0
 it	09_hydro_pump	1	129	0.0	0.0
-it	01_solar	1	130	1.0	0.0
-it	02_wind_on	1	130	1.0	0.0
-it	03_wind_off	1	130	1.0	0.0
-it	04_res	1	130	1.0	0.0
-it	05_nuclear	1	130	1.0	0.0
-it	06_coal	1	130	1.0	0.0
-it	07_gas	1	130	1.0	0.0
+it	01_solar	1	130	0.0	1.0
+it	02_wind_on	1	130	0.0	1.0
+it	03_wind_off	1	130	0.0	1.0
+it	04_res	1	130	0.0	1.0
+it	05_nuclear	1	130	0.0	1.0
+it	06_coal	1	130	0.0	1.0
+it	07_gas	1	130	0.0	1.0
 it	08_non-res	1	130	0.0	0.0
 it	09_hydro_pump	1	130	0.0	0.0
-it	01_solar	1	131	1.0	0.0
-it	02_wind_on	1	131	1.0	0.0
-it	03_wind_off	1	131	1.0	0.0
-it	04_res	1	131	1.0	0.0
-it	05_nuclear	1	131	1.0	0.0
-it	06_coal	1	131	1.0	0.0
-it	07_gas	1	131	1.0	0.0
+it	01_solar	1	131	0.0	1.0
+it	02_wind_on	1	131	0.0	1.0
+it	03_wind_off	1	131	0.0	1.0
+it	04_res	1	131	0.0	1.0
+it	05_nuclear	1	131	0.0	1.0
+it	06_coal	1	131	0.0	1.0
+it	07_gas	1	131	0.0	1.0
 it	08_non-res	1	131	0.0	0.0
 it	09_hydro_pump	1	131	0.0	0.0
-it	01_solar	1	132	1.0	0.0
-it	02_wind_on	1	132	1.0	0.0
-it	03_wind_off	1	132	1.0	0.0
-it	04_res	1	132	1.0	0.0
-it	05_nuclear	1	132	1.0	0.0
-it	06_coal	1	132	1.0	0.0
-it	07_gas	1	132	1.0	0.0
+it	01_solar	1	132	0.0	1.0
+it	02_wind_on	1	132	0.0	1.0
+it	03_wind_off	1	132	0.0	1.0
+it	04_res	1	132	0.0	1.0
+it	05_nuclear	1	132	0.0	1.0
+it	06_coal	1	132	0.0	1.0
+it	07_gas	1	132	0.0	1.0
 it	08_non-res	1	132	0.0	0.0
 it	09_hydro_pump	1	132	0.0	0.0
-it	01_solar	1	133	1.0	0.0
-it	02_wind_on	1	133	1.0	0.0
-it	03_wind_off	1	133	1.0	0.0
-it	04_res	1	133	1.0	0.0
-it	05_nuclear	1	133	1.0	0.0
-it	06_coal	1	133	1.0	0.0
-it	07_gas	1	133	1.0	0.0
+it	01_solar	1	133	0.0	1.0
+it	02_wind_on	1	133	0.0	1.0
+it	03_wind_off	1	133	0.0	1.0
+it	04_res	1	133	0.0	1.0
+it	05_nuclear	1	133	0.0	1.0
+it	06_coal	1	133	0.0	1.0
+it	07_gas	1	133	0.0	1.0
 it	08_non-res	1	133	0.0	0.0
 it	09_hydro_pump	1	133	0.0	0.0
-it	01_solar	1	134	1.0	0.0
-it	02_wind_on	1	134	1.0	0.0
-it	03_wind_off	1	134	1.0	0.0
-it	04_res	1	134	1.0	0.0
-it	05_nuclear	1	134	1.0	0.0
-it	06_coal	1	134	1.0	0.0
-it	07_gas	1	134	1.0	0.0
+it	01_solar	1	134	0.0	1.0
+it	02_wind_on	1	134	0.0	1.0
+it	03_wind_off	1	134	0.0	1.0
+it	04_res	1	134	0.0	1.0
+it	05_nuclear	1	134	0.0	1.0
+it	06_coal	1	134	0.0	1.0
+it	07_gas	1	134	0.0	1.0
 it	08_non-res	1	134	0.0	0.0
 it	09_hydro_pump	1	134	0.0	0.0
-it	01_solar	1	135	1.0	0.0
-it	02_wind_on	1	135	1.0	0.0
-it	03_wind_off	1	135	1.0	0.0
-it	04_res	1	135	1.0	0.0
-it	05_nuclear	1	135	1.0	0.0
-it	06_coal	1	135	1.0	0.0
-it	07_gas	1	135	1.0	0.0
+it	01_solar	1	135	0.0	1.0
+it	02_wind_on	1	135	0.0	1.0
+it	03_wind_off	1	135	0.0	1.0
+it	04_res	1	135	0.0	1.0
+it	05_nuclear	1	135	0.0	1.0
+it	06_coal	1	135	0.0	1.0
+it	07_gas	1	135	0.0	1.0
 it	08_non-res	1	135	0.0	0.0
 it	09_hydro_pump	1	135	0.0	0.0
-it	01_solar	1	136	1.0	0.0
-it	02_wind_on	1	136	1.0	0.0
-it	03_wind_off	1	136	1.0	0.0
-it	04_res	1	136	1.0	0.0
-it	05_nuclear	1	136	1.0	0.0
-it	06_coal	1	136	1.0	0.0
-it	07_gas	1	136	1.0	0.0
+it	01_solar	1	136	0.0	1.0
+it	02_wind_on	1	136	0.0	1.0
+it	03_wind_off	1	136	0.0	1.0
+it	04_res	1	136	0.0	1.0
+it	05_nuclear	1	136	0.0	1.0
+it	06_coal	1	136	0.0	1.0
+it	07_gas	1	136	0.0	1.0
 it	08_non-res	1	136	0.0	0.0
 it	09_hydro_pump	1	136	0.0	0.0
-it	01_solar	1	137	1.0	0.0
-it	02_wind_on	1	137	1.0	0.0
-it	03_wind_off	1	137	1.0	0.0
-it	04_res	1	137	1.0	0.0
-it	05_nuclear	1	137	1.0	0.0
-it	06_coal	1	137	1.0	0.0
-it	07_gas	1	137	1.0	0.0
+it	01_solar	1	137	0.0	1.0
+it	02_wind_on	1	137	0.0	1.0
+it	03_wind_off	1	137	0.0	1.0
+it	04_res	1	137	0.0	1.0
+it	05_nuclear	1	137	0.0	1.0
+it	06_coal	1	137	0.0	1.0
+it	07_gas	1	137	0.0	1.0
 it	08_non-res	1	137	0.0	0.0
 it	09_hydro_pump	1	137	0.0	0.0
-it	01_solar	1	138	1.0	0.0
-it	02_wind_on	1	138	1.0	0.0
-it	03_wind_off	1	138	1.0	0.0
-it	04_res	1	138	1.0	0.0
-it	05_nuclear	1	138	1.0	0.0
-it	06_coal	1	138	1.0	0.0
-it	07_gas	1	138	1.0	0.0
+it	01_solar	1	138	0.0	1.0
+it	02_wind_on	1	138	0.0	1.0
+it	03_wind_off	1	138	0.0	1.0
+it	04_res	1	138	0.0	1.0
+it	05_nuclear	1	138	0.0	1.0
+it	06_coal	1	138	0.0	1.0
+it	07_gas	1	138	0.0	1.0
 it	08_non-res	1	138	0.0	0.0
 it	09_hydro_pump	1	138	0.0	0.0
-it	01_solar	1	139	1.0	0.0
-it	02_wind_on	1	139	1.0	0.0
-it	03_wind_off	1	139	1.0	0.0
-it	04_res	1	139	1.0	0.0
-it	05_nuclear	1	139	1.0	0.0
-it	06_coal	1	139	1.0	0.0
-it	07_gas	1	139	1.0	0.0
+it	01_solar	1	139	0.0	1.0
+it	02_wind_on	1	139	0.0	1.0
+it	03_wind_off	1	139	0.0	1.0
+it	04_res	1	139	0.0	1.0
+it	05_nuclear	1	139	0.0	1.0
+it	06_coal	1	139	0.0	1.0
+it	07_gas	1	139	0.0	1.0
 it	08_non-res	1	139	0.0	0.0
 it	09_hydro_pump	1	139	0.0	0.0
-it	01_solar	1	140	1.0	0.0
-it	02_wind_on	1	140	1.0	0.0
-it	03_wind_off	1	140	1.0	0.0
-it	04_res	1	140	1.0	0.0
-it	05_nuclear	1	140	1.0	0.0
-it	06_coal	1	140	1.0	0.0
-it	07_gas	1	140	1.0	0.0
+it	01_solar	1	140	0.0	1.0
+it	02_wind_on	1	140	0.0	1.0
+it	03_wind_off	1	140	0.0	1.0
+it	04_res	1	140	0.0	1.0
+it	05_nuclear	1	140	0.0	1.0
+it	06_coal	1	140	0.0	1.0
+it	07_gas	1	140	0.0	1.0
 it	08_non-res	1	140	0.0	0.0
 it	09_hydro_pump	1	140	0.0	0.0
-it	01_solar	1	141	1.0	0.0
-it	02_wind_on	1	141	1.0	0.0
-it	03_wind_off	1	141	1.0	0.0
-it	04_res	1	141	1.0	0.0
-it	05_nuclear	1	141	1.0	0.0
-it	06_coal	1	141	1.0	0.0
-it	07_gas	1	141	1.0	0.0
+it	01_solar	1	141	0.0	1.0
+it	02_wind_on	1	141	0.0	1.0
+it	03_wind_off	1	141	0.0	1.0
+it	04_res	1	141	0.0	1.0
+it	05_nuclear	1	141	0.0	1.0
+it	06_coal	1	141	0.0	1.0
+it	07_gas	1	141	0.0	1.0
 it	08_non-res	1	141	0.0	0.0
 it	09_hydro_pump	1	141	0.0	0.0
-it	01_solar	1	142	1.0	0.0
-it	02_wind_on	1	142	1.0	0.0
-it	03_wind_off	1	142	1.0	0.0
-it	04_res	1	142	1.0	0.0
-it	05_nuclear	1	142	1.0	0.0
-it	06_coal	1	142	1.0	0.0
-it	07_gas	1	142	1.0	0.0
-it	08_non-res	1	142	1.0	0.0
+it	01_solar	1	142	0.0	1.0
+it	02_wind_on	1	142	0.0	1.0
+it	03_wind_off	1	142	0.0	1.0
+it	04_res	1	142	0.0	1.0
+it	05_nuclear	1	142	0.0	1.0
+it	06_coal	1	142	0.0	1.0
+it	07_gas	1	142	0.0	1.0
+it	08_non-res	1	142	0.0	1.0
 it	09_hydro_pump	1	142	0.0	0.0
-it	01_solar	1	143	1.0	0.0
-it	02_wind_on	1	143	1.0	0.0
-it	03_wind_off	1	143	1.0	0.0
-it	04_res	1	143	1.0	0.0
-it	05_nuclear	1	143	1.0	0.0
-it	06_coal	1	143	1.0	0.0
-it	07_gas	1	143	1.0	0.0
-it	08_non-res	1	143	1.0	0.0
+it	01_solar	1	143	0.0	1.0
+it	02_wind_on	1	143	0.0	1.0
+it	03_wind_off	1	143	0.0	1.0
+it	04_res	1	143	0.0	1.0
+it	05_nuclear	1	143	0.0	1.0
+it	06_coal	1	143	0.0	1.0
+it	07_gas	1	143	0.0	1.0
+it	08_non-res	1	143	0.0	1.0
 it	09_hydro_pump	1	143	0.0	0.0
-it	01_solar	1	144	1.0	0.0
-it	02_wind_on	1	144	1.0	0.0
-it	03_wind_off	1	144	1.0	0.0
-it	04_res	1	144	1.0	0.0
-it	05_nuclear	1	144	1.0	0.0
-it	06_coal	1	144	1.0	0.0
-it	07_gas	1	144	1.0	0.0
-it	08_non-res	1	144	1.0	0.0
+it	01_solar	1	144	0.0	1.0
+it	02_wind_on	1	144	0.0	1.0
+it	03_wind_off	1	144	0.0	1.0
+it	04_res	1	144	0.0	1.0
+it	05_nuclear	1	144	0.0	1.0
+it	06_coal	1	144	0.0	1.0
+it	07_gas	1	144	0.0	1.0
+it	08_non-res	1	144	0.0	1.0
 it	09_hydro_pump	1	144	0.0	0.0
-it	01_solar	1	145	1.0	0.0
-it	02_wind_on	1	145	1.0	0.0
-it	03_wind_off	1	145	1.0	0.0
-it	04_res	1	145	1.0	0.0
-it	05_nuclear	1	145	1.0	0.0
-it	06_coal	1	145	1.0	0.0
-it	07_gas	1	145	1.0	0.0
-it	08_non-res	1	145	1.0	0.0
+it	01_solar	1	145	0.0	1.0
+it	02_wind_on	1	145	0.0	1.0
+it	03_wind_off	1	145	0.0	1.0
+it	04_res	1	145	0.0	1.0
+it	05_nuclear	1	145	0.0	1.0
+it	06_coal	1	145	0.0	1.0
+it	07_gas	1	145	0.0	1.0
+it	08_non-res	1	145	0.0	1.0
 it	09_hydro_pump	1	145	0.0	0.0
-it	01_solar	1	146	1.0	0.0
-it	02_wind_on	1	146	1.0	0.0
-it	03_wind_off	1	146	1.0	0.0
-it	04_res	1	146	1.0	0.0
-it	05_nuclear	1	146	1.0	0.0
-it	06_coal	1	146	1.0	0.0
-it	07_gas	1	146	1.0	0.0
-it	08_non-res	1	146	1.0	0.0
+it	01_solar	1	146	0.0	1.0
+it	02_wind_on	1	146	0.0	1.0
+it	03_wind_off	1	146	0.0	1.0
+it	04_res	1	146	0.0	1.0
+it	05_nuclear	1	146	0.0	1.0
+it	06_coal	1	146	0.0	1.0
+it	07_gas	1	146	0.0	1.0
+it	08_non-res	1	146	0.0	1.0
 it	09_hydro_pump	1	146	0.0	0.0
-it	01_solar	1	147	1.0	0.0
-it	02_wind_on	1	147	1.0	0.0
-it	03_wind_off	1	147	1.0	0.0
-it	04_res	1	147	1.0	0.0
-it	05_nuclear	1	147	1.0	0.0
-it	06_coal	1	147	1.0	0.0
-it	07_gas	1	147	1.0	0.0
-it	08_non-res	1	147	1.0	0.0
+it	01_solar	1	147	0.0	1.0
+it	02_wind_on	1	147	0.0	1.0
+it	03_wind_off	1	147	0.0	1.0
+it	04_res	1	147	0.0	1.0
+it	05_nuclear	1	147	0.0	1.0
+it	06_coal	1	147	0.0	1.0
+it	07_gas	1	147	0.0	1.0
+it	08_non-res	1	147	0.0	1.0
 it	09_hydro_pump	1	147	0.0	0.0
-it	01_solar	1	148	1.0	0.0
-it	02_wind_on	1	148	1.0	0.0
-it	03_wind_off	1	148	1.0	0.0
-it	04_res	1	148	1.0	0.0
-it	05_nuclear	1	148	1.0	0.0
-it	06_coal	1	148	1.0	0.0
-it	07_gas	1	148	1.0	0.0
-it	08_non-res	1	148	1.0	0.0
+it	01_solar	1	148	0.0	1.0
+it	02_wind_on	1	148	0.0	1.0
+it	03_wind_off	1	148	0.0	1.0
+it	04_res	1	148	0.0	1.0
+it	05_nuclear	1	148	0.0	1.0
+it	06_coal	1	148	0.0	1.0
+it	07_gas	1	148	0.0	1.0
+it	08_non-res	1	148	0.0	1.0
 it	09_hydro_pump	1	148	0.0	0.0
-it	01_solar	1	149	1.0	0.0
-it	02_wind_on	1	149	1.0	0.0
-it	03_wind_off	1	149	1.0	0.0
-it	04_res	1	149	1.0	0.0
-it	05_nuclear	1	149	1.0	0.0
-it	06_coal	1	149	1.0	0.0
-it	07_gas	1	149	1.0	0.0
-it	08_non-res	1	149	1.0	0.0
+it	01_solar	1	149	0.0	1.0
+it	02_wind_on	1	149	0.0	1.0
+it	03_wind_off	1	149	0.0	1.0
+it	04_res	1	149	0.0	1.0
+it	05_nuclear	1	149	0.0	1.0
+it	06_coal	1	149	0.0	1.0
+it	07_gas	1	149	0.0	1.0
+it	08_non-res	1	149	0.0	1.0
 it	09_hydro_pump	1	149	0.0	0.0
-it	01_solar	1	150	1.0	0.0
-it	02_wind_on	1	150	1.0	0.0
-it	03_wind_off	1	150	1.0	0.0
-it	04_res	1	150	1.0	0.0
-it	05_nuclear	1	150	1.0	0.0
-it	06_coal	1	150	1.0	0.0
-it	07_gas	1	150	1.0	0.0
-it	08_non-res	1	150	1.0	0.0
+it	01_solar	1	150	0.0	1.0
+it	02_wind_on	1	150	0.0	1.0
+it	03_wind_off	1	150	0.0	1.0
+it	04_res	1	150	0.0	1.0
+it	05_nuclear	1	150	0.0	1.0
+it	06_coal	1	150	0.0	1.0
+it	07_gas	1	150	0.0	1.0
+it	08_non-res	1	150	0.0	1.0
 it	09_hydro_pump	1	150	0.0	0.0
-it	01_solar	1	151	1.0	0.0
-it	02_wind_on	1	151	1.0	0.0
-it	03_wind_off	1	151	1.0	0.0
-it	04_res	1	151	1.0	0.0
-it	05_nuclear	1	151	1.0	0.0
-it	06_coal	1	151	1.0	0.0
-it	07_gas	1	151	1.0	0.0
-it	08_non-res	1	151	1.0	0.0
+it	01_solar	1	151	0.0	1.0
+it	02_wind_on	1	151	0.0	1.0
+it	03_wind_off	1	151	0.0	1.0
+it	04_res	1	151	0.0	1.0
+it	05_nuclear	1	151	0.0	1.0
+it	06_coal	1	151	0.0	1.0
+it	07_gas	1	151	0.0	1.0
+it	08_non-res	1	151	0.0	1.0
 it	09_hydro_pump	1	151	0.0	0.0
-it	01_solar	1	152	1.0	0.0
-it	02_wind_on	1	152	1.0	0.0
-it	03_wind_off	1	152	1.0	0.0
-it	04_res	1	152	1.0	0.0
-it	05_nuclear	1	152	1.0	0.0
-it	06_coal	1	152	1.0	0.0
-it	07_gas	1	152	1.0	0.0
-it	08_non-res	1	152	1.0	0.0
+it	01_solar	1	152	0.0	1.0
+it	02_wind_on	1	152	0.0	1.0
+it	03_wind_off	1	152	0.0	1.0
+it	04_res	1	152	0.0	1.0
+it	05_nuclear	1	152	0.0	1.0
+it	06_coal	1	152	0.0	1.0
+it	07_gas	1	152	0.0	1.0
+it	08_non-res	1	152	0.0	1.0
 it	09_hydro_pump	1	152	0.0	0.0
-it	01_solar	1	153	1.0	0.0
-it	02_wind_on	1	153	1.0	0.0
-it	03_wind_off	1	153	1.0	0.0
-it	04_res	1	153	1.0	0.0
-it	05_nuclear	1	153	1.0	0.0
-it	06_coal	1	153	1.0	0.0
-it	07_gas	1	153	1.0	0.0
-it	08_non-res	1	153	1.0	0.0
+it	01_solar	1	153	0.0	1.0
+it	02_wind_on	1	153	0.0	1.0
+it	03_wind_off	1	153	0.0	1.0
+it	04_res	1	153	0.0	1.0
+it	05_nuclear	1	153	0.0	1.0
+it	06_coal	1	153	0.0	1.0
+it	07_gas	1	153	0.0	1.0
+it	08_non-res	1	153	0.0	1.0
 it	09_hydro_pump	1	153	0.0	0.0
-it	01_solar	1	154	1.0	0.0
-it	02_wind_on	1	154	1.0	0.0
-it	03_wind_off	1	154	1.0	0.0
-it	04_res	1	154	1.0	0.0
-it	05_nuclear	1	154	1.0	0.0
-it	06_coal	1	154	1.0	0.0
-it	07_gas	1	154	1.0	0.0
-it	08_non-res	1	154	1.0	0.0
+it	01_solar	1	154	0.0	1.0
+it	02_wind_on	1	154	0.0	1.0
+it	03_wind_off	1	154	0.0	1.0
+it	04_res	1	154	0.0	1.0
+it	05_nuclear	1	154	0.0	1.0
+it	06_coal	1	154	0.0	1.0
+it	07_gas	1	154	0.0	1.0
+it	08_non-res	1	154	0.0	1.0
 it	09_hydro_pump	1	154	0.0	0.0
-it	01_solar	1	155	1.0	0.0
-it	02_wind_on	1	155	1.0	0.0
-it	03_wind_off	1	155	1.0	0.0
-it	04_res	1	155	1.0	0.0
-it	05_nuclear	1	155	1.0	0.0
-it	06_coal	1	155	1.0	0.0
-it	07_gas	1	155	1.0	0.0
-it	08_non-res	1	155	1.0	0.0
+it	01_solar	1	155	0.0	1.0
+it	02_wind_on	1	155	0.0	1.0
+it	03_wind_off	1	155	0.0	1.0
+it	04_res	1	155	0.0	1.0
+it	05_nuclear	1	155	0.0	1.0
+it	06_coal	1	155	0.0	1.0
+it	07_gas	1	155	0.0	1.0
+it	08_non-res	1	155	0.0	1.0
 it	09_hydro_pump	1	155	0.0	0.0
-it	01_solar	1	156	1.0	0.0
-it	02_wind_on	1	156	1.0	0.0
-it	03_wind_off	1	156	1.0	0.0
-it	04_res	1	156	1.0	0.0
-it	05_nuclear	1	156	1.0	0.0
-it	06_coal	1	156	1.0	0.0
-it	07_gas	1	156	1.0	0.0
-it	08_non-res	1	156	1.0	0.0
+it	01_solar	1	156	0.0	1.0
+it	02_wind_on	1	156	0.0	1.0
+it	03_wind_off	1	156	0.0	1.0
+it	04_res	1	156	0.0	1.0
+it	05_nuclear	1	156	0.0	1.0
+it	06_coal	1	156	0.0	1.0
+it	07_gas	1	156	0.0	1.0
+it	08_non-res	1	156	0.0	1.0
 it	09_hydro_pump	1	156	0.0	0.0
-it	01_solar	1	157	1.0	0.0
-it	02_wind_on	1	157	1.0	0.0
-it	03_wind_off	1	157	1.0	0.0
-it	04_res	1	157	1.0	0.0
-it	05_nuclear	1	157	1.0	0.0
-it	06_coal	1	157	1.0	0.0
-it	07_gas	1	157	1.0	0.0
-it	08_non-res	1	157	1.0	0.0
+it	01_solar	1	157	0.0	1.0
+it	02_wind_on	1	157	0.0	1.0
+it	03_wind_off	1	157	0.0	1.0
+it	04_res	1	157	0.0	1.0
+it	05_nuclear	1	157	0.0	1.0
+it	06_coal	1	157	0.0	1.0
+it	07_gas	1	157	0.0	1.0
+it	08_non-res	1	157	0.0	1.0
 it	09_hydro_pump	1	157	0.0	0.0
-it	01_solar	1	158	1.0	0.0
-it	02_wind_on	1	158	1.0	0.0
-it	03_wind_off	1	158	1.0	0.0
-it	04_res	1	158	1.0	0.0
-it	05_nuclear	1	158	1.0	0.0
-it	06_coal	1	158	1.0	0.0
-it	07_gas	1	158	1.0	0.0
-it	08_non-res	1	158	1.0	0.0
+it	01_solar	1	158	0.0	1.0
+it	02_wind_on	1	158	0.0	1.0
+it	03_wind_off	1	158	0.0	1.0
+it	04_res	1	158	0.0	1.0
+it	05_nuclear	1	158	0.0	1.0
+it	06_coal	1	158	0.0	1.0
+it	07_gas	1	158	0.0	1.0
+it	08_non-res	1	158	0.0	1.0
 it	09_hydro_pump	1	158	0.0	0.0
-it	01_solar	1	159	1.0	0.0
-it	02_wind_on	1	159	1.0	0.0
-it	03_wind_off	1	159	1.0	0.0
-it	04_res	1	159	1.0	0.0
-it	05_nuclear	1	159	1.0	0.0
-it	06_coal	1	159	1.0	0.0
-it	07_gas	1	159	1.0	0.0
-it	08_non-res	1	159	1.0	0.0
+it	01_solar	1	159	0.0	1.0
+it	02_wind_on	1	159	0.0	1.0
+it	03_wind_off	1	159	0.0	1.0
+it	04_res	1	159	0.0	1.0
+it	05_nuclear	1	159	0.0	1.0
+it	06_coal	1	159	0.0	1.0
+it	07_gas	1	159	0.0	1.0
+it	08_non-res	1	159	0.0	1.0
 it	09_hydro_pump	1	159	0.0	0.0
-it	01_solar	1	160	1.0	0.0
-it	02_wind_on	1	160	1.0	0.0
-it	03_wind_off	1	160	1.0	0.0
-it	04_res	1	160	1.0	0.0
-it	05_nuclear	1	160	1.0	0.0
-it	06_coal	1	160	1.0	0.0
-it	07_gas	1	160	1.0	0.0
-it	08_non-res	1	160	1.0	0.0
+it	01_solar	1	160	0.0	1.0
+it	02_wind_on	1	160	0.0	1.0
+it	03_wind_off	1	160	0.0	1.0
+it	04_res	1	160	0.0	1.0
+it	05_nuclear	1	160	0.0	1.0
+it	06_coal	1	160	0.0	1.0
+it	07_gas	1	160	0.0	1.0
+it	08_non-res	1	160	0.0	1.0
 it	09_hydro_pump	1	160	0.0	0.0
-it	01_solar	1	161	1.0	0.0
-it	02_wind_on	1	161	1.0	0.0
-it	03_wind_off	1	161	1.0	0.0
-it	04_res	1	161	1.0	0.0
-it	05_nuclear	1	161	1.0	0.0
-it	06_coal	1	161	1.0	0.0
-it	07_gas	1	161	1.0	0.0
-it	08_non-res	1	161	1.0	0.0
+it	01_solar	1	161	0.0	1.0
+it	02_wind_on	1	161	0.0	1.0
+it	03_wind_off	1	161	0.0	1.0
+it	04_res	1	161	0.0	1.0
+it	05_nuclear	1	161	0.0	1.0
+it	06_coal	1	161	0.0	1.0
+it	07_gas	1	161	0.0	1.0
+it	08_non-res	1	161	0.0	1.0
 it	09_hydro_pump	1	161	0.0	0.0
-it	01_solar	1	162	1.0	0.0
-it	02_wind_on	1	162	1.0	0.0
-it	03_wind_off	1	162	1.0	0.0
-it	04_res	1	162	1.0	0.0
-it	05_nuclear	1	162	1.0	0.0
-it	06_coal	1	162	1.0	0.0
-it	07_gas	1	162	1.0	0.0
-it	08_non-res	1	162	1.0	0.0
-it	09_hydro_pump	1	162	1.0	0.0
-it	01_solar	1	163	1.0	0.0
-it	02_wind_on	1	163	1.0	0.0
-it	03_wind_off	1	163	1.0	0.0
-it	04_res	1	163	1.0	0.0
-it	05_nuclear	1	163	1.0	0.0
-it	06_coal	1	163	1.0	0.0
-it	07_gas	1	163	1.0	0.0
-it	08_non-res	1	163	1.0	0.0
-it	09_hydro_pump	1	163	1.0	0.0
-it	01_solar	1	164	1.0	0.0
-it	02_wind_on	1	164	1.0	0.0
-it	03_wind_off	1	164	1.0	0.0
-it	04_res	1	164	1.0	0.0
-it	05_nuclear	1	164	1.0	0.0
-it	06_coal	1	164	1.0	0.0
-it	07_gas	1	164	1.0	0.0
-it	08_non-res	1	164	1.0	0.0
-it	09_hydro_pump	1	164	1.0	0.0
-it	01_solar	1	165	1.0	0.0
-it	02_wind_on	1	165	1.0	0.0
-it	03_wind_off	1	165	1.0	0.0
-it	04_res	1	165	1.0	0.0
-it	05_nuclear	1	165	1.0	0.0
-it	06_coal	1	165	1.0	0.0
-it	07_gas	1	165	1.0	0.0
-it	08_non-res	1	165	1.0	0.0
-it	09_hydro_pump	1	165	1.0	0.0
-it	01_solar	1	166	1.0	0.0
-it	02_wind_on	1	166	1.0	0.0
-it	03_wind_off	1	166	1.0	0.0
-it	04_res	1	166	1.0	0.0
-it	05_nuclear	1	166	1.0	0.0
-it	06_coal	1	166	1.0	0.0
-it	07_gas	1	166	1.0	0.0
-it	08_non-res	1	166	1.0	0.0
-it	09_hydro_pump	1	166	1.0	0.0
-it	01_solar	1	167	1.0	0.0
-it	02_wind_on	1	167	1.0	0.0
-it	03_wind_off	1	167	1.0	0.0
-it	04_res	1	167	1.0	0.0
-it	05_nuclear	1	167	1.0	0.0
-it	06_coal	1	167	1.0	0.0
-it	07_gas	1	167	1.0	0.0
-it	08_non-res	1	167	1.0	0.0
-it	09_hydro_pump	1	167	1.0	0.0
-it	01_solar	1	168	1.0	0.0
-it	02_wind_on	1	168	1.0	0.0
-it	03_wind_off	1	168	1.0	0.0
-it	04_res	1	168	1.0	0.0
-it	05_nuclear	1	168	1.0	0.0
-it	06_coal	1	168	1.0	0.0
-it	07_gas	1	168	1.0	0.0
-it	08_non-res	1	168	1.0	0.0
-it	09_hydro_pump	1	168	1.0	0.0
+it	01_solar	1	162	0.0	1.0
+it	02_wind_on	1	162	0.0	1.0
+it	03_wind_off	1	162	0.0	1.0
+it	04_res	1	162	0.0	1.0
+it	05_nuclear	1	162	0.0	1.0
+it	06_coal	1	162	0.0	1.0
+it	07_gas	1	162	0.0	1.0
+it	08_non-res	1	162	0.0	1.0
+it	09_hydro_pump	1	162	0.0	1.0
+it	01_solar	1	163	0.0	1.0
+it	02_wind_on	1	163	0.0	1.0
+it	03_wind_off	1	163	0.0	1.0
+it	04_res	1	163	0.0	1.0
+it	05_nuclear	1	163	0.0	1.0
+it	06_coal	1	163	0.0	1.0
+it	07_gas	1	163	0.0	1.0
+it	08_non-res	1	163	0.0	1.0
+it	09_hydro_pump	1	163	0.0	1.0
+it	01_solar	1	164	0.0	1.0
+it	02_wind_on	1	164	0.0	1.0
+it	03_wind_off	1	164	0.0	1.0
+it	04_res	1	164	0.0	1.0
+it	05_nuclear	1	164	0.0	1.0
+it	06_coal	1	164	0.0	1.0
+it	07_gas	1	164	0.0	1.0
+it	08_non-res	1	164	0.0	1.0
+it	09_hydro_pump	1	164	0.0	1.0
+it	01_solar	1	165	0.0	1.0
+it	02_wind_on	1	165	0.0	1.0
+it	03_wind_off	1	165	0.0	1.0
+it	04_res	1	165	0.0	1.0
+it	05_nuclear	1	165	0.0	1.0
+it	06_coal	1	165	0.0	1.0
+it	07_gas	1	165	0.0	1.0
+it	08_non-res	1	165	0.0	1.0
+it	09_hydro_pump	1	165	0.0	1.0
+it	01_solar	1	166	0.0	1.0
+it	02_wind_on	1	166	0.0	1.0
+it	03_wind_off	1	166	0.0	1.0
+it	04_res	1	166	0.0	1.0
+it	05_nuclear	1	166	0.0	1.0
+it	06_coal	1	166	0.0	1.0
+it	07_gas	1	166	0.0	1.0
+it	08_non-res	1	166	0.0	1.0
+it	09_hydro_pump	1	166	0.0	1.0
+it	01_solar	1	167	0.0	1.0
+it	02_wind_on	1	167	0.0	1.0
+it	03_wind_off	1	167	0.0	1.0
+it	04_res	1	167	0.0	1.0
+it	05_nuclear	1	167	0.0	1.0
+it	06_coal	1	167	0.0	1.0
+it	07_gas	1	167	0.0	1.0
+it	08_non-res	1	167	0.0	1.0
+it	09_hydro_pump	1	167	0.0	1.0
+it	01_solar	1	168	0.0	1.0
+it	02_wind_on	1	168	0.0	1.0
+it	03_wind_off	1	168	0.0	1.0
+it	04_res	1	168	0.0	1.0
+it	05_nuclear	1	168	0.0	1.0
+it	06_coal	1	168	0.0	1.0
+it	07_gas	1	168	0.0	1.0
+it	08_non-res	1	168	0.0	1.0
+it	09_hydro_pump	1	168	0.0	1.0
 it	01_solar	1	169	0.0	0.0
 it	02_wind_on	1	169	0.0	0.0
 it	03_wind_off	1	169	0.0	0.0
@@ -10592,7 +10592,7 @@ it	06_coal	1	169	0.0	0.0
 it	07_gas	1	169	0.0	0.0
 it	08_non-res	1	169	0.0	0.0
 it	09_hydro_pump	1	169	0.0	0.0
-it	01_solar	1	170	1.0	0.0
+it	01_solar	1	170	0.0	1.0
 it	02_wind_on	1	170	0.0	0.0
 it	03_wind_off	1	170	0.0	0.0
 it	04_res	1	170	0.0	0.0
@@ -10601,7 +10601,7 @@ it	06_coal	1	170	0.0	0.0
 it	07_gas	1	170	0.0	0.0
 it	08_non-res	1	170	0.0	0.0
 it	09_hydro_pump	1	170	0.0	0.0
-it	01_solar	1	171	1.0	0.0
+it	01_solar	1	171	0.0	1.0
 it	02_wind_on	1	171	0.0	0.0
 it	03_wind_off	1	171	0.0	0.0
 it	04_res	1	171	0.0	0.0
@@ -10610,7 +10610,7 @@ it	06_coal	1	171	0.0	0.0
 it	07_gas	1	171	0.0	0.0
 it	08_non-res	1	171	0.0	0.0
 it	09_hydro_pump	1	171	0.0	0.0
-it	01_solar	1	172	1.0	0.0
+it	01_solar	1	172	0.0	1.0
 it	02_wind_on	1	172	0.0	0.0
 it	03_wind_off	1	172	0.0	0.0
 it	04_res	1	172	0.0	0.0
@@ -10619,7 +10619,7 @@ it	06_coal	1	172	0.0	0.0
 it	07_gas	1	172	0.0	0.0
 it	08_non-res	1	172	0.0	0.0
 it	09_hydro_pump	1	172	0.0	0.0
-it	01_solar	1	173	1.0	0.0
+it	01_solar	1	173	0.0	1.0
 it	02_wind_on	1	173	0.0	0.0
 it	03_wind_off	1	173	0.0	0.0
 it	04_res	1	173	0.0	0.0
@@ -10628,7 +10628,7 @@ it	06_coal	1	173	0.0	0.0
 it	07_gas	1	173	0.0	0.0
 it	08_non-res	1	173	0.0	0.0
 it	09_hydro_pump	1	173	0.0	0.0
-it	01_solar	1	174	1.0	0.0
+it	01_solar	1	174	0.0	1.0
 it	02_wind_on	1	174	0.0	0.0
 it	03_wind_off	1	174	0.0	0.0
 it	04_res	1	174	0.0	0.0
@@ -10637,7 +10637,7 @@ it	06_coal	1	174	0.0	0.0
 it	07_gas	1	174	0.0	0.0
 it	08_non-res	1	174	0.0	0.0
 it	09_hydro_pump	1	174	0.0	0.0
-it	01_solar	1	175	1.0	0.0
+it	01_solar	1	175	0.0	1.0
 it	02_wind_on	1	175	0.0	0.0
 it	03_wind_off	1	175	0.0	0.0
 it	04_res	1	175	0.0	0.0
@@ -10646,7 +10646,7 @@ it	06_coal	1	175	0.0	0.0
 it	07_gas	1	175	0.0	0.0
 it	08_non-res	1	175	0.0	0.0
 it	09_hydro_pump	1	175	0.0	0.0
-it	01_solar	1	176	1.0	0.0
+it	01_solar	1	176	0.0	1.0
 it	02_wind_on	1	176	0.0	0.0
 it	03_wind_off	1	176	0.0	0.0
 it	04_res	1	176	0.0	0.0
@@ -10655,7 +10655,7 @@ it	06_coal	1	176	0.0	0.0
 it	07_gas	1	176	0.0	0.0
 it	08_non-res	1	176	0.0	0.0
 it	09_hydro_pump	1	176	0.0	0.0
-it	01_solar	1	177	1.0	0.0
+it	01_solar	1	177	0.0	1.0
 it	02_wind_on	1	177	0.0	0.0
 it	03_wind_off	1	177	0.0	0.0
 it	04_res	1	177	0.0	0.0
@@ -10664,7 +10664,7 @@ it	06_coal	1	177	0.0	0.0
 it	07_gas	1	177	0.0	0.0
 it	08_non-res	1	177	0.0	0.0
 it	09_hydro_pump	1	177	0.0	0.0
-it	01_solar	1	178	1.0	0.0
+it	01_solar	1	178	0.0	1.0
 it	02_wind_on	1	178	0.0	0.0
 it	03_wind_off	1	178	0.0	0.0
 it	04_res	1	178	0.0	0.0
@@ -10673,7 +10673,7 @@ it	06_coal	1	178	0.0	0.0
 it	07_gas	1	178	0.0	0.0
 it	08_non-res	1	178	0.0	0.0
 it	09_hydro_pump	1	178	0.0	0.0
-it	01_solar	1	179	1.0	0.0
+it	01_solar	1	179	0.0	1.0
 it	02_wind_on	1	179	0.0	0.0
 it	03_wind_off	1	179	0.0	0.0
 it	04_res	1	179	0.0	0.0
@@ -10682,7 +10682,7 @@ it	06_coal	1	179	0.0	0.0
 it	07_gas	1	179	0.0	0.0
 it	08_non-res	1	179	0.0	0.0
 it	09_hydro_pump	1	179	0.0	0.0
-it	01_solar	1	180	1.0	0.0
+it	01_solar	1	180	0.0	1.0
 it	02_wind_on	1	180	0.0	0.0
 it	03_wind_off	1	180	0.0	0.0
 it	04_res	1	180	0.0	0.0
@@ -10691,7 +10691,7 @@ it	06_coal	1	180	0.0	0.0
 it	07_gas	1	180	0.0	0.0
 it	08_non-res	1	180	0.0	0.0
 it	09_hydro_pump	1	180	0.0	0.0
-it	01_solar	1	181	1.0	0.0
+it	01_solar	1	181	0.0	1.0
 it	02_wind_on	1	181	0.0	0.0
 it	03_wind_off	1	181	0.0	0.0
 it	04_res	1	181	0.0	0.0
@@ -10700,7 +10700,7 @@ it	06_coal	1	181	0.0	0.0
 it	07_gas	1	181	0.0	0.0
 it	08_non-res	1	181	0.0	0.0
 it	09_hydro_pump	1	181	0.0	0.0
-it	01_solar	1	182	1.0	0.0
+it	01_solar	1	182	0.0	1.0
 it	02_wind_on	1	182	0.0	0.0
 it	03_wind_off	1	182	0.0	0.0
 it	04_res	1	182	0.0	0.0
@@ -10709,7 +10709,7 @@ it	06_coal	1	182	0.0	0.0
 it	07_gas	1	182	0.0	0.0
 it	08_non-res	1	182	0.0	0.0
 it	09_hydro_pump	1	182	0.0	0.0
-it	01_solar	1	183	1.0	0.0
+it	01_solar	1	183	0.0	1.0
 it	02_wind_on	1	183	0.0	0.0
 it	03_wind_off	1	183	0.0	0.0
 it	04_res	1	183	0.0	0.0
@@ -10718,7 +10718,7 @@ it	06_coal	1	183	0.0	0.0
 it	07_gas	1	183	0.0	0.0
 it	08_non-res	1	183	0.0	0.0
 it	09_hydro_pump	1	183	0.0	0.0
-it	01_solar	1	184	1.0	0.0
+it	01_solar	1	184	0.0	1.0
 it	02_wind_on	1	184	0.0	0.0
 it	03_wind_off	1	184	0.0	0.0
 it	04_res	1	184	0.0	0.0
@@ -10727,7 +10727,7 @@ it	06_coal	1	184	0.0	0.0
 it	07_gas	1	184	0.0	0.0
 it	08_non-res	1	184	0.0	0.0
 it	09_hydro_pump	1	184	0.0	0.0
-it	01_solar	1	185	1.0	0.0
+it	01_solar	1	185	0.0	1.0
 it	02_wind_on	1	185	0.0	0.0
 it	03_wind_off	1	185	0.0	0.0
 it	04_res	1	185	0.0	0.0
@@ -10736,7 +10736,7 @@ it	06_coal	1	185	0.0	0.0
 it	07_gas	1	185	0.0	0.0
 it	08_non-res	1	185	0.0	0.0
 it	09_hydro_pump	1	185	0.0	0.0
-it	01_solar	1	186	1.0	0.0
+it	01_solar	1	186	0.0	1.0
 it	02_wind_on	1	186	0.0	0.0
 it	03_wind_off	1	186	0.0	0.0
 it	04_res	1	186	0.0	0.0
@@ -10745,7 +10745,7 @@ it	06_coal	1	186	0.0	0.0
 it	07_gas	1	186	0.0	0.0
 it	08_non-res	1	186	0.0	0.0
 it	09_hydro_pump	1	186	0.0	0.0
-it	01_solar	1	187	1.0	0.0
+it	01_solar	1	187	0.0	1.0
 it	02_wind_on	1	187	0.0	0.0
 it	03_wind_off	1	187	0.0	0.0
 it	04_res	1	187	0.0	0.0
@@ -10754,7 +10754,7 @@ it	06_coal	1	187	0.0	0.0
 it	07_gas	1	187	0.0	0.0
 it	08_non-res	1	187	0.0	0.0
 it	09_hydro_pump	1	187	0.0	0.0
-it	01_solar	1	188	1.0	0.0
+it	01_solar	1	188	0.0	1.0
 it	02_wind_on	1	188	0.0	0.0
 it	03_wind_off	1	188	0.0	0.0
 it	04_res	1	188	0.0	0.0
@@ -10763,7 +10763,7 @@ it	06_coal	1	188	0.0	0.0
 it	07_gas	1	188	0.0	0.0
 it	08_non-res	1	188	0.0	0.0
 it	09_hydro_pump	1	188	0.0	0.0
-it	01_solar	1	189	1.0	0.0
+it	01_solar	1	189	0.0	1.0
 it	02_wind_on	1	189	0.0	0.0
 it	03_wind_off	1	189	0.0	0.0
 it	04_res	1	189	0.0	0.0
@@ -10772,8 +10772,8 @@ it	06_coal	1	189	0.0	0.0
 it	07_gas	1	189	0.0	0.0
 it	08_non-res	1	189	0.0	0.0
 it	09_hydro_pump	1	189	0.0	0.0
-it	01_solar	1	190	1.0	0.0
-it	02_wind_on	1	190	1.0	0.0
+it	01_solar	1	190	0.0	1.0
+it	02_wind_on	1	190	0.0	1.0
 it	03_wind_off	1	190	0.0	0.0
 it	04_res	1	190	0.0	0.0
 it	05_nuclear	1	190	0.0	0.0
@@ -10781,8 +10781,8 @@ it	06_coal	1	190	0.0	0.0
 it	07_gas	1	190	0.0	0.0
 it	08_non-res	1	190	0.0	0.0
 it	09_hydro_pump	1	190	0.0	0.0
-it	01_solar	1	191	1.0	0.0
-it	02_wind_on	1	191	1.0	0.0
+it	01_solar	1	191	0.0	1.0
+it	02_wind_on	1	191	0.0	1.0
 it	03_wind_off	1	191	0.0	0.0
 it	04_res	1	191	0.0	0.0
 it	05_nuclear	1	191	0.0	0.0
@@ -10790,8 +10790,8 @@ it	06_coal	1	191	0.0	0.0
 it	07_gas	1	191	0.0	0.0
 it	08_non-res	1	191	0.0	0.0
 it	09_hydro_pump	1	191	0.0	0.0
-it	01_solar	1	192	1.0	0.0
-it	02_wind_on	1	192	1.0	0.0
+it	01_solar	1	192	0.0	1.0
+it	02_wind_on	1	192	0.0	1.0
 it	03_wind_off	1	192	0.0	0.0
 it	04_res	1	192	0.0	0.0
 it	05_nuclear	1	192	0.0	0.0
@@ -10799,8 +10799,8 @@ it	06_coal	1	192	0.0	0.0
 it	07_gas	1	192	0.0	0.0
 it	08_non-res	1	192	0.0	0.0
 it	09_hydro_pump	1	192	0.0	0.0
-it	01_solar	1	193	1.0	0.0
-it	02_wind_on	1	193	1.0	0.0
+it	01_solar	1	193	0.0	1.0
+it	02_wind_on	1	193	0.0	1.0
 it	03_wind_off	1	193	0.0	0.0
 it	04_res	1	193	0.0	0.0
 it	05_nuclear	1	193	0.0	0.0
@@ -10808,8 +10808,8 @@ it	06_coal	1	193	0.0	0.0
 it	07_gas	1	193	0.0	0.0
 it	08_non-res	1	193	0.0	0.0
 it	09_hydro_pump	1	193	0.0	0.0
-it	01_solar	1	194	1.0	0.0
-it	02_wind_on	1	194	1.0	0.0
+it	01_solar	1	194	0.0	1.0
+it	02_wind_on	1	194	0.0	1.0
 it	03_wind_off	1	194	0.0	0.0
 it	04_res	1	194	0.0	0.0
 it	05_nuclear	1	194	0.0	0.0
@@ -10817,8 +10817,8 @@ it	06_coal	1	194	0.0	0.0
 it	07_gas	1	194	0.0	0.0
 it	08_non-res	1	194	0.0	0.0
 it	09_hydro_pump	1	194	0.0	0.0
-it	01_solar	1	195	1.0	0.0
-it	02_wind_on	1	195	1.0	0.0
+it	01_solar	1	195	0.0	1.0
+it	02_wind_on	1	195	0.0	1.0
 it	03_wind_off	1	195	0.0	0.0
 it	04_res	1	195	0.0	0.0
 it	05_nuclear	1	195	0.0	0.0
@@ -10826,8 +10826,8 @@ it	06_coal	1	195	0.0	0.0
 it	07_gas	1	195	0.0	0.0
 it	08_non-res	1	195	0.0	0.0
 it	09_hydro_pump	1	195	0.0	0.0
-it	01_solar	1	196	1.0	0.0
-it	02_wind_on	1	196	1.0	0.0
+it	01_solar	1	196	0.0	1.0
+it	02_wind_on	1	196	0.0	1.0
 it	03_wind_off	1	196	0.0	0.0
 it	04_res	1	196	0.0	0.0
 it	05_nuclear	1	196	0.0	0.0
@@ -10835,8 +10835,8 @@ it	06_coal	1	196	0.0	0.0
 it	07_gas	1	196	0.0	0.0
 it	08_non-res	1	196	0.0	0.0
 it	09_hydro_pump	1	196	0.0	0.0
-it	01_solar	1	197	1.0	0.0
-it	02_wind_on	1	197	1.0	0.0
+it	01_solar	1	197	0.0	1.0
+it	02_wind_on	1	197	0.0	1.0
 it	03_wind_off	1	197	0.0	0.0
 it	04_res	1	197	0.0	0.0
 it	05_nuclear	1	197	0.0	0.0
@@ -10844,8 +10844,8 @@ it	06_coal	1	197	0.0	0.0
 it	07_gas	1	197	0.0	0.0
 it	08_non-res	1	197	0.0	0.0
 it	09_hydro_pump	1	197	0.0	0.0
-it	01_solar	1	198	1.0	0.0
-it	02_wind_on	1	198	1.0	0.0
+it	01_solar	1	198	0.0	1.0
+it	02_wind_on	1	198	0.0	1.0
 it	03_wind_off	1	198	0.0	0.0
 it	04_res	1	198	0.0	0.0
 it	05_nuclear	1	198	0.0	0.0
@@ -10853,8 +10853,8 @@ it	06_coal	1	198	0.0	0.0
 it	07_gas	1	198	0.0	0.0
 it	08_non-res	1	198	0.0	0.0
 it	09_hydro_pump	1	198	0.0	0.0
-it	01_solar	1	199	1.0	0.0
-it	02_wind_on	1	199	1.0	0.0
+it	01_solar	1	199	0.0	1.0
+it	02_wind_on	1	199	0.0	1.0
 it	03_wind_off	1	199	0.0	0.0
 it	04_res	1	199	0.0	0.0
 it	05_nuclear	1	199	0.0	0.0
@@ -10862,8 +10862,8 @@ it	06_coal	1	199	0.0	0.0
 it	07_gas	1	199	0.0	0.0
 it	08_non-res	1	199	0.0	0.0
 it	09_hydro_pump	1	199	0.0	0.0
-it	01_solar	1	200	1.0	0.0
-it	02_wind_on	1	200	1.0	0.0
+it	01_solar	1	200	0.0	1.0
+it	02_wind_on	1	200	0.0	1.0
 it	03_wind_off	1	200	0.0	0.0
 it	04_res	1	200	0.0	0.0
 it	05_nuclear	1	200	0.0	0.0
@@ -10871,8 +10871,8 @@ it	06_coal	1	200	0.0	0.0
 it	07_gas	1	200	0.0	0.0
 it	08_non-res	1	200	0.0	0.0
 it	09_hydro_pump	1	200	0.0	0.0
-it	01_solar	1	201	1.0	0.0
-it	02_wind_on	1	201	1.0	0.0
+it	01_solar	1	201	0.0	1.0
+it	02_wind_on	1	201	0.0	1.0
 it	03_wind_off	1	201	0.0	0.0
 it	04_res	1	201	0.0	0.0
 it	05_nuclear	1	201	0.0	0.0
@@ -10880,8 +10880,8 @@ it	06_coal	1	201	0.0	0.0
 it	07_gas	1	201	0.0	0.0
 it	08_non-res	1	201	0.0	0.0
 it	09_hydro_pump	1	201	0.0	0.0
-it	01_solar	1	202	1.0	0.0
-it	02_wind_on	1	202	1.0	0.0
+it	01_solar	1	202	0.0	1.0
+it	02_wind_on	1	202	0.0	1.0
 it	03_wind_off	1	202	0.0	0.0
 it	04_res	1	202	0.0	0.0
 it	05_nuclear	1	202	0.0	0.0
@@ -10889,8 +10889,8 @@ it	06_coal	1	202	0.0	0.0
 it	07_gas	1	202	0.0	0.0
 it	08_non-res	1	202	0.0	0.0
 it	09_hydro_pump	1	202	0.0	0.0
-it	01_solar	1	203	1.0	0.0
-it	02_wind_on	1	203	1.0	0.0
+it	01_solar	1	203	0.0	1.0
+it	02_wind_on	1	203	0.0	1.0
 it	03_wind_off	1	203	0.0	0.0
 it	04_res	1	203	0.0	0.0
 it	05_nuclear	1	203	0.0	0.0
@@ -10898,8 +10898,8 @@ it	06_coal	1	203	0.0	0.0
 it	07_gas	1	203	0.0	0.0
 it	08_non-res	1	203	0.0	0.0
 it	09_hydro_pump	1	203	0.0	0.0
-it	01_solar	1	204	1.0	0.0
-it	02_wind_on	1	204	1.0	0.0
+it	01_solar	1	204	0.0	1.0
+it	02_wind_on	1	204	0.0	1.0
 it	03_wind_off	1	204	0.0	0.0
 it	04_res	1	204	0.0	0.0
 it	05_nuclear	1	204	0.0	0.0
@@ -10907,8 +10907,8 @@ it	06_coal	1	204	0.0	0.0
 it	07_gas	1	204	0.0	0.0
 it	08_non-res	1	204	0.0	0.0
 it	09_hydro_pump	1	204	0.0	0.0
-it	01_solar	1	205	1.0	0.0
-it	02_wind_on	1	205	1.0	0.0
+it	01_solar	1	205	0.0	1.0
+it	02_wind_on	1	205	0.0	1.0
 it	03_wind_off	1	205	0.0	0.0
 it	04_res	1	205	0.0	0.0
 it	05_nuclear	1	205	0.0	0.0
@@ -10916,8 +10916,8 @@ it	06_coal	1	205	0.0	0.0
 it	07_gas	1	205	0.0	0.0
 it	08_non-res	1	205	0.0	0.0
 it	09_hydro_pump	1	205	0.0	0.0
-it	01_solar	1	206	1.0	0.0
-it	02_wind_on	1	206	1.0	0.0
+it	01_solar	1	206	0.0	1.0
+it	02_wind_on	1	206	0.0	1.0
 it	03_wind_off	1	206	0.0	0.0
 it	04_res	1	206	0.0	0.0
 it	05_nuclear	1	206	0.0	0.0
@@ -10925,8 +10925,8 @@ it	06_coal	1	206	0.0	0.0
 it	07_gas	1	206	0.0	0.0
 it	08_non-res	1	206	0.0	0.0
 it	09_hydro_pump	1	206	0.0	0.0
-it	01_solar	1	207	1.0	0.0
-it	02_wind_on	1	207	1.0	0.0
+it	01_solar	1	207	0.0	1.0
+it	02_wind_on	1	207	0.0	1.0
 it	03_wind_off	1	207	0.0	0.0
 it	04_res	1	207	0.0	0.0
 it	05_nuclear	1	207	0.0	0.0
@@ -10934,8 +10934,8 @@ it	06_coal	1	207	0.0	0.0
 it	07_gas	1	207	0.0	0.0
 it	08_non-res	1	207	0.0	0.0
 it	09_hydro_pump	1	207	0.0	0.0
-it	01_solar	1	208	1.0	0.0
-it	02_wind_on	1	208	1.0	0.0
+it	01_solar	1	208	0.0	1.0
+it	02_wind_on	1	208	0.0	1.0
 it	03_wind_off	1	208	0.0	0.0
 it	04_res	1	208	0.0	0.0
 it	05_nuclear	1	208	0.0	0.0
@@ -10943,8 +10943,8 @@ it	06_coal	1	208	0.0	0.0
 it	07_gas	1	208	0.0	0.0
 it	08_non-res	1	208	0.0	0.0
 it	09_hydro_pump	1	208	0.0	0.0
-it	01_solar	1	209	1.0	0.0
-it	02_wind_on	1	209	1.0	0.0
+it	01_solar	1	209	0.0	1.0
+it	02_wind_on	1	209	0.0	1.0
 it	03_wind_off	1	209	0.0	0.0
 it	04_res	1	209	0.0	0.0
 it	05_nuclear	1	209	0.0	0.0
@@ -10952,1149 +10952,1149 @@ it	06_coal	1	209	0.0	0.0
 it	07_gas	1	209	0.0	0.0
 it	08_non-res	1	209	0.0	0.0
 it	09_hydro_pump	1	209	0.0	0.0
-it	01_solar	1	210	1.0	0.0
-it	02_wind_on	1	210	1.0	0.0
-it	03_wind_off	1	210	1.0	0.0
+it	01_solar	1	210	0.0	1.0
+it	02_wind_on	1	210	0.0	1.0
+it	03_wind_off	1	210	0.0	1.0
 it	04_res	1	210	0.0	0.0
 it	05_nuclear	1	210	0.0	0.0
 it	06_coal	1	210	0.0	0.0
 it	07_gas	1	210	0.0	0.0
 it	08_non-res	1	210	0.0	0.0
 it	09_hydro_pump	1	210	0.0	0.0
-it	01_solar	1	211	1.0	0.0
-it	02_wind_on	1	211	1.0	0.0
-it	03_wind_off	1	211	1.0	0.0
+it	01_solar	1	211	0.0	1.0
+it	02_wind_on	1	211	0.0	1.0
+it	03_wind_off	1	211	0.0	1.0
 it	04_res	1	211	0.0	0.0
 it	05_nuclear	1	211	0.0	0.0
 it	06_coal	1	211	0.0	0.0
 it	07_gas	1	211	0.0	0.0
 it	08_non-res	1	211	0.0	0.0
 it	09_hydro_pump	1	211	0.0	0.0
-it	01_solar	1	212	1.0	0.0
-it	02_wind_on	1	212	1.0	0.0
-it	03_wind_off	1	212	1.0	0.0
+it	01_solar	1	212	0.0	1.0
+it	02_wind_on	1	212	0.0	1.0
+it	03_wind_off	1	212	0.0	1.0
 it	04_res	1	212	0.0	0.0
 it	05_nuclear	1	212	0.0	0.0
 it	06_coal	1	212	0.0	0.0
 it	07_gas	1	212	0.0	0.0
 it	08_non-res	1	212	0.0	0.0
 it	09_hydro_pump	1	212	0.0	0.0
-it	01_solar	1	213	1.0	0.0
-it	02_wind_on	1	213	1.0	0.0
-it	03_wind_off	1	213	1.0	0.0
+it	01_solar	1	213	0.0	1.0
+it	02_wind_on	1	213	0.0	1.0
+it	03_wind_off	1	213	0.0	1.0
 it	04_res	1	213	0.0	0.0
 it	05_nuclear	1	213	0.0	0.0
 it	06_coal	1	213	0.0	0.0
 it	07_gas	1	213	0.0	0.0
 it	08_non-res	1	213	0.0	0.0
 it	09_hydro_pump	1	213	0.0	0.0
-it	01_solar	1	214	1.0	0.0
-it	02_wind_on	1	214	1.0	0.0
-it	03_wind_off	1	214	1.0	0.0
+it	01_solar	1	214	0.0	1.0
+it	02_wind_on	1	214	0.0	1.0
+it	03_wind_off	1	214	0.0	1.0
 it	04_res	1	214	0.0	0.0
 it	05_nuclear	1	214	0.0	0.0
 it	06_coal	1	214	0.0	0.0
 it	07_gas	1	214	0.0	0.0
 it	08_non-res	1	214	0.0	0.0
 it	09_hydro_pump	1	214	0.0	0.0
-it	01_solar	1	215	1.0	0.0
-it	02_wind_on	1	215	1.0	0.0
-it	03_wind_off	1	215	1.0	0.0
+it	01_solar	1	215	0.0	1.0
+it	02_wind_on	1	215	0.0	1.0
+it	03_wind_off	1	215	0.0	1.0
 it	04_res	1	215	0.0	0.0
 it	05_nuclear	1	215	0.0	0.0
 it	06_coal	1	215	0.0	0.0
 it	07_gas	1	215	0.0	0.0
 it	08_non-res	1	215	0.0	0.0
 it	09_hydro_pump	1	215	0.0	0.0
-it	01_solar	1	216	1.0	0.0
-it	02_wind_on	1	216	1.0	0.0
-it	03_wind_off	1	216	1.0	0.0
+it	01_solar	1	216	0.0	1.0
+it	02_wind_on	1	216	0.0	1.0
+it	03_wind_off	1	216	0.0	1.0
 it	04_res	1	216	0.0	0.0
 it	05_nuclear	1	216	0.0	0.0
 it	06_coal	1	216	0.0	0.0
 it	07_gas	1	216	0.0	0.0
 it	08_non-res	1	216	0.0	0.0
 it	09_hydro_pump	1	216	0.0	0.0
-it	01_solar	1	217	1.0	0.0
-it	02_wind_on	1	217	1.0	0.0
-it	03_wind_off	1	217	1.0	0.0
+it	01_solar	1	217	0.0	1.0
+it	02_wind_on	1	217	0.0	1.0
+it	03_wind_off	1	217	0.0	1.0
 it	04_res	1	217	0.0	0.0
 it	05_nuclear	1	217	0.0	0.0
 it	06_coal	1	217	0.0	0.0
 it	07_gas	1	217	0.0	0.0
 it	08_non-res	1	217	0.0	0.0
 it	09_hydro_pump	1	217	0.0	0.0
-it	01_solar	1	218	1.0	0.0
-it	02_wind_on	1	218	1.0	0.0
-it	03_wind_off	1	218	1.0	0.0
+it	01_solar	1	218	0.0	1.0
+it	02_wind_on	1	218	0.0	1.0
+it	03_wind_off	1	218	0.0	1.0
 it	04_res	1	218	0.0	0.0
 it	05_nuclear	1	218	0.0	0.0
 it	06_coal	1	218	0.0	0.0
 it	07_gas	1	218	0.0	0.0
 it	08_non-res	1	218	0.0	0.0
 it	09_hydro_pump	1	218	0.0	0.0
-it	01_solar	1	219	1.0	0.0
-it	02_wind_on	1	219	1.0	0.0
-it	03_wind_off	1	219	1.0	0.0
+it	01_solar	1	219	0.0	1.0
+it	02_wind_on	1	219	0.0	1.0
+it	03_wind_off	1	219	0.0	1.0
 it	04_res	1	219	0.0	0.0
 it	05_nuclear	1	219	0.0	0.0
 it	06_coal	1	219	0.0	0.0
 it	07_gas	1	219	0.0	0.0
 it	08_non-res	1	219	0.0	0.0
 it	09_hydro_pump	1	219	0.0	0.0
-it	01_solar	1	220	1.0	0.0
-it	02_wind_on	1	220	1.0	0.0
-it	03_wind_off	1	220	1.0	0.0
+it	01_solar	1	220	0.0	1.0
+it	02_wind_on	1	220	0.0	1.0
+it	03_wind_off	1	220	0.0	1.0
 it	04_res	1	220	0.0	0.0
 it	05_nuclear	1	220	0.0	0.0
 it	06_coal	1	220	0.0	0.0
 it	07_gas	1	220	0.0	0.0
 it	08_non-res	1	220	0.0	0.0
 it	09_hydro_pump	1	220	0.0	0.0
-it	01_solar	1	221	1.0	0.0
-it	02_wind_on	1	221	1.0	0.0
-it	03_wind_off	1	221	1.0	0.0
+it	01_solar	1	221	0.0	1.0
+it	02_wind_on	1	221	0.0	1.0
+it	03_wind_off	1	221	0.0	1.0
 it	04_res	1	221	0.0	0.0
 it	05_nuclear	1	221	0.0	0.0
 it	06_coal	1	221	0.0	0.0
 it	07_gas	1	221	0.0	0.0
 it	08_non-res	1	221	0.0	0.0
 it	09_hydro_pump	1	221	0.0	0.0
-it	01_solar	1	222	1.0	0.0
-it	02_wind_on	1	222	1.0	0.0
-it	03_wind_off	1	222	1.0	0.0
+it	01_solar	1	222	0.0	1.0
+it	02_wind_on	1	222	0.0	1.0
+it	03_wind_off	1	222	0.0	1.0
 it	04_res	1	222	0.0	0.0
 it	05_nuclear	1	222	0.0	0.0
 it	06_coal	1	222	0.0	0.0
 it	07_gas	1	222	0.0	0.0
 it	08_non-res	1	222	0.0	0.0
 it	09_hydro_pump	1	222	0.0	0.0
-it	01_solar	1	223	1.0	0.0
-it	02_wind_on	1	223	1.0	0.0
-it	03_wind_off	1	223	1.0	0.0
+it	01_solar	1	223	0.0	1.0
+it	02_wind_on	1	223	0.0	1.0
+it	03_wind_off	1	223	0.0	1.0
 it	04_res	1	223	0.0	0.0
 it	05_nuclear	1	223	0.0	0.0
 it	06_coal	1	223	0.0	0.0
 it	07_gas	1	223	0.0	0.0
 it	08_non-res	1	223	0.0	0.0
 it	09_hydro_pump	1	223	0.0	0.0
-it	01_solar	1	224	1.0	0.0
-it	02_wind_on	1	224	1.0	0.0
-it	03_wind_off	1	224	1.0	0.0
+it	01_solar	1	224	0.0	1.0
+it	02_wind_on	1	224	0.0	1.0
+it	03_wind_off	1	224	0.0	1.0
 it	04_res	1	224	0.0	0.0
 it	05_nuclear	1	224	0.0	0.0
 it	06_coal	1	224	0.0	0.0
 it	07_gas	1	224	0.0	0.0
 it	08_non-res	1	224	0.0	0.0
 it	09_hydro_pump	1	224	0.0	0.0
-it	01_solar	1	225	1.0	0.0
-it	02_wind_on	1	225	1.0	0.0
-it	03_wind_off	1	225	1.0	0.0
+it	01_solar	1	225	0.0	1.0
+it	02_wind_on	1	225	0.0	1.0
+it	03_wind_off	1	225	0.0	1.0
 it	04_res	1	225	0.0	0.0
 it	05_nuclear	1	225	0.0	0.0
 it	06_coal	1	225	0.0	0.0
 it	07_gas	1	225	0.0	0.0
 it	08_non-res	1	225	0.0	0.0
 it	09_hydro_pump	1	225	0.0	0.0
-it	01_solar	1	226	1.0	0.0
-it	02_wind_on	1	226	1.0	0.0
-it	03_wind_off	1	226	1.0	0.0
+it	01_solar	1	226	0.0	1.0
+it	02_wind_on	1	226	0.0	1.0
+it	03_wind_off	1	226	0.0	1.0
 it	04_res	1	226	0.0	0.0
 it	05_nuclear	1	226	0.0	0.0
 it	06_coal	1	226	0.0	0.0
 it	07_gas	1	226	0.0	0.0
 it	08_non-res	1	226	0.0	0.0
 it	09_hydro_pump	1	226	0.0	0.0
-it	01_solar	1	227	1.0	0.0
-it	02_wind_on	1	227	1.0	0.0
-it	03_wind_off	1	227	1.0	0.0
+it	01_solar	1	227	0.0	1.0
+it	02_wind_on	1	227	0.0	1.0
+it	03_wind_off	1	227	0.0	1.0
 it	04_res	1	227	0.0	0.0
 it	05_nuclear	1	227	0.0	0.0
 it	06_coal	1	227	0.0	0.0
 it	07_gas	1	227	0.0	0.0
 it	08_non-res	1	227	0.0	0.0
 it	09_hydro_pump	1	227	0.0	0.0
-it	01_solar	1	228	1.0	0.0
-it	02_wind_on	1	228	1.0	0.0
-it	03_wind_off	1	228	1.0	0.0
+it	01_solar	1	228	0.0	1.0
+it	02_wind_on	1	228	0.0	1.0
+it	03_wind_off	1	228	0.0	1.0
 it	04_res	1	228	0.0	0.0
 it	05_nuclear	1	228	0.0	0.0
 it	06_coal	1	228	0.0	0.0
 it	07_gas	1	228	0.0	0.0
 it	08_non-res	1	228	0.0	0.0
 it	09_hydro_pump	1	228	0.0	0.0
-it	01_solar	1	229	1.0	0.0
-it	02_wind_on	1	229	1.0	0.0
-it	03_wind_off	1	229	1.0	0.0
+it	01_solar	1	229	0.0	1.0
+it	02_wind_on	1	229	0.0	1.0
+it	03_wind_off	1	229	0.0	1.0
 it	04_res	1	229	0.0	0.0
 it	05_nuclear	1	229	0.0	0.0
 it	06_coal	1	229	0.0	0.0
 it	07_gas	1	229	0.0	0.0
 it	08_non-res	1	229	0.0	0.0
 it	09_hydro_pump	1	229	0.0	0.0
-it	01_solar	1	230	1.0	0.0
-it	02_wind_on	1	230	1.0	0.0
-it	03_wind_off	1	230	1.0	0.0
-it	04_res	1	230	1.0	0.0
+it	01_solar	1	230	0.0	1.0
+it	02_wind_on	1	230	0.0	1.0
+it	03_wind_off	1	230	0.0	1.0
+it	04_res	1	230	0.0	1.0
 it	05_nuclear	1	230	0.0	0.0
 it	06_coal	1	230	0.0	0.0
 it	07_gas	1	230	0.0	0.0
 it	08_non-res	1	230	0.0	0.0
 it	09_hydro_pump	1	230	0.0	0.0
-it	01_solar	1	231	1.0	0.0
-it	02_wind_on	1	231	1.0	0.0
-it	03_wind_off	1	231	1.0	0.0
-it	04_res	1	231	1.0	0.0
+it	01_solar	1	231	0.0	1.0
+it	02_wind_on	1	231	0.0	1.0
+it	03_wind_off	1	231	0.0	1.0
+it	04_res	1	231	0.0	1.0
 it	05_nuclear	1	231	0.0	0.0
 it	06_coal	1	231	0.0	0.0
 it	07_gas	1	231	0.0	0.0
 it	08_non-res	1	231	0.0	0.0
 it	09_hydro_pump	1	231	0.0	0.0
-it	01_solar	1	232	1.0	0.0
-it	02_wind_on	1	232	1.0	0.0
-it	03_wind_off	1	232	1.0	0.0
-it	04_res	1	232	1.0	0.0
+it	01_solar	1	232	0.0	1.0
+it	02_wind_on	1	232	0.0	1.0
+it	03_wind_off	1	232	0.0	1.0
+it	04_res	1	232	0.0	1.0
 it	05_nuclear	1	232	0.0	0.0
 it	06_coal	1	232	0.0	0.0
 it	07_gas	1	232	0.0	0.0
 it	08_non-res	1	232	0.0	0.0
 it	09_hydro_pump	1	232	0.0	0.0
-it	01_solar	1	233	1.0	0.0
-it	02_wind_on	1	233	1.0	0.0
-it	03_wind_off	1	233	1.0	0.0
-it	04_res	1	233	1.0	0.0
+it	01_solar	1	233	0.0	1.0
+it	02_wind_on	1	233	0.0	1.0
+it	03_wind_off	1	233	0.0	1.0
+it	04_res	1	233	0.0	1.0
 it	05_nuclear	1	233	0.0	0.0
 it	06_coal	1	233	0.0	0.0
 it	07_gas	1	233	0.0	0.0
 it	08_non-res	1	233	0.0	0.0
 it	09_hydro_pump	1	233	0.0	0.0
-it	01_solar	1	234	1.0	0.0
-it	02_wind_on	1	234	1.0	0.0
-it	03_wind_off	1	234	1.0	0.0
-it	04_res	1	234	1.0	0.0
+it	01_solar	1	234	0.0	1.0
+it	02_wind_on	1	234	0.0	1.0
+it	03_wind_off	1	234	0.0	1.0
+it	04_res	1	234	0.0	1.0
 it	05_nuclear	1	234	0.0	0.0
 it	06_coal	1	234	0.0	0.0
 it	07_gas	1	234	0.0	0.0
 it	08_non-res	1	234	0.0	0.0
 it	09_hydro_pump	1	234	0.0	0.0
-it	01_solar	1	235	1.0	0.0
-it	02_wind_on	1	235	1.0	0.0
-it	03_wind_off	1	235	1.0	0.0
-it	04_res	1	235	1.0	0.0
+it	01_solar	1	235	0.0	1.0
+it	02_wind_on	1	235	0.0	1.0
+it	03_wind_off	1	235	0.0	1.0
+it	04_res	1	235	0.0	1.0
 it	05_nuclear	1	235	0.0	0.0
 it	06_coal	1	235	0.0	0.0
 it	07_gas	1	235	0.0	0.0
 it	08_non-res	1	235	0.0	0.0
 it	09_hydro_pump	1	235	0.0	0.0
-it	01_solar	1	236	1.0	0.0
-it	02_wind_on	1	236	1.0	0.0
-it	03_wind_off	1	236	1.0	0.0
-it	04_res	1	236	1.0	0.0
+it	01_solar	1	236	0.0	1.0
+it	02_wind_on	1	236	0.0	1.0
+it	03_wind_off	1	236	0.0	1.0
+it	04_res	1	236	0.0	1.0
 it	05_nuclear	1	236	0.0	0.0
 it	06_coal	1	236	0.0	0.0
 it	07_gas	1	236	0.0	0.0
 it	08_non-res	1	236	0.0	0.0
 it	09_hydro_pump	1	236	0.0	0.0
-it	01_solar	1	237	1.0	0.0
-it	02_wind_on	1	237	1.0	0.0
-it	03_wind_off	1	237	1.0	0.0
-it	04_res	1	237	1.0	0.0
+it	01_solar	1	237	0.0	1.0
+it	02_wind_on	1	237	0.0	1.0
+it	03_wind_off	1	237	0.0	1.0
+it	04_res	1	237	0.0	1.0
 it	05_nuclear	1	237	0.0	0.0
 it	06_coal	1	237	0.0	0.0
 it	07_gas	1	237	0.0	0.0
 it	08_non-res	1	237	0.0	0.0
 it	09_hydro_pump	1	237	0.0	0.0
-it	01_solar	1	238	1.0	0.0
-it	02_wind_on	1	238	1.0	0.0
-it	03_wind_off	1	238	1.0	0.0
-it	04_res	1	238	1.0	0.0
+it	01_solar	1	238	0.0	1.0
+it	02_wind_on	1	238	0.0	1.0
+it	03_wind_off	1	238	0.0	1.0
+it	04_res	1	238	0.0	1.0
 it	05_nuclear	1	238	0.0	0.0
 it	06_coal	1	238	0.0	0.0
 it	07_gas	1	238	0.0	0.0
 it	08_non-res	1	238	0.0	0.0
 it	09_hydro_pump	1	238	0.0	0.0
-it	01_solar	1	239	1.0	0.0
-it	02_wind_on	1	239	1.0	0.0
-it	03_wind_off	1	239	1.0	0.0
-it	04_res	1	239	1.0	0.0
+it	01_solar	1	239	0.0	1.0
+it	02_wind_on	1	239	0.0	1.0
+it	03_wind_off	1	239	0.0	1.0
+it	04_res	1	239	0.0	1.0
 it	05_nuclear	1	239	0.0	0.0
 it	06_coal	1	239	0.0	0.0
 it	07_gas	1	239	0.0	0.0
 it	08_non-res	1	239	0.0	0.0
 it	09_hydro_pump	1	239	0.0	0.0
-it	01_solar	1	240	1.0	0.0
-it	02_wind_on	1	240	1.0	0.0
-it	03_wind_off	1	240	1.0	0.0
-it	04_res	1	240	1.0	0.0
+it	01_solar	1	240	0.0	1.0
+it	02_wind_on	1	240	0.0	1.0
+it	03_wind_off	1	240	0.0	1.0
+it	04_res	1	240	0.0	1.0
 it	05_nuclear	1	240	0.0	0.0
 it	06_coal	1	240	0.0	0.0
 it	07_gas	1	240	0.0	0.0
 it	08_non-res	1	240	0.0	0.0
 it	09_hydro_pump	1	240	0.0	0.0
-it	01_solar	1	241	1.0	0.0
-it	02_wind_on	1	241	1.0	0.0
-it	03_wind_off	1	241	1.0	0.0
-it	04_res	1	241	1.0	0.0
+it	01_solar	1	241	0.0	1.0
+it	02_wind_on	1	241	0.0	1.0
+it	03_wind_off	1	241	0.0	1.0
+it	04_res	1	241	0.0	1.0
 it	05_nuclear	1	241	0.0	0.0
 it	06_coal	1	241	0.0	0.0
 it	07_gas	1	241	0.0	0.0
 it	08_non-res	1	241	0.0	0.0
 it	09_hydro_pump	1	241	0.0	0.0
-it	01_solar	1	242	1.0	0.0
-it	02_wind_on	1	242	1.0	0.0
-it	03_wind_off	1	242	1.0	0.0
-it	04_res	1	242	1.0	0.0
+it	01_solar	1	242	0.0	1.0
+it	02_wind_on	1	242	0.0	1.0
+it	03_wind_off	1	242	0.0	1.0
+it	04_res	1	242	0.0	1.0
 it	05_nuclear	1	242	0.0	0.0
 it	06_coal	1	242	0.0	0.0
 it	07_gas	1	242	0.0	0.0
 it	08_non-res	1	242	0.0	0.0
 it	09_hydro_pump	1	242	0.0	0.0
-it	01_solar	1	243	1.0	0.0
-it	02_wind_on	1	243	1.0	0.0
-it	03_wind_off	1	243	1.0	0.0
-it	04_res	1	243	1.0	0.0
+it	01_solar	1	243	0.0	1.0
+it	02_wind_on	1	243	0.0	1.0
+it	03_wind_off	1	243	0.0	1.0
+it	04_res	1	243	0.0	1.0
 it	05_nuclear	1	243	0.0	0.0
 it	06_coal	1	243	0.0	0.0
 it	07_gas	1	243	0.0	0.0
 it	08_non-res	1	243	0.0	0.0
 it	09_hydro_pump	1	243	0.0	0.0
-it	01_solar	1	244	1.0	0.0
-it	02_wind_on	1	244	1.0	0.0
-it	03_wind_off	1	244	1.0	0.0
-it	04_res	1	244	1.0	0.0
+it	01_solar	1	244	0.0	1.0
+it	02_wind_on	1	244	0.0	1.0
+it	03_wind_off	1	244	0.0	1.0
+it	04_res	1	244	0.0	1.0
 it	05_nuclear	1	244	0.0	0.0
 it	06_coal	1	244	0.0	0.0
 it	07_gas	1	244	0.0	0.0
 it	08_non-res	1	244	0.0	0.0
 it	09_hydro_pump	1	244	0.0	0.0
-it	01_solar	1	245	1.0	0.0
-it	02_wind_on	1	245	1.0	0.0
-it	03_wind_off	1	245	1.0	0.0
-it	04_res	1	245	1.0	0.0
+it	01_solar	1	245	0.0	1.0
+it	02_wind_on	1	245	0.0	1.0
+it	03_wind_off	1	245	0.0	1.0
+it	04_res	1	245	0.0	1.0
 it	05_nuclear	1	245	0.0	0.0
 it	06_coal	1	245	0.0	0.0
 it	07_gas	1	245	0.0	0.0
 it	08_non-res	1	245	0.0	0.0
 it	09_hydro_pump	1	245	0.0	0.0
-it	01_solar	1	246	1.0	0.0
-it	02_wind_on	1	246	1.0	0.0
-it	03_wind_off	1	246	1.0	0.0
-it	04_res	1	246	1.0	0.0
+it	01_solar	1	246	0.0	1.0
+it	02_wind_on	1	246	0.0	1.0
+it	03_wind_off	1	246	0.0	1.0
+it	04_res	1	246	0.0	1.0
 it	05_nuclear	1	246	0.0	0.0
 it	06_coal	1	246	0.0	0.0
 it	07_gas	1	246	0.0	0.0
 it	08_non-res	1	246	0.0	0.0
 it	09_hydro_pump	1	246	0.0	0.0
-it	01_solar	1	247	1.0	0.0
-it	02_wind_on	1	247	1.0	0.0
-it	03_wind_off	1	247	1.0	0.0
-it	04_res	1	247	1.0	0.0
+it	01_solar	1	247	0.0	1.0
+it	02_wind_on	1	247	0.0	1.0
+it	03_wind_off	1	247	0.0	1.0
+it	04_res	1	247	0.0	1.0
 it	05_nuclear	1	247	0.0	0.0
 it	06_coal	1	247	0.0	0.0
 it	07_gas	1	247	0.0	0.0
 it	08_non-res	1	247	0.0	0.0
 it	09_hydro_pump	1	247	0.0	0.0
-it	01_solar	1	248	1.0	0.0
-it	02_wind_on	1	248	1.0	0.0
-it	03_wind_off	1	248	1.0	0.0
-it	04_res	1	248	1.0	0.0
+it	01_solar	1	248	0.0	1.0
+it	02_wind_on	1	248	0.0	1.0
+it	03_wind_off	1	248	0.0	1.0
+it	04_res	1	248	0.0	1.0
 it	05_nuclear	1	248	0.0	0.0
 it	06_coal	1	248	0.0	0.0
 it	07_gas	1	248	0.0	0.0
 it	08_non-res	1	248	0.0	0.0
 it	09_hydro_pump	1	248	0.0	0.0
-it	01_solar	1	249	1.0	0.0
-it	02_wind_on	1	249	1.0	0.0
-it	03_wind_off	1	249	1.0	0.0
-it	04_res	1	249	1.0	0.0
+it	01_solar	1	249	0.0	1.0
+it	02_wind_on	1	249	0.0	1.0
+it	03_wind_off	1	249	0.0	1.0
+it	04_res	1	249	0.0	1.0
 it	05_nuclear	1	249	0.0	0.0
 it	06_coal	1	249	0.0	0.0
 it	07_gas	1	249	0.0	0.0
 it	08_non-res	1	249	0.0	0.0
 it	09_hydro_pump	1	249	0.0	0.0
-it	01_solar	1	250	1.0	0.0
-it	02_wind_on	1	250	1.0	0.0
-it	03_wind_off	1	250	1.0	0.0
-it	04_res	1	250	1.0	0.0
-it	05_nuclear	1	250	1.0	0.0
+it	01_solar	1	250	0.0	1.0
+it	02_wind_on	1	250	0.0	1.0
+it	03_wind_off	1	250	0.0	1.0
+it	04_res	1	250	0.0	1.0
+it	05_nuclear	1	250	0.0	1.0
 it	06_coal	1	250	0.0	0.0
 it	07_gas	1	250	0.0	0.0
 it	08_non-res	1	250	0.0	0.0
 it	09_hydro_pump	1	250	0.0	0.0
-it	01_solar	1	251	1.0	0.0
-it	02_wind_on	1	251	1.0	0.0
-it	03_wind_off	1	251	1.0	0.0
-it	04_res	1	251	1.0	0.0
-it	05_nuclear	1	251	1.0	0.0
+it	01_solar	1	251	0.0	1.0
+it	02_wind_on	1	251	0.0	1.0
+it	03_wind_off	1	251	0.0	1.0
+it	04_res	1	251	0.0	1.0
+it	05_nuclear	1	251	0.0	1.0
 it	06_coal	1	251	0.0	0.0
 it	07_gas	1	251	0.0	0.0
 it	08_non-res	1	251	0.0	0.0
 it	09_hydro_pump	1	251	0.0	0.0
-it	01_solar	1	252	1.0	0.0
-it	02_wind_on	1	252	1.0	0.0
-it	03_wind_off	1	252	1.0	0.0
-it	04_res	1	252	1.0	0.0
-it	05_nuclear	1	252	1.0	0.0
+it	01_solar	1	252	0.0	1.0
+it	02_wind_on	1	252	0.0	1.0
+it	03_wind_off	1	252	0.0	1.0
+it	04_res	1	252	0.0	1.0
+it	05_nuclear	1	252	0.0	1.0
 it	06_coal	1	252	0.0	0.0
 it	07_gas	1	252	0.0	0.0
 it	08_non-res	1	252	0.0	0.0
 it	09_hydro_pump	1	252	0.0	0.0
-it	01_solar	1	253	1.0	0.0
-it	02_wind_on	1	253	1.0	0.0
-it	03_wind_off	1	253	1.0	0.0
-it	04_res	1	253	1.0	0.0
-it	05_nuclear	1	253	1.0	0.0
+it	01_solar	1	253	0.0	1.0
+it	02_wind_on	1	253	0.0	1.0
+it	03_wind_off	1	253	0.0	1.0
+it	04_res	1	253	0.0	1.0
+it	05_nuclear	1	253	0.0	1.0
 it	06_coal	1	253	0.0	0.0
 it	07_gas	1	253	0.0	0.0
 it	08_non-res	1	253	0.0	0.0
 it	09_hydro_pump	1	253	0.0	0.0
-it	01_solar	1	254	1.0	0.0
-it	02_wind_on	1	254	1.0	0.0
-it	03_wind_off	1	254	1.0	0.0
-it	04_res	1	254	1.0	0.0
-it	05_nuclear	1	254	1.0	0.0
+it	01_solar	1	254	0.0	1.0
+it	02_wind_on	1	254	0.0	1.0
+it	03_wind_off	1	254	0.0	1.0
+it	04_res	1	254	0.0	1.0
+it	05_nuclear	1	254	0.0	1.0
 it	06_coal	1	254	0.0	0.0
 it	07_gas	1	254	0.0	0.0
 it	08_non-res	1	254	0.0	0.0
 it	09_hydro_pump	1	254	0.0	0.0
-it	01_solar	1	255	1.0	0.0
-it	02_wind_on	1	255	1.0	0.0
-it	03_wind_off	1	255	1.0	0.0
-it	04_res	1	255	1.0	0.0
-it	05_nuclear	1	255	1.0	0.0
+it	01_solar	1	255	0.0	1.0
+it	02_wind_on	1	255	0.0	1.0
+it	03_wind_off	1	255	0.0	1.0
+it	04_res	1	255	0.0	1.0
+it	05_nuclear	1	255	0.0	1.0
 it	06_coal	1	255	0.0	0.0
 it	07_gas	1	255	0.0	0.0
 it	08_non-res	1	255	0.0	0.0
 it	09_hydro_pump	1	255	0.0	0.0
-it	01_solar	1	256	1.0	0.0
-it	02_wind_on	1	256	1.0	0.0
-it	03_wind_off	1	256	1.0	0.0
-it	04_res	1	256	1.0	0.0
-it	05_nuclear	1	256	1.0	0.0
+it	01_solar	1	256	0.0	1.0
+it	02_wind_on	1	256	0.0	1.0
+it	03_wind_off	1	256	0.0	1.0
+it	04_res	1	256	0.0	1.0
+it	05_nuclear	1	256	0.0	1.0
 it	06_coal	1	256	0.0	0.0
 it	07_gas	1	256	0.0	0.0
 it	08_non-res	1	256	0.0	0.0
 it	09_hydro_pump	1	256	0.0	0.0
-it	01_solar	1	257	1.0	0.0
-it	02_wind_on	1	257	1.0	0.0
-it	03_wind_off	1	257	1.0	0.0
-it	04_res	1	257	1.0	0.0
-it	05_nuclear	1	257	1.0	0.0
+it	01_solar	1	257	0.0	1.0
+it	02_wind_on	1	257	0.0	1.0
+it	03_wind_off	1	257	0.0	1.0
+it	04_res	1	257	0.0	1.0
+it	05_nuclear	1	257	0.0	1.0
 it	06_coal	1	257	0.0	0.0
 it	07_gas	1	257	0.0	0.0
 it	08_non-res	1	257	0.0	0.0
 it	09_hydro_pump	1	257	0.0	0.0
-it	01_solar	1	258	1.0	0.0
-it	02_wind_on	1	258	1.0	0.0
-it	03_wind_off	1	258	1.0	0.0
-it	04_res	1	258	1.0	0.0
-it	05_nuclear	1	258	1.0	0.0
+it	01_solar	1	258	0.0	1.0
+it	02_wind_on	1	258	0.0	1.0
+it	03_wind_off	1	258	0.0	1.0
+it	04_res	1	258	0.0	1.0
+it	05_nuclear	1	258	0.0	1.0
 it	06_coal	1	258	0.0	0.0
 it	07_gas	1	258	0.0	0.0
 it	08_non-res	1	258	0.0	0.0
 it	09_hydro_pump	1	258	0.0	0.0
-it	01_solar	1	259	1.0	0.0
-it	02_wind_on	1	259	1.0	0.0
-it	03_wind_off	1	259	1.0	0.0
-it	04_res	1	259	1.0	0.0
-it	05_nuclear	1	259	1.0	0.0
+it	01_solar	1	259	0.0	1.0
+it	02_wind_on	1	259	0.0	1.0
+it	03_wind_off	1	259	0.0	1.0
+it	04_res	1	259	0.0	1.0
+it	05_nuclear	1	259	0.0	1.0
 it	06_coal	1	259	0.0	0.0
 it	07_gas	1	259	0.0	0.0
 it	08_non-res	1	259	0.0	0.0
 it	09_hydro_pump	1	259	0.0	0.0
-it	01_solar	1	260	1.0	0.0
-it	02_wind_on	1	260	1.0	0.0
-it	03_wind_off	1	260	1.0	0.0
-it	04_res	1	260	1.0	0.0
-it	05_nuclear	1	260	1.0	0.0
+it	01_solar	1	260	0.0	1.0
+it	02_wind_on	1	260	0.0	1.0
+it	03_wind_off	1	260	0.0	1.0
+it	04_res	1	260	0.0	1.0
+it	05_nuclear	1	260	0.0	1.0
 it	06_coal	1	260	0.0	0.0
 it	07_gas	1	260	0.0	0.0
 it	08_non-res	1	260	0.0	0.0
 it	09_hydro_pump	1	260	0.0	0.0
-it	01_solar	1	261	1.0	0.0
-it	02_wind_on	1	261	1.0	0.0
-it	03_wind_off	1	261	1.0	0.0
-it	04_res	1	261	1.0	0.0
-it	05_nuclear	1	261	1.0	0.0
+it	01_solar	1	261	0.0	1.0
+it	02_wind_on	1	261	0.0	1.0
+it	03_wind_off	1	261	0.0	1.0
+it	04_res	1	261	0.0	1.0
+it	05_nuclear	1	261	0.0	1.0
 it	06_coal	1	261	0.0	0.0
 it	07_gas	1	261	0.0	0.0
 it	08_non-res	1	261	0.0	0.0
 it	09_hydro_pump	1	261	0.0	0.0
-it	01_solar	1	262	1.0	0.0
-it	02_wind_on	1	262	1.0	0.0
-it	03_wind_off	1	262	1.0	0.0
-it	04_res	1	262	1.0	0.0
-it	05_nuclear	1	262	1.0	0.0
+it	01_solar	1	262	0.0	1.0
+it	02_wind_on	1	262	0.0	1.0
+it	03_wind_off	1	262	0.0	1.0
+it	04_res	1	262	0.0	1.0
+it	05_nuclear	1	262	0.0	1.0
 it	06_coal	1	262	0.0	0.0
 it	07_gas	1	262	0.0	0.0
 it	08_non-res	1	262	0.0	0.0
 it	09_hydro_pump	1	262	0.0	0.0
-it	01_solar	1	263	1.0	0.0
-it	02_wind_on	1	263	1.0	0.0
-it	03_wind_off	1	263	1.0	0.0
-it	04_res	1	263	1.0	0.0
-it	05_nuclear	1	263	1.0	0.0
+it	01_solar	1	263	0.0	1.0
+it	02_wind_on	1	263	0.0	1.0
+it	03_wind_off	1	263	0.0	1.0
+it	04_res	1	263	0.0	1.0
+it	05_nuclear	1	263	0.0	1.0
 it	06_coal	1	263	0.0	0.0
 it	07_gas	1	263	0.0	0.0
 it	08_non-res	1	263	0.0	0.0
 it	09_hydro_pump	1	263	0.0	0.0
-it	01_solar	1	264	1.0	0.0
-it	02_wind_on	1	264	1.0	0.0
-it	03_wind_off	1	264	1.0	0.0
-it	04_res	1	264	1.0	0.0
-it	05_nuclear	1	264	1.0	0.0
+it	01_solar	1	264	0.0	1.0
+it	02_wind_on	1	264	0.0	1.0
+it	03_wind_off	1	264	0.0	1.0
+it	04_res	1	264	0.0	1.0
+it	05_nuclear	1	264	0.0	1.0
 it	06_coal	1	264	0.0	0.0
 it	07_gas	1	264	0.0	0.0
 it	08_non-res	1	264	0.0	0.0
 it	09_hydro_pump	1	264	0.0	0.0
-it	01_solar	1	265	1.0	0.0
-it	02_wind_on	1	265	1.0	0.0
-it	03_wind_off	1	265	1.0	0.0
-it	04_res	1	265	1.0	0.0
-it	05_nuclear	1	265	1.0	0.0
+it	01_solar	1	265	0.0	1.0
+it	02_wind_on	1	265	0.0	1.0
+it	03_wind_off	1	265	0.0	1.0
+it	04_res	1	265	0.0	1.0
+it	05_nuclear	1	265	0.0	1.0
 it	06_coal	1	265	0.0	0.0
 it	07_gas	1	265	0.0	0.0
 it	08_non-res	1	265	0.0	0.0
 it	09_hydro_pump	1	265	0.0	0.0
-it	01_solar	1	266	1.0	0.0
-it	02_wind_on	1	266	1.0	0.0
-it	03_wind_off	1	266	1.0	0.0
-it	04_res	1	266	1.0	0.0
-it	05_nuclear	1	266	1.0	0.0
+it	01_solar	1	266	0.0	1.0
+it	02_wind_on	1	266	0.0	1.0
+it	03_wind_off	1	266	0.0	1.0
+it	04_res	1	266	0.0	1.0
+it	05_nuclear	1	266	0.0	1.0
 it	06_coal	1	266	0.0	0.0
 it	07_gas	1	266	0.0	0.0
 it	08_non-res	1	266	0.0	0.0
 it	09_hydro_pump	1	266	0.0	0.0
-it	01_solar	1	267	1.0	0.0
-it	02_wind_on	1	267	1.0	0.0
-it	03_wind_off	1	267	1.0	0.0
-it	04_res	1	267	1.0	0.0
-it	05_nuclear	1	267	1.0	0.0
+it	01_solar	1	267	0.0	1.0
+it	02_wind_on	1	267	0.0	1.0
+it	03_wind_off	1	267	0.0	1.0
+it	04_res	1	267	0.0	1.0
+it	05_nuclear	1	267	0.0	1.0
 it	06_coal	1	267	0.0	0.0
 it	07_gas	1	267	0.0	0.0
 it	08_non-res	1	267	0.0	0.0
 it	09_hydro_pump	1	267	0.0	0.0
-it	01_solar	1	268	1.0	0.0
-it	02_wind_on	1	268	1.0	0.0
-it	03_wind_off	1	268	1.0	0.0
-it	04_res	1	268	1.0	0.0
-it	05_nuclear	1	268	1.0	0.0
+it	01_solar	1	268	0.0	1.0
+it	02_wind_on	1	268	0.0	1.0
+it	03_wind_off	1	268	0.0	1.0
+it	04_res	1	268	0.0	1.0
+it	05_nuclear	1	268	0.0	1.0
 it	06_coal	1	268	0.0	0.0
 it	07_gas	1	268	0.0	0.0
 it	08_non-res	1	268	0.0	0.0
 it	09_hydro_pump	1	268	0.0	0.0
-it	01_solar	1	269	1.0	0.0
-it	02_wind_on	1	269	1.0	0.0
-it	03_wind_off	1	269	1.0	0.0
-it	04_res	1	269	1.0	0.0
-it	05_nuclear	1	269	1.0	0.0
+it	01_solar	1	269	0.0	1.0
+it	02_wind_on	1	269	0.0	1.0
+it	03_wind_off	1	269	0.0	1.0
+it	04_res	1	269	0.0	1.0
+it	05_nuclear	1	269	0.0	1.0
 it	06_coal	1	269	0.0	0.0
 it	07_gas	1	269	0.0	0.0
 it	08_non-res	1	269	0.0	0.0
 it	09_hydro_pump	1	269	0.0	0.0
-it	01_solar	1	270	1.0	0.0
-it	02_wind_on	1	270	1.0	0.0
-it	03_wind_off	1	270	1.0	0.0
-it	04_res	1	270	1.0	0.0
-it	05_nuclear	1	270	1.0	0.0
-it	06_coal	1	270	1.0	0.0
+it	01_solar	1	270	0.0	1.0
+it	02_wind_on	1	270	0.0	1.0
+it	03_wind_off	1	270	0.0	1.0
+it	04_res	1	270	0.0	1.0
+it	05_nuclear	1	270	0.0	1.0
+it	06_coal	1	270	0.0	1.0
 it	07_gas	1	270	0.0	0.0
 it	08_non-res	1	270	0.0	0.0
 it	09_hydro_pump	1	270	0.0	0.0
-it	01_solar	1	271	1.0	0.0
-it	02_wind_on	1	271	1.0	0.0
-it	03_wind_off	1	271	1.0	0.0
-it	04_res	1	271	1.0	0.0
-it	05_nuclear	1	271	1.0	0.0
-it	06_coal	1	271	1.0	0.0
+it	01_solar	1	271	0.0	1.0
+it	02_wind_on	1	271	0.0	1.0
+it	03_wind_off	1	271	0.0	1.0
+it	04_res	1	271	0.0	1.0
+it	05_nuclear	1	271	0.0	1.0
+it	06_coal	1	271	0.0	1.0
 it	07_gas	1	271	0.0	0.0
 it	08_non-res	1	271	0.0	0.0
 it	09_hydro_pump	1	271	0.0	0.0
-it	01_solar	1	272	1.0	0.0
-it	02_wind_on	1	272	1.0	0.0
-it	03_wind_off	1	272	1.0	0.0
-it	04_res	1	272	1.0	0.0
-it	05_nuclear	1	272	1.0	0.0
-it	06_coal	1	272	1.0	0.0
+it	01_solar	1	272	0.0	1.0
+it	02_wind_on	1	272	0.0	1.0
+it	03_wind_off	1	272	0.0	1.0
+it	04_res	1	272	0.0	1.0
+it	05_nuclear	1	272	0.0	1.0
+it	06_coal	1	272	0.0	1.0
 it	07_gas	1	272	0.0	0.0
 it	08_non-res	1	272	0.0	0.0
 it	09_hydro_pump	1	272	0.0	0.0
-it	01_solar	1	273	1.0	0.0
-it	02_wind_on	1	273	1.0	0.0
-it	03_wind_off	1	273	1.0	0.0
-it	04_res	1	273	1.0	0.0
-it	05_nuclear	1	273	1.0	0.0
-it	06_coal	1	273	1.0	0.0
+it	01_solar	1	273	0.0	1.0
+it	02_wind_on	1	273	0.0	1.0
+it	03_wind_off	1	273	0.0	1.0
+it	04_res	1	273	0.0	1.0
+it	05_nuclear	1	273	0.0	1.0
+it	06_coal	1	273	0.0	1.0
 it	07_gas	1	273	0.0	0.0
 it	08_non-res	1	273	0.0	0.0
 it	09_hydro_pump	1	273	0.0	0.0
-it	01_solar	1	274	1.0	0.0
-it	02_wind_on	1	274	1.0	0.0
-it	03_wind_off	1	274	1.0	0.0
-it	04_res	1	274	1.0	0.0
-it	05_nuclear	1	274	1.0	0.0
-it	06_coal	1	274	1.0	0.0
+it	01_solar	1	274	0.0	1.0
+it	02_wind_on	1	274	0.0	1.0
+it	03_wind_off	1	274	0.0	1.0
+it	04_res	1	274	0.0	1.0
+it	05_nuclear	1	274	0.0	1.0
+it	06_coal	1	274	0.0	1.0
 it	07_gas	1	274	0.0	0.0
 it	08_non-res	1	274	0.0	0.0
 it	09_hydro_pump	1	274	0.0	0.0
-it	01_solar	1	275	1.0	0.0
-it	02_wind_on	1	275	1.0	0.0
-it	03_wind_off	1	275	1.0	0.0
-it	04_res	1	275	1.0	0.0
-it	05_nuclear	1	275	1.0	0.0
-it	06_coal	1	275	1.0	0.0
+it	01_solar	1	275	0.0	1.0
+it	02_wind_on	1	275	0.0	1.0
+it	03_wind_off	1	275	0.0	1.0
+it	04_res	1	275	0.0	1.0
+it	05_nuclear	1	275	0.0	1.0
+it	06_coal	1	275	0.0	1.0
 it	07_gas	1	275	0.0	0.0
 it	08_non-res	1	275	0.0	0.0
 it	09_hydro_pump	1	275	0.0	0.0
-it	01_solar	1	276	1.0	0.0
-it	02_wind_on	1	276	1.0	0.0
-it	03_wind_off	1	276	1.0	0.0
-it	04_res	1	276	1.0	0.0
-it	05_nuclear	1	276	1.0	0.0
-it	06_coal	1	276	1.0	0.0
+it	01_solar	1	276	0.0	1.0
+it	02_wind_on	1	276	0.0	1.0
+it	03_wind_off	1	276	0.0	1.0
+it	04_res	1	276	0.0	1.0
+it	05_nuclear	1	276	0.0	1.0
+it	06_coal	1	276	0.0	1.0
 it	07_gas	1	276	0.0	0.0
 it	08_non-res	1	276	0.0	0.0
 it	09_hydro_pump	1	276	0.0	0.0
-it	01_solar	1	277	1.0	0.0
-it	02_wind_on	1	277	1.0	0.0
-it	03_wind_off	1	277	1.0	0.0
-it	04_res	1	277	1.0	0.0
-it	05_nuclear	1	277	1.0	0.0
-it	06_coal	1	277	1.0	0.0
+it	01_solar	1	277	0.0	1.0
+it	02_wind_on	1	277	0.0	1.0
+it	03_wind_off	1	277	0.0	1.0
+it	04_res	1	277	0.0	1.0
+it	05_nuclear	1	277	0.0	1.0
+it	06_coal	1	277	0.0	1.0
 it	07_gas	1	277	0.0	0.0
 it	08_non-res	1	277	0.0	0.0
 it	09_hydro_pump	1	277	0.0	0.0
-it	01_solar	1	278	1.0	0.0
-it	02_wind_on	1	278	1.0	0.0
-it	03_wind_off	1	278	1.0	0.0
-it	04_res	1	278	1.0	0.0
-it	05_nuclear	1	278	1.0	0.0
-it	06_coal	1	278	1.0	0.0
+it	01_solar	1	278	0.0	1.0
+it	02_wind_on	1	278	0.0	1.0
+it	03_wind_off	1	278	0.0	1.0
+it	04_res	1	278	0.0	1.0
+it	05_nuclear	1	278	0.0	1.0
+it	06_coal	1	278	0.0	1.0
 it	07_gas	1	278	0.0	0.0
 it	08_non-res	1	278	0.0	0.0
 it	09_hydro_pump	1	278	0.0	0.0
-it	01_solar	1	279	1.0	0.0
-it	02_wind_on	1	279	1.0	0.0
-it	03_wind_off	1	279	1.0	0.0
-it	04_res	1	279	1.0	0.0
-it	05_nuclear	1	279	1.0	0.0
-it	06_coal	1	279	1.0	0.0
+it	01_solar	1	279	0.0	1.0
+it	02_wind_on	1	279	0.0	1.0
+it	03_wind_off	1	279	0.0	1.0
+it	04_res	1	279	0.0	1.0
+it	05_nuclear	1	279	0.0	1.0
+it	06_coal	1	279	0.0	1.0
 it	07_gas	1	279	0.0	0.0
 it	08_non-res	1	279	0.0	0.0
 it	09_hydro_pump	1	279	0.0	0.0
-it	01_solar	1	280	1.0	0.0
-it	02_wind_on	1	280	1.0	0.0
-it	03_wind_off	1	280	1.0	0.0
-it	04_res	1	280	1.0	0.0
-it	05_nuclear	1	280	1.0	0.0
-it	06_coal	1	280	1.0	0.0
+it	01_solar	1	280	0.0	1.0
+it	02_wind_on	1	280	0.0	1.0
+it	03_wind_off	1	280	0.0	1.0
+it	04_res	1	280	0.0	1.0
+it	05_nuclear	1	280	0.0	1.0
+it	06_coal	1	280	0.0	1.0
 it	07_gas	1	280	0.0	0.0
 it	08_non-res	1	280	0.0	0.0
 it	09_hydro_pump	1	280	0.0	0.0
-it	01_solar	1	281	1.0	0.0
-it	02_wind_on	1	281	1.0	0.0
-it	03_wind_off	1	281	1.0	0.0
-it	04_res	1	281	1.0	0.0
-it	05_nuclear	1	281	1.0	0.0
-it	06_coal	1	281	1.0	0.0
+it	01_solar	1	281	0.0	1.0
+it	02_wind_on	1	281	0.0	1.0
+it	03_wind_off	1	281	0.0	1.0
+it	04_res	1	281	0.0	1.0
+it	05_nuclear	1	281	0.0	1.0
+it	06_coal	1	281	0.0	1.0
 it	07_gas	1	281	0.0	0.0
 it	08_non-res	1	281	0.0	0.0
 it	09_hydro_pump	1	281	0.0	0.0
-it	01_solar	1	282	1.0	0.0
-it	02_wind_on	1	282	1.0	0.0
-it	03_wind_off	1	282	1.0	0.0
-it	04_res	1	282	1.0	0.0
-it	05_nuclear	1	282	1.0	0.0
-it	06_coal	1	282	1.0	0.0
+it	01_solar	1	282	0.0	1.0
+it	02_wind_on	1	282	0.0	1.0
+it	03_wind_off	1	282	0.0	1.0
+it	04_res	1	282	0.0	1.0
+it	05_nuclear	1	282	0.0	1.0
+it	06_coal	1	282	0.0	1.0
 it	07_gas	1	282	0.0	0.0
 it	08_non-res	1	282	0.0	0.0
 it	09_hydro_pump	1	282	0.0	0.0
-it	01_solar	1	283	1.0	0.0
-it	02_wind_on	1	283	1.0	0.0
-it	03_wind_off	1	283	1.0	0.0
-it	04_res	1	283	1.0	0.0
-it	05_nuclear	1	283	1.0	0.0
-it	06_coal	1	283	1.0	0.0
+it	01_solar	1	283	0.0	1.0
+it	02_wind_on	1	283	0.0	1.0
+it	03_wind_off	1	283	0.0	1.0
+it	04_res	1	283	0.0	1.0
+it	05_nuclear	1	283	0.0	1.0
+it	06_coal	1	283	0.0	1.0
 it	07_gas	1	283	0.0	0.0
 it	08_non-res	1	283	0.0	0.0
 it	09_hydro_pump	1	283	0.0	0.0
-it	01_solar	1	284	1.0	0.0
-it	02_wind_on	1	284	1.0	0.0
-it	03_wind_off	1	284	1.0	0.0
-it	04_res	1	284	1.0	0.0
-it	05_nuclear	1	284	1.0	0.0
-it	06_coal	1	284	1.0	0.0
+it	01_solar	1	284	0.0	1.0
+it	02_wind_on	1	284	0.0	1.0
+it	03_wind_off	1	284	0.0	1.0
+it	04_res	1	284	0.0	1.0
+it	05_nuclear	1	284	0.0	1.0
+it	06_coal	1	284	0.0	1.0
 it	07_gas	1	284	0.0	0.0
 it	08_non-res	1	284	0.0	0.0
 it	09_hydro_pump	1	284	0.0	0.0
-it	01_solar	1	285	1.0	0.0
-it	02_wind_on	1	285	1.0	0.0
-it	03_wind_off	1	285	1.0	0.0
-it	04_res	1	285	1.0	0.0
-it	05_nuclear	1	285	1.0	0.0
-it	06_coal	1	285	1.0	0.0
+it	01_solar	1	285	0.0	1.0
+it	02_wind_on	1	285	0.0	1.0
+it	03_wind_off	1	285	0.0	1.0
+it	04_res	1	285	0.0	1.0
+it	05_nuclear	1	285	0.0	1.0
+it	06_coal	1	285	0.0	1.0
 it	07_gas	1	285	0.0	0.0
 it	08_non-res	1	285	0.0	0.0
 it	09_hydro_pump	1	285	0.0	0.0
-it	01_solar	1	286	1.0	0.0
-it	02_wind_on	1	286	1.0	0.0
-it	03_wind_off	1	286	1.0	0.0
-it	04_res	1	286	1.0	0.0
-it	05_nuclear	1	286	1.0	0.0
-it	06_coal	1	286	1.0	0.0
+it	01_solar	1	286	0.0	1.0
+it	02_wind_on	1	286	0.0	1.0
+it	03_wind_off	1	286	0.0	1.0
+it	04_res	1	286	0.0	1.0
+it	05_nuclear	1	286	0.0	1.0
+it	06_coal	1	286	0.0	1.0
 it	07_gas	1	286	0.0	0.0
 it	08_non-res	1	286	0.0	0.0
 it	09_hydro_pump	1	286	0.0	0.0
-it	01_solar	1	287	1.0	0.0
-it	02_wind_on	1	287	1.0	0.0
-it	03_wind_off	1	287	1.0	0.0
-it	04_res	1	287	1.0	0.0
-it	05_nuclear	1	287	1.0	0.0
-it	06_coal	1	287	1.0	0.0
+it	01_solar	1	287	0.0	1.0
+it	02_wind_on	1	287	0.0	1.0
+it	03_wind_off	1	287	0.0	1.0
+it	04_res	1	287	0.0	1.0
+it	05_nuclear	1	287	0.0	1.0
+it	06_coal	1	287	0.0	1.0
 it	07_gas	1	287	0.0	0.0
 it	08_non-res	1	287	0.0	0.0
 it	09_hydro_pump	1	287	0.0	0.0
-it	01_solar	1	288	1.0	0.0
-it	02_wind_on	1	288	1.0	0.0
-it	03_wind_off	1	288	1.0	0.0
-it	04_res	1	288	1.0	0.0
-it	05_nuclear	1	288	1.0	0.0
-it	06_coal	1	288	1.0	0.0
+it	01_solar	1	288	0.0	1.0
+it	02_wind_on	1	288	0.0	1.0
+it	03_wind_off	1	288	0.0	1.0
+it	04_res	1	288	0.0	1.0
+it	05_nuclear	1	288	0.0	1.0
+it	06_coal	1	288	0.0	1.0
 it	07_gas	1	288	0.0	0.0
 it	08_non-res	1	288	0.0	0.0
 it	09_hydro_pump	1	288	0.0	0.0
-it	01_solar	1	289	1.0	0.0
-it	02_wind_on	1	289	1.0	0.0
-it	03_wind_off	1	289	1.0	0.0
-it	04_res	1	289	1.0	0.0
-it	05_nuclear	1	289	1.0	0.0
-it	06_coal	1	289	1.0	0.0
+it	01_solar	1	289	0.0	1.0
+it	02_wind_on	1	289	0.0	1.0
+it	03_wind_off	1	289	0.0	1.0
+it	04_res	1	289	0.0	1.0
+it	05_nuclear	1	289	0.0	1.0
+it	06_coal	1	289	0.0	1.0
 it	07_gas	1	289	0.0	0.0
 it	08_non-res	1	289	0.0	0.0
 it	09_hydro_pump	1	289	0.0	0.0
-it	01_solar	1	290	1.0	0.0
-it	02_wind_on	1	290	1.0	0.0
-it	03_wind_off	1	290	1.0	0.0
-it	04_res	1	290	1.0	0.0
-it	05_nuclear	1	290	1.0	0.0
-it	06_coal	1	290	1.0	0.0
-it	07_gas	1	290	1.0	0.0
+it	01_solar	1	290	0.0	1.0
+it	02_wind_on	1	290	0.0	1.0
+it	03_wind_off	1	290	0.0	1.0
+it	04_res	1	290	0.0	1.0
+it	05_nuclear	1	290	0.0	1.0
+it	06_coal	1	290	0.0	1.0
+it	07_gas	1	290	0.0	1.0
 it	08_non-res	1	290	0.0	0.0
 it	09_hydro_pump	1	290	0.0	0.0
-it	01_solar	1	291	1.0	0.0
-it	02_wind_on	1	291	1.0	0.0
-it	03_wind_off	1	291	1.0	0.0
-it	04_res	1	291	1.0	0.0
-it	05_nuclear	1	291	1.0	0.0
-it	06_coal	1	291	1.0	0.0
-it	07_gas	1	291	1.0	0.0
+it	01_solar	1	291	0.0	1.0
+it	02_wind_on	1	291	0.0	1.0
+it	03_wind_off	1	291	0.0	1.0
+it	04_res	1	291	0.0	1.0
+it	05_nuclear	1	291	0.0	1.0
+it	06_coal	1	291	0.0	1.0
+it	07_gas	1	291	0.0	1.0
 it	08_non-res	1	291	0.0	0.0
 it	09_hydro_pump	1	291	0.0	0.0
-it	01_solar	1	292	1.0	0.0
-it	02_wind_on	1	292	1.0	0.0
-it	03_wind_off	1	292	1.0	0.0
-it	04_res	1	292	1.0	0.0
-it	05_nuclear	1	292	1.0	0.0
-it	06_coal	1	292	1.0	0.0
-it	07_gas	1	292	1.0	0.0
+it	01_solar	1	292	0.0	1.0
+it	02_wind_on	1	292	0.0	1.0
+it	03_wind_off	1	292	0.0	1.0
+it	04_res	1	292	0.0	1.0
+it	05_nuclear	1	292	0.0	1.0
+it	06_coal	1	292	0.0	1.0
+it	07_gas	1	292	0.0	1.0
 it	08_non-res	1	292	0.0	0.0
 it	09_hydro_pump	1	292	0.0	0.0
-it	01_solar	1	293	1.0	0.0
-it	02_wind_on	1	293	1.0	0.0
-it	03_wind_off	1	293	1.0	0.0
-it	04_res	1	293	1.0	0.0
-it	05_nuclear	1	293	1.0	0.0
-it	06_coal	1	293	1.0	0.0
-it	07_gas	1	293	1.0	0.0
+it	01_solar	1	293	0.0	1.0
+it	02_wind_on	1	293	0.0	1.0
+it	03_wind_off	1	293	0.0	1.0
+it	04_res	1	293	0.0	1.0
+it	05_nuclear	1	293	0.0	1.0
+it	06_coal	1	293	0.0	1.0
+it	07_gas	1	293	0.0	1.0
 it	08_non-res	1	293	0.0	0.0
 it	09_hydro_pump	1	293	0.0	0.0
-it	01_solar	1	294	1.0	0.0
-it	02_wind_on	1	294	1.0	0.0
-it	03_wind_off	1	294	1.0	0.0
-it	04_res	1	294	1.0	0.0
-it	05_nuclear	1	294	1.0	0.0
-it	06_coal	1	294	1.0	0.0
-it	07_gas	1	294	1.0	0.0
+it	01_solar	1	294	0.0	1.0
+it	02_wind_on	1	294	0.0	1.0
+it	03_wind_off	1	294	0.0	1.0
+it	04_res	1	294	0.0	1.0
+it	05_nuclear	1	294	0.0	1.0
+it	06_coal	1	294	0.0	1.0
+it	07_gas	1	294	0.0	1.0
 it	08_non-res	1	294	0.0	0.0
 it	09_hydro_pump	1	294	0.0	0.0
-it	01_solar	1	295	1.0	0.0
-it	02_wind_on	1	295	1.0	0.0
-it	03_wind_off	1	295	1.0	0.0
-it	04_res	1	295	1.0	0.0
-it	05_nuclear	1	295	1.0	0.0
-it	06_coal	1	295	1.0	0.0
-it	07_gas	1	295	1.0	0.0
+it	01_solar	1	295	0.0	1.0
+it	02_wind_on	1	295	0.0	1.0
+it	03_wind_off	1	295	0.0	1.0
+it	04_res	1	295	0.0	1.0
+it	05_nuclear	1	295	0.0	1.0
+it	06_coal	1	295	0.0	1.0
+it	07_gas	1	295	0.0	1.0
 it	08_non-res	1	295	0.0	0.0
 it	09_hydro_pump	1	295	0.0	0.0
-it	01_solar	1	296	1.0	0.0
-it	02_wind_on	1	296	1.0	0.0
-it	03_wind_off	1	296	1.0	0.0
-it	04_res	1	296	1.0	0.0
-it	05_nuclear	1	296	1.0	0.0
-it	06_coal	1	296	1.0	0.0
-it	07_gas	1	296	1.0	0.0
+it	01_solar	1	296	0.0	1.0
+it	02_wind_on	1	296	0.0	1.0
+it	03_wind_off	1	296	0.0	1.0
+it	04_res	1	296	0.0	1.0
+it	05_nuclear	1	296	0.0	1.0
+it	06_coal	1	296	0.0	1.0
+it	07_gas	1	296	0.0	1.0
 it	08_non-res	1	296	0.0	0.0
 it	09_hydro_pump	1	296	0.0	0.0
-it	01_solar	1	297	1.0	0.0
-it	02_wind_on	1	297	1.0	0.0
-it	03_wind_off	1	297	1.0	0.0
-it	04_res	1	297	1.0	0.0
-it	05_nuclear	1	297	1.0	0.0
-it	06_coal	1	297	1.0	0.0
-it	07_gas	1	297	1.0	0.0
+it	01_solar	1	297	0.0	1.0
+it	02_wind_on	1	297	0.0	1.0
+it	03_wind_off	1	297	0.0	1.0
+it	04_res	1	297	0.0	1.0
+it	05_nuclear	1	297	0.0	1.0
+it	06_coal	1	297	0.0	1.0
+it	07_gas	1	297	0.0	1.0
 it	08_non-res	1	297	0.0	0.0
 it	09_hydro_pump	1	297	0.0	0.0
-it	01_solar	1	298	1.0	0.0
-it	02_wind_on	1	298	1.0	0.0
-it	03_wind_off	1	298	1.0	0.0
-it	04_res	1	298	1.0	0.0
-it	05_nuclear	1	298	1.0	0.0
-it	06_coal	1	298	1.0	0.0
-it	07_gas	1	298	1.0	0.0
+it	01_solar	1	298	0.0	1.0
+it	02_wind_on	1	298	0.0	1.0
+it	03_wind_off	1	298	0.0	1.0
+it	04_res	1	298	0.0	1.0
+it	05_nuclear	1	298	0.0	1.0
+it	06_coal	1	298	0.0	1.0
+it	07_gas	1	298	0.0	1.0
 it	08_non-res	1	298	0.0	0.0
 it	09_hydro_pump	1	298	0.0	0.0
-it	01_solar	1	299	1.0	0.0
-it	02_wind_on	1	299	1.0	0.0
-it	03_wind_off	1	299	1.0	0.0
-it	04_res	1	299	1.0	0.0
-it	05_nuclear	1	299	1.0	0.0
-it	06_coal	1	299	1.0	0.0
-it	07_gas	1	299	1.0	0.0
+it	01_solar	1	299	0.0	1.0
+it	02_wind_on	1	299	0.0	1.0
+it	03_wind_off	1	299	0.0	1.0
+it	04_res	1	299	0.0	1.0
+it	05_nuclear	1	299	0.0	1.0
+it	06_coal	1	299	0.0	1.0
+it	07_gas	1	299	0.0	1.0
 it	08_non-res	1	299	0.0	0.0
 it	09_hydro_pump	1	299	0.0	0.0
-it	01_solar	1	300	1.0	0.0
-it	02_wind_on	1	300	1.0	0.0
-it	03_wind_off	1	300	1.0	0.0
-it	04_res	1	300	1.0	0.0
-it	05_nuclear	1	300	1.0	0.0
-it	06_coal	1	300	1.0	0.0
-it	07_gas	1	300	1.0	0.0
+it	01_solar	1	300	0.0	1.0
+it	02_wind_on	1	300	0.0	1.0
+it	03_wind_off	1	300	0.0	1.0
+it	04_res	1	300	0.0	1.0
+it	05_nuclear	1	300	0.0	1.0
+it	06_coal	1	300	0.0	1.0
+it	07_gas	1	300	0.0	1.0
 it	08_non-res	1	300	0.0	0.0
 it	09_hydro_pump	1	300	0.0	0.0
-it	01_solar	1	301	1.0	0.0
-it	02_wind_on	1	301	1.0	0.0
-it	03_wind_off	1	301	1.0	0.0
-it	04_res	1	301	1.0	0.0
-it	05_nuclear	1	301	1.0	0.0
-it	06_coal	1	301	1.0	0.0
-it	07_gas	1	301	1.0	0.0
+it	01_solar	1	301	0.0	1.0
+it	02_wind_on	1	301	0.0	1.0
+it	03_wind_off	1	301	0.0	1.0
+it	04_res	1	301	0.0	1.0
+it	05_nuclear	1	301	0.0	1.0
+it	06_coal	1	301	0.0	1.0
+it	07_gas	1	301	0.0	1.0
 it	08_non-res	1	301	0.0	0.0
 it	09_hydro_pump	1	301	0.0	0.0
-it	01_solar	1	302	1.0	0.0
-it	02_wind_on	1	302	1.0	0.0
-it	03_wind_off	1	302	1.0	0.0
-it	04_res	1	302	1.0	0.0
-it	05_nuclear	1	302	1.0	0.0
-it	06_coal	1	302	1.0	0.0
-it	07_gas	1	302	1.0	0.0
+it	01_solar	1	302	0.0	1.0
+it	02_wind_on	1	302	0.0	1.0
+it	03_wind_off	1	302	0.0	1.0
+it	04_res	1	302	0.0	1.0
+it	05_nuclear	1	302	0.0	1.0
+it	06_coal	1	302	0.0	1.0
+it	07_gas	1	302	0.0	1.0
 it	08_non-res	1	302	0.0	0.0
 it	09_hydro_pump	1	302	0.0	0.0
-it	01_solar	1	303	1.0	0.0
-it	02_wind_on	1	303	1.0	0.0
-it	03_wind_off	1	303	1.0	0.0
-it	04_res	1	303	1.0	0.0
-it	05_nuclear	1	303	1.0	0.0
-it	06_coal	1	303	1.0	0.0
-it	07_gas	1	303	1.0	0.0
+it	01_solar	1	303	0.0	1.0
+it	02_wind_on	1	303	0.0	1.0
+it	03_wind_off	1	303	0.0	1.0
+it	04_res	1	303	0.0	1.0
+it	05_nuclear	1	303	0.0	1.0
+it	06_coal	1	303	0.0	1.0
+it	07_gas	1	303	0.0	1.0
 it	08_non-res	1	303	0.0	0.0
 it	09_hydro_pump	1	303	0.0	0.0
-it	01_solar	1	304	1.0	0.0
-it	02_wind_on	1	304	1.0	0.0
-it	03_wind_off	1	304	1.0	0.0
-it	04_res	1	304	1.0	0.0
-it	05_nuclear	1	304	1.0	0.0
-it	06_coal	1	304	1.0	0.0
-it	07_gas	1	304	1.0	0.0
+it	01_solar	1	304	0.0	1.0
+it	02_wind_on	1	304	0.0	1.0
+it	03_wind_off	1	304	0.0	1.0
+it	04_res	1	304	0.0	1.0
+it	05_nuclear	1	304	0.0	1.0
+it	06_coal	1	304	0.0	1.0
+it	07_gas	1	304	0.0	1.0
 it	08_non-res	1	304	0.0	0.0
 it	09_hydro_pump	1	304	0.0	0.0
-it	01_solar	1	305	1.0	0.0
-it	02_wind_on	1	305	1.0	0.0
-it	03_wind_off	1	305	1.0	0.0
-it	04_res	1	305	1.0	0.0
-it	05_nuclear	1	305	1.0	0.0
-it	06_coal	1	305	1.0	0.0
-it	07_gas	1	305	1.0	0.0
+it	01_solar	1	305	0.0	1.0
+it	02_wind_on	1	305	0.0	1.0
+it	03_wind_off	1	305	0.0	1.0
+it	04_res	1	305	0.0	1.0
+it	05_nuclear	1	305	0.0	1.0
+it	06_coal	1	305	0.0	1.0
+it	07_gas	1	305	0.0	1.0
 it	08_non-res	1	305	0.0	0.0
 it	09_hydro_pump	1	305	0.0	0.0
-it	01_solar	1	306	1.0	0.0
-it	02_wind_on	1	306	1.0	0.0
-it	03_wind_off	1	306	1.0	0.0
-it	04_res	1	306	1.0	0.0
-it	05_nuclear	1	306	1.0	0.0
-it	06_coal	1	306	1.0	0.0
-it	07_gas	1	306	1.0	0.0
+it	01_solar	1	306	0.0	1.0
+it	02_wind_on	1	306	0.0	1.0
+it	03_wind_off	1	306	0.0	1.0
+it	04_res	1	306	0.0	1.0
+it	05_nuclear	1	306	0.0	1.0
+it	06_coal	1	306	0.0	1.0
+it	07_gas	1	306	0.0	1.0
 it	08_non-res	1	306	0.0	0.0
 it	09_hydro_pump	1	306	0.0	0.0
-it	01_solar	1	307	1.0	0.0
-it	02_wind_on	1	307	1.0	0.0
-it	03_wind_off	1	307	1.0	0.0
-it	04_res	1	307	1.0	0.0
-it	05_nuclear	1	307	1.0	0.0
-it	06_coal	1	307	1.0	0.0
-it	07_gas	1	307	1.0	0.0
+it	01_solar	1	307	0.0	1.0
+it	02_wind_on	1	307	0.0	1.0
+it	03_wind_off	1	307	0.0	1.0
+it	04_res	1	307	0.0	1.0
+it	05_nuclear	1	307	0.0	1.0
+it	06_coal	1	307	0.0	1.0
+it	07_gas	1	307	0.0	1.0
 it	08_non-res	1	307	0.0	0.0
 it	09_hydro_pump	1	307	0.0	0.0
-it	01_solar	1	308	1.0	0.0
-it	02_wind_on	1	308	1.0	0.0
-it	03_wind_off	1	308	1.0	0.0
-it	04_res	1	308	1.0	0.0
-it	05_nuclear	1	308	1.0	0.0
-it	06_coal	1	308	1.0	0.0
-it	07_gas	1	308	1.0	0.0
+it	01_solar	1	308	0.0	1.0
+it	02_wind_on	1	308	0.0	1.0
+it	03_wind_off	1	308	0.0	1.0
+it	04_res	1	308	0.0	1.0
+it	05_nuclear	1	308	0.0	1.0
+it	06_coal	1	308	0.0	1.0
+it	07_gas	1	308	0.0	1.0
 it	08_non-res	1	308	0.0	0.0
 it	09_hydro_pump	1	308	0.0	0.0
-it	01_solar	1	309	1.0	0.0
-it	02_wind_on	1	309	1.0	0.0
-it	03_wind_off	1	309	1.0	0.0
-it	04_res	1	309	1.0	0.0
-it	05_nuclear	1	309	1.0	0.0
-it	06_coal	1	309	1.0	0.0
-it	07_gas	1	309	1.0	0.0
+it	01_solar	1	309	0.0	1.0
+it	02_wind_on	1	309	0.0	1.0
+it	03_wind_off	1	309	0.0	1.0
+it	04_res	1	309	0.0	1.0
+it	05_nuclear	1	309	0.0	1.0
+it	06_coal	1	309	0.0	1.0
+it	07_gas	1	309	0.0	1.0
 it	08_non-res	1	309	0.0	0.0
 it	09_hydro_pump	1	309	0.0	0.0
-it	01_solar	1	310	1.0	0.0
-it	02_wind_on	1	310	1.0	0.0
-it	03_wind_off	1	310	1.0	0.0
-it	04_res	1	310	1.0	0.0
-it	05_nuclear	1	310	1.0	0.0
-it	06_coal	1	310	1.0	0.0
-it	07_gas	1	310	1.0	0.0
-it	08_non-res	1	310	1.0	0.0
+it	01_solar	1	310	0.0	1.0
+it	02_wind_on	1	310	0.0	1.0
+it	03_wind_off	1	310	0.0	1.0
+it	04_res	1	310	0.0	1.0
+it	05_nuclear	1	310	0.0	1.0
+it	06_coal	1	310	0.0	1.0
+it	07_gas	1	310	0.0	1.0
+it	08_non-res	1	310	0.0	1.0
 it	09_hydro_pump	1	310	0.0	0.0
-it	01_solar	1	311	1.0	0.0
-it	02_wind_on	1	311	1.0	0.0
-it	03_wind_off	1	311	1.0	0.0
-it	04_res	1	311	1.0	0.0
-it	05_nuclear	1	311	1.0	0.0
-it	06_coal	1	311	1.0	0.0
-it	07_gas	1	311	1.0	0.0
-it	08_non-res	1	311	1.0	0.0
+it	01_solar	1	311	0.0	1.0
+it	02_wind_on	1	311	0.0	1.0
+it	03_wind_off	1	311	0.0	1.0
+it	04_res	1	311	0.0	1.0
+it	05_nuclear	1	311	0.0	1.0
+it	06_coal	1	311	0.0	1.0
+it	07_gas	1	311	0.0	1.0
+it	08_non-res	1	311	0.0	1.0
 it	09_hydro_pump	1	311	0.0	0.0
-it	01_solar	1	312	1.0	0.0
-it	02_wind_on	1	312	1.0	0.0
-it	03_wind_off	1	312	1.0	0.0
-it	04_res	1	312	1.0	0.0
-it	05_nuclear	1	312	1.0	0.0
-it	06_coal	1	312	1.0	0.0
-it	07_gas	1	312	1.0	0.0
-it	08_non-res	1	312	1.0	0.0
+it	01_solar	1	312	0.0	1.0
+it	02_wind_on	1	312	0.0	1.0
+it	03_wind_off	1	312	0.0	1.0
+it	04_res	1	312	0.0	1.0
+it	05_nuclear	1	312	0.0	1.0
+it	06_coal	1	312	0.0	1.0
+it	07_gas	1	312	0.0	1.0
+it	08_non-res	1	312	0.0	1.0
 it	09_hydro_pump	1	312	0.0	0.0
-it	01_solar	1	313	1.0	0.0
-it	02_wind_on	1	313	1.0	0.0
-it	03_wind_off	1	313	1.0	0.0
-it	04_res	1	313	1.0	0.0
-it	05_nuclear	1	313	1.0	0.0
-it	06_coal	1	313	1.0	0.0
-it	07_gas	1	313	1.0	0.0
-it	08_non-res	1	313	1.0	0.0
+it	01_solar	1	313	0.0	1.0
+it	02_wind_on	1	313	0.0	1.0
+it	03_wind_off	1	313	0.0	1.0
+it	04_res	1	313	0.0	1.0
+it	05_nuclear	1	313	0.0	1.0
+it	06_coal	1	313	0.0	1.0
+it	07_gas	1	313	0.0	1.0
+it	08_non-res	1	313	0.0	1.0
 it	09_hydro_pump	1	313	0.0	0.0
-it	01_solar	1	314	1.0	0.0
-it	02_wind_on	1	314	1.0	0.0
-it	03_wind_off	1	314	1.0	0.0
-it	04_res	1	314	1.0	0.0
-it	05_nuclear	1	314	1.0	0.0
-it	06_coal	1	314	1.0	0.0
-it	07_gas	1	314	1.0	0.0
-it	08_non-res	1	314	1.0	0.0
+it	01_solar	1	314	0.0	1.0
+it	02_wind_on	1	314	0.0	1.0
+it	03_wind_off	1	314	0.0	1.0
+it	04_res	1	314	0.0	1.0
+it	05_nuclear	1	314	0.0	1.0
+it	06_coal	1	314	0.0	1.0
+it	07_gas	1	314	0.0	1.0
+it	08_non-res	1	314	0.0	1.0
 it	09_hydro_pump	1	314	0.0	0.0
-it	01_solar	1	315	1.0	0.0
-it	02_wind_on	1	315	1.0	0.0
-it	03_wind_off	1	315	1.0	0.0
-it	04_res	1	315	1.0	0.0
-it	05_nuclear	1	315	1.0	0.0
-it	06_coal	1	315	1.0	0.0
-it	07_gas	1	315	1.0	0.0
-it	08_non-res	1	315	1.0	0.0
+it	01_solar	1	315	0.0	1.0
+it	02_wind_on	1	315	0.0	1.0
+it	03_wind_off	1	315	0.0	1.0
+it	04_res	1	315	0.0	1.0
+it	05_nuclear	1	315	0.0	1.0
+it	06_coal	1	315	0.0	1.0
+it	07_gas	1	315	0.0	1.0
+it	08_non-res	1	315	0.0	1.0
 it	09_hydro_pump	1	315	0.0	0.0
-it	01_solar	1	316	1.0	0.0
-it	02_wind_on	1	316	1.0	0.0
-it	03_wind_off	1	316	1.0	0.0
-it	04_res	1	316	1.0	0.0
-it	05_nuclear	1	316	1.0	0.0
-it	06_coal	1	316	1.0	0.0
-it	07_gas	1	316	1.0	0.0
-it	08_non-res	1	316	1.0	0.0
+it	01_solar	1	316	0.0	1.0
+it	02_wind_on	1	316	0.0	1.0
+it	03_wind_off	1	316	0.0	1.0
+it	04_res	1	316	0.0	1.0
+it	05_nuclear	1	316	0.0	1.0
+it	06_coal	1	316	0.0	1.0
+it	07_gas	1	316	0.0	1.0
+it	08_non-res	1	316	0.0	1.0
 it	09_hydro_pump	1	316	0.0	0.0
-it	01_solar	1	317	1.0	0.0
-it	02_wind_on	1	317	1.0	0.0
-it	03_wind_off	1	317	1.0	0.0
-it	04_res	1	317	1.0	0.0
-it	05_nuclear	1	317	1.0	0.0
-it	06_coal	1	317	1.0	0.0
-it	07_gas	1	317	1.0	0.0
-it	08_non-res	1	317	1.0	0.0
+it	01_solar	1	317	0.0	1.0
+it	02_wind_on	1	317	0.0	1.0
+it	03_wind_off	1	317	0.0	1.0
+it	04_res	1	317	0.0	1.0
+it	05_nuclear	1	317	0.0	1.0
+it	06_coal	1	317	0.0	1.0
+it	07_gas	1	317	0.0	1.0
+it	08_non-res	1	317	0.0	1.0
 it	09_hydro_pump	1	317	0.0	0.0
-it	01_solar	1	318	1.0	0.0
-it	02_wind_on	1	318	1.0	0.0
-it	03_wind_off	1	318	1.0	0.0
-it	04_res	1	318	1.0	0.0
-it	05_nuclear	1	318	1.0	0.0
-it	06_coal	1	318	1.0	0.0
-it	07_gas	1	318	1.0	0.0
-it	08_non-res	1	318	1.0	0.0
+it	01_solar	1	318	0.0	1.0
+it	02_wind_on	1	318	0.0	1.0
+it	03_wind_off	1	318	0.0	1.0
+it	04_res	1	318	0.0	1.0
+it	05_nuclear	1	318	0.0	1.0
+it	06_coal	1	318	0.0	1.0
+it	07_gas	1	318	0.0	1.0
+it	08_non-res	1	318	0.0	1.0
 it	09_hydro_pump	1	318	0.0	0.0
-it	01_solar	1	319	1.0	0.0
-it	02_wind_on	1	319	1.0	0.0
-it	03_wind_off	1	319	1.0	0.0
-it	04_res	1	319	1.0	0.0
-it	05_nuclear	1	319	1.0	0.0
-it	06_coal	1	319	1.0	0.0
-it	07_gas	1	319	1.0	0.0
-it	08_non-res	1	319	1.0	0.0
+it	01_solar	1	319	0.0	1.0
+it	02_wind_on	1	319	0.0	1.0
+it	03_wind_off	1	319	0.0	1.0
+it	04_res	1	319	0.0	1.0
+it	05_nuclear	1	319	0.0	1.0
+it	06_coal	1	319	0.0	1.0
+it	07_gas	1	319	0.0	1.0
+it	08_non-res	1	319	0.0	1.0
 it	09_hydro_pump	1	319	0.0	0.0
-it	01_solar	1	320	1.0	0.0
-it	02_wind_on	1	320	1.0	0.0
-it	03_wind_off	1	320	1.0	0.0
-it	04_res	1	320	1.0	0.0
-it	05_nuclear	1	320	1.0	0.0
-it	06_coal	1	320	1.0	0.0
-it	07_gas	1	320	1.0	0.0
-it	08_non-res	1	320	1.0	0.0
+it	01_solar	1	320	0.0	1.0
+it	02_wind_on	1	320	0.0	1.0
+it	03_wind_off	1	320	0.0	1.0
+it	04_res	1	320	0.0	1.0
+it	05_nuclear	1	320	0.0	1.0
+it	06_coal	1	320	0.0	1.0
+it	07_gas	1	320	0.0	1.0
+it	08_non-res	1	320	0.0	1.0
 it	09_hydro_pump	1	320	0.0	0.0
-it	01_solar	1	321	1.0	0.0
-it	02_wind_on	1	321	1.0	0.0
-it	03_wind_off	1	321	1.0	0.0
-it	04_res	1	321	1.0	0.0
-it	05_nuclear	1	321	1.0	0.0
-it	06_coal	1	321	1.0	0.0
-it	07_gas	1	321	1.0	0.0
-it	08_non-res	1	321	1.0	0.0
+it	01_solar	1	321	0.0	1.0
+it	02_wind_on	1	321	0.0	1.0
+it	03_wind_off	1	321	0.0	1.0
+it	04_res	1	321	0.0	1.0
+it	05_nuclear	1	321	0.0	1.0
+it	06_coal	1	321	0.0	1.0
+it	07_gas	1	321	0.0	1.0
+it	08_non-res	1	321	0.0	1.0
 it	09_hydro_pump	1	321	0.0	0.0
-it	01_solar	1	322	1.0	0.0
-it	02_wind_on	1	322	1.0	0.0
-it	03_wind_off	1	322	1.0	0.0
-it	04_res	1	322	1.0	0.0
-it	05_nuclear	1	322	1.0	0.0
-it	06_coal	1	322	1.0	0.0
-it	07_gas	1	322	1.0	0.0
-it	08_non-res	1	322	1.0	0.0
+it	01_solar	1	322	0.0	1.0
+it	02_wind_on	1	322	0.0	1.0
+it	03_wind_off	1	322	0.0	1.0
+it	04_res	1	322	0.0	1.0
+it	05_nuclear	1	322	0.0	1.0
+it	06_coal	1	322	0.0	1.0
+it	07_gas	1	322	0.0	1.0
+it	08_non-res	1	322	0.0	1.0
 it	09_hydro_pump	1	322	0.0	0.0
-it	01_solar	1	323	1.0	0.0
-it	02_wind_on	1	323	1.0	0.0
-it	03_wind_off	1	323	1.0	0.0
-it	04_res	1	323	1.0	0.0
-it	05_nuclear	1	323	1.0	0.0
-it	06_coal	1	323	1.0	0.0
-it	07_gas	1	323	1.0	0.0
-it	08_non-res	1	323	1.0	0.0
+it	01_solar	1	323	0.0	1.0
+it	02_wind_on	1	323	0.0	1.0
+it	03_wind_off	1	323	0.0	1.0
+it	04_res	1	323	0.0	1.0
+it	05_nuclear	1	323	0.0	1.0
+it	06_coal	1	323	0.0	1.0
+it	07_gas	1	323	0.0	1.0
+it	08_non-res	1	323	0.0	1.0
 it	09_hydro_pump	1	323	0.0	0.0
-it	01_solar	1	324	1.0	0.0
-it	02_wind_on	1	324	1.0	0.0
-it	03_wind_off	1	324	1.0	0.0
-it	04_res	1	324	1.0	0.0
-it	05_nuclear	1	324	1.0	0.0
-it	06_coal	1	324	1.0	0.0
-it	07_gas	1	324	1.0	0.0
-it	08_non-res	1	324	1.0	0.0
+it	01_solar	1	324	0.0	1.0
+it	02_wind_on	1	324	0.0	1.0
+it	03_wind_off	1	324	0.0	1.0
+it	04_res	1	324	0.0	1.0
+it	05_nuclear	1	324	0.0	1.0
+it	06_coal	1	324	0.0	1.0
+it	07_gas	1	324	0.0	1.0
+it	08_non-res	1	324	0.0	1.0
 it	09_hydro_pump	1	324	0.0	0.0
-it	01_solar	1	325	1.0	0.0
-it	02_wind_on	1	325	1.0	0.0
-it	03_wind_off	1	325	1.0	0.0
-it	04_res	1	325	1.0	0.0
-it	05_nuclear	1	325	1.0	0.0
-it	06_coal	1	325	1.0	0.0
-it	07_gas	1	325	1.0	0.0
-it	08_non-res	1	325	1.0	0.0
+it	01_solar	1	325	0.0	1.0
+it	02_wind_on	1	325	0.0	1.0
+it	03_wind_off	1	325	0.0	1.0
+it	04_res	1	325	0.0	1.0
+it	05_nuclear	1	325	0.0	1.0
+it	06_coal	1	325	0.0	1.0
+it	07_gas	1	325	0.0	1.0
+it	08_non-res	1	325	0.0	1.0
 it	09_hydro_pump	1	325	0.0	0.0
-it	01_solar	1	326	1.0	0.0
-it	02_wind_on	1	326	1.0	0.0
-it	03_wind_off	1	326	1.0	0.0
-it	04_res	1	326	1.0	0.0
-it	05_nuclear	1	326	1.0	0.0
-it	06_coal	1	326	1.0	0.0
-it	07_gas	1	326	1.0	0.0
-it	08_non-res	1	326	1.0	0.0
+it	01_solar	1	326	0.0	1.0
+it	02_wind_on	1	326	0.0	1.0
+it	03_wind_off	1	326	0.0	1.0
+it	04_res	1	326	0.0	1.0
+it	05_nuclear	1	326	0.0	1.0
+it	06_coal	1	326	0.0	1.0
+it	07_gas	1	326	0.0	1.0
+it	08_non-res	1	326	0.0	1.0
 it	09_hydro_pump	1	326	0.0	0.0
-it	01_solar	1	327	1.0	0.0
-it	02_wind_on	1	327	1.0	0.0
-it	03_wind_off	1	327	1.0	0.0
-it	04_res	1	327	1.0	0.0
-it	05_nuclear	1	327	1.0	0.0
-it	06_coal	1	327	1.0	0.0
-it	07_gas	1	327	1.0	0.0
-it	08_non-res	1	327	1.0	0.0
+it	01_solar	1	327	0.0	1.0
+it	02_wind_on	1	327	0.0	1.0
+it	03_wind_off	1	327	0.0	1.0
+it	04_res	1	327	0.0	1.0
+it	05_nuclear	1	327	0.0	1.0
+it	06_coal	1	327	0.0	1.0
+it	07_gas	1	327	0.0	1.0
+it	08_non-res	1	327	0.0	1.0
 it	09_hydro_pump	1	327	0.0	0.0
-it	01_solar	1	328	1.0	0.0
-it	02_wind_on	1	328	1.0	0.0
-it	03_wind_off	1	328	1.0	0.0
-it	04_res	1	328	1.0	0.0
-it	05_nuclear	1	328	1.0	0.0
-it	06_coal	1	328	1.0	0.0
-it	07_gas	1	328	1.0	0.0
-it	08_non-res	1	328	1.0	0.0
+it	01_solar	1	328	0.0	1.0
+it	02_wind_on	1	328	0.0	1.0
+it	03_wind_off	1	328	0.0	1.0
+it	04_res	1	328	0.0	1.0
+it	05_nuclear	1	328	0.0	1.0
+it	06_coal	1	328	0.0	1.0
+it	07_gas	1	328	0.0	1.0
+it	08_non-res	1	328	0.0	1.0
 it	09_hydro_pump	1	328	0.0	0.0
-it	01_solar	1	329	1.0	0.0
-it	02_wind_on	1	329	1.0	0.0
-it	03_wind_off	1	329	1.0	0.0
-it	04_res	1	329	1.0	0.0
-it	05_nuclear	1	329	1.0	0.0
-it	06_coal	1	329	1.0	0.0
-it	07_gas	1	329	1.0	0.0
-it	08_non-res	1	329	1.0	0.0
+it	01_solar	1	329	0.0	1.0
+it	02_wind_on	1	329	0.0	1.0
+it	03_wind_off	1	329	0.0	1.0
+it	04_res	1	329	0.0	1.0
+it	05_nuclear	1	329	0.0	1.0
+it	06_coal	1	329	0.0	1.0
+it	07_gas	1	329	0.0	1.0
+it	08_non-res	1	329	0.0	1.0
 it	09_hydro_pump	1	329	0.0	0.0
-it	01_solar	1	330	1.0	0.0
-it	02_wind_on	1	330	1.0	0.0
-it	03_wind_off	1	330	1.0	0.0
-it	04_res	1	330	1.0	0.0
-it	05_nuclear	1	330	1.0	0.0
-it	06_coal	1	330	1.0	0.0
-it	07_gas	1	330	1.0	0.0
-it	08_non-res	1	330	1.0	0.0
-it	09_hydro_pump	1	330	1.0	0.0
-it	01_solar	1	331	1.0	0.0
-it	02_wind_on	1	331	1.0	0.0
-it	03_wind_off	1	331	1.0	0.0
-it	04_res	1	331	1.0	0.0
-it	05_nuclear	1	331	1.0	0.0
-it	06_coal	1	331	1.0	0.0
-it	07_gas	1	331	1.0	0.0
-it	08_non-res	1	331	1.0	0.0
-it	09_hydro_pump	1	331	1.0	0.0
-it	01_solar	1	332	1.0	0.0
-it	02_wind_on	1	332	1.0	0.0
-it	03_wind_off	1	332	1.0	0.0
-it	04_res	1	332	1.0	0.0
-it	05_nuclear	1	332	1.0	0.0
-it	06_coal	1	332	1.0	0.0
-it	07_gas	1	332	1.0	0.0
-it	08_non-res	1	332	1.0	0.0
-it	09_hydro_pump	1	332	1.0	0.0
-it	01_solar	1	333	1.0	0.0
-it	02_wind_on	1	333	1.0	0.0
-it	03_wind_off	1	333	1.0	0.0
-it	04_res	1	333	1.0	0.0
-it	05_nuclear	1	333	1.0	0.0
-it	06_coal	1	333	1.0	0.0
-it	07_gas	1	333	1.0	0.0
-it	08_non-res	1	333	1.0	0.0
-it	09_hydro_pump	1	333	1.0	0.0
-it	01_solar	1	334	1.0	0.0
-it	02_wind_on	1	334	1.0	0.0
-it	03_wind_off	1	334	1.0	0.0
-it	04_res	1	334	1.0	0.0
-it	05_nuclear	1	334	1.0	0.0
-it	06_coal	1	334	1.0	0.0
-it	07_gas	1	334	1.0	0.0
-it	08_non-res	1	334	1.0	0.0
-it	09_hydro_pump	1	334	1.0	0.0
-it	01_solar	1	335	1.0	0.0
-it	02_wind_on	1	335	1.0	0.0
-it	03_wind_off	1	335	1.0	0.0
-it	04_res	1	335	1.0	0.0
-it	05_nuclear	1	335	1.0	0.0
-it	06_coal	1	335	1.0	0.0
-it	07_gas	1	335	1.0	0.0
-it	08_non-res	1	335	1.0	0.0
-it	09_hydro_pump	1	335	1.0	0.0
-it	01_solar	1	336	1.0	0.0
-it	02_wind_on	1	336	1.0	0.0
-it	03_wind_off	1	336	1.0	0.0
-it	04_res	1	336	1.0	0.0
-it	05_nuclear	1	336	1.0	0.0
-it	06_coal	1	336	1.0	0.0
-it	07_gas	1	336	1.0	0.0
-it	08_non-res	1	336	1.0	0.0
-it	09_hydro_pump	1	336	1.0	0.0
+it	01_solar	1	330	0.0	1.0
+it	02_wind_on	1	330	0.0	1.0
+it	03_wind_off	1	330	0.0	1.0
+it	04_res	1	330	0.0	1.0
+it	05_nuclear	1	330	0.0	1.0
+it	06_coal	1	330	0.0	1.0
+it	07_gas	1	330	0.0	1.0
+it	08_non-res	1	330	0.0	1.0
+it	09_hydro_pump	1	330	0.0	1.0
+it	01_solar	1	331	0.0	1.0
+it	02_wind_on	1	331	0.0	1.0
+it	03_wind_off	1	331	0.0	1.0
+it	04_res	1	331	0.0	1.0
+it	05_nuclear	1	331	0.0	1.0
+it	06_coal	1	331	0.0	1.0
+it	07_gas	1	331	0.0	1.0
+it	08_non-res	1	331	0.0	1.0
+it	09_hydro_pump	1	331	0.0	1.0
+it	01_solar	1	332	0.0	1.0
+it	02_wind_on	1	332	0.0	1.0
+it	03_wind_off	1	332	0.0	1.0
+it	04_res	1	332	0.0	1.0
+it	05_nuclear	1	332	0.0	1.0
+it	06_coal	1	332	0.0	1.0
+it	07_gas	1	332	0.0	1.0
+it	08_non-res	1	332	0.0	1.0
+it	09_hydro_pump	1	332	0.0	1.0
+it	01_solar	1	333	0.0	1.0
+it	02_wind_on	1	333	0.0	1.0
+it	03_wind_off	1	333	0.0	1.0
+it	04_res	1	333	0.0	1.0
+it	05_nuclear	1	333	0.0	1.0
+it	06_coal	1	333	0.0	1.0
+it	07_gas	1	333	0.0	1.0
+it	08_non-res	1	333	0.0	1.0
+it	09_hydro_pump	1	333	0.0	1.0
+it	01_solar	1	334	0.0	1.0
+it	02_wind_on	1	334	0.0	1.0
+it	03_wind_off	1	334	0.0	1.0
+it	04_res	1	334	0.0	1.0
+it	05_nuclear	1	334	0.0	1.0
+it	06_coal	1	334	0.0	1.0
+it	07_gas	1	334	0.0	1.0
+it	08_non-res	1	334	0.0	1.0
+it	09_hydro_pump	1	334	0.0	1.0
+it	01_solar	1	335	0.0	1.0
+it	02_wind_on	1	335	0.0	1.0
+it	03_wind_off	1	335	0.0	1.0
+it	04_res	1	335	0.0	1.0
+it	05_nuclear	1	335	0.0	1.0
+it	06_coal	1	335	0.0	1.0
+it	07_gas	1	335	0.0	1.0
+it	08_non-res	1	335	0.0	1.0
+it	09_hydro_pump	1	335	0.0	1.0
+it	01_solar	1	336	0.0	1.0
+it	02_wind_on	1	336	0.0	1.0
+it	03_wind_off	1	336	0.0	1.0
+it	04_res	1	336	0.0	1.0
+it	05_nuclear	1	336	0.0	1.0
+it	06_coal	1	336	0.0	1.0
+it	07_gas	1	336	0.0	1.0
+it	08_non-res	1	336	0.0	1.0
+it	09_hydro_pump	1	336	0.0	1.0
 de	01_solar	2	1	0.0	0.0
 de	02_wind_on	2	1	0.0	0.0
 de	03_wind_off	2	1	0.0	0.0
@@ -12104,7 +12104,7 @@ de	06_coal	2	1	0.0	0.0
 de	07_gas	2	1	0.0	0.0
 de	08_non-res	2	1	0.0	0.0
 de	09_hydro_pump	2	1	0.0	0.0
-de	01_solar	2	2	1.0	0.0
+de	01_solar	2	2	0.0	1.0
 de	02_wind_on	2	2	0.0	0.0
 de	03_wind_off	2	2	0.0	0.0
 de	04_res	2	2	0.0	0.0
@@ -12113,7 +12113,7 @@ de	06_coal	2	2	0.0	0.0
 de	07_gas	2	2	0.0	0.0
 de	08_non-res	2	2	0.0	0.0
 de	09_hydro_pump	2	2	0.0	0.0
-de	01_solar	2	3	1.0	0.0
+de	01_solar	2	3	0.0	1.0
 de	02_wind_on	2	3	0.0	0.0
 de	03_wind_off	2	3	0.0	0.0
 de	04_res	2	3	0.0	0.0
@@ -12122,7 +12122,7 @@ de	06_coal	2	3	0.0	0.0
 de	07_gas	2	3	0.0	0.0
 de	08_non-res	2	3	0.0	0.0
 de	09_hydro_pump	2	3	0.0	0.0
-de	01_solar	2	4	1.0	0.0
+de	01_solar	2	4	0.0	1.0
 de	02_wind_on	2	4	0.0	0.0
 de	03_wind_off	2	4	0.0	0.0
 de	04_res	2	4	0.0	0.0
@@ -12131,7 +12131,7 @@ de	06_coal	2	4	0.0	0.0
 de	07_gas	2	4	0.0	0.0
 de	08_non-res	2	4	0.0	0.0
 de	09_hydro_pump	2	4	0.0	0.0
-de	01_solar	2	5	1.0	0.0
+de	01_solar	2	5	0.0	1.0
 de	02_wind_on	2	5	0.0	0.0
 de	03_wind_off	2	5	0.0	0.0
 de	04_res	2	5	0.0	0.0
@@ -12140,7 +12140,7 @@ de	06_coal	2	5	0.0	0.0
 de	07_gas	2	5	0.0	0.0
 de	08_non-res	2	5	0.0	0.0
 de	09_hydro_pump	2	5	0.0	0.0
-de	01_solar	2	6	1.0	0.0
+de	01_solar	2	6	0.0	1.0
 de	02_wind_on	2	6	0.0	0.0
 de	03_wind_off	2	6	0.0	0.0
 de	04_res	2	6	0.0	0.0
@@ -12149,7 +12149,7 @@ de	06_coal	2	6	0.0	0.0
 de	07_gas	2	6	0.0	0.0
 de	08_non-res	2	6	0.0	0.0
 de	09_hydro_pump	2	6	0.0	0.0
-de	01_solar	2	7	1.0	0.0
+de	01_solar	2	7	0.0	1.0
 de	02_wind_on	2	7	0.0	0.0
 de	03_wind_off	2	7	0.0	0.0
 de	04_res	2	7	0.0	0.0
@@ -12158,7 +12158,7 @@ de	06_coal	2	7	0.0	0.0
 de	07_gas	2	7	0.0	0.0
 de	08_non-res	2	7	0.0	0.0
 de	09_hydro_pump	2	7	0.0	0.0
-de	01_solar	2	8	1.0	0.0
+de	01_solar	2	8	0.0	1.0
 de	02_wind_on	2	8	0.0	0.0
 de	03_wind_off	2	8	0.0	0.0
 de	04_res	2	8	0.0	0.0
@@ -12167,7 +12167,7 @@ de	06_coal	2	8	0.0	0.0
 de	07_gas	2	8	0.0	0.0
 de	08_non-res	2	8	0.0	0.0
 de	09_hydro_pump	2	8	0.0	0.0
-de	01_solar	2	9	1.0	0.0
+de	01_solar	2	9	0.0	1.0
 de	02_wind_on	2	9	0.0	0.0
 de	03_wind_off	2	9	0.0	0.0
 de	04_res	2	9	0.0	0.0
@@ -12176,7 +12176,7 @@ de	06_coal	2	9	0.0	0.0
 de	07_gas	2	9	0.0	0.0
 de	08_non-res	2	9	0.0	0.0
 de	09_hydro_pump	2	9	0.0	0.0
-de	01_solar	2	10	1.0	0.0
+de	01_solar	2	10	0.0	1.0
 de	02_wind_on	2	10	0.0	0.0
 de	03_wind_off	2	10	0.0	0.0
 de	04_res	2	10	0.0	0.0
@@ -12185,7 +12185,7 @@ de	06_coal	2	10	0.0	0.0
 de	07_gas	2	10	0.0	0.0
 de	08_non-res	2	10	0.0	0.0
 de	09_hydro_pump	2	10	0.0	0.0
-de	01_solar	2	11	1.0	0.0
+de	01_solar	2	11	0.0	1.0
 de	02_wind_on	2	11	0.0	0.0
 de	03_wind_off	2	11	0.0	0.0
 de	04_res	2	11	0.0	0.0
@@ -12194,7 +12194,7 @@ de	06_coal	2	11	0.0	0.0
 de	07_gas	2	11	0.0	0.0
 de	08_non-res	2	11	0.0	0.0
 de	09_hydro_pump	2	11	0.0	0.0
-de	01_solar	2	12	1.0	0.0
+de	01_solar	2	12	0.0	1.0
 de	02_wind_on	2	12	0.0	0.0
 de	03_wind_off	2	12	0.0	0.0
 de	04_res	2	12	0.0	0.0
@@ -12203,7 +12203,7 @@ de	06_coal	2	12	0.0	0.0
 de	07_gas	2	12	0.0	0.0
 de	08_non-res	2	12	0.0	0.0
 de	09_hydro_pump	2	12	0.0	0.0
-de	01_solar	2	13	1.0	0.0
+de	01_solar	2	13	0.0	1.0
 de	02_wind_on	2	13	0.0	0.0
 de	03_wind_off	2	13	0.0	0.0
 de	04_res	2	13	0.0	0.0
@@ -12212,7 +12212,7 @@ de	06_coal	2	13	0.0	0.0
 de	07_gas	2	13	0.0	0.0
 de	08_non-res	2	13	0.0	0.0
 de	09_hydro_pump	2	13	0.0	0.0
-de	01_solar	2	14	1.0	0.0
+de	01_solar	2	14	0.0	1.0
 de	02_wind_on	2	14	0.0	0.0
 de	03_wind_off	2	14	0.0	0.0
 de	04_res	2	14	0.0	0.0
@@ -12221,7 +12221,7 @@ de	06_coal	2	14	0.0	0.0
 de	07_gas	2	14	0.0	0.0
 de	08_non-res	2	14	0.0	0.0
 de	09_hydro_pump	2	14	0.0	0.0
-de	01_solar	2	15	1.0	0.0
+de	01_solar	2	15	0.0	1.0
 de	02_wind_on	2	15	0.0	0.0
 de	03_wind_off	2	15	0.0	0.0
 de	04_res	2	15	0.0	0.0
@@ -12230,7 +12230,7 @@ de	06_coal	2	15	0.0	0.0
 de	07_gas	2	15	0.0	0.0
 de	08_non-res	2	15	0.0	0.0
 de	09_hydro_pump	2	15	0.0	0.0
-de	01_solar	2	16	1.0	0.0
+de	01_solar	2	16	0.0	1.0
 de	02_wind_on	2	16	0.0	0.0
 de	03_wind_off	2	16	0.0	0.0
 de	04_res	2	16	0.0	0.0
@@ -12239,7 +12239,7 @@ de	06_coal	2	16	0.0	0.0
 de	07_gas	2	16	0.0	0.0
 de	08_non-res	2	16	0.0	0.0
 de	09_hydro_pump	2	16	0.0	0.0
-de	01_solar	2	17	1.0	0.0
+de	01_solar	2	17	0.0	1.0
 de	02_wind_on	2	17	0.0	0.0
 de	03_wind_off	2	17	0.0	0.0
 de	04_res	2	17	0.0	0.0
@@ -12248,7 +12248,7 @@ de	06_coal	2	17	0.0	0.0
 de	07_gas	2	17	0.0	0.0
 de	08_non-res	2	17	0.0	0.0
 de	09_hydro_pump	2	17	0.0	0.0
-de	01_solar	2	18	1.0	0.0
+de	01_solar	2	18	0.0	1.0
 de	02_wind_on	2	18	0.0	0.0
 de	03_wind_off	2	18	0.0	0.0
 de	04_res	2	18	0.0	0.0
@@ -12257,7 +12257,7 @@ de	06_coal	2	18	0.0	0.0
 de	07_gas	2	18	0.0	0.0
 de	08_non-res	2	18	0.0	0.0
 de	09_hydro_pump	2	18	0.0	0.0
-de	01_solar	2	19	1.0	0.0
+de	01_solar	2	19	0.0	1.0
 de	02_wind_on	2	19	0.0	0.0
 de	03_wind_off	2	19	0.0	0.0
 de	04_res	2	19	0.0	0.0
@@ -12266,7 +12266,7 @@ de	06_coal	2	19	0.0	0.0
 de	07_gas	2	19	0.0	0.0
 de	08_non-res	2	19	0.0	0.0
 de	09_hydro_pump	2	19	0.0	0.0
-de	01_solar	2	20	1.0	0.0
+de	01_solar	2	20	0.0	1.0
 de	02_wind_on	2	20	0.0	0.0
 de	03_wind_off	2	20	0.0	0.0
 de	04_res	2	20	0.0	0.0
@@ -12275,7 +12275,7 @@ de	06_coal	2	20	0.0	0.0
 de	07_gas	2	20	0.0	0.0
 de	08_non-res	2	20	0.0	0.0
 de	09_hydro_pump	2	20	0.0	0.0
-de	01_solar	2	21	1.0	0.0
+de	01_solar	2	21	0.0	1.0
 de	02_wind_on	2	21	0.0	0.0
 de	03_wind_off	2	21	0.0	0.0
 de	04_res	2	21	0.0	0.0
@@ -12284,8 +12284,8 @@ de	06_coal	2	21	0.0	0.0
 de	07_gas	2	21	0.0	0.0
 de	08_non-res	2	21	0.0	0.0
 de	09_hydro_pump	2	21	0.0	0.0
-de	01_solar	2	22	1.0	0.0
-de	02_wind_on	2	22	1.0	0.0
+de	01_solar	2	22	0.0	1.0
+de	02_wind_on	2	22	0.0	1.0
 de	03_wind_off	2	22	0.0	0.0
 de	04_res	2	22	0.0	0.0
 de	05_nuclear	2	22	0.0	0.0
@@ -12293,8 +12293,8 @@ de	06_coal	2	22	0.0	0.0
 de	07_gas	2	22	0.0	0.0
 de	08_non-res	2	22	0.0	0.0
 de	09_hydro_pump	2	22	0.0	0.0
-de	01_solar	2	23	1.0	0.0
-de	02_wind_on	2	23	1.0	0.0
+de	01_solar	2	23	0.0	1.0
+de	02_wind_on	2	23	0.0	1.0
 de	03_wind_off	2	23	0.0	0.0
 de	04_res	2	23	0.0	0.0
 de	05_nuclear	2	23	0.0	0.0
@@ -12302,8 +12302,8 @@ de	06_coal	2	23	0.0	0.0
 de	07_gas	2	23	0.0	0.0
 de	08_non-res	2	23	0.0	0.0
 de	09_hydro_pump	2	23	0.0	0.0
-de	01_solar	2	24	1.0	0.0
-de	02_wind_on	2	24	1.0	0.0
+de	01_solar	2	24	0.0	1.0
+de	02_wind_on	2	24	0.0	1.0
 de	03_wind_off	2	24	0.0	0.0
 de	04_res	2	24	0.0	0.0
 de	05_nuclear	2	24	0.0	0.0
@@ -12311,8 +12311,8 @@ de	06_coal	2	24	0.0	0.0
 de	07_gas	2	24	0.0	0.0
 de	08_non-res	2	24	0.0	0.0
 de	09_hydro_pump	2	24	0.0	0.0
-de	01_solar	2	25	1.0	0.0
-de	02_wind_on	2	25	1.0	0.0
+de	01_solar	2	25	0.0	1.0
+de	02_wind_on	2	25	0.0	1.0
 de	03_wind_off	2	25	0.0	0.0
 de	04_res	2	25	0.0	0.0
 de	05_nuclear	2	25	0.0	0.0
@@ -12320,8 +12320,8 @@ de	06_coal	2	25	0.0	0.0
 de	07_gas	2	25	0.0	0.0
 de	08_non-res	2	25	0.0	0.0
 de	09_hydro_pump	2	25	0.0	0.0
-de	01_solar	2	26	1.0	0.0
-de	02_wind_on	2	26	1.0	0.0
+de	01_solar	2	26	0.0	1.0
+de	02_wind_on	2	26	0.0	1.0
 de	03_wind_off	2	26	0.0	0.0
 de	04_res	2	26	0.0	0.0
 de	05_nuclear	2	26	0.0	0.0
@@ -12329,8 +12329,8 @@ de	06_coal	2	26	0.0	0.0
 de	07_gas	2	26	0.0	0.0
 de	08_non-res	2	26	0.0	0.0
 de	09_hydro_pump	2	26	0.0	0.0
-de	01_solar	2	27	1.0	0.0
-de	02_wind_on	2	27	1.0	0.0
+de	01_solar	2	27	0.0	1.0
+de	02_wind_on	2	27	0.0	1.0
 de	03_wind_off	2	27	0.0	0.0
 de	04_res	2	27	0.0	0.0
 de	05_nuclear	2	27	0.0	0.0
@@ -12338,8 +12338,8 @@ de	06_coal	2	27	0.0	0.0
 de	07_gas	2	27	0.0	0.0
 de	08_non-res	2	27	0.0	0.0
 de	09_hydro_pump	2	27	0.0	0.0
-de	01_solar	2	28	1.0	0.0
-de	02_wind_on	2	28	1.0	0.0
+de	01_solar	2	28	0.0	1.0
+de	02_wind_on	2	28	0.0	1.0
 de	03_wind_off	2	28	0.0	0.0
 de	04_res	2	28	0.0	0.0
 de	05_nuclear	2	28	0.0	0.0
@@ -12347,8 +12347,8 @@ de	06_coal	2	28	0.0	0.0
 de	07_gas	2	28	0.0	0.0
 de	08_non-res	2	28	0.0	0.0
 de	09_hydro_pump	2	28	0.0	0.0
-de	01_solar	2	29	1.0	0.0
-de	02_wind_on	2	29	1.0	0.0
+de	01_solar	2	29	0.0	1.0
+de	02_wind_on	2	29	0.0	1.0
 de	03_wind_off	2	29	0.0	0.0
 de	04_res	2	29	0.0	0.0
 de	05_nuclear	2	29	0.0	0.0
@@ -12356,8 +12356,8 @@ de	06_coal	2	29	0.0	0.0
 de	07_gas	2	29	0.0	0.0
 de	08_non-res	2	29	0.0	0.0
 de	09_hydro_pump	2	29	0.0	0.0
-de	01_solar	2	30	1.0	0.0
-de	02_wind_on	2	30	1.0	0.0
+de	01_solar	2	30	0.0	1.0
+de	02_wind_on	2	30	0.0	1.0
 de	03_wind_off	2	30	0.0	0.0
 de	04_res	2	30	0.0	0.0
 de	05_nuclear	2	30	0.0	0.0
@@ -12365,8 +12365,8 @@ de	06_coal	2	30	0.0	0.0
 de	07_gas	2	30	0.0	0.0
 de	08_non-res	2	30	0.0	0.0
 de	09_hydro_pump	2	30	0.0	0.0
-de	01_solar	2	31	1.0	0.0
-de	02_wind_on	2	31	1.0	0.0
+de	01_solar	2	31	0.0	1.0
+de	02_wind_on	2	31	0.0	1.0
 de	03_wind_off	2	31	0.0	0.0
 de	04_res	2	31	0.0	0.0
 de	05_nuclear	2	31	0.0	0.0
@@ -12374,8 +12374,8 @@ de	06_coal	2	31	0.0	0.0
 de	07_gas	2	31	0.0	0.0
 de	08_non-res	2	31	0.0	0.0
 de	09_hydro_pump	2	31	0.0	0.0
-de	01_solar	2	32	1.0	0.0
-de	02_wind_on	2	32	1.0	0.0
+de	01_solar	2	32	0.0	1.0
+de	02_wind_on	2	32	0.0	1.0
 de	03_wind_off	2	32	0.0	0.0
 de	04_res	2	32	0.0	0.0
 de	05_nuclear	2	32	0.0	0.0
@@ -12383,8 +12383,8 @@ de	06_coal	2	32	0.0	0.0
 de	07_gas	2	32	0.0	0.0
 de	08_non-res	2	32	0.0	0.0
 de	09_hydro_pump	2	32	0.0	0.0
-de	01_solar	2	33	1.0	0.0
-de	02_wind_on	2	33	1.0	0.0
+de	01_solar	2	33	0.0	1.0
+de	02_wind_on	2	33	0.0	1.0
 de	03_wind_off	2	33	0.0	0.0
 de	04_res	2	33	0.0	0.0
 de	05_nuclear	2	33	0.0	0.0
@@ -12392,8 +12392,8 @@ de	06_coal	2	33	0.0	0.0
 de	07_gas	2	33	0.0	0.0
 de	08_non-res	2	33	0.0	0.0
 de	09_hydro_pump	2	33	0.0	0.0
-de	01_solar	2	34	1.0	0.0
-de	02_wind_on	2	34	1.0	0.0
+de	01_solar	2	34	0.0	1.0
+de	02_wind_on	2	34	0.0	1.0
 de	03_wind_off	2	34	0.0	0.0
 de	04_res	2	34	0.0	0.0
 de	05_nuclear	2	34	0.0	0.0
@@ -12401,8 +12401,8 @@ de	06_coal	2	34	0.0	0.0
 de	07_gas	2	34	0.0	0.0
 de	08_non-res	2	34	0.0	0.0
 de	09_hydro_pump	2	34	0.0	0.0
-de	01_solar	2	35	1.0	0.0
-de	02_wind_on	2	35	1.0	0.0
+de	01_solar	2	35	0.0	1.0
+de	02_wind_on	2	35	0.0	1.0
 de	03_wind_off	2	35	0.0	0.0
 de	04_res	2	35	0.0	0.0
 de	05_nuclear	2	35	0.0	0.0
@@ -12410,8 +12410,8 @@ de	06_coal	2	35	0.0	0.0
 de	07_gas	2	35	0.0	0.0
 de	08_non-res	2	35	0.0	0.0
 de	09_hydro_pump	2	35	0.0	0.0
-de	01_solar	2	36	1.0	0.0
-de	02_wind_on	2	36	1.0	0.0
+de	01_solar	2	36	0.0	1.0
+de	02_wind_on	2	36	0.0	1.0
 de	03_wind_off	2	36	0.0	0.0
 de	04_res	2	36	0.0	0.0
 de	05_nuclear	2	36	0.0	0.0
@@ -12419,8 +12419,8 @@ de	06_coal	2	36	0.0	0.0
 de	07_gas	2	36	0.0	0.0
 de	08_non-res	2	36	0.0	0.0
 de	09_hydro_pump	2	36	0.0	0.0
-de	01_solar	2	37	1.0	0.0
-de	02_wind_on	2	37	1.0	0.0
+de	01_solar	2	37	0.0	1.0
+de	02_wind_on	2	37	0.0	1.0
 de	03_wind_off	2	37	0.0	0.0
 de	04_res	2	37	0.0	0.0
 de	05_nuclear	2	37	0.0	0.0
@@ -12428,8 +12428,8 @@ de	06_coal	2	37	0.0	0.0
 de	07_gas	2	37	0.0	0.0
 de	08_non-res	2	37	0.0	0.0
 de	09_hydro_pump	2	37	0.0	0.0
-de	01_solar	2	38	1.0	0.0
-de	02_wind_on	2	38	1.0	0.0
+de	01_solar	2	38	0.0	1.0
+de	02_wind_on	2	38	0.0	1.0
 de	03_wind_off	2	38	0.0	0.0
 de	04_res	2	38	0.0	0.0
 de	05_nuclear	2	38	0.0	0.0
@@ -12437,8 +12437,8 @@ de	06_coal	2	38	0.0	0.0
 de	07_gas	2	38	0.0	0.0
 de	08_non-res	2	38	0.0	0.0
 de	09_hydro_pump	2	38	0.0	0.0
-de	01_solar	2	39	1.0	0.0
-de	02_wind_on	2	39	1.0	0.0
+de	01_solar	2	39	0.0	1.0
+de	02_wind_on	2	39	0.0	1.0
 de	03_wind_off	2	39	0.0	0.0
 de	04_res	2	39	0.0	0.0
 de	05_nuclear	2	39	0.0	0.0
@@ -12446,8 +12446,8 @@ de	06_coal	2	39	0.0	0.0
 de	07_gas	2	39	0.0	0.0
 de	08_non-res	2	39	0.0	0.0
 de	09_hydro_pump	2	39	0.0	0.0
-de	01_solar	2	40	1.0	0.0
-de	02_wind_on	2	40	1.0	0.0
+de	01_solar	2	40	0.0	1.0
+de	02_wind_on	2	40	0.0	1.0
 de	03_wind_off	2	40	0.0	0.0
 de	04_res	2	40	0.0	0.0
 de	05_nuclear	2	40	0.0	0.0
@@ -12455,8 +12455,8 @@ de	06_coal	2	40	0.0	0.0
 de	07_gas	2	40	0.0	0.0
 de	08_non-res	2	40	0.0	0.0
 de	09_hydro_pump	2	40	0.0	0.0
-de	01_solar	2	41	1.0	0.0
-de	02_wind_on	2	41	1.0	0.0
+de	01_solar	2	41	0.0	1.0
+de	02_wind_on	2	41	0.0	1.0
 de	03_wind_off	2	41	0.0	0.0
 de	04_res	2	41	0.0	0.0
 de	05_nuclear	2	41	0.0	0.0
@@ -12464,1149 +12464,1149 @@ de	06_coal	2	41	0.0	0.0
 de	07_gas	2	41	0.0	0.0
 de	08_non-res	2	41	0.0	0.0
 de	09_hydro_pump	2	41	0.0	0.0
-de	01_solar	2	42	1.0	0.0
-de	02_wind_on	2	42	1.0	0.0
-de	03_wind_off	2	42	1.0	0.0
+de	01_solar	2	42	0.0	1.0
+de	02_wind_on	2	42	0.0	1.0
+de	03_wind_off	2	42	0.0	1.0
 de	04_res	2	42	0.0	0.0
 de	05_nuclear	2	42	0.0	0.0
 de	06_coal	2	42	0.0	0.0
 de	07_gas	2	42	0.0	0.0
 de	08_non-res	2	42	0.0	0.0
 de	09_hydro_pump	2	42	0.0	0.0
-de	01_solar	2	43	1.0	0.0
-de	02_wind_on	2	43	1.0	0.0
-de	03_wind_off	2	43	1.0	0.0
+de	01_solar	2	43	0.0	1.0
+de	02_wind_on	2	43	0.0	1.0
+de	03_wind_off	2	43	0.0	1.0
 de	04_res	2	43	0.0	0.0
 de	05_nuclear	2	43	0.0	0.0
 de	06_coal	2	43	0.0	0.0
 de	07_gas	2	43	0.0	0.0
 de	08_non-res	2	43	0.0	0.0
 de	09_hydro_pump	2	43	0.0	0.0
-de	01_solar	2	44	1.0	0.0
-de	02_wind_on	2	44	1.0	0.0
-de	03_wind_off	2	44	1.0	0.0
+de	01_solar	2	44	0.0	1.0
+de	02_wind_on	2	44	0.0	1.0
+de	03_wind_off	2	44	0.0	1.0
 de	04_res	2	44	0.0	0.0
 de	05_nuclear	2	44	0.0	0.0
 de	06_coal	2	44	0.0	0.0
 de	07_gas	2	44	0.0	0.0
 de	08_non-res	2	44	0.0	0.0
 de	09_hydro_pump	2	44	0.0	0.0
-de	01_solar	2	45	1.0	0.0
-de	02_wind_on	2	45	1.0	0.0
-de	03_wind_off	2	45	1.0	0.0
+de	01_solar	2	45	0.0	1.0
+de	02_wind_on	2	45	0.0	1.0
+de	03_wind_off	2	45	0.0	1.0
 de	04_res	2	45	0.0	0.0
 de	05_nuclear	2	45	0.0	0.0
 de	06_coal	2	45	0.0	0.0
 de	07_gas	2	45	0.0	0.0
 de	08_non-res	2	45	0.0	0.0
 de	09_hydro_pump	2	45	0.0	0.0
-de	01_solar	2	46	1.0	0.0
-de	02_wind_on	2	46	1.0	0.0
-de	03_wind_off	2	46	1.0	0.0
+de	01_solar	2	46	0.0	1.0
+de	02_wind_on	2	46	0.0	1.0
+de	03_wind_off	2	46	0.0	1.0
 de	04_res	2	46	0.0	0.0
 de	05_nuclear	2	46	0.0	0.0
 de	06_coal	2	46	0.0	0.0
 de	07_gas	2	46	0.0	0.0
 de	08_non-res	2	46	0.0	0.0
 de	09_hydro_pump	2	46	0.0	0.0
-de	01_solar	2	47	1.0	0.0
-de	02_wind_on	2	47	1.0	0.0
-de	03_wind_off	2	47	1.0	0.0
+de	01_solar	2	47	0.0	1.0
+de	02_wind_on	2	47	0.0	1.0
+de	03_wind_off	2	47	0.0	1.0
 de	04_res	2	47	0.0	0.0
 de	05_nuclear	2	47	0.0	0.0
 de	06_coal	2	47	0.0	0.0
 de	07_gas	2	47	0.0	0.0
 de	08_non-res	2	47	0.0	0.0
 de	09_hydro_pump	2	47	0.0	0.0
-de	01_solar	2	48	1.0	0.0
-de	02_wind_on	2	48	1.0	0.0
-de	03_wind_off	2	48	1.0	0.0
+de	01_solar	2	48	0.0	1.0
+de	02_wind_on	2	48	0.0	1.0
+de	03_wind_off	2	48	0.0	1.0
 de	04_res	2	48	0.0	0.0
 de	05_nuclear	2	48	0.0	0.0
 de	06_coal	2	48	0.0	0.0
 de	07_gas	2	48	0.0	0.0
 de	08_non-res	2	48	0.0	0.0
 de	09_hydro_pump	2	48	0.0	0.0
-de	01_solar	2	49	1.0	0.0
-de	02_wind_on	2	49	1.0	0.0
-de	03_wind_off	2	49	1.0	0.0
+de	01_solar	2	49	0.0	1.0
+de	02_wind_on	2	49	0.0	1.0
+de	03_wind_off	2	49	0.0	1.0
 de	04_res	2	49	0.0	0.0
 de	05_nuclear	2	49	0.0	0.0
 de	06_coal	2	49	0.0	0.0
 de	07_gas	2	49	0.0	0.0
 de	08_non-res	2	49	0.0	0.0
 de	09_hydro_pump	2	49	0.0	0.0
-de	01_solar	2	50	1.0	0.0
-de	02_wind_on	2	50	1.0	0.0
-de	03_wind_off	2	50	1.0	0.0
+de	01_solar	2	50	0.0	1.0
+de	02_wind_on	2	50	0.0	1.0
+de	03_wind_off	2	50	0.0	1.0
 de	04_res	2	50	0.0	0.0
 de	05_nuclear	2	50	0.0	0.0
 de	06_coal	2	50	0.0	0.0
 de	07_gas	2	50	0.0	0.0
 de	08_non-res	2	50	0.0	0.0
 de	09_hydro_pump	2	50	0.0	0.0
-de	01_solar	2	51	1.0	0.0
-de	02_wind_on	2	51	1.0	0.0
-de	03_wind_off	2	51	1.0	0.0
+de	01_solar	2	51	0.0	1.0
+de	02_wind_on	2	51	0.0	1.0
+de	03_wind_off	2	51	0.0	1.0
 de	04_res	2	51	0.0	0.0
 de	05_nuclear	2	51	0.0	0.0
 de	06_coal	2	51	0.0	0.0
 de	07_gas	2	51	0.0	0.0
 de	08_non-res	2	51	0.0	0.0
 de	09_hydro_pump	2	51	0.0	0.0
-de	01_solar	2	52	1.0	0.0
-de	02_wind_on	2	52	1.0	0.0
-de	03_wind_off	2	52	1.0	0.0
+de	01_solar	2	52	0.0	1.0
+de	02_wind_on	2	52	0.0	1.0
+de	03_wind_off	2	52	0.0	1.0
 de	04_res	2	52	0.0	0.0
 de	05_nuclear	2	52	0.0	0.0
 de	06_coal	2	52	0.0	0.0
 de	07_gas	2	52	0.0	0.0
 de	08_non-res	2	52	0.0	0.0
 de	09_hydro_pump	2	52	0.0	0.0
-de	01_solar	2	53	1.0	0.0
-de	02_wind_on	2	53	1.0	0.0
-de	03_wind_off	2	53	1.0	0.0
+de	01_solar	2	53	0.0	1.0
+de	02_wind_on	2	53	0.0	1.0
+de	03_wind_off	2	53	0.0	1.0
 de	04_res	2	53	0.0	0.0
 de	05_nuclear	2	53	0.0	0.0
 de	06_coal	2	53	0.0	0.0
 de	07_gas	2	53	0.0	0.0
 de	08_non-res	2	53	0.0	0.0
 de	09_hydro_pump	2	53	0.0	0.0
-de	01_solar	2	54	1.0	0.0
-de	02_wind_on	2	54	1.0	0.0
-de	03_wind_off	2	54	1.0	0.0
+de	01_solar	2	54	0.0	1.0
+de	02_wind_on	2	54	0.0	1.0
+de	03_wind_off	2	54	0.0	1.0
 de	04_res	2	54	0.0	0.0
 de	05_nuclear	2	54	0.0	0.0
 de	06_coal	2	54	0.0	0.0
 de	07_gas	2	54	0.0	0.0
 de	08_non-res	2	54	0.0	0.0
 de	09_hydro_pump	2	54	0.0	0.0
-de	01_solar	2	55	1.0	0.0
-de	02_wind_on	2	55	1.0	0.0
-de	03_wind_off	2	55	1.0	0.0
+de	01_solar	2	55	0.0	1.0
+de	02_wind_on	2	55	0.0	1.0
+de	03_wind_off	2	55	0.0	1.0
 de	04_res	2	55	0.0	0.0
 de	05_nuclear	2	55	0.0	0.0
 de	06_coal	2	55	0.0	0.0
 de	07_gas	2	55	0.0	0.0
 de	08_non-res	2	55	0.0	0.0
 de	09_hydro_pump	2	55	0.0	0.0
-de	01_solar	2	56	1.0	0.0
-de	02_wind_on	2	56	1.0	0.0
-de	03_wind_off	2	56	1.0	0.0
+de	01_solar	2	56	0.0	1.0
+de	02_wind_on	2	56	0.0	1.0
+de	03_wind_off	2	56	0.0	1.0
 de	04_res	2	56	0.0	0.0
 de	05_nuclear	2	56	0.0	0.0
 de	06_coal	2	56	0.0	0.0
 de	07_gas	2	56	0.0	0.0
 de	08_non-res	2	56	0.0	0.0
 de	09_hydro_pump	2	56	0.0	0.0
-de	01_solar	2	57	1.0	0.0
-de	02_wind_on	2	57	1.0	0.0
-de	03_wind_off	2	57	1.0	0.0
+de	01_solar	2	57	0.0	1.0
+de	02_wind_on	2	57	0.0	1.0
+de	03_wind_off	2	57	0.0	1.0
 de	04_res	2	57	0.0	0.0
 de	05_nuclear	2	57	0.0	0.0
 de	06_coal	2	57	0.0	0.0
 de	07_gas	2	57	0.0	0.0
 de	08_non-res	2	57	0.0	0.0
 de	09_hydro_pump	2	57	0.0	0.0
-de	01_solar	2	58	1.0	0.0
-de	02_wind_on	2	58	1.0	0.0
-de	03_wind_off	2	58	1.0	0.0
+de	01_solar	2	58	0.0	1.0
+de	02_wind_on	2	58	0.0	1.0
+de	03_wind_off	2	58	0.0	1.0
 de	04_res	2	58	0.0	0.0
 de	05_nuclear	2	58	0.0	0.0
 de	06_coal	2	58	0.0	0.0
 de	07_gas	2	58	0.0	0.0
 de	08_non-res	2	58	0.0	0.0
 de	09_hydro_pump	2	58	0.0	0.0
-de	01_solar	2	59	1.0	0.0
-de	02_wind_on	2	59	1.0	0.0
-de	03_wind_off	2	59	1.0	0.0
+de	01_solar	2	59	0.0	1.0
+de	02_wind_on	2	59	0.0	1.0
+de	03_wind_off	2	59	0.0	1.0
 de	04_res	2	59	0.0	0.0
 de	05_nuclear	2	59	0.0	0.0
 de	06_coal	2	59	0.0	0.0
 de	07_gas	2	59	0.0	0.0
 de	08_non-res	2	59	0.0	0.0
 de	09_hydro_pump	2	59	0.0	0.0
-de	01_solar	2	60	1.0	0.0
-de	02_wind_on	2	60	1.0	0.0
-de	03_wind_off	2	60	1.0	0.0
+de	01_solar	2	60	0.0	1.0
+de	02_wind_on	2	60	0.0	1.0
+de	03_wind_off	2	60	0.0	1.0
 de	04_res	2	60	0.0	0.0
 de	05_nuclear	2	60	0.0	0.0
 de	06_coal	2	60	0.0	0.0
 de	07_gas	2	60	0.0	0.0
 de	08_non-res	2	60	0.0	0.0
 de	09_hydro_pump	2	60	0.0	0.0
-de	01_solar	2	61	1.0	0.0
-de	02_wind_on	2	61	1.0	0.0
-de	03_wind_off	2	61	1.0	0.0
+de	01_solar	2	61	0.0	1.0
+de	02_wind_on	2	61	0.0	1.0
+de	03_wind_off	2	61	0.0	1.0
 de	04_res	2	61	0.0	0.0
 de	05_nuclear	2	61	0.0	0.0
 de	06_coal	2	61	0.0	0.0
 de	07_gas	2	61	0.0	0.0
 de	08_non-res	2	61	0.0	0.0
 de	09_hydro_pump	2	61	0.0	0.0
-de	01_solar	2	62	1.0	0.0
-de	02_wind_on	2	62	1.0	0.0
-de	03_wind_off	2	62	1.0	0.0
-de	04_res	2	62	1.0	0.0
+de	01_solar	2	62	0.0	1.0
+de	02_wind_on	2	62	0.0	1.0
+de	03_wind_off	2	62	0.0	1.0
+de	04_res	2	62	0.0	1.0
 de	05_nuclear	2	62	0.0	0.0
 de	06_coal	2	62	0.0	0.0
 de	07_gas	2	62	0.0	0.0
 de	08_non-res	2	62	0.0	0.0
 de	09_hydro_pump	2	62	0.0	0.0
-de	01_solar	2	63	1.0	0.0
-de	02_wind_on	2	63	1.0	0.0
-de	03_wind_off	2	63	1.0	0.0
-de	04_res	2	63	1.0	0.0
+de	01_solar	2	63	0.0	1.0
+de	02_wind_on	2	63	0.0	1.0
+de	03_wind_off	2	63	0.0	1.0
+de	04_res	2	63	0.0	1.0
 de	05_nuclear	2	63	0.0	0.0
 de	06_coal	2	63	0.0	0.0
 de	07_gas	2	63	0.0	0.0
 de	08_non-res	2	63	0.0	0.0
 de	09_hydro_pump	2	63	0.0	0.0
-de	01_solar	2	64	1.0	0.0
-de	02_wind_on	2	64	1.0	0.0
-de	03_wind_off	2	64	1.0	0.0
-de	04_res	2	64	1.0	0.0
+de	01_solar	2	64	0.0	1.0
+de	02_wind_on	2	64	0.0	1.0
+de	03_wind_off	2	64	0.0	1.0
+de	04_res	2	64	0.0	1.0
 de	05_nuclear	2	64	0.0	0.0
 de	06_coal	2	64	0.0	0.0
 de	07_gas	2	64	0.0	0.0
 de	08_non-res	2	64	0.0	0.0
 de	09_hydro_pump	2	64	0.0	0.0
-de	01_solar	2	65	1.0	0.0
-de	02_wind_on	2	65	1.0	0.0
-de	03_wind_off	2	65	1.0	0.0
-de	04_res	2	65	1.0	0.0
+de	01_solar	2	65	0.0	1.0
+de	02_wind_on	2	65	0.0	1.0
+de	03_wind_off	2	65	0.0	1.0
+de	04_res	2	65	0.0	1.0
 de	05_nuclear	2	65	0.0	0.0
 de	06_coal	2	65	0.0	0.0
 de	07_gas	2	65	0.0	0.0
 de	08_non-res	2	65	0.0	0.0
 de	09_hydro_pump	2	65	0.0	0.0
-de	01_solar	2	66	1.0	0.0
-de	02_wind_on	2	66	1.0	0.0
-de	03_wind_off	2	66	1.0	0.0
-de	04_res	2	66	1.0	0.0
+de	01_solar	2	66	0.0	1.0
+de	02_wind_on	2	66	0.0	1.0
+de	03_wind_off	2	66	0.0	1.0
+de	04_res	2	66	0.0	1.0
 de	05_nuclear	2	66	0.0	0.0
 de	06_coal	2	66	0.0	0.0
 de	07_gas	2	66	0.0	0.0
 de	08_non-res	2	66	0.0	0.0
 de	09_hydro_pump	2	66	0.0	0.0
-de	01_solar	2	67	1.0	0.0
-de	02_wind_on	2	67	1.0	0.0
-de	03_wind_off	2	67	1.0	0.0
-de	04_res	2	67	1.0	0.0
+de	01_solar	2	67	0.0	1.0
+de	02_wind_on	2	67	0.0	1.0
+de	03_wind_off	2	67	0.0	1.0
+de	04_res	2	67	0.0	1.0
 de	05_nuclear	2	67	0.0	0.0
 de	06_coal	2	67	0.0	0.0
 de	07_gas	2	67	0.0	0.0
 de	08_non-res	2	67	0.0	0.0
 de	09_hydro_pump	2	67	0.0	0.0
-de	01_solar	2	68	1.0	0.0
-de	02_wind_on	2	68	1.0	0.0
-de	03_wind_off	2	68	1.0	0.0
-de	04_res	2	68	1.0	0.0
+de	01_solar	2	68	0.0	1.0
+de	02_wind_on	2	68	0.0	1.0
+de	03_wind_off	2	68	0.0	1.0
+de	04_res	2	68	0.0	1.0
 de	05_nuclear	2	68	0.0	0.0
 de	06_coal	2	68	0.0	0.0
 de	07_gas	2	68	0.0	0.0
 de	08_non-res	2	68	0.0	0.0
 de	09_hydro_pump	2	68	0.0	0.0
-de	01_solar	2	69	1.0	0.0
-de	02_wind_on	2	69	1.0	0.0
-de	03_wind_off	2	69	1.0	0.0
-de	04_res	2	69	1.0	0.0
+de	01_solar	2	69	0.0	1.0
+de	02_wind_on	2	69	0.0	1.0
+de	03_wind_off	2	69	0.0	1.0
+de	04_res	2	69	0.0	1.0
 de	05_nuclear	2	69	0.0	0.0
 de	06_coal	2	69	0.0	0.0
 de	07_gas	2	69	0.0	0.0
 de	08_non-res	2	69	0.0	0.0
 de	09_hydro_pump	2	69	0.0	0.0
-de	01_solar	2	70	1.0	0.0
-de	02_wind_on	2	70	1.0	0.0
-de	03_wind_off	2	70	1.0	0.0
-de	04_res	2	70	1.0	0.0
+de	01_solar	2	70	0.0	1.0
+de	02_wind_on	2	70	0.0	1.0
+de	03_wind_off	2	70	0.0	1.0
+de	04_res	2	70	0.0	1.0
 de	05_nuclear	2	70	0.0	0.0
 de	06_coal	2	70	0.0	0.0
 de	07_gas	2	70	0.0	0.0
 de	08_non-res	2	70	0.0	0.0
 de	09_hydro_pump	2	70	0.0	0.0
-de	01_solar	2	71	1.0	0.0
-de	02_wind_on	2	71	1.0	0.0
-de	03_wind_off	2	71	1.0	0.0
-de	04_res	2	71	1.0	0.0
+de	01_solar	2	71	0.0	1.0
+de	02_wind_on	2	71	0.0	1.0
+de	03_wind_off	2	71	0.0	1.0
+de	04_res	2	71	0.0	1.0
 de	05_nuclear	2	71	0.0	0.0
 de	06_coal	2	71	0.0	0.0
 de	07_gas	2	71	0.0	0.0
 de	08_non-res	2	71	0.0	0.0
 de	09_hydro_pump	2	71	0.0	0.0
-de	01_solar	2	72	1.0	0.0
-de	02_wind_on	2	72	1.0	0.0
-de	03_wind_off	2	72	1.0	0.0
-de	04_res	2	72	1.0	0.0
+de	01_solar	2	72	0.0	1.0
+de	02_wind_on	2	72	0.0	1.0
+de	03_wind_off	2	72	0.0	1.0
+de	04_res	2	72	0.0	1.0
 de	05_nuclear	2	72	0.0	0.0
 de	06_coal	2	72	0.0	0.0
 de	07_gas	2	72	0.0	0.0
 de	08_non-res	2	72	0.0	0.0
 de	09_hydro_pump	2	72	0.0	0.0
-de	01_solar	2	73	1.0	0.0
-de	02_wind_on	2	73	1.0	0.0
-de	03_wind_off	2	73	1.0	0.0
-de	04_res	2	73	1.0	0.0
+de	01_solar	2	73	0.0	1.0
+de	02_wind_on	2	73	0.0	1.0
+de	03_wind_off	2	73	0.0	1.0
+de	04_res	2	73	0.0	1.0
 de	05_nuclear	2	73	0.0	0.0
 de	06_coal	2	73	0.0	0.0
 de	07_gas	2	73	0.0	0.0
 de	08_non-res	2	73	0.0	0.0
 de	09_hydro_pump	2	73	0.0	0.0
-de	01_solar	2	74	1.0	0.0
-de	02_wind_on	2	74	1.0	0.0
-de	03_wind_off	2	74	1.0	0.0
-de	04_res	2	74	1.0	0.0
+de	01_solar	2	74	0.0	1.0
+de	02_wind_on	2	74	0.0	1.0
+de	03_wind_off	2	74	0.0	1.0
+de	04_res	2	74	0.0	1.0
 de	05_nuclear	2	74	0.0	0.0
 de	06_coal	2	74	0.0	0.0
 de	07_gas	2	74	0.0	0.0
 de	08_non-res	2	74	0.0	0.0
 de	09_hydro_pump	2	74	0.0	0.0
-de	01_solar	2	75	1.0	0.0
-de	02_wind_on	2	75	1.0	0.0
-de	03_wind_off	2	75	1.0	0.0
-de	04_res	2	75	1.0	0.0
+de	01_solar	2	75	0.0	1.0
+de	02_wind_on	2	75	0.0	1.0
+de	03_wind_off	2	75	0.0	1.0
+de	04_res	2	75	0.0	1.0
 de	05_nuclear	2	75	0.0	0.0
 de	06_coal	2	75	0.0	0.0
 de	07_gas	2	75	0.0	0.0
 de	08_non-res	2	75	0.0	0.0
 de	09_hydro_pump	2	75	0.0	0.0
-de	01_solar	2	76	1.0	0.0
-de	02_wind_on	2	76	1.0	0.0
-de	03_wind_off	2	76	1.0	0.0
-de	04_res	2	76	1.0	0.0
+de	01_solar	2	76	0.0	1.0
+de	02_wind_on	2	76	0.0	1.0
+de	03_wind_off	2	76	0.0	1.0
+de	04_res	2	76	0.0	1.0
 de	05_nuclear	2	76	0.0	0.0
 de	06_coal	2	76	0.0	0.0
 de	07_gas	2	76	0.0	0.0
 de	08_non-res	2	76	0.0	0.0
 de	09_hydro_pump	2	76	0.0	0.0
-de	01_solar	2	77	1.0	0.0
-de	02_wind_on	2	77	1.0	0.0
-de	03_wind_off	2	77	1.0	0.0
-de	04_res	2	77	1.0	0.0
+de	01_solar	2	77	0.0	1.0
+de	02_wind_on	2	77	0.0	1.0
+de	03_wind_off	2	77	0.0	1.0
+de	04_res	2	77	0.0	1.0
 de	05_nuclear	2	77	0.0	0.0
 de	06_coal	2	77	0.0	0.0
 de	07_gas	2	77	0.0	0.0
 de	08_non-res	2	77	0.0	0.0
 de	09_hydro_pump	2	77	0.0	0.0
-de	01_solar	2	78	1.0	0.0
-de	02_wind_on	2	78	1.0	0.0
-de	03_wind_off	2	78	1.0	0.0
-de	04_res	2	78	1.0	0.0
+de	01_solar	2	78	0.0	1.0
+de	02_wind_on	2	78	0.0	1.0
+de	03_wind_off	2	78	0.0	1.0
+de	04_res	2	78	0.0	1.0
 de	05_nuclear	2	78	0.0	0.0
 de	06_coal	2	78	0.0	0.0
 de	07_gas	2	78	0.0	0.0
 de	08_non-res	2	78	0.0	0.0
 de	09_hydro_pump	2	78	0.0	0.0
-de	01_solar	2	79	1.0	0.0
-de	02_wind_on	2	79	1.0	0.0
-de	03_wind_off	2	79	1.0	0.0
-de	04_res	2	79	1.0	0.0
+de	01_solar	2	79	0.0	1.0
+de	02_wind_on	2	79	0.0	1.0
+de	03_wind_off	2	79	0.0	1.0
+de	04_res	2	79	0.0	1.0
 de	05_nuclear	2	79	0.0	0.0
 de	06_coal	2	79	0.0	0.0
 de	07_gas	2	79	0.0	0.0
 de	08_non-res	2	79	0.0	0.0
 de	09_hydro_pump	2	79	0.0	0.0
-de	01_solar	2	80	1.0	0.0
-de	02_wind_on	2	80	1.0	0.0
-de	03_wind_off	2	80	1.0	0.0
-de	04_res	2	80	1.0	0.0
+de	01_solar	2	80	0.0	1.0
+de	02_wind_on	2	80	0.0	1.0
+de	03_wind_off	2	80	0.0	1.0
+de	04_res	2	80	0.0	1.0
 de	05_nuclear	2	80	0.0	0.0
 de	06_coal	2	80	0.0	0.0
 de	07_gas	2	80	0.0	0.0
 de	08_non-res	2	80	0.0	0.0
 de	09_hydro_pump	2	80	0.0	0.0
-de	01_solar	2	81	1.0	0.0
-de	02_wind_on	2	81	1.0	0.0
-de	03_wind_off	2	81	1.0	0.0
-de	04_res	2	81	1.0	0.0
+de	01_solar	2	81	0.0	1.0
+de	02_wind_on	2	81	0.0	1.0
+de	03_wind_off	2	81	0.0	1.0
+de	04_res	2	81	0.0	1.0
 de	05_nuclear	2	81	0.0	0.0
 de	06_coal	2	81	0.0	0.0
 de	07_gas	2	81	0.0	0.0
 de	08_non-res	2	81	0.0	0.0
 de	09_hydro_pump	2	81	0.0	0.0
-de	01_solar	2	82	1.0	0.0
-de	02_wind_on	2	82	1.0	0.0
-de	03_wind_off	2	82	1.0	0.0
-de	04_res	2	82	1.0	0.0
-de	05_nuclear	2	82	1.0	0.0
+de	01_solar	2	82	0.0	1.0
+de	02_wind_on	2	82	0.0	1.0
+de	03_wind_off	2	82	0.0	1.0
+de	04_res	2	82	0.0	1.0
+de	05_nuclear	2	82	0.0	1.0
 de	06_coal	2	82	0.0	0.0
 de	07_gas	2	82	0.0	0.0
 de	08_non-res	2	82	0.0	0.0
 de	09_hydro_pump	2	82	0.0	0.0
-de	01_solar	2	83	1.0	0.0
-de	02_wind_on	2	83	1.0	0.0
-de	03_wind_off	2	83	1.0	0.0
-de	04_res	2	83	1.0	0.0
-de	05_nuclear	2	83	1.0	0.0
+de	01_solar	2	83	0.0	1.0
+de	02_wind_on	2	83	0.0	1.0
+de	03_wind_off	2	83	0.0	1.0
+de	04_res	2	83	0.0	1.0
+de	05_nuclear	2	83	0.0	1.0
 de	06_coal	2	83	0.0	0.0
 de	07_gas	2	83	0.0	0.0
 de	08_non-res	2	83	0.0	0.0
 de	09_hydro_pump	2	83	0.0	0.0
-de	01_solar	2	84	1.0	0.0
-de	02_wind_on	2	84	1.0	0.0
-de	03_wind_off	2	84	1.0	0.0
-de	04_res	2	84	1.0	0.0
-de	05_nuclear	2	84	1.0	0.0
+de	01_solar	2	84	0.0	1.0
+de	02_wind_on	2	84	0.0	1.0
+de	03_wind_off	2	84	0.0	1.0
+de	04_res	2	84	0.0	1.0
+de	05_nuclear	2	84	0.0	1.0
 de	06_coal	2	84	0.0	0.0
 de	07_gas	2	84	0.0	0.0
 de	08_non-res	2	84	0.0	0.0
 de	09_hydro_pump	2	84	0.0	0.0
-de	01_solar	2	85	1.0	0.0
-de	02_wind_on	2	85	1.0	0.0
-de	03_wind_off	2	85	1.0	0.0
-de	04_res	2	85	1.0	0.0
-de	05_nuclear	2	85	1.0	0.0
+de	01_solar	2	85	0.0	1.0
+de	02_wind_on	2	85	0.0	1.0
+de	03_wind_off	2	85	0.0	1.0
+de	04_res	2	85	0.0	1.0
+de	05_nuclear	2	85	0.0	1.0
 de	06_coal	2	85	0.0	0.0
 de	07_gas	2	85	0.0	0.0
 de	08_non-res	2	85	0.0	0.0
 de	09_hydro_pump	2	85	0.0	0.0
-de	01_solar	2	86	1.0	0.0
-de	02_wind_on	2	86	1.0	0.0
-de	03_wind_off	2	86	1.0	0.0
-de	04_res	2	86	1.0	0.0
-de	05_nuclear	2	86	1.0	0.0
+de	01_solar	2	86	0.0	1.0
+de	02_wind_on	2	86	0.0	1.0
+de	03_wind_off	2	86	0.0	1.0
+de	04_res	2	86	0.0	1.0
+de	05_nuclear	2	86	0.0	1.0
 de	06_coal	2	86	0.0	0.0
 de	07_gas	2	86	0.0	0.0
 de	08_non-res	2	86	0.0	0.0
 de	09_hydro_pump	2	86	0.0	0.0
-de	01_solar	2	87	1.0	0.0
-de	02_wind_on	2	87	1.0	0.0
-de	03_wind_off	2	87	1.0	0.0
-de	04_res	2	87	1.0	0.0
-de	05_nuclear	2	87	1.0	0.0
+de	01_solar	2	87	0.0	1.0
+de	02_wind_on	2	87	0.0	1.0
+de	03_wind_off	2	87	0.0	1.0
+de	04_res	2	87	0.0	1.0
+de	05_nuclear	2	87	0.0	1.0
 de	06_coal	2	87	0.0	0.0
 de	07_gas	2	87	0.0	0.0
 de	08_non-res	2	87	0.0	0.0
 de	09_hydro_pump	2	87	0.0	0.0
-de	01_solar	2	88	1.0	0.0
-de	02_wind_on	2	88	1.0	0.0
-de	03_wind_off	2	88	1.0	0.0
-de	04_res	2	88	1.0	0.0
-de	05_nuclear	2	88	1.0	0.0
+de	01_solar	2	88	0.0	1.0
+de	02_wind_on	2	88	0.0	1.0
+de	03_wind_off	2	88	0.0	1.0
+de	04_res	2	88	0.0	1.0
+de	05_nuclear	2	88	0.0	1.0
 de	06_coal	2	88	0.0	0.0
 de	07_gas	2	88	0.0	0.0
 de	08_non-res	2	88	0.0	0.0
 de	09_hydro_pump	2	88	0.0	0.0
-de	01_solar	2	89	1.0	0.0
-de	02_wind_on	2	89	1.0	0.0
-de	03_wind_off	2	89	1.0	0.0
-de	04_res	2	89	1.0	0.0
-de	05_nuclear	2	89	1.0	0.0
+de	01_solar	2	89	0.0	1.0
+de	02_wind_on	2	89	0.0	1.0
+de	03_wind_off	2	89	0.0	1.0
+de	04_res	2	89	0.0	1.0
+de	05_nuclear	2	89	0.0	1.0
 de	06_coal	2	89	0.0	0.0
 de	07_gas	2	89	0.0	0.0
 de	08_non-res	2	89	0.0	0.0
 de	09_hydro_pump	2	89	0.0	0.0
-de	01_solar	2	90	1.0	0.0
-de	02_wind_on	2	90	1.0	0.0
-de	03_wind_off	2	90	1.0	0.0
-de	04_res	2	90	1.0	0.0
-de	05_nuclear	2	90	1.0	0.0
+de	01_solar	2	90	0.0	1.0
+de	02_wind_on	2	90	0.0	1.0
+de	03_wind_off	2	90	0.0	1.0
+de	04_res	2	90	0.0	1.0
+de	05_nuclear	2	90	0.0	1.0
 de	06_coal	2	90	0.0	0.0
 de	07_gas	2	90	0.0	0.0
 de	08_non-res	2	90	0.0	0.0
 de	09_hydro_pump	2	90	0.0	0.0
-de	01_solar	2	91	1.0	0.0
-de	02_wind_on	2	91	1.0	0.0
-de	03_wind_off	2	91	1.0	0.0
-de	04_res	2	91	1.0	0.0
-de	05_nuclear	2	91	1.0	0.0
+de	01_solar	2	91	0.0	1.0
+de	02_wind_on	2	91	0.0	1.0
+de	03_wind_off	2	91	0.0	1.0
+de	04_res	2	91	0.0	1.0
+de	05_nuclear	2	91	0.0	1.0
 de	06_coal	2	91	0.0	0.0
 de	07_gas	2	91	0.0	0.0
 de	08_non-res	2	91	0.0	0.0
 de	09_hydro_pump	2	91	0.0	0.0
-de	01_solar	2	92	1.0	0.0
-de	02_wind_on	2	92	1.0	0.0
-de	03_wind_off	2	92	1.0	0.0
-de	04_res	2	92	1.0	0.0
-de	05_nuclear	2	92	1.0	0.0
+de	01_solar	2	92	0.0	1.0
+de	02_wind_on	2	92	0.0	1.0
+de	03_wind_off	2	92	0.0	1.0
+de	04_res	2	92	0.0	1.0
+de	05_nuclear	2	92	0.0	1.0
 de	06_coal	2	92	0.0	0.0
 de	07_gas	2	92	0.0	0.0
 de	08_non-res	2	92	0.0	0.0
 de	09_hydro_pump	2	92	0.0	0.0
-de	01_solar	2	93	1.0	0.0
-de	02_wind_on	2	93	1.0	0.0
-de	03_wind_off	2	93	1.0	0.0
-de	04_res	2	93	1.0	0.0
-de	05_nuclear	2	93	1.0	0.0
+de	01_solar	2	93	0.0	1.0
+de	02_wind_on	2	93	0.0	1.0
+de	03_wind_off	2	93	0.0	1.0
+de	04_res	2	93	0.0	1.0
+de	05_nuclear	2	93	0.0	1.0
 de	06_coal	2	93	0.0	0.0
 de	07_gas	2	93	0.0	0.0
 de	08_non-res	2	93	0.0	0.0
 de	09_hydro_pump	2	93	0.0	0.0
-de	01_solar	2	94	1.0	0.0
-de	02_wind_on	2	94	1.0	0.0
-de	03_wind_off	2	94	1.0	0.0
-de	04_res	2	94	1.0	0.0
-de	05_nuclear	2	94	1.0	0.0
+de	01_solar	2	94	0.0	1.0
+de	02_wind_on	2	94	0.0	1.0
+de	03_wind_off	2	94	0.0	1.0
+de	04_res	2	94	0.0	1.0
+de	05_nuclear	2	94	0.0	1.0
 de	06_coal	2	94	0.0	0.0
 de	07_gas	2	94	0.0	0.0
 de	08_non-res	2	94	0.0	0.0
 de	09_hydro_pump	2	94	0.0	0.0
-de	01_solar	2	95	1.0	0.0
-de	02_wind_on	2	95	1.0	0.0
-de	03_wind_off	2	95	1.0	0.0
-de	04_res	2	95	1.0	0.0
-de	05_nuclear	2	95	1.0	0.0
+de	01_solar	2	95	0.0	1.0
+de	02_wind_on	2	95	0.0	1.0
+de	03_wind_off	2	95	0.0	1.0
+de	04_res	2	95	0.0	1.0
+de	05_nuclear	2	95	0.0	1.0
 de	06_coal	2	95	0.0	0.0
 de	07_gas	2	95	0.0	0.0
 de	08_non-res	2	95	0.0	0.0
 de	09_hydro_pump	2	95	0.0	0.0
-de	01_solar	2	96	1.0	0.0
-de	02_wind_on	2	96	1.0	0.0
-de	03_wind_off	2	96	1.0	0.0
-de	04_res	2	96	1.0	0.0
-de	05_nuclear	2	96	1.0	0.0
+de	01_solar	2	96	0.0	1.0
+de	02_wind_on	2	96	0.0	1.0
+de	03_wind_off	2	96	0.0	1.0
+de	04_res	2	96	0.0	1.0
+de	05_nuclear	2	96	0.0	1.0
 de	06_coal	2	96	0.0	0.0
 de	07_gas	2	96	0.0	0.0
 de	08_non-res	2	96	0.0	0.0
 de	09_hydro_pump	2	96	0.0	0.0
-de	01_solar	2	97	1.0	0.0
-de	02_wind_on	2	97	1.0	0.0
-de	03_wind_off	2	97	1.0	0.0
-de	04_res	2	97	1.0	0.0
-de	05_nuclear	2	97	1.0	0.0
+de	01_solar	2	97	0.0	1.0
+de	02_wind_on	2	97	0.0	1.0
+de	03_wind_off	2	97	0.0	1.0
+de	04_res	2	97	0.0	1.0
+de	05_nuclear	2	97	0.0	1.0
 de	06_coal	2	97	0.0	0.0
 de	07_gas	2	97	0.0	0.0
 de	08_non-res	2	97	0.0	0.0
 de	09_hydro_pump	2	97	0.0	0.0
-de	01_solar	2	98	1.0	0.0
-de	02_wind_on	2	98	1.0	0.0
-de	03_wind_off	2	98	1.0	0.0
-de	04_res	2	98	1.0	0.0
-de	05_nuclear	2	98	1.0	0.0
+de	01_solar	2	98	0.0	1.0
+de	02_wind_on	2	98	0.0	1.0
+de	03_wind_off	2	98	0.0	1.0
+de	04_res	2	98	0.0	1.0
+de	05_nuclear	2	98	0.0	1.0
 de	06_coal	2	98	0.0	0.0
 de	07_gas	2	98	0.0	0.0
 de	08_non-res	2	98	0.0	0.0
 de	09_hydro_pump	2	98	0.0	0.0
-de	01_solar	2	99	1.0	0.0
-de	02_wind_on	2	99	1.0	0.0
-de	03_wind_off	2	99	1.0	0.0
-de	04_res	2	99	1.0	0.0
-de	05_nuclear	2	99	1.0	0.0
+de	01_solar	2	99	0.0	1.0
+de	02_wind_on	2	99	0.0	1.0
+de	03_wind_off	2	99	0.0	1.0
+de	04_res	2	99	0.0	1.0
+de	05_nuclear	2	99	0.0	1.0
 de	06_coal	2	99	0.0	0.0
 de	07_gas	2	99	0.0	0.0
 de	08_non-res	2	99	0.0	0.0
 de	09_hydro_pump	2	99	0.0	0.0
-de	01_solar	2	100	1.0	0.0
-de	02_wind_on	2	100	1.0	0.0
-de	03_wind_off	2	100	1.0	0.0
-de	04_res	2	100	1.0	0.0
-de	05_nuclear	2	100	1.0	0.0
+de	01_solar	2	100	0.0	1.0
+de	02_wind_on	2	100	0.0	1.0
+de	03_wind_off	2	100	0.0	1.0
+de	04_res	2	100	0.0	1.0
+de	05_nuclear	2	100	0.0	1.0
 de	06_coal	2	100	0.0	0.0
 de	07_gas	2	100	0.0	0.0
 de	08_non-res	2	100	0.0	0.0
 de	09_hydro_pump	2	100	0.0	0.0
-de	01_solar	2	101	1.0	0.0
-de	02_wind_on	2	101	1.0	0.0
-de	03_wind_off	2	101	1.0	0.0
-de	04_res	2	101	1.0	0.0
-de	05_nuclear	2	101	1.0	0.0
+de	01_solar	2	101	0.0	1.0
+de	02_wind_on	2	101	0.0	1.0
+de	03_wind_off	2	101	0.0	1.0
+de	04_res	2	101	0.0	1.0
+de	05_nuclear	2	101	0.0	1.0
 de	06_coal	2	101	0.0	0.0
 de	07_gas	2	101	0.0	0.0
 de	08_non-res	2	101	0.0	0.0
 de	09_hydro_pump	2	101	0.0	0.0
-de	01_solar	2	102	1.0	0.0
-de	02_wind_on	2	102	1.0	0.0
-de	03_wind_off	2	102	1.0	0.0
-de	04_res	2	102	1.0	0.0
-de	05_nuclear	2	102	1.0	0.0
-de	06_coal	2	102	1.0	0.0
+de	01_solar	2	102	0.0	1.0
+de	02_wind_on	2	102	0.0	1.0
+de	03_wind_off	2	102	0.0	1.0
+de	04_res	2	102	0.0	1.0
+de	05_nuclear	2	102	0.0	1.0
+de	06_coal	2	102	0.0	1.0
 de	07_gas	2	102	0.0	0.0
 de	08_non-res	2	102	0.0	0.0
 de	09_hydro_pump	2	102	0.0	0.0
-de	01_solar	2	103	1.0	0.0
-de	02_wind_on	2	103	1.0	0.0
-de	03_wind_off	2	103	1.0	0.0
-de	04_res	2	103	1.0	0.0
-de	05_nuclear	2	103	1.0	0.0
-de	06_coal	2	103	1.0	0.0
+de	01_solar	2	103	0.0	1.0
+de	02_wind_on	2	103	0.0	1.0
+de	03_wind_off	2	103	0.0	1.0
+de	04_res	2	103	0.0	1.0
+de	05_nuclear	2	103	0.0	1.0
+de	06_coal	2	103	0.0	1.0
 de	07_gas	2	103	0.0	0.0
 de	08_non-res	2	103	0.0	0.0
 de	09_hydro_pump	2	103	0.0	0.0
-de	01_solar	2	104	1.0	0.0
-de	02_wind_on	2	104	1.0	0.0
-de	03_wind_off	2	104	1.0	0.0
-de	04_res	2	104	1.0	0.0
-de	05_nuclear	2	104	1.0	0.0
-de	06_coal	2	104	1.0	0.0
+de	01_solar	2	104	0.0	1.0
+de	02_wind_on	2	104	0.0	1.0
+de	03_wind_off	2	104	0.0	1.0
+de	04_res	2	104	0.0	1.0
+de	05_nuclear	2	104	0.0	1.0
+de	06_coal	2	104	0.0	1.0
 de	07_gas	2	104	0.0	0.0
 de	08_non-res	2	104	0.0	0.0
 de	09_hydro_pump	2	104	0.0	0.0
-de	01_solar	2	105	1.0	0.0
-de	02_wind_on	2	105	1.0	0.0
-de	03_wind_off	2	105	1.0	0.0
-de	04_res	2	105	1.0	0.0
-de	05_nuclear	2	105	1.0	0.0
-de	06_coal	2	105	1.0	0.0
+de	01_solar	2	105	0.0	1.0
+de	02_wind_on	2	105	0.0	1.0
+de	03_wind_off	2	105	0.0	1.0
+de	04_res	2	105	0.0	1.0
+de	05_nuclear	2	105	0.0	1.0
+de	06_coal	2	105	0.0	1.0
 de	07_gas	2	105	0.0	0.0
 de	08_non-res	2	105	0.0	0.0
 de	09_hydro_pump	2	105	0.0	0.0
-de	01_solar	2	106	1.0	0.0
-de	02_wind_on	2	106	1.0	0.0
-de	03_wind_off	2	106	1.0	0.0
-de	04_res	2	106	1.0	0.0
-de	05_nuclear	2	106	1.0	0.0
-de	06_coal	2	106	1.0	0.0
+de	01_solar	2	106	0.0	1.0
+de	02_wind_on	2	106	0.0	1.0
+de	03_wind_off	2	106	0.0	1.0
+de	04_res	2	106	0.0	1.0
+de	05_nuclear	2	106	0.0	1.0
+de	06_coal	2	106	0.0	1.0
 de	07_gas	2	106	0.0	0.0
 de	08_non-res	2	106	0.0	0.0
 de	09_hydro_pump	2	106	0.0	0.0
-de	01_solar	2	107	1.0	0.0
-de	02_wind_on	2	107	1.0	0.0
-de	03_wind_off	2	107	1.0	0.0
-de	04_res	2	107	1.0	0.0
-de	05_nuclear	2	107	1.0	0.0
-de	06_coal	2	107	1.0	0.0
+de	01_solar	2	107	0.0	1.0
+de	02_wind_on	2	107	0.0	1.0
+de	03_wind_off	2	107	0.0	1.0
+de	04_res	2	107	0.0	1.0
+de	05_nuclear	2	107	0.0	1.0
+de	06_coal	2	107	0.0	1.0
 de	07_gas	2	107	0.0	0.0
 de	08_non-res	2	107	0.0	0.0
 de	09_hydro_pump	2	107	0.0	0.0
-de	01_solar	2	108	1.0	0.0
-de	02_wind_on	2	108	1.0	0.0
-de	03_wind_off	2	108	1.0	0.0
-de	04_res	2	108	1.0	0.0
-de	05_nuclear	2	108	1.0	0.0
-de	06_coal	2	108	1.0	0.0
+de	01_solar	2	108	0.0	1.0
+de	02_wind_on	2	108	0.0	1.0
+de	03_wind_off	2	108	0.0	1.0
+de	04_res	2	108	0.0	1.0
+de	05_nuclear	2	108	0.0	1.0
+de	06_coal	2	108	0.0	1.0
 de	07_gas	2	108	0.0	0.0
 de	08_non-res	2	108	0.0	0.0
 de	09_hydro_pump	2	108	0.0	0.0
-de	01_solar	2	109	1.0	0.0
-de	02_wind_on	2	109	1.0	0.0
-de	03_wind_off	2	109	1.0	0.0
-de	04_res	2	109	1.0	0.0
-de	05_nuclear	2	109	1.0	0.0
-de	06_coal	2	109	1.0	0.0
+de	01_solar	2	109	0.0	1.0
+de	02_wind_on	2	109	0.0	1.0
+de	03_wind_off	2	109	0.0	1.0
+de	04_res	2	109	0.0	1.0
+de	05_nuclear	2	109	0.0	1.0
+de	06_coal	2	109	0.0	1.0
 de	07_gas	2	109	0.0	0.0
 de	08_non-res	2	109	0.0	0.0
 de	09_hydro_pump	2	109	0.0	0.0
-de	01_solar	2	110	1.0	0.0
-de	02_wind_on	2	110	1.0	0.0
-de	03_wind_off	2	110	1.0	0.0
-de	04_res	2	110	1.0	0.0
-de	05_nuclear	2	110	1.0	0.0
-de	06_coal	2	110	1.0	0.0
+de	01_solar	2	110	0.0	1.0
+de	02_wind_on	2	110	0.0	1.0
+de	03_wind_off	2	110	0.0	1.0
+de	04_res	2	110	0.0	1.0
+de	05_nuclear	2	110	0.0	1.0
+de	06_coal	2	110	0.0	1.0
 de	07_gas	2	110	0.0	0.0
 de	08_non-res	2	110	0.0	0.0
 de	09_hydro_pump	2	110	0.0	0.0
-de	01_solar	2	111	1.0	0.0
-de	02_wind_on	2	111	1.0	0.0
-de	03_wind_off	2	111	1.0	0.0
-de	04_res	2	111	1.0	0.0
-de	05_nuclear	2	111	1.0	0.0
-de	06_coal	2	111	1.0	0.0
+de	01_solar	2	111	0.0	1.0
+de	02_wind_on	2	111	0.0	1.0
+de	03_wind_off	2	111	0.0	1.0
+de	04_res	2	111	0.0	1.0
+de	05_nuclear	2	111	0.0	1.0
+de	06_coal	2	111	0.0	1.0
 de	07_gas	2	111	0.0	0.0
 de	08_non-res	2	111	0.0	0.0
 de	09_hydro_pump	2	111	0.0	0.0
-de	01_solar	2	112	1.0	0.0
-de	02_wind_on	2	112	1.0	0.0
-de	03_wind_off	2	112	1.0	0.0
-de	04_res	2	112	1.0	0.0
-de	05_nuclear	2	112	1.0	0.0
-de	06_coal	2	112	1.0	0.0
+de	01_solar	2	112	0.0	1.0
+de	02_wind_on	2	112	0.0	1.0
+de	03_wind_off	2	112	0.0	1.0
+de	04_res	2	112	0.0	1.0
+de	05_nuclear	2	112	0.0	1.0
+de	06_coal	2	112	0.0	1.0
 de	07_gas	2	112	0.0	0.0
 de	08_non-res	2	112	0.0	0.0
 de	09_hydro_pump	2	112	0.0	0.0
-de	01_solar	2	113	1.0	0.0
-de	02_wind_on	2	113	1.0	0.0
-de	03_wind_off	2	113	1.0	0.0
-de	04_res	2	113	1.0	0.0
-de	05_nuclear	2	113	1.0	0.0
-de	06_coal	2	113	1.0	0.0
+de	01_solar	2	113	0.0	1.0
+de	02_wind_on	2	113	0.0	1.0
+de	03_wind_off	2	113	0.0	1.0
+de	04_res	2	113	0.0	1.0
+de	05_nuclear	2	113	0.0	1.0
+de	06_coal	2	113	0.0	1.0
 de	07_gas	2	113	0.0	0.0
 de	08_non-res	2	113	0.0	0.0
 de	09_hydro_pump	2	113	0.0	0.0
-de	01_solar	2	114	1.0	0.0
-de	02_wind_on	2	114	1.0	0.0
-de	03_wind_off	2	114	1.0	0.0
-de	04_res	2	114	1.0	0.0
-de	05_nuclear	2	114	1.0	0.0
-de	06_coal	2	114	1.0	0.0
+de	01_solar	2	114	0.0	1.0
+de	02_wind_on	2	114	0.0	1.0
+de	03_wind_off	2	114	0.0	1.0
+de	04_res	2	114	0.0	1.0
+de	05_nuclear	2	114	0.0	1.0
+de	06_coal	2	114	0.0	1.0
 de	07_gas	2	114	0.0	0.0
 de	08_non-res	2	114	0.0	0.0
 de	09_hydro_pump	2	114	0.0	0.0
-de	01_solar	2	115	1.0	0.0
-de	02_wind_on	2	115	1.0	0.0
-de	03_wind_off	2	115	1.0	0.0
-de	04_res	2	115	1.0	0.0
-de	05_nuclear	2	115	1.0	0.0
-de	06_coal	2	115	1.0	0.0
+de	01_solar	2	115	0.0	1.0
+de	02_wind_on	2	115	0.0	1.0
+de	03_wind_off	2	115	0.0	1.0
+de	04_res	2	115	0.0	1.0
+de	05_nuclear	2	115	0.0	1.0
+de	06_coal	2	115	0.0	1.0
 de	07_gas	2	115	0.0	0.0
 de	08_non-res	2	115	0.0	0.0
 de	09_hydro_pump	2	115	0.0	0.0
-de	01_solar	2	116	1.0	0.0
-de	02_wind_on	2	116	1.0	0.0
-de	03_wind_off	2	116	1.0	0.0
-de	04_res	2	116	1.0	0.0
-de	05_nuclear	2	116	1.0	0.0
-de	06_coal	2	116	1.0	0.0
+de	01_solar	2	116	0.0	1.0
+de	02_wind_on	2	116	0.0	1.0
+de	03_wind_off	2	116	0.0	1.0
+de	04_res	2	116	0.0	1.0
+de	05_nuclear	2	116	0.0	1.0
+de	06_coal	2	116	0.0	1.0
 de	07_gas	2	116	0.0	0.0
 de	08_non-res	2	116	0.0	0.0
 de	09_hydro_pump	2	116	0.0	0.0
-de	01_solar	2	117	1.0	0.0
-de	02_wind_on	2	117	1.0	0.0
-de	03_wind_off	2	117	1.0	0.0
-de	04_res	2	117	1.0	0.0
-de	05_nuclear	2	117	1.0	0.0
-de	06_coal	2	117	1.0	0.0
+de	01_solar	2	117	0.0	1.0
+de	02_wind_on	2	117	0.0	1.0
+de	03_wind_off	2	117	0.0	1.0
+de	04_res	2	117	0.0	1.0
+de	05_nuclear	2	117	0.0	1.0
+de	06_coal	2	117	0.0	1.0
 de	07_gas	2	117	0.0	0.0
 de	08_non-res	2	117	0.0	0.0
 de	09_hydro_pump	2	117	0.0	0.0
-de	01_solar	2	118	1.0	0.0
-de	02_wind_on	2	118	1.0	0.0
-de	03_wind_off	2	118	1.0	0.0
-de	04_res	2	118	1.0	0.0
-de	05_nuclear	2	118	1.0	0.0
-de	06_coal	2	118	1.0	0.0
+de	01_solar	2	118	0.0	1.0
+de	02_wind_on	2	118	0.0	1.0
+de	03_wind_off	2	118	0.0	1.0
+de	04_res	2	118	0.0	1.0
+de	05_nuclear	2	118	0.0	1.0
+de	06_coal	2	118	0.0	1.0
 de	07_gas	2	118	0.0	0.0
 de	08_non-res	2	118	0.0	0.0
 de	09_hydro_pump	2	118	0.0	0.0
-de	01_solar	2	119	1.0	0.0
-de	02_wind_on	2	119	1.0	0.0
-de	03_wind_off	2	119	1.0	0.0
-de	04_res	2	119	1.0	0.0
-de	05_nuclear	2	119	1.0	0.0
-de	06_coal	2	119	1.0	0.0
+de	01_solar	2	119	0.0	1.0
+de	02_wind_on	2	119	0.0	1.0
+de	03_wind_off	2	119	0.0	1.0
+de	04_res	2	119	0.0	1.0
+de	05_nuclear	2	119	0.0	1.0
+de	06_coal	2	119	0.0	1.0
 de	07_gas	2	119	0.0	0.0
 de	08_non-res	2	119	0.0	0.0
 de	09_hydro_pump	2	119	0.0	0.0
-de	01_solar	2	120	1.0	0.0
-de	02_wind_on	2	120	1.0	0.0
-de	03_wind_off	2	120	1.0	0.0
-de	04_res	2	120	1.0	0.0
-de	05_nuclear	2	120	1.0	0.0
-de	06_coal	2	120	1.0	0.0
+de	01_solar	2	120	0.0	1.0
+de	02_wind_on	2	120	0.0	1.0
+de	03_wind_off	2	120	0.0	1.0
+de	04_res	2	120	0.0	1.0
+de	05_nuclear	2	120	0.0	1.0
+de	06_coal	2	120	0.0	1.0
 de	07_gas	2	120	0.0	0.0
 de	08_non-res	2	120	0.0	0.0
 de	09_hydro_pump	2	120	0.0	0.0
-de	01_solar	2	121	1.0	0.0
-de	02_wind_on	2	121	1.0	0.0
-de	03_wind_off	2	121	1.0	0.0
-de	04_res	2	121	1.0	0.0
-de	05_nuclear	2	121	1.0	0.0
-de	06_coal	2	121	1.0	0.0
+de	01_solar	2	121	0.0	1.0
+de	02_wind_on	2	121	0.0	1.0
+de	03_wind_off	2	121	0.0	1.0
+de	04_res	2	121	0.0	1.0
+de	05_nuclear	2	121	0.0	1.0
+de	06_coal	2	121	0.0	1.0
 de	07_gas	2	121	0.0	0.0
 de	08_non-res	2	121	0.0	0.0
 de	09_hydro_pump	2	121	0.0	0.0
-de	01_solar	2	122	1.0	0.0
-de	02_wind_on	2	122	1.0	0.0
-de	03_wind_off	2	122	1.0	0.0
-de	04_res	2	122	1.0	0.0
-de	05_nuclear	2	122	1.0	0.0
-de	06_coal	2	122	1.0	0.0
-de	07_gas	2	122	1.0	0.0
+de	01_solar	2	122	0.0	1.0
+de	02_wind_on	2	122	0.0	1.0
+de	03_wind_off	2	122	0.0	1.0
+de	04_res	2	122	0.0	1.0
+de	05_nuclear	2	122	0.0	1.0
+de	06_coal	2	122	0.0	1.0
+de	07_gas	2	122	0.0	1.0
 de	08_non-res	2	122	0.0	0.0
 de	09_hydro_pump	2	122	0.0	0.0
-de	01_solar	2	123	1.0	0.0
-de	02_wind_on	2	123	1.0	0.0
-de	03_wind_off	2	123	1.0	0.0
-de	04_res	2	123	1.0	0.0
-de	05_nuclear	2	123	1.0	0.0
-de	06_coal	2	123	1.0	0.0
-de	07_gas	2	123	1.0	0.0
+de	01_solar	2	123	0.0	1.0
+de	02_wind_on	2	123	0.0	1.0
+de	03_wind_off	2	123	0.0	1.0
+de	04_res	2	123	0.0	1.0
+de	05_nuclear	2	123	0.0	1.0
+de	06_coal	2	123	0.0	1.0
+de	07_gas	2	123	0.0	1.0
 de	08_non-res	2	123	0.0	0.0
 de	09_hydro_pump	2	123	0.0	0.0
-de	01_solar	2	124	1.0	0.0
-de	02_wind_on	2	124	1.0	0.0
-de	03_wind_off	2	124	1.0	0.0
-de	04_res	2	124	1.0	0.0
-de	05_nuclear	2	124	1.0	0.0
-de	06_coal	2	124	1.0	0.0
-de	07_gas	2	124	1.0	0.0
+de	01_solar	2	124	0.0	1.0
+de	02_wind_on	2	124	0.0	1.0
+de	03_wind_off	2	124	0.0	1.0
+de	04_res	2	124	0.0	1.0
+de	05_nuclear	2	124	0.0	1.0
+de	06_coal	2	124	0.0	1.0
+de	07_gas	2	124	0.0	1.0
 de	08_non-res	2	124	0.0	0.0
 de	09_hydro_pump	2	124	0.0	0.0
-de	01_solar	2	125	1.0	0.0
-de	02_wind_on	2	125	1.0	0.0
-de	03_wind_off	2	125	1.0	0.0
-de	04_res	2	125	1.0	0.0
-de	05_nuclear	2	125	1.0	0.0
-de	06_coal	2	125	1.0	0.0
-de	07_gas	2	125	1.0	0.0
+de	01_solar	2	125	0.0	1.0
+de	02_wind_on	2	125	0.0	1.0
+de	03_wind_off	2	125	0.0	1.0
+de	04_res	2	125	0.0	1.0
+de	05_nuclear	2	125	0.0	1.0
+de	06_coal	2	125	0.0	1.0
+de	07_gas	2	125	0.0	1.0
 de	08_non-res	2	125	0.0	0.0
 de	09_hydro_pump	2	125	0.0	0.0
-de	01_solar	2	126	1.0	0.0
-de	02_wind_on	2	126	1.0	0.0
-de	03_wind_off	2	126	1.0	0.0
-de	04_res	2	126	1.0	0.0
-de	05_nuclear	2	126	1.0	0.0
-de	06_coal	2	126	1.0	0.0
-de	07_gas	2	126	1.0	0.0
+de	01_solar	2	126	0.0	1.0
+de	02_wind_on	2	126	0.0	1.0
+de	03_wind_off	2	126	0.0	1.0
+de	04_res	2	126	0.0	1.0
+de	05_nuclear	2	126	0.0	1.0
+de	06_coal	2	126	0.0	1.0
+de	07_gas	2	126	0.0	1.0
 de	08_non-res	2	126	0.0	0.0
 de	09_hydro_pump	2	126	0.0	0.0
-de	01_solar	2	127	1.0	0.0
-de	02_wind_on	2	127	1.0	0.0
-de	03_wind_off	2	127	1.0	0.0
-de	04_res	2	127	1.0	0.0
-de	05_nuclear	2	127	1.0	0.0
-de	06_coal	2	127	1.0	0.0
-de	07_gas	2	127	1.0	0.0
+de	01_solar	2	127	0.0	1.0
+de	02_wind_on	2	127	0.0	1.0
+de	03_wind_off	2	127	0.0	1.0
+de	04_res	2	127	0.0	1.0
+de	05_nuclear	2	127	0.0	1.0
+de	06_coal	2	127	0.0	1.0
+de	07_gas	2	127	0.0	1.0
 de	08_non-res	2	127	0.0	0.0
 de	09_hydro_pump	2	127	0.0	0.0
-de	01_solar	2	128	1.0	0.0
-de	02_wind_on	2	128	1.0	0.0
-de	03_wind_off	2	128	1.0	0.0
-de	04_res	2	128	1.0	0.0
-de	05_nuclear	2	128	1.0	0.0
-de	06_coal	2	128	1.0	0.0
-de	07_gas	2	128	1.0	0.0
+de	01_solar	2	128	0.0	1.0
+de	02_wind_on	2	128	0.0	1.0
+de	03_wind_off	2	128	0.0	1.0
+de	04_res	2	128	0.0	1.0
+de	05_nuclear	2	128	0.0	1.0
+de	06_coal	2	128	0.0	1.0
+de	07_gas	2	128	0.0	1.0
 de	08_non-res	2	128	0.0	0.0
 de	09_hydro_pump	2	128	0.0	0.0
-de	01_solar	2	129	1.0	0.0
-de	02_wind_on	2	129	1.0	0.0
-de	03_wind_off	2	129	1.0	0.0
-de	04_res	2	129	1.0	0.0
-de	05_nuclear	2	129	1.0	0.0
-de	06_coal	2	129	1.0	0.0
-de	07_gas	2	129	1.0	0.0
+de	01_solar	2	129	0.0	1.0
+de	02_wind_on	2	129	0.0	1.0
+de	03_wind_off	2	129	0.0	1.0
+de	04_res	2	129	0.0	1.0
+de	05_nuclear	2	129	0.0	1.0
+de	06_coal	2	129	0.0	1.0
+de	07_gas	2	129	0.0	1.0
 de	08_non-res	2	129	0.0	0.0
 de	09_hydro_pump	2	129	0.0	0.0
-de	01_solar	2	130	1.0	0.0
-de	02_wind_on	2	130	1.0	0.0
-de	03_wind_off	2	130	1.0	0.0
-de	04_res	2	130	1.0	0.0
-de	05_nuclear	2	130	1.0	0.0
-de	06_coal	2	130	1.0	0.0
-de	07_gas	2	130	1.0	0.0
+de	01_solar	2	130	0.0	1.0
+de	02_wind_on	2	130	0.0	1.0
+de	03_wind_off	2	130	0.0	1.0
+de	04_res	2	130	0.0	1.0
+de	05_nuclear	2	130	0.0	1.0
+de	06_coal	2	130	0.0	1.0
+de	07_gas	2	130	0.0	1.0
 de	08_non-res	2	130	0.0	0.0
 de	09_hydro_pump	2	130	0.0	0.0
-de	01_solar	2	131	1.0	0.0
-de	02_wind_on	2	131	1.0	0.0
-de	03_wind_off	2	131	1.0	0.0
-de	04_res	2	131	1.0	0.0
-de	05_nuclear	2	131	1.0	0.0
-de	06_coal	2	131	1.0	0.0
-de	07_gas	2	131	1.0	0.0
+de	01_solar	2	131	0.0	1.0
+de	02_wind_on	2	131	0.0	1.0
+de	03_wind_off	2	131	0.0	1.0
+de	04_res	2	131	0.0	1.0
+de	05_nuclear	2	131	0.0	1.0
+de	06_coal	2	131	0.0	1.0
+de	07_gas	2	131	0.0	1.0
 de	08_non-res	2	131	0.0	0.0
 de	09_hydro_pump	2	131	0.0	0.0
-de	01_solar	2	132	1.0	0.0
-de	02_wind_on	2	132	1.0	0.0
-de	03_wind_off	2	132	1.0	0.0
-de	04_res	2	132	1.0	0.0
-de	05_nuclear	2	132	1.0	0.0
-de	06_coal	2	132	1.0	0.0
-de	07_gas	2	132	1.0	0.0
+de	01_solar	2	132	0.0	1.0
+de	02_wind_on	2	132	0.0	1.0
+de	03_wind_off	2	132	0.0	1.0
+de	04_res	2	132	0.0	1.0
+de	05_nuclear	2	132	0.0	1.0
+de	06_coal	2	132	0.0	1.0
+de	07_gas	2	132	0.0	1.0
 de	08_non-res	2	132	0.0	0.0
 de	09_hydro_pump	2	132	0.0	0.0
-de	01_solar	2	133	1.0	0.0
-de	02_wind_on	2	133	1.0	0.0
-de	03_wind_off	2	133	1.0	0.0
-de	04_res	2	133	1.0	0.0
-de	05_nuclear	2	133	1.0	0.0
-de	06_coal	2	133	1.0	0.0
-de	07_gas	2	133	1.0	0.0
+de	01_solar	2	133	0.0	1.0
+de	02_wind_on	2	133	0.0	1.0
+de	03_wind_off	2	133	0.0	1.0
+de	04_res	2	133	0.0	1.0
+de	05_nuclear	2	133	0.0	1.0
+de	06_coal	2	133	0.0	1.0
+de	07_gas	2	133	0.0	1.0
 de	08_non-res	2	133	0.0	0.0
 de	09_hydro_pump	2	133	0.0	0.0
-de	01_solar	2	134	1.0	0.0
-de	02_wind_on	2	134	1.0	0.0
-de	03_wind_off	2	134	1.0	0.0
-de	04_res	2	134	1.0	0.0
-de	05_nuclear	2	134	1.0	0.0
-de	06_coal	2	134	1.0	0.0
-de	07_gas	2	134	1.0	0.0
+de	01_solar	2	134	0.0	1.0
+de	02_wind_on	2	134	0.0	1.0
+de	03_wind_off	2	134	0.0	1.0
+de	04_res	2	134	0.0	1.0
+de	05_nuclear	2	134	0.0	1.0
+de	06_coal	2	134	0.0	1.0
+de	07_gas	2	134	0.0	1.0
 de	08_non-res	2	134	0.0	0.0
 de	09_hydro_pump	2	134	0.0	0.0
-de	01_solar	2	135	1.0	0.0
-de	02_wind_on	2	135	1.0	0.0
-de	03_wind_off	2	135	1.0	0.0
-de	04_res	2	135	1.0	0.0
-de	05_nuclear	2	135	1.0	0.0
-de	06_coal	2	135	1.0	0.0
-de	07_gas	2	135	1.0	0.0
+de	01_solar	2	135	0.0	1.0
+de	02_wind_on	2	135	0.0	1.0
+de	03_wind_off	2	135	0.0	1.0
+de	04_res	2	135	0.0	1.0
+de	05_nuclear	2	135	0.0	1.0
+de	06_coal	2	135	0.0	1.0
+de	07_gas	2	135	0.0	1.0
 de	08_non-res	2	135	0.0	0.0
 de	09_hydro_pump	2	135	0.0	0.0
-de	01_solar	2	136	1.0	0.0
-de	02_wind_on	2	136	1.0	0.0
-de	03_wind_off	2	136	1.0	0.0
-de	04_res	2	136	1.0	0.0
-de	05_nuclear	2	136	1.0	0.0
-de	06_coal	2	136	1.0	0.0
-de	07_gas	2	136	1.0	0.0
+de	01_solar	2	136	0.0	1.0
+de	02_wind_on	2	136	0.0	1.0
+de	03_wind_off	2	136	0.0	1.0
+de	04_res	2	136	0.0	1.0
+de	05_nuclear	2	136	0.0	1.0
+de	06_coal	2	136	0.0	1.0
+de	07_gas	2	136	0.0	1.0
 de	08_non-res	2	136	0.0	0.0
 de	09_hydro_pump	2	136	0.0	0.0
-de	01_solar	2	137	1.0	0.0
-de	02_wind_on	2	137	1.0	0.0
-de	03_wind_off	2	137	1.0	0.0
-de	04_res	2	137	1.0	0.0
-de	05_nuclear	2	137	1.0	0.0
-de	06_coal	2	137	1.0	0.0
-de	07_gas	2	137	1.0	0.0
+de	01_solar	2	137	0.0	1.0
+de	02_wind_on	2	137	0.0	1.0
+de	03_wind_off	2	137	0.0	1.0
+de	04_res	2	137	0.0	1.0
+de	05_nuclear	2	137	0.0	1.0
+de	06_coal	2	137	0.0	1.0
+de	07_gas	2	137	0.0	1.0
 de	08_non-res	2	137	0.0	0.0
 de	09_hydro_pump	2	137	0.0	0.0
-de	01_solar	2	138	1.0	0.0
-de	02_wind_on	2	138	1.0	0.0
-de	03_wind_off	2	138	1.0	0.0
-de	04_res	2	138	1.0	0.0
-de	05_nuclear	2	138	1.0	0.0
-de	06_coal	2	138	1.0	0.0
-de	07_gas	2	138	1.0	0.0
+de	01_solar	2	138	0.0	1.0
+de	02_wind_on	2	138	0.0	1.0
+de	03_wind_off	2	138	0.0	1.0
+de	04_res	2	138	0.0	1.0
+de	05_nuclear	2	138	0.0	1.0
+de	06_coal	2	138	0.0	1.0
+de	07_gas	2	138	0.0	1.0
 de	08_non-res	2	138	0.0	0.0
 de	09_hydro_pump	2	138	0.0	0.0
-de	01_solar	2	139	1.0	0.0
-de	02_wind_on	2	139	1.0	0.0
-de	03_wind_off	2	139	1.0	0.0
-de	04_res	2	139	1.0	0.0
-de	05_nuclear	2	139	1.0	0.0
-de	06_coal	2	139	1.0	0.0
-de	07_gas	2	139	1.0	0.0
+de	01_solar	2	139	0.0	1.0
+de	02_wind_on	2	139	0.0	1.0
+de	03_wind_off	2	139	0.0	1.0
+de	04_res	2	139	0.0	1.0
+de	05_nuclear	2	139	0.0	1.0
+de	06_coal	2	139	0.0	1.0
+de	07_gas	2	139	0.0	1.0
 de	08_non-res	2	139	0.0	0.0
 de	09_hydro_pump	2	139	0.0	0.0
-de	01_solar	2	140	1.0	0.0
-de	02_wind_on	2	140	1.0	0.0
-de	03_wind_off	2	140	1.0	0.0
-de	04_res	2	140	1.0	0.0
-de	05_nuclear	2	140	1.0	0.0
-de	06_coal	2	140	1.0	0.0
-de	07_gas	2	140	1.0	0.0
+de	01_solar	2	140	0.0	1.0
+de	02_wind_on	2	140	0.0	1.0
+de	03_wind_off	2	140	0.0	1.0
+de	04_res	2	140	0.0	1.0
+de	05_nuclear	2	140	0.0	1.0
+de	06_coal	2	140	0.0	1.0
+de	07_gas	2	140	0.0	1.0
 de	08_non-res	2	140	0.0	0.0
 de	09_hydro_pump	2	140	0.0	0.0
-de	01_solar	2	141	1.0	0.0
-de	02_wind_on	2	141	1.0	0.0
-de	03_wind_off	2	141	1.0	0.0
-de	04_res	2	141	1.0	0.0
-de	05_nuclear	2	141	1.0	0.0
-de	06_coal	2	141	1.0	0.0
-de	07_gas	2	141	1.0	0.0
+de	01_solar	2	141	0.0	1.0
+de	02_wind_on	2	141	0.0	1.0
+de	03_wind_off	2	141	0.0	1.0
+de	04_res	2	141	0.0	1.0
+de	05_nuclear	2	141	0.0	1.0
+de	06_coal	2	141	0.0	1.0
+de	07_gas	2	141	0.0	1.0
 de	08_non-res	2	141	0.0	0.0
 de	09_hydro_pump	2	141	0.0	0.0
-de	01_solar	2	142	1.0	0.0
-de	02_wind_on	2	142	1.0	0.0
-de	03_wind_off	2	142	1.0	0.0
-de	04_res	2	142	1.0	0.0
-de	05_nuclear	2	142	1.0	0.0
-de	06_coal	2	142	1.0	0.0
-de	07_gas	2	142	1.0	0.0
-de	08_non-res	2	142	1.0	0.0
+de	01_solar	2	142	0.0	1.0
+de	02_wind_on	2	142	0.0	1.0
+de	03_wind_off	2	142	0.0	1.0
+de	04_res	2	142	0.0	1.0
+de	05_nuclear	2	142	0.0	1.0
+de	06_coal	2	142	0.0	1.0
+de	07_gas	2	142	0.0	1.0
+de	08_non-res	2	142	0.0	1.0
 de	09_hydro_pump	2	142	0.0	0.0
-de	01_solar	2	143	1.0	0.0
-de	02_wind_on	2	143	1.0	0.0
-de	03_wind_off	2	143	1.0	0.0
-de	04_res	2	143	1.0	0.0
-de	05_nuclear	2	143	1.0	0.0
-de	06_coal	2	143	1.0	0.0
-de	07_gas	2	143	1.0	0.0
-de	08_non-res	2	143	1.0	0.0
+de	01_solar	2	143	0.0	1.0
+de	02_wind_on	2	143	0.0	1.0
+de	03_wind_off	2	143	0.0	1.0
+de	04_res	2	143	0.0	1.0
+de	05_nuclear	2	143	0.0	1.0
+de	06_coal	2	143	0.0	1.0
+de	07_gas	2	143	0.0	1.0
+de	08_non-res	2	143	0.0	1.0
 de	09_hydro_pump	2	143	0.0	0.0
-de	01_solar	2	144	1.0	0.0
-de	02_wind_on	2	144	1.0	0.0
-de	03_wind_off	2	144	1.0	0.0
-de	04_res	2	144	1.0	0.0
-de	05_nuclear	2	144	1.0	0.0
-de	06_coal	2	144	1.0	0.0
-de	07_gas	2	144	1.0	0.0
-de	08_non-res	2	144	1.0	0.0
+de	01_solar	2	144	0.0	1.0
+de	02_wind_on	2	144	0.0	1.0
+de	03_wind_off	2	144	0.0	1.0
+de	04_res	2	144	0.0	1.0
+de	05_nuclear	2	144	0.0	1.0
+de	06_coal	2	144	0.0	1.0
+de	07_gas	2	144	0.0	1.0
+de	08_non-res	2	144	0.0	1.0
 de	09_hydro_pump	2	144	0.0	0.0
-de	01_solar	2	145	1.0	0.0
-de	02_wind_on	2	145	1.0	0.0
-de	03_wind_off	2	145	1.0	0.0
-de	04_res	2	145	1.0	0.0
-de	05_nuclear	2	145	1.0	0.0
-de	06_coal	2	145	1.0	0.0
-de	07_gas	2	145	1.0	0.0
-de	08_non-res	2	145	1.0	0.0
+de	01_solar	2	145	0.0	1.0
+de	02_wind_on	2	145	0.0	1.0
+de	03_wind_off	2	145	0.0	1.0
+de	04_res	2	145	0.0	1.0
+de	05_nuclear	2	145	0.0	1.0
+de	06_coal	2	145	0.0	1.0
+de	07_gas	2	145	0.0	1.0
+de	08_non-res	2	145	0.0	1.0
 de	09_hydro_pump	2	145	0.0	0.0
-de	01_solar	2	146	1.0	0.0
-de	02_wind_on	2	146	1.0	0.0
-de	03_wind_off	2	146	1.0	0.0
-de	04_res	2	146	1.0	0.0
-de	05_nuclear	2	146	1.0	0.0
-de	06_coal	2	146	1.0	0.0
-de	07_gas	2	146	1.0	0.0
-de	08_non-res	2	146	1.0	0.0
+de	01_solar	2	146	0.0	1.0
+de	02_wind_on	2	146	0.0	1.0
+de	03_wind_off	2	146	0.0	1.0
+de	04_res	2	146	0.0	1.0
+de	05_nuclear	2	146	0.0	1.0
+de	06_coal	2	146	0.0	1.0
+de	07_gas	2	146	0.0	1.0
+de	08_non-res	2	146	0.0	1.0
 de	09_hydro_pump	2	146	0.0	0.0
-de	01_solar	2	147	1.0	0.0
-de	02_wind_on	2	147	1.0	0.0
-de	03_wind_off	2	147	1.0	0.0
-de	04_res	2	147	1.0	0.0
-de	05_nuclear	2	147	1.0	0.0
-de	06_coal	2	147	1.0	0.0
-de	07_gas	2	147	1.0	0.0
-de	08_non-res	2	147	1.0	0.0
+de	01_solar	2	147	0.0	1.0
+de	02_wind_on	2	147	0.0	1.0
+de	03_wind_off	2	147	0.0	1.0
+de	04_res	2	147	0.0	1.0
+de	05_nuclear	2	147	0.0	1.0
+de	06_coal	2	147	0.0	1.0
+de	07_gas	2	147	0.0	1.0
+de	08_non-res	2	147	0.0	1.0
 de	09_hydro_pump	2	147	0.0	0.0
-de	01_solar	2	148	1.0	0.0
-de	02_wind_on	2	148	1.0	0.0
-de	03_wind_off	2	148	1.0	0.0
-de	04_res	2	148	1.0	0.0
-de	05_nuclear	2	148	1.0	0.0
-de	06_coal	2	148	1.0	0.0
-de	07_gas	2	148	1.0	0.0
-de	08_non-res	2	148	1.0	0.0
+de	01_solar	2	148	0.0	1.0
+de	02_wind_on	2	148	0.0	1.0
+de	03_wind_off	2	148	0.0	1.0
+de	04_res	2	148	0.0	1.0
+de	05_nuclear	2	148	0.0	1.0
+de	06_coal	2	148	0.0	1.0
+de	07_gas	2	148	0.0	1.0
+de	08_non-res	2	148	0.0	1.0
 de	09_hydro_pump	2	148	0.0	0.0
-de	01_solar	2	149	1.0	0.0
-de	02_wind_on	2	149	1.0	0.0
-de	03_wind_off	2	149	1.0	0.0
-de	04_res	2	149	1.0	0.0
-de	05_nuclear	2	149	1.0	0.0
-de	06_coal	2	149	1.0	0.0
-de	07_gas	2	149	1.0	0.0
-de	08_non-res	2	149	1.0	0.0
+de	01_solar	2	149	0.0	1.0
+de	02_wind_on	2	149	0.0	1.0
+de	03_wind_off	2	149	0.0	1.0
+de	04_res	2	149	0.0	1.0
+de	05_nuclear	2	149	0.0	1.0
+de	06_coal	2	149	0.0	1.0
+de	07_gas	2	149	0.0	1.0
+de	08_non-res	2	149	0.0	1.0
 de	09_hydro_pump	2	149	0.0	0.0
-de	01_solar	2	150	1.0	0.0
-de	02_wind_on	2	150	1.0	0.0
-de	03_wind_off	2	150	1.0	0.0
-de	04_res	2	150	1.0	0.0
-de	05_nuclear	2	150	1.0	0.0
-de	06_coal	2	150	1.0	0.0
-de	07_gas	2	150	1.0	0.0
-de	08_non-res	2	150	1.0	0.0
+de	01_solar	2	150	0.0	1.0
+de	02_wind_on	2	150	0.0	1.0
+de	03_wind_off	2	150	0.0	1.0
+de	04_res	2	150	0.0	1.0
+de	05_nuclear	2	150	0.0	1.0
+de	06_coal	2	150	0.0	1.0
+de	07_gas	2	150	0.0	1.0
+de	08_non-res	2	150	0.0	1.0
 de	09_hydro_pump	2	150	0.0	0.0
-de	01_solar	2	151	1.0	0.0
-de	02_wind_on	2	151	1.0	0.0
-de	03_wind_off	2	151	1.0	0.0
-de	04_res	2	151	1.0	0.0
-de	05_nuclear	2	151	1.0	0.0
-de	06_coal	2	151	1.0	0.0
-de	07_gas	2	151	1.0	0.0
-de	08_non-res	2	151	1.0	0.0
+de	01_solar	2	151	0.0	1.0
+de	02_wind_on	2	151	0.0	1.0
+de	03_wind_off	2	151	0.0	1.0
+de	04_res	2	151	0.0	1.0
+de	05_nuclear	2	151	0.0	1.0
+de	06_coal	2	151	0.0	1.0
+de	07_gas	2	151	0.0	1.0
+de	08_non-res	2	151	0.0	1.0
 de	09_hydro_pump	2	151	0.0	0.0
-de	01_solar	2	152	1.0	0.0
-de	02_wind_on	2	152	1.0	0.0
-de	03_wind_off	2	152	1.0	0.0
-de	04_res	2	152	1.0	0.0
-de	05_nuclear	2	152	1.0	0.0
-de	06_coal	2	152	1.0	0.0
-de	07_gas	2	152	1.0	0.0
-de	08_non-res	2	152	1.0	0.0
+de	01_solar	2	152	0.0	1.0
+de	02_wind_on	2	152	0.0	1.0
+de	03_wind_off	2	152	0.0	1.0
+de	04_res	2	152	0.0	1.0
+de	05_nuclear	2	152	0.0	1.0
+de	06_coal	2	152	0.0	1.0
+de	07_gas	2	152	0.0	1.0
+de	08_non-res	2	152	0.0	1.0
 de	09_hydro_pump	2	152	0.0	0.0
-de	01_solar	2	153	1.0	0.0
-de	02_wind_on	2	153	1.0	0.0
-de	03_wind_off	2	153	1.0	0.0
-de	04_res	2	153	1.0	0.0
-de	05_nuclear	2	153	1.0	0.0
-de	06_coal	2	153	1.0	0.0
-de	07_gas	2	153	1.0	0.0
-de	08_non-res	2	153	1.0	0.0
+de	01_solar	2	153	0.0	1.0
+de	02_wind_on	2	153	0.0	1.0
+de	03_wind_off	2	153	0.0	1.0
+de	04_res	2	153	0.0	1.0
+de	05_nuclear	2	153	0.0	1.0
+de	06_coal	2	153	0.0	1.0
+de	07_gas	2	153	0.0	1.0
+de	08_non-res	2	153	0.0	1.0
 de	09_hydro_pump	2	153	0.0	0.0
-de	01_solar	2	154	1.0	0.0
-de	02_wind_on	2	154	1.0	0.0
-de	03_wind_off	2	154	1.0	0.0
-de	04_res	2	154	1.0	0.0
-de	05_nuclear	2	154	1.0	0.0
-de	06_coal	2	154	1.0	0.0
-de	07_gas	2	154	1.0	0.0
-de	08_non-res	2	154	1.0	0.0
+de	01_solar	2	154	0.0	1.0
+de	02_wind_on	2	154	0.0	1.0
+de	03_wind_off	2	154	0.0	1.0
+de	04_res	2	154	0.0	1.0
+de	05_nuclear	2	154	0.0	1.0
+de	06_coal	2	154	0.0	1.0
+de	07_gas	2	154	0.0	1.0
+de	08_non-res	2	154	0.0	1.0
 de	09_hydro_pump	2	154	0.0	0.0
-de	01_solar	2	155	1.0	0.0
-de	02_wind_on	2	155	1.0	0.0
-de	03_wind_off	2	155	1.0	0.0
-de	04_res	2	155	1.0	0.0
-de	05_nuclear	2	155	1.0	0.0
-de	06_coal	2	155	1.0	0.0
-de	07_gas	2	155	1.0	0.0
-de	08_non-res	2	155	1.0	0.0
+de	01_solar	2	155	0.0	1.0
+de	02_wind_on	2	155	0.0	1.0
+de	03_wind_off	2	155	0.0	1.0
+de	04_res	2	155	0.0	1.0
+de	05_nuclear	2	155	0.0	1.0
+de	06_coal	2	155	0.0	1.0
+de	07_gas	2	155	0.0	1.0
+de	08_non-res	2	155	0.0	1.0
 de	09_hydro_pump	2	155	0.0	0.0
-de	01_solar	2	156	1.0	0.0
-de	02_wind_on	2	156	1.0	0.0
-de	03_wind_off	2	156	1.0	0.0
-de	04_res	2	156	1.0	0.0
-de	05_nuclear	2	156	1.0	0.0
-de	06_coal	2	156	1.0	0.0
-de	07_gas	2	156	1.0	0.0
-de	08_non-res	2	156	1.0	0.0
+de	01_solar	2	156	0.0	1.0
+de	02_wind_on	2	156	0.0	1.0
+de	03_wind_off	2	156	0.0	1.0
+de	04_res	2	156	0.0	1.0
+de	05_nuclear	2	156	0.0	1.0
+de	06_coal	2	156	0.0	1.0
+de	07_gas	2	156	0.0	1.0
+de	08_non-res	2	156	0.0	1.0
 de	09_hydro_pump	2	156	0.0	0.0
-de	01_solar	2	157	1.0	0.0
-de	02_wind_on	2	157	1.0	0.0
-de	03_wind_off	2	157	1.0	0.0
-de	04_res	2	157	1.0	0.0
-de	05_nuclear	2	157	1.0	0.0
-de	06_coal	2	157	1.0	0.0
-de	07_gas	2	157	1.0	0.0
-de	08_non-res	2	157	1.0	0.0
+de	01_solar	2	157	0.0	1.0
+de	02_wind_on	2	157	0.0	1.0
+de	03_wind_off	2	157	0.0	1.0
+de	04_res	2	157	0.0	1.0
+de	05_nuclear	2	157	0.0	1.0
+de	06_coal	2	157	0.0	1.0
+de	07_gas	2	157	0.0	1.0
+de	08_non-res	2	157	0.0	1.0
 de	09_hydro_pump	2	157	0.0	0.0
-de	01_solar	2	158	1.0	0.0
-de	02_wind_on	2	158	1.0	0.0
-de	03_wind_off	2	158	1.0	0.0
-de	04_res	2	158	1.0	0.0
-de	05_nuclear	2	158	1.0	0.0
-de	06_coal	2	158	1.0	0.0
-de	07_gas	2	158	1.0	0.0
-de	08_non-res	2	158	1.0	0.0
+de	01_solar	2	158	0.0	1.0
+de	02_wind_on	2	158	0.0	1.0
+de	03_wind_off	2	158	0.0	1.0
+de	04_res	2	158	0.0	1.0
+de	05_nuclear	2	158	0.0	1.0
+de	06_coal	2	158	0.0	1.0
+de	07_gas	2	158	0.0	1.0
+de	08_non-res	2	158	0.0	1.0
 de	09_hydro_pump	2	158	0.0	0.0
-de	01_solar	2	159	1.0	0.0
-de	02_wind_on	2	159	1.0	0.0
-de	03_wind_off	2	159	1.0	0.0
-de	04_res	2	159	1.0	0.0
-de	05_nuclear	2	159	1.0	0.0
-de	06_coal	2	159	1.0	0.0
-de	07_gas	2	159	1.0	0.0
-de	08_non-res	2	159	1.0	0.0
+de	01_solar	2	159	0.0	1.0
+de	02_wind_on	2	159	0.0	1.0
+de	03_wind_off	2	159	0.0	1.0
+de	04_res	2	159	0.0	1.0
+de	05_nuclear	2	159	0.0	1.0
+de	06_coal	2	159	0.0	1.0
+de	07_gas	2	159	0.0	1.0
+de	08_non-res	2	159	0.0	1.0
 de	09_hydro_pump	2	159	0.0	0.0
-de	01_solar	2	160	1.0	0.0
-de	02_wind_on	2	160	1.0	0.0
-de	03_wind_off	2	160	1.0	0.0
-de	04_res	2	160	1.0	0.0
-de	05_nuclear	2	160	1.0	0.0
-de	06_coal	2	160	1.0	0.0
-de	07_gas	2	160	1.0	0.0
-de	08_non-res	2	160	1.0	0.0
+de	01_solar	2	160	0.0	1.0
+de	02_wind_on	2	160	0.0	1.0
+de	03_wind_off	2	160	0.0	1.0
+de	04_res	2	160	0.0	1.0
+de	05_nuclear	2	160	0.0	1.0
+de	06_coal	2	160	0.0	1.0
+de	07_gas	2	160	0.0	1.0
+de	08_non-res	2	160	0.0	1.0
 de	09_hydro_pump	2	160	0.0	0.0
-de	01_solar	2	161	1.0	0.0
-de	02_wind_on	2	161	1.0	0.0
-de	03_wind_off	2	161	1.0	0.0
-de	04_res	2	161	1.0	0.0
-de	05_nuclear	2	161	1.0	0.0
-de	06_coal	2	161	1.0	0.0
-de	07_gas	2	161	1.0	0.0
-de	08_non-res	2	161	1.0	0.0
+de	01_solar	2	161	0.0	1.0
+de	02_wind_on	2	161	0.0	1.0
+de	03_wind_off	2	161	0.0	1.0
+de	04_res	2	161	0.0	1.0
+de	05_nuclear	2	161	0.0	1.0
+de	06_coal	2	161	0.0	1.0
+de	07_gas	2	161	0.0	1.0
+de	08_non-res	2	161	0.0	1.0
 de	09_hydro_pump	2	161	0.0	0.0
-de	01_solar	2	162	1.0	0.0
-de	02_wind_on	2	162	1.0	0.0
-de	03_wind_off	2	162	1.0	0.0
-de	04_res	2	162	1.0	0.0
-de	05_nuclear	2	162	1.0	0.0
-de	06_coal	2	162	1.0	0.0
-de	07_gas	2	162	1.0	0.0
-de	08_non-res	2	162	1.0	0.0
-de	09_hydro_pump	2	162	1.0	0.0
-de	01_solar	2	163	1.0	0.0
-de	02_wind_on	2	163	1.0	0.0
-de	03_wind_off	2	163	1.0	0.0
-de	04_res	2	163	1.0	0.0
-de	05_nuclear	2	163	1.0	0.0
-de	06_coal	2	163	1.0	0.0
-de	07_gas	2	163	1.0	0.0
-de	08_non-res	2	163	1.0	0.0
-de	09_hydro_pump	2	163	1.0	0.0
-de	01_solar	2	164	1.0	0.0
-de	02_wind_on	2	164	1.0	0.0
-de	03_wind_off	2	164	1.0	0.0
-de	04_res	2	164	1.0	0.0
-de	05_nuclear	2	164	1.0	0.0
-de	06_coal	2	164	1.0	0.0
-de	07_gas	2	164	1.0	0.0
-de	08_non-res	2	164	1.0	0.0
-de	09_hydro_pump	2	164	1.0	0.0
-de	01_solar	2	165	1.0	0.0
-de	02_wind_on	2	165	1.0	0.0
-de	03_wind_off	2	165	1.0	0.0
-de	04_res	2	165	1.0	0.0
-de	05_nuclear	2	165	1.0	0.0
-de	06_coal	2	165	1.0	0.0
-de	07_gas	2	165	1.0	0.0
-de	08_non-res	2	165	1.0	0.0
-de	09_hydro_pump	2	165	1.0	0.0
-de	01_solar	2	166	1.0	0.0
-de	02_wind_on	2	166	1.0	0.0
-de	03_wind_off	2	166	1.0	0.0
-de	04_res	2	166	1.0	0.0
-de	05_nuclear	2	166	1.0	0.0
-de	06_coal	2	166	1.0	0.0
-de	07_gas	2	166	1.0	0.0
-de	08_non-res	2	166	1.0	0.0
-de	09_hydro_pump	2	166	1.0	0.0
-de	01_solar	2	167	1.0	0.0
-de	02_wind_on	2	167	1.0	0.0
-de	03_wind_off	2	167	1.0	0.0
-de	04_res	2	167	1.0	0.0
-de	05_nuclear	2	167	1.0	0.0
-de	06_coal	2	167	1.0	0.0
-de	07_gas	2	167	1.0	0.0
-de	08_non-res	2	167	1.0	0.0
-de	09_hydro_pump	2	167	1.0	0.0
-de	01_solar	2	168	1.0	0.0
-de	02_wind_on	2	168	1.0	0.0
-de	03_wind_off	2	168	1.0	0.0
-de	04_res	2	168	1.0	0.0
-de	05_nuclear	2	168	1.0	0.0
-de	06_coal	2	168	1.0	0.0
-de	07_gas	2	168	1.0	0.0
-de	08_non-res	2	168	1.0	0.0
-de	09_hydro_pump	2	168	1.0	0.0
+de	01_solar	2	162	0.0	1.0
+de	02_wind_on	2	162	0.0	1.0
+de	03_wind_off	2	162	0.0	1.0
+de	04_res	2	162	0.0	1.0
+de	05_nuclear	2	162	0.0	1.0
+de	06_coal	2	162	0.0	1.0
+de	07_gas	2	162	0.0	1.0
+de	08_non-res	2	162	0.0	1.0
+de	09_hydro_pump	2	162	0.0	1.0
+de	01_solar	2	163	0.0	1.0
+de	02_wind_on	2	163	0.0	1.0
+de	03_wind_off	2	163	0.0	1.0
+de	04_res	2	163	0.0	1.0
+de	05_nuclear	2	163	0.0	1.0
+de	06_coal	2	163	0.0	1.0
+de	07_gas	2	163	0.0	1.0
+de	08_non-res	2	163	0.0	1.0
+de	09_hydro_pump	2	163	0.0	1.0
+de	01_solar	2	164	0.0	1.0
+de	02_wind_on	2	164	0.0	1.0
+de	03_wind_off	2	164	0.0	1.0
+de	04_res	2	164	0.0	1.0
+de	05_nuclear	2	164	0.0	1.0
+de	06_coal	2	164	0.0	1.0
+de	07_gas	2	164	0.0	1.0
+de	08_non-res	2	164	0.0	1.0
+de	09_hydro_pump	2	164	0.0	1.0
+de	01_solar	2	165	0.0	1.0
+de	02_wind_on	2	165	0.0	1.0
+de	03_wind_off	2	165	0.0	1.0
+de	04_res	2	165	0.0	1.0
+de	05_nuclear	2	165	0.0	1.0
+de	06_coal	2	165	0.0	1.0
+de	07_gas	2	165	0.0	1.0
+de	08_non-res	2	165	0.0	1.0
+de	09_hydro_pump	2	165	0.0	1.0
+de	01_solar	2	166	0.0	1.0
+de	02_wind_on	2	166	0.0	1.0
+de	03_wind_off	2	166	0.0	1.0
+de	04_res	2	166	0.0	1.0
+de	05_nuclear	2	166	0.0	1.0
+de	06_coal	2	166	0.0	1.0
+de	07_gas	2	166	0.0	1.0
+de	08_non-res	2	166	0.0	1.0
+de	09_hydro_pump	2	166	0.0	1.0
+de	01_solar	2	167	0.0	1.0
+de	02_wind_on	2	167	0.0	1.0
+de	03_wind_off	2	167	0.0	1.0
+de	04_res	2	167	0.0	1.0
+de	05_nuclear	2	167	0.0	1.0
+de	06_coal	2	167	0.0	1.0
+de	07_gas	2	167	0.0	1.0
+de	08_non-res	2	167	0.0	1.0
+de	09_hydro_pump	2	167	0.0	1.0
+de	01_solar	2	168	0.0	1.0
+de	02_wind_on	2	168	0.0	1.0
+de	03_wind_off	2	168	0.0	1.0
+de	04_res	2	168	0.0	1.0
+de	05_nuclear	2	168	0.0	1.0
+de	06_coal	2	168	0.0	1.0
+de	07_gas	2	168	0.0	1.0
+de	08_non-res	2	168	0.0	1.0
+de	09_hydro_pump	2	168	0.0	1.0
 de	01_solar	2	169	0.0	0.0
 de	02_wind_on	2	169	0.0	0.0
 de	03_wind_off	2	169	0.0	0.0
@@ -13616,7 +13616,7 @@ de	06_coal	2	169	0.0	0.0
 de	07_gas	2	169	0.0	0.0
 de	08_non-res	2	169	0.0	0.0
 de	09_hydro_pump	2	169	0.0	0.0
-de	01_solar	2	170	1.0	0.0
+de	01_solar	2	170	0.0	1.0
 de	02_wind_on	2	170	0.0	0.0
 de	03_wind_off	2	170	0.0	0.0
 de	04_res	2	170	0.0	0.0
@@ -13625,7 +13625,7 @@ de	06_coal	2	170	0.0	0.0
 de	07_gas	2	170	0.0	0.0
 de	08_non-res	2	170	0.0	0.0
 de	09_hydro_pump	2	170	0.0	0.0
-de	01_solar	2	171	1.0	0.0
+de	01_solar	2	171	0.0	1.0
 de	02_wind_on	2	171	0.0	0.0
 de	03_wind_off	2	171	0.0	0.0
 de	04_res	2	171	0.0	0.0
@@ -13634,7 +13634,7 @@ de	06_coal	2	171	0.0	0.0
 de	07_gas	2	171	0.0	0.0
 de	08_non-res	2	171	0.0	0.0
 de	09_hydro_pump	2	171	0.0	0.0
-de	01_solar	2	172	1.0	0.0
+de	01_solar	2	172	0.0	1.0
 de	02_wind_on	2	172	0.0	0.0
 de	03_wind_off	2	172	0.0	0.0
 de	04_res	2	172	0.0	0.0
@@ -13643,7 +13643,7 @@ de	06_coal	2	172	0.0	0.0
 de	07_gas	2	172	0.0	0.0
 de	08_non-res	2	172	0.0	0.0
 de	09_hydro_pump	2	172	0.0	0.0
-de	01_solar	2	173	1.0	0.0
+de	01_solar	2	173	0.0	1.0
 de	02_wind_on	2	173	0.0	0.0
 de	03_wind_off	2	173	0.0	0.0
 de	04_res	2	173	0.0	0.0
@@ -13652,7 +13652,7 @@ de	06_coal	2	173	0.0	0.0
 de	07_gas	2	173	0.0	0.0
 de	08_non-res	2	173	0.0	0.0
 de	09_hydro_pump	2	173	0.0	0.0
-de	01_solar	2	174	1.0	0.0
+de	01_solar	2	174	0.0	1.0
 de	02_wind_on	2	174	0.0	0.0
 de	03_wind_off	2	174	0.0	0.0
 de	04_res	2	174	0.0	0.0
@@ -13661,7 +13661,7 @@ de	06_coal	2	174	0.0	0.0
 de	07_gas	2	174	0.0	0.0
 de	08_non-res	2	174	0.0	0.0
 de	09_hydro_pump	2	174	0.0	0.0
-de	01_solar	2	175	1.0	0.0
+de	01_solar	2	175	0.0	1.0
 de	02_wind_on	2	175	0.0	0.0
 de	03_wind_off	2	175	0.0	0.0
 de	04_res	2	175	0.0	0.0
@@ -13670,7 +13670,7 @@ de	06_coal	2	175	0.0	0.0
 de	07_gas	2	175	0.0	0.0
 de	08_non-res	2	175	0.0	0.0
 de	09_hydro_pump	2	175	0.0	0.0
-de	01_solar	2	176	1.0	0.0
+de	01_solar	2	176	0.0	1.0
 de	02_wind_on	2	176	0.0	0.0
 de	03_wind_off	2	176	0.0	0.0
 de	04_res	2	176	0.0	0.0
@@ -13679,7 +13679,7 @@ de	06_coal	2	176	0.0	0.0
 de	07_gas	2	176	0.0	0.0
 de	08_non-res	2	176	0.0	0.0
 de	09_hydro_pump	2	176	0.0	0.0
-de	01_solar	2	177	1.0	0.0
+de	01_solar	2	177	0.0	1.0
 de	02_wind_on	2	177	0.0	0.0
 de	03_wind_off	2	177	0.0	0.0
 de	04_res	2	177	0.0	0.0
@@ -13688,7 +13688,7 @@ de	06_coal	2	177	0.0	0.0
 de	07_gas	2	177	0.0	0.0
 de	08_non-res	2	177	0.0	0.0
 de	09_hydro_pump	2	177	0.0	0.0
-de	01_solar	2	178	1.0	0.0
+de	01_solar	2	178	0.0	1.0
 de	02_wind_on	2	178	0.0	0.0
 de	03_wind_off	2	178	0.0	0.0
 de	04_res	2	178	0.0	0.0
@@ -13697,7 +13697,7 @@ de	06_coal	2	178	0.0	0.0
 de	07_gas	2	178	0.0	0.0
 de	08_non-res	2	178	0.0	0.0
 de	09_hydro_pump	2	178	0.0	0.0
-de	01_solar	2	179	1.0	0.0
+de	01_solar	2	179	0.0	1.0
 de	02_wind_on	2	179	0.0	0.0
 de	03_wind_off	2	179	0.0	0.0
 de	04_res	2	179	0.0	0.0
@@ -13706,7 +13706,7 @@ de	06_coal	2	179	0.0	0.0
 de	07_gas	2	179	0.0	0.0
 de	08_non-res	2	179	0.0	0.0
 de	09_hydro_pump	2	179	0.0	0.0
-de	01_solar	2	180	1.0	0.0
+de	01_solar	2	180	0.0	1.0
 de	02_wind_on	2	180	0.0	0.0
 de	03_wind_off	2	180	0.0	0.0
 de	04_res	2	180	0.0	0.0
@@ -13715,7 +13715,7 @@ de	06_coal	2	180	0.0	0.0
 de	07_gas	2	180	0.0	0.0
 de	08_non-res	2	180	0.0	0.0
 de	09_hydro_pump	2	180	0.0	0.0
-de	01_solar	2	181	1.0	0.0
+de	01_solar	2	181	0.0	1.0
 de	02_wind_on	2	181	0.0	0.0
 de	03_wind_off	2	181	0.0	0.0
 de	04_res	2	181	0.0	0.0
@@ -13724,7 +13724,7 @@ de	06_coal	2	181	0.0	0.0
 de	07_gas	2	181	0.0	0.0
 de	08_non-res	2	181	0.0	0.0
 de	09_hydro_pump	2	181	0.0	0.0
-de	01_solar	2	182	1.0	0.0
+de	01_solar	2	182	0.0	1.0
 de	02_wind_on	2	182	0.0	0.0
 de	03_wind_off	2	182	0.0	0.0
 de	04_res	2	182	0.0	0.0
@@ -13733,7 +13733,7 @@ de	06_coal	2	182	0.0	0.0
 de	07_gas	2	182	0.0	0.0
 de	08_non-res	2	182	0.0	0.0
 de	09_hydro_pump	2	182	0.0	0.0
-de	01_solar	2	183	1.0	0.0
+de	01_solar	2	183	0.0	1.0
 de	02_wind_on	2	183	0.0	0.0
 de	03_wind_off	2	183	0.0	0.0
 de	04_res	2	183	0.0	0.0
@@ -13742,7 +13742,7 @@ de	06_coal	2	183	0.0	0.0
 de	07_gas	2	183	0.0	0.0
 de	08_non-res	2	183	0.0	0.0
 de	09_hydro_pump	2	183	0.0	0.0
-de	01_solar	2	184	1.0	0.0
+de	01_solar	2	184	0.0	1.0
 de	02_wind_on	2	184	0.0	0.0
 de	03_wind_off	2	184	0.0	0.0
 de	04_res	2	184	0.0	0.0
@@ -13751,7 +13751,7 @@ de	06_coal	2	184	0.0	0.0
 de	07_gas	2	184	0.0	0.0
 de	08_non-res	2	184	0.0	0.0
 de	09_hydro_pump	2	184	0.0	0.0
-de	01_solar	2	185	1.0	0.0
+de	01_solar	2	185	0.0	1.0
 de	02_wind_on	2	185	0.0	0.0
 de	03_wind_off	2	185	0.0	0.0
 de	04_res	2	185	0.0	0.0
@@ -13760,7 +13760,7 @@ de	06_coal	2	185	0.0	0.0
 de	07_gas	2	185	0.0	0.0
 de	08_non-res	2	185	0.0	0.0
 de	09_hydro_pump	2	185	0.0	0.0
-de	01_solar	2	186	1.0	0.0
+de	01_solar	2	186	0.0	1.0
 de	02_wind_on	2	186	0.0	0.0
 de	03_wind_off	2	186	0.0	0.0
 de	04_res	2	186	0.0	0.0
@@ -13769,7 +13769,7 @@ de	06_coal	2	186	0.0	0.0
 de	07_gas	2	186	0.0	0.0
 de	08_non-res	2	186	0.0	0.0
 de	09_hydro_pump	2	186	0.0	0.0
-de	01_solar	2	187	1.0	0.0
+de	01_solar	2	187	0.0	1.0
 de	02_wind_on	2	187	0.0	0.0
 de	03_wind_off	2	187	0.0	0.0
 de	04_res	2	187	0.0	0.0
@@ -13778,7 +13778,7 @@ de	06_coal	2	187	0.0	0.0
 de	07_gas	2	187	0.0	0.0
 de	08_non-res	2	187	0.0	0.0
 de	09_hydro_pump	2	187	0.0	0.0
-de	01_solar	2	188	1.0	0.0
+de	01_solar	2	188	0.0	1.0
 de	02_wind_on	2	188	0.0	0.0
 de	03_wind_off	2	188	0.0	0.0
 de	04_res	2	188	0.0	0.0
@@ -13787,7 +13787,7 @@ de	06_coal	2	188	0.0	0.0
 de	07_gas	2	188	0.0	0.0
 de	08_non-res	2	188	0.0	0.0
 de	09_hydro_pump	2	188	0.0	0.0
-de	01_solar	2	189	1.0	0.0
+de	01_solar	2	189	0.0	1.0
 de	02_wind_on	2	189	0.0	0.0
 de	03_wind_off	2	189	0.0	0.0
 de	04_res	2	189	0.0	0.0
@@ -13796,8 +13796,8 @@ de	06_coal	2	189	0.0	0.0
 de	07_gas	2	189	0.0	0.0
 de	08_non-res	2	189	0.0	0.0
 de	09_hydro_pump	2	189	0.0	0.0
-de	01_solar	2	190	1.0	0.0
-de	02_wind_on	2	190	1.0	0.0
+de	01_solar	2	190	0.0	1.0
+de	02_wind_on	2	190	0.0	1.0
 de	03_wind_off	2	190	0.0	0.0
 de	04_res	2	190	0.0	0.0
 de	05_nuclear	2	190	0.0	0.0
@@ -13805,8 +13805,8 @@ de	06_coal	2	190	0.0	0.0
 de	07_gas	2	190	0.0	0.0
 de	08_non-res	2	190	0.0	0.0
 de	09_hydro_pump	2	190	0.0	0.0
-de	01_solar	2	191	1.0	0.0
-de	02_wind_on	2	191	1.0	0.0
+de	01_solar	2	191	0.0	1.0
+de	02_wind_on	2	191	0.0	1.0
 de	03_wind_off	2	191	0.0	0.0
 de	04_res	2	191	0.0	0.0
 de	05_nuclear	2	191	0.0	0.0
@@ -13814,8 +13814,8 @@ de	06_coal	2	191	0.0	0.0
 de	07_gas	2	191	0.0	0.0
 de	08_non-res	2	191	0.0	0.0
 de	09_hydro_pump	2	191	0.0	0.0
-de	01_solar	2	192	1.0	0.0
-de	02_wind_on	2	192	1.0	0.0
+de	01_solar	2	192	0.0	1.0
+de	02_wind_on	2	192	0.0	1.0
 de	03_wind_off	2	192	0.0	0.0
 de	04_res	2	192	0.0	0.0
 de	05_nuclear	2	192	0.0	0.0
@@ -13823,8 +13823,8 @@ de	06_coal	2	192	0.0	0.0
 de	07_gas	2	192	0.0	0.0
 de	08_non-res	2	192	0.0	0.0
 de	09_hydro_pump	2	192	0.0	0.0
-de	01_solar	2	193	1.0	0.0
-de	02_wind_on	2	193	1.0	0.0
+de	01_solar	2	193	0.0	1.0
+de	02_wind_on	2	193	0.0	1.0
 de	03_wind_off	2	193	0.0	0.0
 de	04_res	2	193	0.0	0.0
 de	05_nuclear	2	193	0.0	0.0
@@ -13832,8 +13832,8 @@ de	06_coal	2	193	0.0	0.0
 de	07_gas	2	193	0.0	0.0
 de	08_non-res	2	193	0.0	0.0
 de	09_hydro_pump	2	193	0.0	0.0
-de	01_solar	2	194	1.0	0.0
-de	02_wind_on	2	194	1.0	0.0
+de	01_solar	2	194	0.0	1.0
+de	02_wind_on	2	194	0.0	1.0
 de	03_wind_off	2	194	0.0	0.0
 de	04_res	2	194	0.0	0.0
 de	05_nuclear	2	194	0.0	0.0
@@ -13841,8 +13841,8 @@ de	06_coal	2	194	0.0	0.0
 de	07_gas	2	194	0.0	0.0
 de	08_non-res	2	194	0.0	0.0
 de	09_hydro_pump	2	194	0.0	0.0
-de	01_solar	2	195	1.0	0.0
-de	02_wind_on	2	195	1.0	0.0
+de	01_solar	2	195	0.0	1.0
+de	02_wind_on	2	195	0.0	1.0
 de	03_wind_off	2	195	0.0	0.0
 de	04_res	2	195	0.0	0.0
 de	05_nuclear	2	195	0.0	0.0
@@ -13850,8 +13850,8 @@ de	06_coal	2	195	0.0	0.0
 de	07_gas	2	195	0.0	0.0
 de	08_non-res	2	195	0.0	0.0
 de	09_hydro_pump	2	195	0.0	0.0
-de	01_solar	2	196	1.0	0.0
-de	02_wind_on	2	196	1.0	0.0
+de	01_solar	2	196	0.0	1.0
+de	02_wind_on	2	196	0.0	1.0
 de	03_wind_off	2	196	0.0	0.0
 de	04_res	2	196	0.0	0.0
 de	05_nuclear	2	196	0.0	0.0
@@ -13859,8 +13859,8 @@ de	06_coal	2	196	0.0	0.0
 de	07_gas	2	196	0.0	0.0
 de	08_non-res	2	196	0.0	0.0
 de	09_hydro_pump	2	196	0.0	0.0
-de	01_solar	2	197	1.0	0.0
-de	02_wind_on	2	197	1.0	0.0
+de	01_solar	2	197	0.0	1.0
+de	02_wind_on	2	197	0.0	1.0
 de	03_wind_off	2	197	0.0	0.0
 de	04_res	2	197	0.0	0.0
 de	05_nuclear	2	197	0.0	0.0
@@ -13868,8 +13868,8 @@ de	06_coal	2	197	0.0	0.0
 de	07_gas	2	197	0.0	0.0
 de	08_non-res	2	197	0.0	0.0
 de	09_hydro_pump	2	197	0.0	0.0
-de	01_solar	2	198	1.0	0.0
-de	02_wind_on	2	198	1.0	0.0
+de	01_solar	2	198	0.0	1.0
+de	02_wind_on	2	198	0.0	1.0
 de	03_wind_off	2	198	0.0	0.0
 de	04_res	2	198	0.0	0.0
 de	05_nuclear	2	198	0.0	0.0
@@ -13877,8 +13877,8 @@ de	06_coal	2	198	0.0	0.0
 de	07_gas	2	198	0.0	0.0
 de	08_non-res	2	198	0.0	0.0
 de	09_hydro_pump	2	198	0.0	0.0
-de	01_solar	2	199	1.0	0.0
-de	02_wind_on	2	199	1.0	0.0
+de	01_solar	2	199	0.0	1.0
+de	02_wind_on	2	199	0.0	1.0
 de	03_wind_off	2	199	0.0	0.0
 de	04_res	2	199	0.0	0.0
 de	05_nuclear	2	199	0.0	0.0
@@ -13886,8 +13886,8 @@ de	06_coal	2	199	0.0	0.0
 de	07_gas	2	199	0.0	0.0
 de	08_non-res	2	199	0.0	0.0
 de	09_hydro_pump	2	199	0.0	0.0
-de	01_solar	2	200	1.0	0.0
-de	02_wind_on	2	200	1.0	0.0
+de	01_solar	2	200	0.0	1.0
+de	02_wind_on	2	200	0.0	1.0
 de	03_wind_off	2	200	0.0	0.0
 de	04_res	2	200	0.0	0.0
 de	05_nuclear	2	200	0.0	0.0
@@ -13895,8 +13895,8 @@ de	06_coal	2	200	0.0	0.0
 de	07_gas	2	200	0.0	0.0
 de	08_non-res	2	200	0.0	0.0
 de	09_hydro_pump	2	200	0.0	0.0
-de	01_solar	2	201	1.0	0.0
-de	02_wind_on	2	201	1.0	0.0
+de	01_solar	2	201	0.0	1.0
+de	02_wind_on	2	201	0.0	1.0
 de	03_wind_off	2	201	0.0	0.0
 de	04_res	2	201	0.0	0.0
 de	05_nuclear	2	201	0.0	0.0
@@ -13904,8 +13904,8 @@ de	06_coal	2	201	0.0	0.0
 de	07_gas	2	201	0.0	0.0
 de	08_non-res	2	201	0.0	0.0
 de	09_hydro_pump	2	201	0.0	0.0
-de	01_solar	2	202	1.0	0.0
-de	02_wind_on	2	202	1.0	0.0
+de	01_solar	2	202	0.0	1.0
+de	02_wind_on	2	202	0.0	1.0
 de	03_wind_off	2	202	0.0	0.0
 de	04_res	2	202	0.0	0.0
 de	05_nuclear	2	202	0.0	0.0
@@ -13913,8 +13913,8 @@ de	06_coal	2	202	0.0	0.0
 de	07_gas	2	202	0.0	0.0
 de	08_non-res	2	202	0.0	0.0
 de	09_hydro_pump	2	202	0.0	0.0
-de	01_solar	2	203	1.0	0.0
-de	02_wind_on	2	203	1.0	0.0
+de	01_solar	2	203	0.0	1.0
+de	02_wind_on	2	203	0.0	1.0
 de	03_wind_off	2	203	0.0	0.0
 de	04_res	2	203	0.0	0.0
 de	05_nuclear	2	203	0.0	0.0
@@ -13922,8 +13922,8 @@ de	06_coal	2	203	0.0	0.0
 de	07_gas	2	203	0.0	0.0
 de	08_non-res	2	203	0.0	0.0
 de	09_hydro_pump	2	203	0.0	0.0
-de	01_solar	2	204	1.0	0.0
-de	02_wind_on	2	204	1.0	0.0
+de	01_solar	2	204	0.0	1.0
+de	02_wind_on	2	204	0.0	1.0
 de	03_wind_off	2	204	0.0	0.0
 de	04_res	2	204	0.0	0.0
 de	05_nuclear	2	204	0.0	0.0
@@ -13931,8 +13931,8 @@ de	06_coal	2	204	0.0	0.0
 de	07_gas	2	204	0.0	0.0
 de	08_non-res	2	204	0.0	0.0
 de	09_hydro_pump	2	204	0.0	0.0
-de	01_solar	2	205	1.0	0.0
-de	02_wind_on	2	205	1.0	0.0
+de	01_solar	2	205	0.0	1.0
+de	02_wind_on	2	205	0.0	1.0
 de	03_wind_off	2	205	0.0	0.0
 de	04_res	2	205	0.0	0.0
 de	05_nuclear	2	205	0.0	0.0
@@ -13940,8 +13940,8 @@ de	06_coal	2	205	0.0	0.0
 de	07_gas	2	205	0.0	0.0
 de	08_non-res	2	205	0.0	0.0
 de	09_hydro_pump	2	205	0.0	0.0
-de	01_solar	2	206	1.0	0.0
-de	02_wind_on	2	206	1.0	0.0
+de	01_solar	2	206	0.0	1.0
+de	02_wind_on	2	206	0.0	1.0
 de	03_wind_off	2	206	0.0	0.0
 de	04_res	2	206	0.0	0.0
 de	05_nuclear	2	206	0.0	0.0
@@ -13949,8 +13949,8 @@ de	06_coal	2	206	0.0	0.0
 de	07_gas	2	206	0.0	0.0
 de	08_non-res	2	206	0.0	0.0
 de	09_hydro_pump	2	206	0.0	0.0
-de	01_solar	2	207	1.0	0.0
-de	02_wind_on	2	207	1.0	0.0
+de	01_solar	2	207	0.0	1.0
+de	02_wind_on	2	207	0.0	1.0
 de	03_wind_off	2	207	0.0	0.0
 de	04_res	2	207	0.0	0.0
 de	05_nuclear	2	207	0.0	0.0
@@ -13958,8 +13958,8 @@ de	06_coal	2	207	0.0	0.0
 de	07_gas	2	207	0.0	0.0
 de	08_non-res	2	207	0.0	0.0
 de	09_hydro_pump	2	207	0.0	0.0
-de	01_solar	2	208	1.0	0.0
-de	02_wind_on	2	208	1.0	0.0
+de	01_solar	2	208	0.0	1.0
+de	02_wind_on	2	208	0.0	1.0
 de	03_wind_off	2	208	0.0	0.0
 de	04_res	2	208	0.0	0.0
 de	05_nuclear	2	208	0.0	0.0
@@ -13967,8 +13967,8 @@ de	06_coal	2	208	0.0	0.0
 de	07_gas	2	208	0.0	0.0
 de	08_non-res	2	208	0.0	0.0
 de	09_hydro_pump	2	208	0.0	0.0
-de	01_solar	2	209	1.0	0.0
-de	02_wind_on	2	209	1.0	0.0
+de	01_solar	2	209	0.0	1.0
+de	02_wind_on	2	209	0.0	1.0
 de	03_wind_off	2	209	0.0	0.0
 de	04_res	2	209	0.0	0.0
 de	05_nuclear	2	209	0.0	0.0
@@ -13976,1149 +13976,1149 @@ de	06_coal	2	209	0.0	0.0
 de	07_gas	2	209	0.0	0.0
 de	08_non-res	2	209	0.0	0.0
 de	09_hydro_pump	2	209	0.0	0.0
-de	01_solar	2	210	1.0	0.0
-de	02_wind_on	2	210	1.0	0.0
-de	03_wind_off	2	210	1.0	0.0
+de	01_solar	2	210	0.0	1.0
+de	02_wind_on	2	210	0.0	1.0
+de	03_wind_off	2	210	0.0	1.0
 de	04_res	2	210	0.0	0.0
 de	05_nuclear	2	210	0.0	0.0
 de	06_coal	2	210	0.0	0.0
 de	07_gas	2	210	0.0	0.0
 de	08_non-res	2	210	0.0	0.0
 de	09_hydro_pump	2	210	0.0	0.0
-de	01_solar	2	211	1.0	0.0
-de	02_wind_on	2	211	1.0	0.0
-de	03_wind_off	2	211	1.0	0.0
+de	01_solar	2	211	0.0	1.0
+de	02_wind_on	2	211	0.0	1.0
+de	03_wind_off	2	211	0.0	1.0
 de	04_res	2	211	0.0	0.0
 de	05_nuclear	2	211	0.0	0.0
 de	06_coal	2	211	0.0	0.0
 de	07_gas	2	211	0.0	0.0
 de	08_non-res	2	211	0.0	0.0
 de	09_hydro_pump	2	211	0.0	0.0
-de	01_solar	2	212	1.0	0.0
-de	02_wind_on	2	212	1.0	0.0
-de	03_wind_off	2	212	1.0	0.0
+de	01_solar	2	212	0.0	1.0
+de	02_wind_on	2	212	0.0	1.0
+de	03_wind_off	2	212	0.0	1.0
 de	04_res	2	212	0.0	0.0
 de	05_nuclear	2	212	0.0	0.0
 de	06_coal	2	212	0.0	0.0
 de	07_gas	2	212	0.0	0.0
 de	08_non-res	2	212	0.0	0.0
 de	09_hydro_pump	2	212	0.0	0.0
-de	01_solar	2	213	1.0	0.0
-de	02_wind_on	2	213	1.0	0.0
-de	03_wind_off	2	213	1.0	0.0
+de	01_solar	2	213	0.0	1.0
+de	02_wind_on	2	213	0.0	1.0
+de	03_wind_off	2	213	0.0	1.0
 de	04_res	2	213	0.0	0.0
 de	05_nuclear	2	213	0.0	0.0
 de	06_coal	2	213	0.0	0.0
 de	07_gas	2	213	0.0	0.0
 de	08_non-res	2	213	0.0	0.0
 de	09_hydro_pump	2	213	0.0	0.0
-de	01_solar	2	214	1.0	0.0
-de	02_wind_on	2	214	1.0	0.0
-de	03_wind_off	2	214	1.0	0.0
+de	01_solar	2	214	0.0	1.0
+de	02_wind_on	2	214	0.0	1.0
+de	03_wind_off	2	214	0.0	1.0
 de	04_res	2	214	0.0	0.0
 de	05_nuclear	2	214	0.0	0.0
 de	06_coal	2	214	0.0	0.0
 de	07_gas	2	214	0.0	0.0
 de	08_non-res	2	214	0.0	0.0
 de	09_hydro_pump	2	214	0.0	0.0
-de	01_solar	2	215	1.0	0.0
-de	02_wind_on	2	215	1.0	0.0
-de	03_wind_off	2	215	1.0	0.0
+de	01_solar	2	215	0.0	1.0
+de	02_wind_on	2	215	0.0	1.0
+de	03_wind_off	2	215	0.0	1.0
 de	04_res	2	215	0.0	0.0
 de	05_nuclear	2	215	0.0	0.0
 de	06_coal	2	215	0.0	0.0
 de	07_gas	2	215	0.0	0.0
 de	08_non-res	2	215	0.0	0.0
 de	09_hydro_pump	2	215	0.0	0.0
-de	01_solar	2	216	1.0	0.0
-de	02_wind_on	2	216	1.0	0.0
-de	03_wind_off	2	216	1.0	0.0
+de	01_solar	2	216	0.0	1.0
+de	02_wind_on	2	216	0.0	1.0
+de	03_wind_off	2	216	0.0	1.0
 de	04_res	2	216	0.0	0.0
 de	05_nuclear	2	216	0.0	0.0
 de	06_coal	2	216	0.0	0.0
 de	07_gas	2	216	0.0	0.0
 de	08_non-res	2	216	0.0	0.0
 de	09_hydro_pump	2	216	0.0	0.0
-de	01_solar	2	217	1.0	0.0
-de	02_wind_on	2	217	1.0	0.0
-de	03_wind_off	2	217	1.0	0.0
+de	01_solar	2	217	0.0	1.0
+de	02_wind_on	2	217	0.0	1.0
+de	03_wind_off	2	217	0.0	1.0
 de	04_res	2	217	0.0	0.0
 de	05_nuclear	2	217	0.0	0.0
 de	06_coal	2	217	0.0	0.0
 de	07_gas	2	217	0.0	0.0
 de	08_non-res	2	217	0.0	0.0
 de	09_hydro_pump	2	217	0.0	0.0
-de	01_solar	2	218	1.0	0.0
-de	02_wind_on	2	218	1.0	0.0
-de	03_wind_off	2	218	1.0	0.0
+de	01_solar	2	218	0.0	1.0
+de	02_wind_on	2	218	0.0	1.0
+de	03_wind_off	2	218	0.0	1.0
 de	04_res	2	218	0.0	0.0
 de	05_nuclear	2	218	0.0	0.0
 de	06_coal	2	218	0.0	0.0
 de	07_gas	2	218	0.0	0.0
 de	08_non-res	2	218	0.0	0.0
 de	09_hydro_pump	2	218	0.0	0.0
-de	01_solar	2	219	1.0	0.0
-de	02_wind_on	2	219	1.0	0.0
-de	03_wind_off	2	219	1.0	0.0
+de	01_solar	2	219	0.0	1.0
+de	02_wind_on	2	219	0.0	1.0
+de	03_wind_off	2	219	0.0	1.0
 de	04_res	2	219	0.0	0.0
 de	05_nuclear	2	219	0.0	0.0
 de	06_coal	2	219	0.0	0.0
 de	07_gas	2	219	0.0	0.0
 de	08_non-res	2	219	0.0	0.0
 de	09_hydro_pump	2	219	0.0	0.0
-de	01_solar	2	220	1.0	0.0
-de	02_wind_on	2	220	1.0	0.0
-de	03_wind_off	2	220	1.0	0.0
+de	01_solar	2	220	0.0	1.0
+de	02_wind_on	2	220	0.0	1.0
+de	03_wind_off	2	220	0.0	1.0
 de	04_res	2	220	0.0	0.0
 de	05_nuclear	2	220	0.0	0.0
 de	06_coal	2	220	0.0	0.0
 de	07_gas	2	220	0.0	0.0
 de	08_non-res	2	220	0.0	0.0
 de	09_hydro_pump	2	220	0.0	0.0
-de	01_solar	2	221	1.0	0.0
-de	02_wind_on	2	221	1.0	0.0
-de	03_wind_off	2	221	1.0	0.0
+de	01_solar	2	221	0.0	1.0
+de	02_wind_on	2	221	0.0	1.0
+de	03_wind_off	2	221	0.0	1.0
 de	04_res	2	221	0.0	0.0
 de	05_nuclear	2	221	0.0	0.0
 de	06_coal	2	221	0.0	0.0
 de	07_gas	2	221	0.0	0.0
 de	08_non-res	2	221	0.0	0.0
 de	09_hydro_pump	2	221	0.0	0.0
-de	01_solar	2	222	1.0	0.0
-de	02_wind_on	2	222	1.0	0.0
-de	03_wind_off	2	222	1.0	0.0
+de	01_solar	2	222	0.0	1.0
+de	02_wind_on	2	222	0.0	1.0
+de	03_wind_off	2	222	0.0	1.0
 de	04_res	2	222	0.0	0.0
 de	05_nuclear	2	222	0.0	0.0
 de	06_coal	2	222	0.0	0.0
 de	07_gas	2	222	0.0	0.0
 de	08_non-res	2	222	0.0	0.0
 de	09_hydro_pump	2	222	0.0	0.0
-de	01_solar	2	223	1.0	0.0
-de	02_wind_on	2	223	1.0	0.0
-de	03_wind_off	2	223	1.0	0.0
+de	01_solar	2	223	0.0	1.0
+de	02_wind_on	2	223	0.0	1.0
+de	03_wind_off	2	223	0.0	1.0
 de	04_res	2	223	0.0	0.0
 de	05_nuclear	2	223	0.0	0.0
 de	06_coal	2	223	0.0	0.0
 de	07_gas	2	223	0.0	0.0
 de	08_non-res	2	223	0.0	0.0
 de	09_hydro_pump	2	223	0.0	0.0
-de	01_solar	2	224	1.0	0.0
-de	02_wind_on	2	224	1.0	0.0
-de	03_wind_off	2	224	1.0	0.0
+de	01_solar	2	224	0.0	1.0
+de	02_wind_on	2	224	0.0	1.0
+de	03_wind_off	2	224	0.0	1.0
 de	04_res	2	224	0.0	0.0
 de	05_nuclear	2	224	0.0	0.0
 de	06_coal	2	224	0.0	0.0
 de	07_gas	2	224	0.0	0.0
 de	08_non-res	2	224	0.0	0.0
 de	09_hydro_pump	2	224	0.0	0.0
-de	01_solar	2	225	1.0	0.0
-de	02_wind_on	2	225	1.0	0.0
-de	03_wind_off	2	225	1.0	0.0
+de	01_solar	2	225	0.0	1.0
+de	02_wind_on	2	225	0.0	1.0
+de	03_wind_off	2	225	0.0	1.0
 de	04_res	2	225	0.0	0.0
 de	05_nuclear	2	225	0.0	0.0
 de	06_coal	2	225	0.0	0.0
 de	07_gas	2	225	0.0	0.0
 de	08_non-res	2	225	0.0	0.0
 de	09_hydro_pump	2	225	0.0	0.0
-de	01_solar	2	226	1.0	0.0
-de	02_wind_on	2	226	1.0	0.0
-de	03_wind_off	2	226	1.0	0.0
+de	01_solar	2	226	0.0	1.0
+de	02_wind_on	2	226	0.0	1.0
+de	03_wind_off	2	226	0.0	1.0
 de	04_res	2	226	0.0	0.0
 de	05_nuclear	2	226	0.0	0.0
 de	06_coal	2	226	0.0	0.0
 de	07_gas	2	226	0.0	0.0
 de	08_non-res	2	226	0.0	0.0
 de	09_hydro_pump	2	226	0.0	0.0
-de	01_solar	2	227	1.0	0.0
-de	02_wind_on	2	227	1.0	0.0
-de	03_wind_off	2	227	1.0	0.0
+de	01_solar	2	227	0.0	1.0
+de	02_wind_on	2	227	0.0	1.0
+de	03_wind_off	2	227	0.0	1.0
 de	04_res	2	227	0.0	0.0
 de	05_nuclear	2	227	0.0	0.0
 de	06_coal	2	227	0.0	0.0
 de	07_gas	2	227	0.0	0.0
 de	08_non-res	2	227	0.0	0.0
 de	09_hydro_pump	2	227	0.0	0.0
-de	01_solar	2	228	1.0	0.0
-de	02_wind_on	2	228	1.0	0.0
-de	03_wind_off	2	228	1.0	0.0
+de	01_solar	2	228	0.0	1.0
+de	02_wind_on	2	228	0.0	1.0
+de	03_wind_off	2	228	0.0	1.0
 de	04_res	2	228	0.0	0.0
 de	05_nuclear	2	228	0.0	0.0
 de	06_coal	2	228	0.0	0.0
 de	07_gas	2	228	0.0	0.0
 de	08_non-res	2	228	0.0	0.0
 de	09_hydro_pump	2	228	0.0	0.0
-de	01_solar	2	229	1.0	0.0
-de	02_wind_on	2	229	1.0	0.0
-de	03_wind_off	2	229	1.0	0.0
+de	01_solar	2	229	0.0	1.0
+de	02_wind_on	2	229	0.0	1.0
+de	03_wind_off	2	229	0.0	1.0
 de	04_res	2	229	0.0	0.0
 de	05_nuclear	2	229	0.0	0.0
 de	06_coal	2	229	0.0	0.0
 de	07_gas	2	229	0.0	0.0
 de	08_non-res	2	229	0.0	0.0
 de	09_hydro_pump	2	229	0.0	0.0
-de	01_solar	2	230	1.0	0.0
-de	02_wind_on	2	230	1.0	0.0
-de	03_wind_off	2	230	1.0	0.0
-de	04_res	2	230	1.0	0.0
+de	01_solar	2	230	0.0	1.0
+de	02_wind_on	2	230	0.0	1.0
+de	03_wind_off	2	230	0.0	1.0
+de	04_res	2	230	0.0	1.0
 de	05_nuclear	2	230	0.0	0.0
 de	06_coal	2	230	0.0	0.0
 de	07_gas	2	230	0.0	0.0
 de	08_non-res	2	230	0.0	0.0
 de	09_hydro_pump	2	230	0.0	0.0
-de	01_solar	2	231	1.0	0.0
-de	02_wind_on	2	231	1.0	0.0
-de	03_wind_off	2	231	1.0	0.0
-de	04_res	2	231	1.0	0.0
+de	01_solar	2	231	0.0	1.0
+de	02_wind_on	2	231	0.0	1.0
+de	03_wind_off	2	231	0.0	1.0
+de	04_res	2	231	0.0	1.0
 de	05_nuclear	2	231	0.0	0.0
 de	06_coal	2	231	0.0	0.0
 de	07_gas	2	231	0.0	0.0
 de	08_non-res	2	231	0.0	0.0
 de	09_hydro_pump	2	231	0.0	0.0
-de	01_solar	2	232	1.0	0.0
-de	02_wind_on	2	232	1.0	0.0
-de	03_wind_off	2	232	1.0	0.0
-de	04_res	2	232	1.0	0.0
+de	01_solar	2	232	0.0	1.0
+de	02_wind_on	2	232	0.0	1.0
+de	03_wind_off	2	232	0.0	1.0
+de	04_res	2	232	0.0	1.0
 de	05_nuclear	2	232	0.0	0.0
 de	06_coal	2	232	0.0	0.0
 de	07_gas	2	232	0.0	0.0
 de	08_non-res	2	232	0.0	0.0
 de	09_hydro_pump	2	232	0.0	0.0
-de	01_solar	2	233	1.0	0.0
-de	02_wind_on	2	233	1.0	0.0
-de	03_wind_off	2	233	1.0	0.0
-de	04_res	2	233	1.0	0.0
+de	01_solar	2	233	0.0	1.0
+de	02_wind_on	2	233	0.0	1.0
+de	03_wind_off	2	233	0.0	1.0
+de	04_res	2	233	0.0	1.0
 de	05_nuclear	2	233	0.0	0.0
 de	06_coal	2	233	0.0	0.0
 de	07_gas	2	233	0.0	0.0
 de	08_non-res	2	233	0.0	0.0
 de	09_hydro_pump	2	233	0.0	0.0
-de	01_solar	2	234	1.0	0.0
-de	02_wind_on	2	234	1.0	0.0
-de	03_wind_off	2	234	1.0	0.0
-de	04_res	2	234	1.0	0.0
+de	01_solar	2	234	0.0	1.0
+de	02_wind_on	2	234	0.0	1.0
+de	03_wind_off	2	234	0.0	1.0
+de	04_res	2	234	0.0	1.0
 de	05_nuclear	2	234	0.0	0.0
 de	06_coal	2	234	0.0	0.0
 de	07_gas	2	234	0.0	0.0
 de	08_non-res	2	234	0.0	0.0
 de	09_hydro_pump	2	234	0.0	0.0
-de	01_solar	2	235	1.0	0.0
-de	02_wind_on	2	235	1.0	0.0
-de	03_wind_off	2	235	1.0	0.0
-de	04_res	2	235	1.0	0.0
+de	01_solar	2	235	0.0	1.0
+de	02_wind_on	2	235	0.0	1.0
+de	03_wind_off	2	235	0.0	1.0
+de	04_res	2	235	0.0	1.0
 de	05_nuclear	2	235	0.0	0.0
 de	06_coal	2	235	0.0	0.0
 de	07_gas	2	235	0.0	0.0
 de	08_non-res	2	235	0.0	0.0
 de	09_hydro_pump	2	235	0.0	0.0
-de	01_solar	2	236	1.0	0.0
-de	02_wind_on	2	236	1.0	0.0
-de	03_wind_off	2	236	1.0	0.0
-de	04_res	2	236	1.0	0.0
+de	01_solar	2	236	0.0	1.0
+de	02_wind_on	2	236	0.0	1.0
+de	03_wind_off	2	236	0.0	1.0
+de	04_res	2	236	0.0	1.0
 de	05_nuclear	2	236	0.0	0.0
 de	06_coal	2	236	0.0	0.0
 de	07_gas	2	236	0.0	0.0
 de	08_non-res	2	236	0.0	0.0
 de	09_hydro_pump	2	236	0.0	0.0
-de	01_solar	2	237	1.0	0.0
-de	02_wind_on	2	237	1.0	0.0
-de	03_wind_off	2	237	1.0	0.0
-de	04_res	2	237	1.0	0.0
+de	01_solar	2	237	0.0	1.0
+de	02_wind_on	2	237	0.0	1.0
+de	03_wind_off	2	237	0.0	1.0
+de	04_res	2	237	0.0	1.0
 de	05_nuclear	2	237	0.0	0.0
 de	06_coal	2	237	0.0	0.0
 de	07_gas	2	237	0.0	0.0
 de	08_non-res	2	237	0.0	0.0
 de	09_hydro_pump	2	237	0.0	0.0
-de	01_solar	2	238	1.0	0.0
-de	02_wind_on	2	238	1.0	0.0
-de	03_wind_off	2	238	1.0	0.0
-de	04_res	2	238	1.0	0.0
+de	01_solar	2	238	0.0	1.0
+de	02_wind_on	2	238	0.0	1.0
+de	03_wind_off	2	238	0.0	1.0
+de	04_res	2	238	0.0	1.0
 de	05_nuclear	2	238	0.0	0.0
 de	06_coal	2	238	0.0	0.0
 de	07_gas	2	238	0.0	0.0
 de	08_non-res	2	238	0.0	0.0
 de	09_hydro_pump	2	238	0.0	0.0
-de	01_solar	2	239	1.0	0.0
-de	02_wind_on	2	239	1.0	0.0
-de	03_wind_off	2	239	1.0	0.0
-de	04_res	2	239	1.0	0.0
+de	01_solar	2	239	0.0	1.0
+de	02_wind_on	2	239	0.0	1.0
+de	03_wind_off	2	239	0.0	1.0
+de	04_res	2	239	0.0	1.0
 de	05_nuclear	2	239	0.0	0.0
 de	06_coal	2	239	0.0	0.0
 de	07_gas	2	239	0.0	0.0
 de	08_non-res	2	239	0.0	0.0
 de	09_hydro_pump	2	239	0.0	0.0
-de	01_solar	2	240	1.0	0.0
-de	02_wind_on	2	240	1.0	0.0
-de	03_wind_off	2	240	1.0	0.0
-de	04_res	2	240	1.0	0.0
+de	01_solar	2	240	0.0	1.0
+de	02_wind_on	2	240	0.0	1.0
+de	03_wind_off	2	240	0.0	1.0
+de	04_res	2	240	0.0	1.0
 de	05_nuclear	2	240	0.0	0.0
 de	06_coal	2	240	0.0	0.0
 de	07_gas	2	240	0.0	0.0
 de	08_non-res	2	240	0.0	0.0
 de	09_hydro_pump	2	240	0.0	0.0
-de	01_solar	2	241	1.0	0.0
-de	02_wind_on	2	241	1.0	0.0
-de	03_wind_off	2	241	1.0	0.0
-de	04_res	2	241	1.0	0.0
+de	01_solar	2	241	0.0	1.0
+de	02_wind_on	2	241	0.0	1.0
+de	03_wind_off	2	241	0.0	1.0
+de	04_res	2	241	0.0	1.0
 de	05_nuclear	2	241	0.0	0.0
 de	06_coal	2	241	0.0	0.0
 de	07_gas	2	241	0.0	0.0
 de	08_non-res	2	241	0.0	0.0
 de	09_hydro_pump	2	241	0.0	0.0
-de	01_solar	2	242	1.0	0.0
-de	02_wind_on	2	242	1.0	0.0
-de	03_wind_off	2	242	1.0	0.0
-de	04_res	2	242	1.0	0.0
+de	01_solar	2	242	0.0	1.0
+de	02_wind_on	2	242	0.0	1.0
+de	03_wind_off	2	242	0.0	1.0
+de	04_res	2	242	0.0	1.0
 de	05_nuclear	2	242	0.0	0.0
 de	06_coal	2	242	0.0	0.0
 de	07_gas	2	242	0.0	0.0
 de	08_non-res	2	242	0.0	0.0
 de	09_hydro_pump	2	242	0.0	0.0
-de	01_solar	2	243	1.0	0.0
-de	02_wind_on	2	243	1.0	0.0
-de	03_wind_off	2	243	1.0	0.0
-de	04_res	2	243	1.0	0.0
+de	01_solar	2	243	0.0	1.0
+de	02_wind_on	2	243	0.0	1.0
+de	03_wind_off	2	243	0.0	1.0
+de	04_res	2	243	0.0	1.0
 de	05_nuclear	2	243	0.0	0.0
 de	06_coal	2	243	0.0	0.0
 de	07_gas	2	243	0.0	0.0
 de	08_non-res	2	243	0.0	0.0
 de	09_hydro_pump	2	243	0.0	0.0
-de	01_solar	2	244	1.0	0.0
-de	02_wind_on	2	244	1.0	0.0
-de	03_wind_off	2	244	1.0	0.0
-de	04_res	2	244	1.0	0.0
+de	01_solar	2	244	0.0	1.0
+de	02_wind_on	2	244	0.0	1.0
+de	03_wind_off	2	244	0.0	1.0
+de	04_res	2	244	0.0	1.0
 de	05_nuclear	2	244	0.0	0.0
 de	06_coal	2	244	0.0	0.0
 de	07_gas	2	244	0.0	0.0
 de	08_non-res	2	244	0.0	0.0
 de	09_hydro_pump	2	244	0.0	0.0
-de	01_solar	2	245	1.0	0.0
-de	02_wind_on	2	245	1.0	0.0
-de	03_wind_off	2	245	1.0	0.0
-de	04_res	2	245	1.0	0.0
+de	01_solar	2	245	0.0	1.0
+de	02_wind_on	2	245	0.0	1.0
+de	03_wind_off	2	245	0.0	1.0
+de	04_res	2	245	0.0	1.0
 de	05_nuclear	2	245	0.0	0.0
 de	06_coal	2	245	0.0	0.0
 de	07_gas	2	245	0.0	0.0
 de	08_non-res	2	245	0.0	0.0
 de	09_hydro_pump	2	245	0.0	0.0
-de	01_solar	2	246	1.0	0.0
-de	02_wind_on	2	246	1.0	0.0
-de	03_wind_off	2	246	1.0	0.0
-de	04_res	2	246	1.0	0.0
+de	01_solar	2	246	0.0	1.0
+de	02_wind_on	2	246	0.0	1.0
+de	03_wind_off	2	246	0.0	1.0
+de	04_res	2	246	0.0	1.0
 de	05_nuclear	2	246	0.0	0.0
 de	06_coal	2	246	0.0	0.0
 de	07_gas	2	246	0.0	0.0
 de	08_non-res	2	246	0.0	0.0
 de	09_hydro_pump	2	246	0.0	0.0
-de	01_solar	2	247	1.0	0.0
-de	02_wind_on	2	247	1.0	0.0
-de	03_wind_off	2	247	1.0	0.0
-de	04_res	2	247	1.0	0.0
+de	01_solar	2	247	0.0	1.0
+de	02_wind_on	2	247	0.0	1.0
+de	03_wind_off	2	247	0.0	1.0
+de	04_res	2	247	0.0	1.0
 de	05_nuclear	2	247	0.0	0.0
 de	06_coal	2	247	0.0	0.0
 de	07_gas	2	247	0.0	0.0
 de	08_non-res	2	247	0.0	0.0
 de	09_hydro_pump	2	247	0.0	0.0
-de	01_solar	2	248	1.0	0.0
-de	02_wind_on	2	248	1.0	0.0
-de	03_wind_off	2	248	1.0	0.0
-de	04_res	2	248	1.0	0.0
+de	01_solar	2	248	0.0	1.0
+de	02_wind_on	2	248	0.0	1.0
+de	03_wind_off	2	248	0.0	1.0
+de	04_res	2	248	0.0	1.0
 de	05_nuclear	2	248	0.0	0.0
 de	06_coal	2	248	0.0	0.0
 de	07_gas	2	248	0.0	0.0
 de	08_non-res	2	248	0.0	0.0
 de	09_hydro_pump	2	248	0.0	0.0
-de	01_solar	2	249	1.0	0.0
-de	02_wind_on	2	249	1.0	0.0
-de	03_wind_off	2	249	1.0	0.0
-de	04_res	2	249	1.0	0.0
+de	01_solar	2	249	0.0	1.0
+de	02_wind_on	2	249	0.0	1.0
+de	03_wind_off	2	249	0.0	1.0
+de	04_res	2	249	0.0	1.0
 de	05_nuclear	2	249	0.0	0.0
 de	06_coal	2	249	0.0	0.0
 de	07_gas	2	249	0.0	0.0
 de	08_non-res	2	249	0.0	0.0
 de	09_hydro_pump	2	249	0.0	0.0
-de	01_solar	2	250	1.0	0.0
-de	02_wind_on	2	250	1.0	0.0
-de	03_wind_off	2	250	1.0	0.0
-de	04_res	2	250	1.0	0.0
-de	05_nuclear	2	250	1.0	0.0
+de	01_solar	2	250	0.0	1.0
+de	02_wind_on	2	250	0.0	1.0
+de	03_wind_off	2	250	0.0	1.0
+de	04_res	2	250	0.0	1.0
+de	05_nuclear	2	250	0.0	1.0
 de	06_coal	2	250	0.0	0.0
 de	07_gas	2	250	0.0	0.0
 de	08_non-res	2	250	0.0	0.0
 de	09_hydro_pump	2	250	0.0	0.0
-de	01_solar	2	251	1.0	0.0
-de	02_wind_on	2	251	1.0	0.0
-de	03_wind_off	2	251	1.0	0.0
-de	04_res	2	251	1.0	0.0
-de	05_nuclear	2	251	1.0	0.0
+de	01_solar	2	251	0.0	1.0
+de	02_wind_on	2	251	0.0	1.0
+de	03_wind_off	2	251	0.0	1.0
+de	04_res	2	251	0.0	1.0
+de	05_nuclear	2	251	0.0	1.0
 de	06_coal	2	251	0.0	0.0
 de	07_gas	2	251	0.0	0.0
 de	08_non-res	2	251	0.0	0.0
 de	09_hydro_pump	2	251	0.0	0.0
-de	01_solar	2	252	1.0	0.0
-de	02_wind_on	2	252	1.0	0.0
-de	03_wind_off	2	252	1.0	0.0
-de	04_res	2	252	1.0	0.0
-de	05_nuclear	2	252	1.0	0.0
+de	01_solar	2	252	0.0	1.0
+de	02_wind_on	2	252	0.0	1.0
+de	03_wind_off	2	252	0.0	1.0
+de	04_res	2	252	0.0	1.0
+de	05_nuclear	2	252	0.0	1.0
 de	06_coal	2	252	0.0	0.0
 de	07_gas	2	252	0.0	0.0
 de	08_non-res	2	252	0.0	0.0
 de	09_hydro_pump	2	252	0.0	0.0
-de	01_solar	2	253	1.0	0.0
-de	02_wind_on	2	253	1.0	0.0
-de	03_wind_off	2	253	1.0	0.0
-de	04_res	2	253	1.0	0.0
-de	05_nuclear	2	253	1.0	0.0
+de	01_solar	2	253	0.0	1.0
+de	02_wind_on	2	253	0.0	1.0
+de	03_wind_off	2	253	0.0	1.0
+de	04_res	2	253	0.0	1.0
+de	05_nuclear	2	253	0.0	1.0
 de	06_coal	2	253	0.0	0.0
 de	07_gas	2	253	0.0	0.0
 de	08_non-res	2	253	0.0	0.0
 de	09_hydro_pump	2	253	0.0	0.0
-de	01_solar	2	254	1.0	0.0
-de	02_wind_on	2	254	1.0	0.0
-de	03_wind_off	2	254	1.0	0.0
-de	04_res	2	254	1.0	0.0
-de	05_nuclear	2	254	1.0	0.0
+de	01_solar	2	254	0.0	1.0
+de	02_wind_on	2	254	0.0	1.0
+de	03_wind_off	2	254	0.0	1.0
+de	04_res	2	254	0.0	1.0
+de	05_nuclear	2	254	0.0	1.0
 de	06_coal	2	254	0.0	0.0
 de	07_gas	2	254	0.0	0.0
 de	08_non-res	2	254	0.0	0.0
 de	09_hydro_pump	2	254	0.0	0.0
-de	01_solar	2	255	1.0	0.0
-de	02_wind_on	2	255	1.0	0.0
-de	03_wind_off	2	255	1.0	0.0
-de	04_res	2	255	1.0	0.0
-de	05_nuclear	2	255	1.0	0.0
+de	01_solar	2	255	0.0	1.0
+de	02_wind_on	2	255	0.0	1.0
+de	03_wind_off	2	255	0.0	1.0
+de	04_res	2	255	0.0	1.0
+de	05_nuclear	2	255	0.0	1.0
 de	06_coal	2	255	0.0	0.0
 de	07_gas	2	255	0.0	0.0
 de	08_non-res	2	255	0.0	0.0
 de	09_hydro_pump	2	255	0.0	0.0
-de	01_solar	2	256	1.0	0.0
-de	02_wind_on	2	256	1.0	0.0
-de	03_wind_off	2	256	1.0	0.0
-de	04_res	2	256	1.0	0.0
-de	05_nuclear	2	256	1.0	0.0
+de	01_solar	2	256	0.0	1.0
+de	02_wind_on	2	256	0.0	1.0
+de	03_wind_off	2	256	0.0	1.0
+de	04_res	2	256	0.0	1.0
+de	05_nuclear	2	256	0.0	1.0
 de	06_coal	2	256	0.0	0.0
 de	07_gas	2	256	0.0	0.0
 de	08_non-res	2	256	0.0	0.0
 de	09_hydro_pump	2	256	0.0	0.0
-de	01_solar	2	257	1.0	0.0
-de	02_wind_on	2	257	1.0	0.0
-de	03_wind_off	2	257	1.0	0.0
-de	04_res	2	257	1.0	0.0
-de	05_nuclear	2	257	1.0	0.0
+de	01_solar	2	257	0.0	1.0
+de	02_wind_on	2	257	0.0	1.0
+de	03_wind_off	2	257	0.0	1.0
+de	04_res	2	257	0.0	1.0
+de	05_nuclear	2	257	0.0	1.0
 de	06_coal	2	257	0.0	0.0
 de	07_gas	2	257	0.0	0.0
 de	08_non-res	2	257	0.0	0.0
 de	09_hydro_pump	2	257	0.0	0.0
-de	01_solar	2	258	1.0	0.0
-de	02_wind_on	2	258	1.0	0.0
-de	03_wind_off	2	258	1.0	0.0
-de	04_res	2	258	1.0	0.0
-de	05_nuclear	2	258	1.0	0.0
+de	01_solar	2	258	0.0	1.0
+de	02_wind_on	2	258	0.0	1.0
+de	03_wind_off	2	258	0.0	1.0
+de	04_res	2	258	0.0	1.0
+de	05_nuclear	2	258	0.0	1.0
 de	06_coal	2	258	0.0	0.0
 de	07_gas	2	258	0.0	0.0
 de	08_non-res	2	258	0.0	0.0
 de	09_hydro_pump	2	258	0.0	0.0
-de	01_solar	2	259	1.0	0.0
-de	02_wind_on	2	259	1.0	0.0
-de	03_wind_off	2	259	1.0	0.0
-de	04_res	2	259	1.0	0.0
-de	05_nuclear	2	259	1.0	0.0
+de	01_solar	2	259	0.0	1.0
+de	02_wind_on	2	259	0.0	1.0
+de	03_wind_off	2	259	0.0	1.0
+de	04_res	2	259	0.0	1.0
+de	05_nuclear	2	259	0.0	1.0
 de	06_coal	2	259	0.0	0.0
 de	07_gas	2	259	0.0	0.0
 de	08_non-res	2	259	0.0	0.0
 de	09_hydro_pump	2	259	0.0	0.0
-de	01_solar	2	260	1.0	0.0
-de	02_wind_on	2	260	1.0	0.0
-de	03_wind_off	2	260	1.0	0.0
-de	04_res	2	260	1.0	0.0
-de	05_nuclear	2	260	1.0	0.0
+de	01_solar	2	260	0.0	1.0
+de	02_wind_on	2	260	0.0	1.0
+de	03_wind_off	2	260	0.0	1.0
+de	04_res	2	260	0.0	1.0
+de	05_nuclear	2	260	0.0	1.0
 de	06_coal	2	260	0.0	0.0
 de	07_gas	2	260	0.0	0.0
 de	08_non-res	2	260	0.0	0.0
 de	09_hydro_pump	2	260	0.0	0.0
-de	01_solar	2	261	1.0	0.0
-de	02_wind_on	2	261	1.0	0.0
-de	03_wind_off	2	261	1.0	0.0
-de	04_res	2	261	1.0	0.0
-de	05_nuclear	2	261	1.0	0.0
+de	01_solar	2	261	0.0	1.0
+de	02_wind_on	2	261	0.0	1.0
+de	03_wind_off	2	261	0.0	1.0
+de	04_res	2	261	0.0	1.0
+de	05_nuclear	2	261	0.0	1.0
 de	06_coal	2	261	0.0	0.0
 de	07_gas	2	261	0.0	0.0
 de	08_non-res	2	261	0.0	0.0
 de	09_hydro_pump	2	261	0.0	0.0
-de	01_solar	2	262	1.0	0.0
-de	02_wind_on	2	262	1.0	0.0
-de	03_wind_off	2	262	1.0	0.0
-de	04_res	2	262	1.0	0.0
-de	05_nuclear	2	262	1.0	0.0
+de	01_solar	2	262	0.0	1.0
+de	02_wind_on	2	262	0.0	1.0
+de	03_wind_off	2	262	0.0	1.0
+de	04_res	2	262	0.0	1.0
+de	05_nuclear	2	262	0.0	1.0
 de	06_coal	2	262	0.0	0.0
 de	07_gas	2	262	0.0	0.0
 de	08_non-res	2	262	0.0	0.0
 de	09_hydro_pump	2	262	0.0	0.0
-de	01_solar	2	263	1.0	0.0
-de	02_wind_on	2	263	1.0	0.0
-de	03_wind_off	2	263	1.0	0.0
-de	04_res	2	263	1.0	0.0
-de	05_nuclear	2	263	1.0	0.0
+de	01_solar	2	263	0.0	1.0
+de	02_wind_on	2	263	0.0	1.0
+de	03_wind_off	2	263	0.0	1.0
+de	04_res	2	263	0.0	1.0
+de	05_nuclear	2	263	0.0	1.0
 de	06_coal	2	263	0.0	0.0
 de	07_gas	2	263	0.0	0.0
 de	08_non-res	2	263	0.0	0.0
 de	09_hydro_pump	2	263	0.0	0.0
-de	01_solar	2	264	1.0	0.0
-de	02_wind_on	2	264	1.0	0.0
-de	03_wind_off	2	264	1.0	0.0
-de	04_res	2	264	1.0	0.0
-de	05_nuclear	2	264	1.0	0.0
+de	01_solar	2	264	0.0	1.0
+de	02_wind_on	2	264	0.0	1.0
+de	03_wind_off	2	264	0.0	1.0
+de	04_res	2	264	0.0	1.0
+de	05_nuclear	2	264	0.0	1.0
 de	06_coal	2	264	0.0	0.0
 de	07_gas	2	264	0.0	0.0
 de	08_non-res	2	264	0.0	0.0
 de	09_hydro_pump	2	264	0.0	0.0
-de	01_solar	2	265	1.0	0.0
-de	02_wind_on	2	265	1.0	0.0
-de	03_wind_off	2	265	1.0	0.0
-de	04_res	2	265	1.0	0.0
-de	05_nuclear	2	265	1.0	0.0
+de	01_solar	2	265	0.0	1.0
+de	02_wind_on	2	265	0.0	1.0
+de	03_wind_off	2	265	0.0	1.0
+de	04_res	2	265	0.0	1.0
+de	05_nuclear	2	265	0.0	1.0
 de	06_coal	2	265	0.0	0.0
 de	07_gas	2	265	0.0	0.0
 de	08_non-res	2	265	0.0	0.0
 de	09_hydro_pump	2	265	0.0	0.0
-de	01_solar	2	266	1.0	0.0
-de	02_wind_on	2	266	1.0	0.0
-de	03_wind_off	2	266	1.0	0.0
-de	04_res	2	266	1.0	0.0
-de	05_nuclear	2	266	1.0	0.0
+de	01_solar	2	266	0.0	1.0
+de	02_wind_on	2	266	0.0	1.0
+de	03_wind_off	2	266	0.0	1.0
+de	04_res	2	266	0.0	1.0
+de	05_nuclear	2	266	0.0	1.0
 de	06_coal	2	266	0.0	0.0
 de	07_gas	2	266	0.0	0.0
 de	08_non-res	2	266	0.0	0.0
 de	09_hydro_pump	2	266	0.0	0.0
-de	01_solar	2	267	1.0	0.0
-de	02_wind_on	2	267	1.0	0.0
-de	03_wind_off	2	267	1.0	0.0
-de	04_res	2	267	1.0	0.0
-de	05_nuclear	2	267	1.0	0.0
+de	01_solar	2	267	0.0	1.0
+de	02_wind_on	2	267	0.0	1.0
+de	03_wind_off	2	267	0.0	1.0
+de	04_res	2	267	0.0	1.0
+de	05_nuclear	2	267	0.0	1.0
 de	06_coal	2	267	0.0	0.0
 de	07_gas	2	267	0.0	0.0
 de	08_non-res	2	267	0.0	0.0
 de	09_hydro_pump	2	267	0.0	0.0
-de	01_solar	2	268	1.0	0.0
-de	02_wind_on	2	268	1.0	0.0
-de	03_wind_off	2	268	1.0	0.0
-de	04_res	2	268	1.0	0.0
-de	05_nuclear	2	268	1.0	0.0
+de	01_solar	2	268	0.0	1.0
+de	02_wind_on	2	268	0.0	1.0
+de	03_wind_off	2	268	0.0	1.0
+de	04_res	2	268	0.0	1.0
+de	05_nuclear	2	268	0.0	1.0
 de	06_coal	2	268	0.0	0.0
 de	07_gas	2	268	0.0	0.0
 de	08_non-res	2	268	0.0	0.0
 de	09_hydro_pump	2	268	0.0	0.0
-de	01_solar	2	269	1.0	0.0
-de	02_wind_on	2	269	1.0	0.0
-de	03_wind_off	2	269	1.0	0.0
-de	04_res	2	269	1.0	0.0
-de	05_nuclear	2	269	1.0	0.0
+de	01_solar	2	269	0.0	1.0
+de	02_wind_on	2	269	0.0	1.0
+de	03_wind_off	2	269	0.0	1.0
+de	04_res	2	269	0.0	1.0
+de	05_nuclear	2	269	0.0	1.0
 de	06_coal	2	269	0.0	0.0
 de	07_gas	2	269	0.0	0.0
 de	08_non-res	2	269	0.0	0.0
 de	09_hydro_pump	2	269	0.0	0.0
-de	01_solar	2	270	1.0	0.0
-de	02_wind_on	2	270	1.0	0.0
-de	03_wind_off	2	270	1.0	0.0
-de	04_res	2	270	1.0	0.0
-de	05_nuclear	2	270	1.0	0.0
-de	06_coal	2	270	1.0	0.0
+de	01_solar	2	270	0.0	1.0
+de	02_wind_on	2	270	0.0	1.0
+de	03_wind_off	2	270	0.0	1.0
+de	04_res	2	270	0.0	1.0
+de	05_nuclear	2	270	0.0	1.0
+de	06_coal	2	270	0.0	1.0
 de	07_gas	2	270	0.0	0.0
 de	08_non-res	2	270	0.0	0.0
 de	09_hydro_pump	2	270	0.0	0.0
-de	01_solar	2	271	1.0	0.0
-de	02_wind_on	2	271	1.0	0.0
-de	03_wind_off	2	271	1.0	0.0
-de	04_res	2	271	1.0	0.0
-de	05_nuclear	2	271	1.0	0.0
-de	06_coal	2	271	1.0	0.0
+de	01_solar	2	271	0.0	1.0
+de	02_wind_on	2	271	0.0	1.0
+de	03_wind_off	2	271	0.0	1.0
+de	04_res	2	271	0.0	1.0
+de	05_nuclear	2	271	0.0	1.0
+de	06_coal	2	271	0.0	1.0
 de	07_gas	2	271	0.0	0.0
 de	08_non-res	2	271	0.0	0.0
 de	09_hydro_pump	2	271	0.0	0.0
-de	01_solar	2	272	1.0	0.0
-de	02_wind_on	2	272	1.0	0.0
-de	03_wind_off	2	272	1.0	0.0
-de	04_res	2	272	1.0	0.0
-de	05_nuclear	2	272	1.0	0.0
-de	06_coal	2	272	1.0	0.0
+de	01_solar	2	272	0.0	1.0
+de	02_wind_on	2	272	0.0	1.0
+de	03_wind_off	2	272	0.0	1.0
+de	04_res	2	272	0.0	1.0
+de	05_nuclear	2	272	0.0	1.0
+de	06_coal	2	272	0.0	1.0
 de	07_gas	2	272	0.0	0.0
 de	08_non-res	2	272	0.0	0.0
 de	09_hydro_pump	2	272	0.0	0.0
-de	01_solar	2	273	1.0	0.0
-de	02_wind_on	2	273	1.0	0.0
-de	03_wind_off	2	273	1.0	0.0
-de	04_res	2	273	1.0	0.0
-de	05_nuclear	2	273	1.0	0.0
-de	06_coal	2	273	1.0	0.0
+de	01_solar	2	273	0.0	1.0
+de	02_wind_on	2	273	0.0	1.0
+de	03_wind_off	2	273	0.0	1.0
+de	04_res	2	273	0.0	1.0
+de	05_nuclear	2	273	0.0	1.0
+de	06_coal	2	273	0.0	1.0
 de	07_gas	2	273	0.0	0.0
 de	08_non-res	2	273	0.0	0.0
 de	09_hydro_pump	2	273	0.0	0.0
-de	01_solar	2	274	1.0	0.0
-de	02_wind_on	2	274	1.0	0.0
-de	03_wind_off	2	274	1.0	0.0
-de	04_res	2	274	1.0	0.0
-de	05_nuclear	2	274	1.0	0.0
-de	06_coal	2	274	1.0	0.0
+de	01_solar	2	274	0.0	1.0
+de	02_wind_on	2	274	0.0	1.0
+de	03_wind_off	2	274	0.0	1.0
+de	04_res	2	274	0.0	1.0
+de	05_nuclear	2	274	0.0	1.0
+de	06_coal	2	274	0.0	1.0
 de	07_gas	2	274	0.0	0.0
 de	08_non-res	2	274	0.0	0.0
 de	09_hydro_pump	2	274	0.0	0.0
-de	01_solar	2	275	1.0	0.0
-de	02_wind_on	2	275	1.0	0.0
-de	03_wind_off	2	275	1.0	0.0
-de	04_res	2	275	1.0	0.0
-de	05_nuclear	2	275	1.0	0.0
-de	06_coal	2	275	1.0	0.0
+de	01_solar	2	275	0.0	1.0
+de	02_wind_on	2	275	0.0	1.0
+de	03_wind_off	2	275	0.0	1.0
+de	04_res	2	275	0.0	1.0
+de	05_nuclear	2	275	0.0	1.0
+de	06_coal	2	275	0.0	1.0
 de	07_gas	2	275	0.0	0.0
 de	08_non-res	2	275	0.0	0.0
 de	09_hydro_pump	2	275	0.0	0.0
-de	01_solar	2	276	1.0	0.0
-de	02_wind_on	2	276	1.0	0.0
-de	03_wind_off	2	276	1.0	0.0
-de	04_res	2	276	1.0	0.0
-de	05_nuclear	2	276	1.0	0.0
-de	06_coal	2	276	1.0	0.0
+de	01_solar	2	276	0.0	1.0
+de	02_wind_on	2	276	0.0	1.0
+de	03_wind_off	2	276	0.0	1.0
+de	04_res	2	276	0.0	1.0
+de	05_nuclear	2	276	0.0	1.0
+de	06_coal	2	276	0.0	1.0
 de	07_gas	2	276	0.0	0.0
 de	08_non-res	2	276	0.0	0.0
 de	09_hydro_pump	2	276	0.0	0.0
-de	01_solar	2	277	1.0	0.0
-de	02_wind_on	2	277	1.0	0.0
-de	03_wind_off	2	277	1.0	0.0
-de	04_res	2	277	1.0	0.0
-de	05_nuclear	2	277	1.0	0.0
-de	06_coal	2	277	1.0	0.0
+de	01_solar	2	277	0.0	1.0
+de	02_wind_on	2	277	0.0	1.0
+de	03_wind_off	2	277	0.0	1.0
+de	04_res	2	277	0.0	1.0
+de	05_nuclear	2	277	0.0	1.0
+de	06_coal	2	277	0.0	1.0
 de	07_gas	2	277	0.0	0.0
 de	08_non-res	2	277	0.0	0.0
 de	09_hydro_pump	2	277	0.0	0.0
-de	01_solar	2	278	1.0	0.0
-de	02_wind_on	2	278	1.0	0.0
-de	03_wind_off	2	278	1.0	0.0
-de	04_res	2	278	1.0	0.0
-de	05_nuclear	2	278	1.0	0.0
-de	06_coal	2	278	1.0	0.0
+de	01_solar	2	278	0.0	1.0
+de	02_wind_on	2	278	0.0	1.0
+de	03_wind_off	2	278	0.0	1.0
+de	04_res	2	278	0.0	1.0
+de	05_nuclear	2	278	0.0	1.0
+de	06_coal	2	278	0.0	1.0
 de	07_gas	2	278	0.0	0.0
 de	08_non-res	2	278	0.0	0.0
 de	09_hydro_pump	2	278	0.0	0.0
-de	01_solar	2	279	1.0	0.0
-de	02_wind_on	2	279	1.0	0.0
-de	03_wind_off	2	279	1.0	0.0
-de	04_res	2	279	1.0	0.0
-de	05_nuclear	2	279	1.0	0.0
-de	06_coal	2	279	1.0	0.0
+de	01_solar	2	279	0.0	1.0
+de	02_wind_on	2	279	0.0	1.0
+de	03_wind_off	2	279	0.0	1.0
+de	04_res	2	279	0.0	1.0
+de	05_nuclear	2	279	0.0	1.0
+de	06_coal	2	279	0.0	1.0
 de	07_gas	2	279	0.0	0.0
 de	08_non-res	2	279	0.0	0.0
 de	09_hydro_pump	2	279	0.0	0.0
-de	01_solar	2	280	1.0	0.0
-de	02_wind_on	2	280	1.0	0.0
-de	03_wind_off	2	280	1.0	0.0
-de	04_res	2	280	1.0	0.0
-de	05_nuclear	2	280	1.0	0.0
-de	06_coal	2	280	1.0	0.0
+de	01_solar	2	280	0.0	1.0
+de	02_wind_on	2	280	0.0	1.0
+de	03_wind_off	2	280	0.0	1.0
+de	04_res	2	280	0.0	1.0
+de	05_nuclear	2	280	0.0	1.0
+de	06_coal	2	280	0.0	1.0
 de	07_gas	2	280	0.0	0.0
 de	08_non-res	2	280	0.0	0.0
 de	09_hydro_pump	2	280	0.0	0.0
-de	01_solar	2	281	1.0	0.0
-de	02_wind_on	2	281	1.0	0.0
-de	03_wind_off	2	281	1.0	0.0
-de	04_res	2	281	1.0	0.0
-de	05_nuclear	2	281	1.0	0.0
-de	06_coal	2	281	1.0	0.0
+de	01_solar	2	281	0.0	1.0
+de	02_wind_on	2	281	0.0	1.0
+de	03_wind_off	2	281	0.0	1.0
+de	04_res	2	281	0.0	1.0
+de	05_nuclear	2	281	0.0	1.0
+de	06_coal	2	281	0.0	1.0
 de	07_gas	2	281	0.0	0.0
 de	08_non-res	2	281	0.0	0.0
 de	09_hydro_pump	2	281	0.0	0.0
-de	01_solar	2	282	1.0	0.0
-de	02_wind_on	2	282	1.0	0.0
-de	03_wind_off	2	282	1.0	0.0
-de	04_res	2	282	1.0	0.0
-de	05_nuclear	2	282	1.0	0.0
-de	06_coal	2	282	1.0	0.0
+de	01_solar	2	282	0.0	1.0
+de	02_wind_on	2	282	0.0	1.0
+de	03_wind_off	2	282	0.0	1.0
+de	04_res	2	282	0.0	1.0
+de	05_nuclear	2	282	0.0	1.0
+de	06_coal	2	282	0.0	1.0
 de	07_gas	2	282	0.0	0.0
 de	08_non-res	2	282	0.0	0.0
 de	09_hydro_pump	2	282	0.0	0.0
-de	01_solar	2	283	1.0	0.0
-de	02_wind_on	2	283	1.0	0.0
-de	03_wind_off	2	283	1.0	0.0
-de	04_res	2	283	1.0	0.0
-de	05_nuclear	2	283	1.0	0.0
-de	06_coal	2	283	1.0	0.0
+de	01_solar	2	283	0.0	1.0
+de	02_wind_on	2	283	0.0	1.0
+de	03_wind_off	2	283	0.0	1.0
+de	04_res	2	283	0.0	1.0
+de	05_nuclear	2	283	0.0	1.0
+de	06_coal	2	283	0.0	1.0
 de	07_gas	2	283	0.0	0.0
 de	08_non-res	2	283	0.0	0.0
 de	09_hydro_pump	2	283	0.0	0.0
-de	01_solar	2	284	1.0	0.0
-de	02_wind_on	2	284	1.0	0.0
-de	03_wind_off	2	284	1.0	0.0
-de	04_res	2	284	1.0	0.0
-de	05_nuclear	2	284	1.0	0.0
-de	06_coal	2	284	1.0	0.0
+de	01_solar	2	284	0.0	1.0
+de	02_wind_on	2	284	0.0	1.0
+de	03_wind_off	2	284	0.0	1.0
+de	04_res	2	284	0.0	1.0
+de	05_nuclear	2	284	0.0	1.0
+de	06_coal	2	284	0.0	1.0
 de	07_gas	2	284	0.0	0.0
 de	08_non-res	2	284	0.0	0.0
 de	09_hydro_pump	2	284	0.0	0.0
-de	01_solar	2	285	1.0	0.0
-de	02_wind_on	2	285	1.0	0.0
-de	03_wind_off	2	285	1.0	0.0
-de	04_res	2	285	1.0	0.0
-de	05_nuclear	2	285	1.0	0.0
-de	06_coal	2	285	1.0	0.0
+de	01_solar	2	285	0.0	1.0
+de	02_wind_on	2	285	0.0	1.0
+de	03_wind_off	2	285	0.0	1.0
+de	04_res	2	285	0.0	1.0
+de	05_nuclear	2	285	0.0	1.0
+de	06_coal	2	285	0.0	1.0
 de	07_gas	2	285	0.0	0.0
 de	08_non-res	2	285	0.0	0.0
 de	09_hydro_pump	2	285	0.0	0.0
-de	01_solar	2	286	1.0	0.0
-de	02_wind_on	2	286	1.0	0.0
-de	03_wind_off	2	286	1.0	0.0
-de	04_res	2	286	1.0	0.0
-de	05_nuclear	2	286	1.0	0.0
-de	06_coal	2	286	1.0	0.0
+de	01_solar	2	286	0.0	1.0
+de	02_wind_on	2	286	0.0	1.0
+de	03_wind_off	2	286	0.0	1.0
+de	04_res	2	286	0.0	1.0
+de	05_nuclear	2	286	0.0	1.0
+de	06_coal	2	286	0.0	1.0
 de	07_gas	2	286	0.0	0.0
 de	08_non-res	2	286	0.0	0.0
 de	09_hydro_pump	2	286	0.0	0.0
-de	01_solar	2	287	1.0	0.0
-de	02_wind_on	2	287	1.0	0.0
-de	03_wind_off	2	287	1.0	0.0
-de	04_res	2	287	1.0	0.0
-de	05_nuclear	2	287	1.0	0.0
-de	06_coal	2	287	1.0	0.0
+de	01_solar	2	287	0.0	1.0
+de	02_wind_on	2	287	0.0	1.0
+de	03_wind_off	2	287	0.0	1.0
+de	04_res	2	287	0.0	1.0
+de	05_nuclear	2	287	0.0	1.0
+de	06_coal	2	287	0.0	1.0
 de	07_gas	2	287	0.0	0.0
 de	08_non-res	2	287	0.0	0.0
 de	09_hydro_pump	2	287	0.0	0.0
-de	01_solar	2	288	1.0	0.0
-de	02_wind_on	2	288	1.0	0.0
-de	03_wind_off	2	288	1.0	0.0
-de	04_res	2	288	1.0	0.0
-de	05_nuclear	2	288	1.0	0.0
-de	06_coal	2	288	1.0	0.0
+de	01_solar	2	288	0.0	1.0
+de	02_wind_on	2	288	0.0	1.0
+de	03_wind_off	2	288	0.0	1.0
+de	04_res	2	288	0.0	1.0
+de	05_nuclear	2	288	0.0	1.0
+de	06_coal	2	288	0.0	1.0
 de	07_gas	2	288	0.0	0.0
 de	08_non-res	2	288	0.0	0.0
 de	09_hydro_pump	2	288	0.0	0.0
-de	01_solar	2	289	1.0	0.0
-de	02_wind_on	2	289	1.0	0.0
-de	03_wind_off	2	289	1.0	0.0
-de	04_res	2	289	1.0	0.0
-de	05_nuclear	2	289	1.0	0.0
-de	06_coal	2	289	1.0	0.0
+de	01_solar	2	289	0.0	1.0
+de	02_wind_on	2	289	0.0	1.0
+de	03_wind_off	2	289	0.0	1.0
+de	04_res	2	289	0.0	1.0
+de	05_nuclear	2	289	0.0	1.0
+de	06_coal	2	289	0.0	1.0
 de	07_gas	2	289	0.0	0.0
 de	08_non-res	2	289	0.0	0.0
 de	09_hydro_pump	2	289	0.0	0.0
-de	01_solar	2	290	1.0	0.0
-de	02_wind_on	2	290	1.0	0.0
-de	03_wind_off	2	290	1.0	0.0
-de	04_res	2	290	1.0	0.0
-de	05_nuclear	2	290	1.0	0.0
-de	06_coal	2	290	1.0	0.0
-de	07_gas	2	290	1.0	0.0
+de	01_solar	2	290	0.0	1.0
+de	02_wind_on	2	290	0.0	1.0
+de	03_wind_off	2	290	0.0	1.0
+de	04_res	2	290	0.0	1.0
+de	05_nuclear	2	290	0.0	1.0
+de	06_coal	2	290	0.0	1.0
+de	07_gas	2	290	0.0	1.0
 de	08_non-res	2	290	0.0	0.0
 de	09_hydro_pump	2	290	0.0	0.0
-de	01_solar	2	291	1.0	0.0
-de	02_wind_on	2	291	1.0	0.0
-de	03_wind_off	2	291	1.0	0.0
-de	04_res	2	291	1.0	0.0
-de	05_nuclear	2	291	1.0	0.0
-de	06_coal	2	291	1.0	0.0
-de	07_gas	2	291	1.0	0.0
+de	01_solar	2	291	0.0	1.0
+de	02_wind_on	2	291	0.0	1.0
+de	03_wind_off	2	291	0.0	1.0
+de	04_res	2	291	0.0	1.0
+de	05_nuclear	2	291	0.0	1.0
+de	06_coal	2	291	0.0	1.0
+de	07_gas	2	291	0.0	1.0
 de	08_non-res	2	291	0.0	0.0
 de	09_hydro_pump	2	291	0.0	0.0
-de	01_solar	2	292	1.0	0.0
-de	02_wind_on	2	292	1.0	0.0
-de	03_wind_off	2	292	1.0	0.0
-de	04_res	2	292	1.0	0.0
-de	05_nuclear	2	292	1.0	0.0
-de	06_coal	2	292	1.0	0.0
-de	07_gas	2	292	1.0	0.0
+de	01_solar	2	292	0.0	1.0
+de	02_wind_on	2	292	0.0	1.0
+de	03_wind_off	2	292	0.0	1.0
+de	04_res	2	292	0.0	1.0
+de	05_nuclear	2	292	0.0	1.0
+de	06_coal	2	292	0.0	1.0
+de	07_gas	2	292	0.0	1.0
 de	08_non-res	2	292	0.0	0.0
 de	09_hydro_pump	2	292	0.0	0.0
-de	01_solar	2	293	1.0	0.0
-de	02_wind_on	2	293	1.0	0.0
-de	03_wind_off	2	293	1.0	0.0
-de	04_res	2	293	1.0	0.0
-de	05_nuclear	2	293	1.0	0.0
-de	06_coal	2	293	1.0	0.0
-de	07_gas	2	293	1.0	0.0
+de	01_solar	2	293	0.0	1.0
+de	02_wind_on	2	293	0.0	1.0
+de	03_wind_off	2	293	0.0	1.0
+de	04_res	2	293	0.0	1.0
+de	05_nuclear	2	293	0.0	1.0
+de	06_coal	2	293	0.0	1.0
+de	07_gas	2	293	0.0	1.0
 de	08_non-res	2	293	0.0	0.0
 de	09_hydro_pump	2	293	0.0	0.0
-de	01_solar	2	294	1.0	0.0
-de	02_wind_on	2	294	1.0	0.0
-de	03_wind_off	2	294	1.0	0.0
-de	04_res	2	294	1.0	0.0
-de	05_nuclear	2	294	1.0	0.0
-de	06_coal	2	294	1.0	0.0
-de	07_gas	2	294	1.0	0.0
+de	01_solar	2	294	0.0	1.0
+de	02_wind_on	2	294	0.0	1.0
+de	03_wind_off	2	294	0.0	1.0
+de	04_res	2	294	0.0	1.0
+de	05_nuclear	2	294	0.0	1.0
+de	06_coal	2	294	0.0	1.0
+de	07_gas	2	294	0.0	1.0
 de	08_non-res	2	294	0.0	0.0
 de	09_hydro_pump	2	294	0.0	0.0
-de	01_solar	2	295	1.0	0.0
-de	02_wind_on	2	295	1.0	0.0
-de	03_wind_off	2	295	1.0	0.0
-de	04_res	2	295	1.0	0.0
-de	05_nuclear	2	295	1.0	0.0
-de	06_coal	2	295	1.0	0.0
-de	07_gas	2	295	1.0	0.0
+de	01_solar	2	295	0.0	1.0
+de	02_wind_on	2	295	0.0	1.0
+de	03_wind_off	2	295	0.0	1.0
+de	04_res	2	295	0.0	1.0
+de	05_nuclear	2	295	0.0	1.0
+de	06_coal	2	295	0.0	1.0
+de	07_gas	2	295	0.0	1.0
 de	08_non-res	2	295	0.0	0.0
 de	09_hydro_pump	2	295	0.0	0.0
-de	01_solar	2	296	1.0	0.0
-de	02_wind_on	2	296	1.0	0.0
-de	03_wind_off	2	296	1.0	0.0
-de	04_res	2	296	1.0	0.0
-de	05_nuclear	2	296	1.0	0.0
-de	06_coal	2	296	1.0	0.0
-de	07_gas	2	296	1.0	0.0
+de	01_solar	2	296	0.0	1.0
+de	02_wind_on	2	296	0.0	1.0
+de	03_wind_off	2	296	0.0	1.0
+de	04_res	2	296	0.0	1.0
+de	05_nuclear	2	296	0.0	1.0
+de	06_coal	2	296	0.0	1.0
+de	07_gas	2	296	0.0	1.0
 de	08_non-res	2	296	0.0	0.0
 de	09_hydro_pump	2	296	0.0	0.0
-de	01_solar	2	297	1.0	0.0
-de	02_wind_on	2	297	1.0	0.0
-de	03_wind_off	2	297	1.0	0.0
-de	04_res	2	297	1.0	0.0
-de	05_nuclear	2	297	1.0	0.0
-de	06_coal	2	297	1.0	0.0
-de	07_gas	2	297	1.0	0.0
+de	01_solar	2	297	0.0	1.0
+de	02_wind_on	2	297	0.0	1.0
+de	03_wind_off	2	297	0.0	1.0
+de	04_res	2	297	0.0	1.0
+de	05_nuclear	2	297	0.0	1.0
+de	06_coal	2	297	0.0	1.0
+de	07_gas	2	297	0.0	1.0
 de	08_non-res	2	297	0.0	0.0
 de	09_hydro_pump	2	297	0.0	0.0
-de	01_solar	2	298	1.0	0.0
-de	02_wind_on	2	298	1.0	0.0
-de	03_wind_off	2	298	1.0	0.0
-de	04_res	2	298	1.0	0.0
-de	05_nuclear	2	298	1.0	0.0
-de	06_coal	2	298	1.0	0.0
-de	07_gas	2	298	1.0	0.0
+de	01_solar	2	298	0.0	1.0
+de	02_wind_on	2	298	0.0	1.0
+de	03_wind_off	2	298	0.0	1.0
+de	04_res	2	298	0.0	1.0
+de	05_nuclear	2	298	0.0	1.0
+de	06_coal	2	298	0.0	1.0
+de	07_gas	2	298	0.0	1.0
 de	08_non-res	2	298	0.0	0.0
 de	09_hydro_pump	2	298	0.0	0.0
-de	01_solar	2	299	1.0	0.0
-de	02_wind_on	2	299	1.0	0.0
-de	03_wind_off	2	299	1.0	0.0
-de	04_res	2	299	1.0	0.0
-de	05_nuclear	2	299	1.0	0.0
-de	06_coal	2	299	1.0	0.0
-de	07_gas	2	299	1.0	0.0
+de	01_solar	2	299	0.0	1.0
+de	02_wind_on	2	299	0.0	1.0
+de	03_wind_off	2	299	0.0	1.0
+de	04_res	2	299	0.0	1.0
+de	05_nuclear	2	299	0.0	1.0
+de	06_coal	2	299	0.0	1.0
+de	07_gas	2	299	0.0	1.0
 de	08_non-res	2	299	0.0	0.0
 de	09_hydro_pump	2	299	0.0	0.0
-de	01_solar	2	300	1.0	0.0
-de	02_wind_on	2	300	1.0	0.0
-de	03_wind_off	2	300	1.0	0.0
-de	04_res	2	300	1.0	0.0
-de	05_nuclear	2	300	1.0	0.0
-de	06_coal	2	300	1.0	0.0
-de	07_gas	2	300	1.0	0.0
+de	01_solar	2	300	0.0	1.0
+de	02_wind_on	2	300	0.0	1.0
+de	03_wind_off	2	300	0.0	1.0
+de	04_res	2	300	0.0	1.0
+de	05_nuclear	2	300	0.0	1.0
+de	06_coal	2	300	0.0	1.0
+de	07_gas	2	300	0.0	1.0
 de	08_non-res	2	300	0.0	0.0
 de	09_hydro_pump	2	300	0.0	0.0
-de	01_solar	2	301	1.0	0.0
-de	02_wind_on	2	301	1.0	0.0
-de	03_wind_off	2	301	1.0	0.0
-de	04_res	2	301	1.0	0.0
-de	05_nuclear	2	301	1.0	0.0
-de	06_coal	2	301	1.0	0.0
-de	07_gas	2	301	1.0	0.0
+de	01_solar	2	301	0.0	1.0
+de	02_wind_on	2	301	0.0	1.0
+de	03_wind_off	2	301	0.0	1.0
+de	04_res	2	301	0.0	1.0
+de	05_nuclear	2	301	0.0	1.0
+de	06_coal	2	301	0.0	1.0
+de	07_gas	2	301	0.0	1.0
 de	08_non-res	2	301	0.0	0.0
 de	09_hydro_pump	2	301	0.0	0.0
-de	01_solar	2	302	1.0	0.0
-de	02_wind_on	2	302	1.0	0.0
-de	03_wind_off	2	302	1.0	0.0
-de	04_res	2	302	1.0	0.0
-de	05_nuclear	2	302	1.0	0.0
-de	06_coal	2	302	1.0	0.0
-de	07_gas	2	302	1.0	0.0
+de	01_solar	2	302	0.0	1.0
+de	02_wind_on	2	302	0.0	1.0
+de	03_wind_off	2	302	0.0	1.0
+de	04_res	2	302	0.0	1.0
+de	05_nuclear	2	302	0.0	1.0
+de	06_coal	2	302	0.0	1.0
+de	07_gas	2	302	0.0	1.0
 de	08_non-res	2	302	0.0	0.0
 de	09_hydro_pump	2	302	0.0	0.0
-de	01_solar	2	303	1.0	0.0
-de	02_wind_on	2	303	1.0	0.0
-de	03_wind_off	2	303	1.0	0.0
-de	04_res	2	303	1.0	0.0
-de	05_nuclear	2	303	1.0	0.0
-de	06_coal	2	303	1.0	0.0
-de	07_gas	2	303	1.0	0.0
+de	01_solar	2	303	0.0	1.0
+de	02_wind_on	2	303	0.0	1.0
+de	03_wind_off	2	303	0.0	1.0
+de	04_res	2	303	0.0	1.0
+de	05_nuclear	2	303	0.0	1.0
+de	06_coal	2	303	0.0	1.0
+de	07_gas	2	303	0.0	1.0
 de	08_non-res	2	303	0.0	0.0
 de	09_hydro_pump	2	303	0.0	0.0
-de	01_solar	2	304	1.0	0.0
-de	02_wind_on	2	304	1.0	0.0
-de	03_wind_off	2	304	1.0	0.0
-de	04_res	2	304	1.0	0.0
-de	05_nuclear	2	304	1.0	0.0
-de	06_coal	2	304	1.0	0.0
-de	07_gas	2	304	1.0	0.0
+de	01_solar	2	304	0.0	1.0
+de	02_wind_on	2	304	0.0	1.0
+de	03_wind_off	2	304	0.0	1.0
+de	04_res	2	304	0.0	1.0
+de	05_nuclear	2	304	0.0	1.0
+de	06_coal	2	304	0.0	1.0
+de	07_gas	2	304	0.0	1.0
 de	08_non-res	2	304	0.0	0.0
 de	09_hydro_pump	2	304	0.0	0.0
-de	01_solar	2	305	1.0	0.0
-de	02_wind_on	2	305	1.0	0.0
-de	03_wind_off	2	305	1.0	0.0
-de	04_res	2	305	1.0	0.0
-de	05_nuclear	2	305	1.0	0.0
-de	06_coal	2	305	1.0	0.0
-de	07_gas	2	305	1.0	0.0
+de	01_solar	2	305	0.0	1.0
+de	02_wind_on	2	305	0.0	1.0
+de	03_wind_off	2	305	0.0	1.0
+de	04_res	2	305	0.0	1.0
+de	05_nuclear	2	305	0.0	1.0
+de	06_coal	2	305	0.0	1.0
+de	07_gas	2	305	0.0	1.0
 de	08_non-res	2	305	0.0	0.0
 de	09_hydro_pump	2	305	0.0	0.0
-de	01_solar	2	306	1.0	0.0
-de	02_wind_on	2	306	1.0	0.0
-de	03_wind_off	2	306	1.0	0.0
-de	04_res	2	306	1.0	0.0
-de	05_nuclear	2	306	1.0	0.0
-de	06_coal	2	306	1.0	0.0
-de	07_gas	2	306	1.0	0.0
+de	01_solar	2	306	0.0	1.0
+de	02_wind_on	2	306	0.0	1.0
+de	03_wind_off	2	306	0.0	1.0
+de	04_res	2	306	0.0	1.0
+de	05_nuclear	2	306	0.0	1.0
+de	06_coal	2	306	0.0	1.0
+de	07_gas	2	306	0.0	1.0
 de	08_non-res	2	306	0.0	0.0
 de	09_hydro_pump	2	306	0.0	0.0
-de	01_solar	2	307	1.0	0.0
-de	02_wind_on	2	307	1.0	0.0
-de	03_wind_off	2	307	1.0	0.0
-de	04_res	2	307	1.0	0.0
-de	05_nuclear	2	307	1.0	0.0
-de	06_coal	2	307	1.0	0.0
-de	07_gas	2	307	1.0	0.0
+de	01_solar	2	307	0.0	1.0
+de	02_wind_on	2	307	0.0	1.0
+de	03_wind_off	2	307	0.0	1.0
+de	04_res	2	307	0.0	1.0
+de	05_nuclear	2	307	0.0	1.0
+de	06_coal	2	307	0.0	1.0
+de	07_gas	2	307	0.0	1.0
 de	08_non-res	2	307	0.0	0.0
 de	09_hydro_pump	2	307	0.0	0.0
-de	01_solar	2	308	1.0	0.0
-de	02_wind_on	2	308	1.0	0.0
-de	03_wind_off	2	308	1.0	0.0
-de	04_res	2	308	1.0	0.0
-de	05_nuclear	2	308	1.0	0.0
-de	06_coal	2	308	1.0	0.0
-de	07_gas	2	308	1.0	0.0
+de	01_solar	2	308	0.0	1.0
+de	02_wind_on	2	308	0.0	1.0
+de	03_wind_off	2	308	0.0	1.0
+de	04_res	2	308	0.0	1.0
+de	05_nuclear	2	308	0.0	1.0
+de	06_coal	2	308	0.0	1.0
+de	07_gas	2	308	0.0	1.0
 de	08_non-res	2	308	0.0	0.0
 de	09_hydro_pump	2	308	0.0	0.0
-de	01_solar	2	309	1.0	0.0
-de	02_wind_on	2	309	1.0	0.0
-de	03_wind_off	2	309	1.0	0.0
-de	04_res	2	309	1.0	0.0
-de	05_nuclear	2	309	1.0	0.0
-de	06_coal	2	309	1.0	0.0
-de	07_gas	2	309	1.0	0.0
+de	01_solar	2	309	0.0	1.0
+de	02_wind_on	2	309	0.0	1.0
+de	03_wind_off	2	309	0.0	1.0
+de	04_res	2	309	0.0	1.0
+de	05_nuclear	2	309	0.0	1.0
+de	06_coal	2	309	0.0	1.0
+de	07_gas	2	309	0.0	1.0
 de	08_non-res	2	309	0.0	0.0
 de	09_hydro_pump	2	309	0.0	0.0
-de	01_solar	2	310	1.0	0.0
-de	02_wind_on	2	310	1.0	0.0
-de	03_wind_off	2	310	1.0	0.0
-de	04_res	2	310	1.0	0.0
-de	05_nuclear	2	310	1.0	0.0
-de	06_coal	2	310	1.0	0.0
-de	07_gas	2	310	1.0	0.0
-de	08_non-res	2	310	1.0	0.0
+de	01_solar	2	310	0.0	1.0
+de	02_wind_on	2	310	0.0	1.0
+de	03_wind_off	2	310	0.0	1.0
+de	04_res	2	310	0.0	1.0
+de	05_nuclear	2	310	0.0	1.0
+de	06_coal	2	310	0.0	1.0
+de	07_gas	2	310	0.0	1.0
+de	08_non-res	2	310	0.0	1.0
 de	09_hydro_pump	2	310	0.0	0.0
-de	01_solar	2	311	1.0	0.0
-de	02_wind_on	2	311	1.0	0.0
-de	03_wind_off	2	311	1.0	0.0
-de	04_res	2	311	1.0	0.0
-de	05_nuclear	2	311	1.0	0.0
-de	06_coal	2	311	1.0	0.0
-de	07_gas	2	311	1.0	0.0
-de	08_non-res	2	311	1.0	0.0
+de	01_solar	2	311	0.0	1.0
+de	02_wind_on	2	311	0.0	1.0
+de	03_wind_off	2	311	0.0	1.0
+de	04_res	2	311	0.0	1.0
+de	05_nuclear	2	311	0.0	1.0
+de	06_coal	2	311	0.0	1.0
+de	07_gas	2	311	0.0	1.0
+de	08_non-res	2	311	0.0	1.0
 de	09_hydro_pump	2	311	0.0	0.0
-de	01_solar	2	312	1.0	0.0
-de	02_wind_on	2	312	1.0	0.0
-de	03_wind_off	2	312	1.0	0.0
-de	04_res	2	312	1.0	0.0
-de	05_nuclear	2	312	1.0	0.0
-de	06_coal	2	312	1.0	0.0
-de	07_gas	2	312	1.0	0.0
-de	08_non-res	2	312	1.0	0.0
+de	01_solar	2	312	0.0	1.0
+de	02_wind_on	2	312	0.0	1.0
+de	03_wind_off	2	312	0.0	1.0
+de	04_res	2	312	0.0	1.0
+de	05_nuclear	2	312	0.0	1.0
+de	06_coal	2	312	0.0	1.0
+de	07_gas	2	312	0.0	1.0
+de	08_non-res	2	312	0.0	1.0
 de	09_hydro_pump	2	312	0.0	0.0
-de	01_solar	2	313	1.0	0.0
-de	02_wind_on	2	313	1.0	0.0
-de	03_wind_off	2	313	1.0	0.0
-de	04_res	2	313	1.0	0.0
-de	05_nuclear	2	313	1.0	0.0
-de	06_coal	2	313	1.0	0.0
-de	07_gas	2	313	1.0	0.0
-de	08_non-res	2	313	1.0	0.0
+de	01_solar	2	313	0.0	1.0
+de	02_wind_on	2	313	0.0	1.0
+de	03_wind_off	2	313	0.0	1.0
+de	04_res	2	313	0.0	1.0
+de	05_nuclear	2	313	0.0	1.0
+de	06_coal	2	313	0.0	1.0
+de	07_gas	2	313	0.0	1.0
+de	08_non-res	2	313	0.0	1.0
 de	09_hydro_pump	2	313	0.0	0.0
-de	01_solar	2	314	1.0	0.0
-de	02_wind_on	2	314	1.0	0.0
-de	03_wind_off	2	314	1.0	0.0
-de	04_res	2	314	1.0	0.0
-de	05_nuclear	2	314	1.0	0.0
-de	06_coal	2	314	1.0	0.0
-de	07_gas	2	314	1.0	0.0
-de	08_non-res	2	314	1.0	0.0
+de	01_solar	2	314	0.0	1.0
+de	02_wind_on	2	314	0.0	1.0
+de	03_wind_off	2	314	0.0	1.0
+de	04_res	2	314	0.0	1.0
+de	05_nuclear	2	314	0.0	1.0
+de	06_coal	2	314	0.0	1.0
+de	07_gas	2	314	0.0	1.0
+de	08_non-res	2	314	0.0	1.0
 de	09_hydro_pump	2	314	0.0	0.0
-de	01_solar	2	315	1.0	0.0
-de	02_wind_on	2	315	1.0	0.0
-de	03_wind_off	2	315	1.0	0.0
-de	04_res	2	315	1.0	0.0
-de	05_nuclear	2	315	1.0	0.0
-de	06_coal	2	315	1.0	0.0
-de	07_gas	2	315	1.0	0.0
-de	08_non-res	2	315	1.0	0.0
+de	01_solar	2	315	0.0	1.0
+de	02_wind_on	2	315	0.0	1.0
+de	03_wind_off	2	315	0.0	1.0
+de	04_res	2	315	0.0	1.0
+de	05_nuclear	2	315	0.0	1.0
+de	06_coal	2	315	0.0	1.0
+de	07_gas	2	315	0.0	1.0
+de	08_non-res	2	315	0.0	1.0
 de	09_hydro_pump	2	315	0.0	0.0
-de	01_solar	2	316	1.0	0.0
-de	02_wind_on	2	316	1.0	0.0
-de	03_wind_off	2	316	1.0	0.0
-de	04_res	2	316	1.0	0.0
-de	05_nuclear	2	316	1.0	0.0
-de	06_coal	2	316	1.0	0.0
-de	07_gas	2	316	1.0	0.0
-de	08_non-res	2	316	1.0	0.0
+de	01_solar	2	316	0.0	1.0
+de	02_wind_on	2	316	0.0	1.0
+de	03_wind_off	2	316	0.0	1.0
+de	04_res	2	316	0.0	1.0
+de	05_nuclear	2	316	0.0	1.0
+de	06_coal	2	316	0.0	1.0
+de	07_gas	2	316	0.0	1.0
+de	08_non-res	2	316	0.0	1.0
 de	09_hydro_pump	2	316	0.0	0.0
-de	01_solar	2	317	1.0	0.0
-de	02_wind_on	2	317	1.0	0.0
-de	03_wind_off	2	317	1.0	0.0
-de	04_res	2	317	1.0	0.0
-de	05_nuclear	2	317	1.0	0.0
-de	06_coal	2	317	1.0	0.0
-de	07_gas	2	317	1.0	0.0
-de	08_non-res	2	317	1.0	0.0
+de	01_solar	2	317	0.0	1.0
+de	02_wind_on	2	317	0.0	1.0
+de	03_wind_off	2	317	0.0	1.0
+de	04_res	2	317	0.0	1.0
+de	05_nuclear	2	317	0.0	1.0
+de	06_coal	2	317	0.0	1.0
+de	07_gas	2	317	0.0	1.0
+de	08_non-res	2	317	0.0	1.0
 de	09_hydro_pump	2	317	0.0	0.0
-de	01_solar	2	318	1.0	0.0
-de	02_wind_on	2	318	1.0	0.0
-de	03_wind_off	2	318	1.0	0.0
-de	04_res	2	318	1.0	0.0
-de	05_nuclear	2	318	1.0	0.0
-de	06_coal	2	318	1.0	0.0
-de	07_gas	2	318	1.0	0.0
-de	08_non-res	2	318	1.0	0.0
+de	01_solar	2	318	0.0	1.0
+de	02_wind_on	2	318	0.0	1.0
+de	03_wind_off	2	318	0.0	1.0
+de	04_res	2	318	0.0	1.0
+de	05_nuclear	2	318	0.0	1.0
+de	06_coal	2	318	0.0	1.0
+de	07_gas	2	318	0.0	1.0
+de	08_non-res	2	318	0.0	1.0
 de	09_hydro_pump	2	318	0.0	0.0
-de	01_solar	2	319	1.0	0.0
-de	02_wind_on	2	319	1.0	0.0
-de	03_wind_off	2	319	1.0	0.0
-de	04_res	2	319	1.0	0.0
-de	05_nuclear	2	319	1.0	0.0
-de	06_coal	2	319	1.0	0.0
-de	07_gas	2	319	1.0	0.0
-de	08_non-res	2	319	1.0	0.0
+de	01_solar	2	319	0.0	1.0
+de	02_wind_on	2	319	0.0	1.0
+de	03_wind_off	2	319	0.0	1.0
+de	04_res	2	319	0.0	1.0
+de	05_nuclear	2	319	0.0	1.0
+de	06_coal	2	319	0.0	1.0
+de	07_gas	2	319	0.0	1.0
+de	08_non-res	2	319	0.0	1.0
 de	09_hydro_pump	2	319	0.0	0.0
-de	01_solar	2	320	1.0	0.0
-de	02_wind_on	2	320	1.0	0.0
-de	03_wind_off	2	320	1.0	0.0
-de	04_res	2	320	1.0	0.0
-de	05_nuclear	2	320	1.0	0.0
-de	06_coal	2	320	1.0	0.0
-de	07_gas	2	320	1.0	0.0
-de	08_non-res	2	320	1.0	0.0
+de	01_solar	2	320	0.0	1.0
+de	02_wind_on	2	320	0.0	1.0
+de	03_wind_off	2	320	0.0	1.0
+de	04_res	2	320	0.0	1.0
+de	05_nuclear	2	320	0.0	1.0
+de	06_coal	2	320	0.0	1.0
+de	07_gas	2	320	0.0	1.0
+de	08_non-res	2	320	0.0	1.0
 de	09_hydro_pump	2	320	0.0	0.0
-de	01_solar	2	321	1.0	0.0
-de	02_wind_on	2	321	1.0	0.0
-de	03_wind_off	2	321	1.0	0.0
-de	04_res	2	321	1.0	0.0
-de	05_nuclear	2	321	1.0	0.0
-de	06_coal	2	321	1.0	0.0
-de	07_gas	2	321	1.0	0.0
-de	08_non-res	2	321	1.0	0.0
+de	01_solar	2	321	0.0	1.0
+de	02_wind_on	2	321	0.0	1.0
+de	03_wind_off	2	321	0.0	1.0
+de	04_res	2	321	0.0	1.0
+de	05_nuclear	2	321	0.0	1.0
+de	06_coal	2	321	0.0	1.0
+de	07_gas	2	321	0.0	1.0
+de	08_non-res	2	321	0.0	1.0
 de	09_hydro_pump	2	321	0.0	0.0
-de	01_solar	2	322	1.0	0.0
-de	02_wind_on	2	322	1.0	0.0
-de	03_wind_off	2	322	1.0	0.0
-de	04_res	2	322	1.0	0.0
-de	05_nuclear	2	322	1.0	0.0
-de	06_coal	2	322	1.0	0.0
-de	07_gas	2	322	1.0	0.0
-de	08_non-res	2	322	1.0	0.0
+de	01_solar	2	322	0.0	1.0
+de	02_wind_on	2	322	0.0	1.0
+de	03_wind_off	2	322	0.0	1.0
+de	04_res	2	322	0.0	1.0
+de	05_nuclear	2	322	0.0	1.0
+de	06_coal	2	322	0.0	1.0
+de	07_gas	2	322	0.0	1.0
+de	08_non-res	2	322	0.0	1.0
 de	09_hydro_pump	2	322	0.0	0.0
-de	01_solar	2	323	1.0	0.0
-de	02_wind_on	2	323	1.0	0.0
-de	03_wind_off	2	323	1.0	0.0
-de	04_res	2	323	1.0	0.0
-de	05_nuclear	2	323	1.0	0.0
-de	06_coal	2	323	1.0	0.0
-de	07_gas	2	323	1.0	0.0
-de	08_non-res	2	323	1.0	0.0
+de	01_solar	2	323	0.0	1.0
+de	02_wind_on	2	323	0.0	1.0
+de	03_wind_off	2	323	0.0	1.0
+de	04_res	2	323	0.0	1.0
+de	05_nuclear	2	323	0.0	1.0
+de	06_coal	2	323	0.0	1.0
+de	07_gas	2	323	0.0	1.0
+de	08_non-res	2	323	0.0	1.0
 de	09_hydro_pump	2	323	0.0	0.0
-de	01_solar	2	324	1.0	0.0
-de	02_wind_on	2	324	1.0	0.0
-de	03_wind_off	2	324	1.0	0.0
-de	04_res	2	324	1.0	0.0
-de	05_nuclear	2	324	1.0	0.0
-de	06_coal	2	324	1.0	0.0
-de	07_gas	2	324	1.0	0.0
-de	08_non-res	2	324	1.0	0.0
+de	01_solar	2	324	0.0	1.0
+de	02_wind_on	2	324	0.0	1.0
+de	03_wind_off	2	324	0.0	1.0
+de	04_res	2	324	0.0	1.0
+de	05_nuclear	2	324	0.0	1.0
+de	06_coal	2	324	0.0	1.0
+de	07_gas	2	324	0.0	1.0
+de	08_non-res	2	324	0.0	1.0
 de	09_hydro_pump	2	324	0.0	0.0
-de	01_solar	2	325	1.0	0.0
-de	02_wind_on	2	325	1.0	0.0
-de	03_wind_off	2	325	1.0	0.0
-de	04_res	2	325	1.0	0.0
-de	05_nuclear	2	325	1.0	0.0
-de	06_coal	2	325	1.0	0.0
-de	07_gas	2	325	1.0	0.0
-de	08_non-res	2	325	1.0	0.0
+de	01_solar	2	325	0.0	1.0
+de	02_wind_on	2	325	0.0	1.0
+de	03_wind_off	2	325	0.0	1.0
+de	04_res	2	325	0.0	1.0
+de	05_nuclear	2	325	0.0	1.0
+de	06_coal	2	325	0.0	1.0
+de	07_gas	2	325	0.0	1.0
+de	08_non-res	2	325	0.0	1.0
 de	09_hydro_pump	2	325	0.0	0.0
-de	01_solar	2	326	1.0	0.0
-de	02_wind_on	2	326	1.0	0.0
-de	03_wind_off	2	326	1.0	0.0
-de	04_res	2	326	1.0	0.0
-de	05_nuclear	2	326	1.0	0.0
-de	06_coal	2	326	1.0	0.0
-de	07_gas	2	326	1.0	0.0
-de	08_non-res	2	326	1.0	0.0
+de	01_solar	2	326	0.0	1.0
+de	02_wind_on	2	326	0.0	1.0
+de	03_wind_off	2	326	0.0	1.0
+de	04_res	2	326	0.0	1.0
+de	05_nuclear	2	326	0.0	1.0
+de	06_coal	2	326	0.0	1.0
+de	07_gas	2	326	0.0	1.0
+de	08_non-res	2	326	0.0	1.0
 de	09_hydro_pump	2	326	0.0	0.0
-de	01_solar	2	327	1.0	0.0
-de	02_wind_on	2	327	1.0	0.0
-de	03_wind_off	2	327	1.0	0.0
-de	04_res	2	327	1.0	0.0
-de	05_nuclear	2	327	1.0	0.0
-de	06_coal	2	327	1.0	0.0
-de	07_gas	2	327	1.0	0.0
-de	08_non-res	2	327	1.0	0.0
+de	01_solar	2	327	0.0	1.0
+de	02_wind_on	2	327	0.0	1.0
+de	03_wind_off	2	327	0.0	1.0
+de	04_res	2	327	0.0	1.0
+de	05_nuclear	2	327	0.0	1.0
+de	06_coal	2	327	0.0	1.0
+de	07_gas	2	327	0.0	1.0
+de	08_non-res	2	327	0.0	1.0
 de	09_hydro_pump	2	327	0.0	0.0
-de	01_solar	2	328	1.0	0.0
-de	02_wind_on	2	328	1.0	0.0
-de	03_wind_off	2	328	1.0	0.0
-de	04_res	2	328	1.0	0.0
-de	05_nuclear	2	328	1.0	0.0
-de	06_coal	2	328	1.0	0.0
-de	07_gas	2	328	1.0	0.0
-de	08_non-res	2	328	1.0	0.0
+de	01_solar	2	328	0.0	1.0
+de	02_wind_on	2	328	0.0	1.0
+de	03_wind_off	2	328	0.0	1.0
+de	04_res	2	328	0.0	1.0
+de	05_nuclear	2	328	0.0	1.0
+de	06_coal	2	328	0.0	1.0
+de	07_gas	2	328	0.0	1.0
+de	08_non-res	2	328	0.0	1.0
 de	09_hydro_pump	2	328	0.0	0.0
-de	01_solar	2	329	1.0	0.0
-de	02_wind_on	2	329	1.0	0.0
-de	03_wind_off	2	329	1.0	0.0
-de	04_res	2	329	1.0	0.0
-de	05_nuclear	2	329	1.0	0.0
-de	06_coal	2	329	1.0	0.0
-de	07_gas	2	329	1.0	0.0
-de	08_non-res	2	329	1.0	0.0
+de	01_solar	2	329	0.0	1.0
+de	02_wind_on	2	329	0.0	1.0
+de	03_wind_off	2	329	0.0	1.0
+de	04_res	2	329	0.0	1.0
+de	05_nuclear	2	329	0.0	1.0
+de	06_coal	2	329	0.0	1.0
+de	07_gas	2	329	0.0	1.0
+de	08_non-res	2	329	0.0	1.0
 de	09_hydro_pump	2	329	0.0	0.0
-de	01_solar	2	330	1.0	0.0
-de	02_wind_on	2	330	1.0	0.0
-de	03_wind_off	2	330	1.0	0.0
-de	04_res	2	330	1.0	0.0
-de	05_nuclear	2	330	1.0	0.0
-de	06_coal	2	330	1.0	0.0
-de	07_gas	2	330	1.0	0.0
-de	08_non-res	2	330	1.0	0.0
-de	09_hydro_pump	2	330	1.0	0.0
-de	01_solar	2	331	1.0	0.0
-de	02_wind_on	2	331	1.0	0.0
-de	03_wind_off	2	331	1.0	0.0
-de	04_res	2	331	1.0	0.0
-de	05_nuclear	2	331	1.0	0.0
-de	06_coal	2	331	1.0	0.0
-de	07_gas	2	331	1.0	0.0
-de	08_non-res	2	331	1.0	0.0
-de	09_hydro_pump	2	331	1.0	0.0
-de	01_solar	2	332	1.0	0.0
-de	02_wind_on	2	332	1.0	0.0
-de	03_wind_off	2	332	1.0	0.0
-de	04_res	2	332	1.0	0.0
-de	05_nuclear	2	332	1.0	0.0
-de	06_coal	2	332	1.0	0.0
-de	07_gas	2	332	1.0	0.0
-de	08_non-res	2	332	1.0	0.0
-de	09_hydro_pump	2	332	1.0	0.0
-de	01_solar	2	333	1.0	0.0
-de	02_wind_on	2	333	1.0	0.0
-de	03_wind_off	2	333	1.0	0.0
-de	04_res	2	333	1.0	0.0
-de	05_nuclear	2	333	1.0	0.0
-de	06_coal	2	333	1.0	0.0
-de	07_gas	2	333	1.0	0.0
-de	08_non-res	2	333	1.0	0.0
-de	09_hydro_pump	2	333	1.0	0.0
-de	01_solar	2	334	1.0	0.0
-de	02_wind_on	2	334	1.0	0.0
-de	03_wind_off	2	334	1.0	0.0
-de	04_res	2	334	1.0	0.0
-de	05_nuclear	2	334	1.0	0.0
-de	06_coal	2	334	1.0	0.0
-de	07_gas	2	334	1.0	0.0
-de	08_non-res	2	334	1.0	0.0
-de	09_hydro_pump	2	334	1.0	0.0
-de	01_solar	2	335	1.0	0.0
-de	02_wind_on	2	335	1.0	0.0
-de	03_wind_off	2	335	1.0	0.0
-de	04_res	2	335	1.0	0.0
-de	05_nuclear	2	335	1.0	0.0
-de	06_coal	2	335	1.0	0.0
-de	07_gas	2	335	1.0	0.0
-de	08_non-res	2	335	1.0	0.0
-de	09_hydro_pump	2	335	1.0	0.0
-de	01_solar	2	336	1.0	0.0
-de	02_wind_on	2	336	1.0	0.0
-de	03_wind_off	2	336	1.0	0.0
-de	04_res	2	336	1.0	0.0
-de	05_nuclear	2	336	1.0	0.0
-de	06_coal	2	336	1.0	0.0
-de	07_gas	2	336	1.0	0.0
-de	08_non-res	2	336	1.0	0.0
-de	09_hydro_pump	2	336	1.0	0.0
+de	01_solar	2	330	0.0	1.0
+de	02_wind_on	2	330	0.0	1.0
+de	03_wind_off	2	330	0.0	1.0
+de	04_res	2	330	0.0	1.0
+de	05_nuclear	2	330	0.0	1.0
+de	06_coal	2	330	0.0	1.0
+de	07_gas	2	330	0.0	1.0
+de	08_non-res	2	330	0.0	1.0
+de	09_hydro_pump	2	330	0.0	1.0
+de	01_solar	2	331	0.0	1.0
+de	02_wind_on	2	331	0.0	1.0
+de	03_wind_off	2	331	0.0	1.0
+de	04_res	2	331	0.0	1.0
+de	05_nuclear	2	331	0.0	1.0
+de	06_coal	2	331	0.0	1.0
+de	07_gas	2	331	0.0	1.0
+de	08_non-res	2	331	0.0	1.0
+de	09_hydro_pump	2	331	0.0	1.0
+de	01_solar	2	332	0.0	1.0
+de	02_wind_on	2	332	0.0	1.0
+de	03_wind_off	2	332	0.0	1.0
+de	04_res	2	332	0.0	1.0
+de	05_nuclear	2	332	0.0	1.0
+de	06_coal	2	332	0.0	1.0
+de	07_gas	2	332	0.0	1.0
+de	08_non-res	2	332	0.0	1.0
+de	09_hydro_pump	2	332	0.0	1.0
+de	01_solar	2	333	0.0	1.0
+de	02_wind_on	2	333	0.0	1.0
+de	03_wind_off	2	333	0.0	1.0
+de	04_res	2	333	0.0	1.0
+de	05_nuclear	2	333	0.0	1.0
+de	06_coal	2	333	0.0	1.0
+de	07_gas	2	333	0.0	1.0
+de	08_non-res	2	333	0.0	1.0
+de	09_hydro_pump	2	333	0.0	1.0
+de	01_solar	2	334	0.0	1.0
+de	02_wind_on	2	334	0.0	1.0
+de	03_wind_off	2	334	0.0	1.0
+de	04_res	2	334	0.0	1.0
+de	05_nuclear	2	334	0.0	1.0
+de	06_coal	2	334	0.0	1.0
+de	07_gas	2	334	0.0	1.0
+de	08_non-res	2	334	0.0	1.0
+de	09_hydro_pump	2	334	0.0	1.0
+de	01_solar	2	335	0.0	1.0
+de	02_wind_on	2	335	0.0	1.0
+de	03_wind_off	2	335	0.0	1.0
+de	04_res	2	335	0.0	1.0
+de	05_nuclear	2	335	0.0	1.0
+de	06_coal	2	335	0.0	1.0
+de	07_gas	2	335	0.0	1.0
+de	08_non-res	2	335	0.0	1.0
+de	09_hydro_pump	2	335	0.0	1.0
+de	01_solar	2	336	0.0	1.0
+de	02_wind_on	2	336	0.0	1.0
+de	03_wind_off	2	336	0.0	1.0
+de	04_res	2	336	0.0	1.0
+de	05_nuclear	2	336	0.0	1.0
+de	06_coal	2	336	0.0	1.0
+de	07_gas	2	336	0.0	1.0
+de	08_non-res	2	336	0.0	1.0
+de	09_hydro_pump	2	336	0.0	1.0
 es	01_solar	2	1	0.0	0.0
 es	02_wind_on	2	1	0.0	0.0
 es	03_wind_off	2	1	0.0	0.0
@@ -15128,7 +15128,7 @@ es	06_coal	2	1	0.0	0.0
 es	07_gas	2	1	0.0	0.0
 es	08_non-res	2	1	0.0	0.0
 es	09_hydro_pump	2	1	0.0	0.0
-es	01_solar	2	2	1.0	0.0
+es	01_solar	2	2	0.0	1.0
 es	02_wind_on	2	2	0.0	0.0
 es	03_wind_off	2	2	0.0	0.0
 es	04_res	2	2	0.0	0.0
@@ -15137,7 +15137,7 @@ es	06_coal	2	2	0.0	0.0
 es	07_gas	2	2	0.0	0.0
 es	08_non-res	2	2	0.0	0.0
 es	09_hydro_pump	2	2	0.0	0.0
-es	01_solar	2	3	1.0	0.0
+es	01_solar	2	3	0.0	1.0
 es	02_wind_on	2	3	0.0	0.0
 es	03_wind_off	2	3	0.0	0.0
 es	04_res	2	3	0.0	0.0
@@ -15146,7 +15146,7 @@ es	06_coal	2	3	0.0	0.0
 es	07_gas	2	3	0.0	0.0
 es	08_non-res	2	3	0.0	0.0
 es	09_hydro_pump	2	3	0.0	0.0
-es	01_solar	2	4	1.0	0.0
+es	01_solar	2	4	0.0	1.0
 es	02_wind_on	2	4	0.0	0.0
 es	03_wind_off	2	4	0.0	0.0
 es	04_res	2	4	0.0	0.0
@@ -15155,7 +15155,7 @@ es	06_coal	2	4	0.0	0.0
 es	07_gas	2	4	0.0	0.0
 es	08_non-res	2	4	0.0	0.0
 es	09_hydro_pump	2	4	0.0	0.0
-es	01_solar	2	5	1.0	0.0
+es	01_solar	2	5	0.0	1.0
 es	02_wind_on	2	5	0.0	0.0
 es	03_wind_off	2	5	0.0	0.0
 es	04_res	2	5	0.0	0.0
@@ -15164,7 +15164,7 @@ es	06_coal	2	5	0.0	0.0
 es	07_gas	2	5	0.0	0.0
 es	08_non-res	2	5	0.0	0.0
 es	09_hydro_pump	2	5	0.0	0.0
-es	01_solar	2	6	1.0	0.0
+es	01_solar	2	6	0.0	1.0
 es	02_wind_on	2	6	0.0	0.0
 es	03_wind_off	2	6	0.0	0.0
 es	04_res	2	6	0.0	0.0
@@ -15173,7 +15173,7 @@ es	06_coal	2	6	0.0	0.0
 es	07_gas	2	6	0.0	0.0
 es	08_non-res	2	6	0.0	0.0
 es	09_hydro_pump	2	6	0.0	0.0
-es	01_solar	2	7	1.0	0.0
+es	01_solar	2	7	0.0	1.0
 es	02_wind_on	2	7	0.0	0.0
 es	03_wind_off	2	7	0.0	0.0
 es	04_res	2	7	0.0	0.0
@@ -15182,7 +15182,7 @@ es	06_coal	2	7	0.0	0.0
 es	07_gas	2	7	0.0	0.0
 es	08_non-res	2	7	0.0	0.0
 es	09_hydro_pump	2	7	0.0	0.0
-es	01_solar	2	8	1.0	0.0
+es	01_solar	2	8	0.0	1.0
 es	02_wind_on	2	8	0.0	0.0
 es	03_wind_off	2	8	0.0	0.0
 es	04_res	2	8	0.0	0.0
@@ -15191,7 +15191,7 @@ es	06_coal	2	8	0.0	0.0
 es	07_gas	2	8	0.0	0.0
 es	08_non-res	2	8	0.0	0.0
 es	09_hydro_pump	2	8	0.0	0.0
-es	01_solar	2	9	1.0	0.0
+es	01_solar	2	9	0.0	1.0
 es	02_wind_on	2	9	0.0	0.0
 es	03_wind_off	2	9	0.0	0.0
 es	04_res	2	9	0.0	0.0
@@ -15200,7 +15200,7 @@ es	06_coal	2	9	0.0	0.0
 es	07_gas	2	9	0.0	0.0
 es	08_non-res	2	9	0.0	0.0
 es	09_hydro_pump	2	9	0.0	0.0
-es	01_solar	2	10	1.0	0.0
+es	01_solar	2	10	0.0	1.0
 es	02_wind_on	2	10	0.0	0.0
 es	03_wind_off	2	10	0.0	0.0
 es	04_res	2	10	0.0	0.0
@@ -15209,7 +15209,7 @@ es	06_coal	2	10	0.0	0.0
 es	07_gas	2	10	0.0	0.0
 es	08_non-res	2	10	0.0	0.0
 es	09_hydro_pump	2	10	0.0	0.0
-es	01_solar	2	11	1.0	0.0
+es	01_solar	2	11	0.0	1.0
 es	02_wind_on	2	11	0.0	0.0
 es	03_wind_off	2	11	0.0	0.0
 es	04_res	2	11	0.0	0.0
@@ -15218,7 +15218,7 @@ es	06_coal	2	11	0.0	0.0
 es	07_gas	2	11	0.0	0.0
 es	08_non-res	2	11	0.0	0.0
 es	09_hydro_pump	2	11	0.0	0.0
-es	01_solar	2	12	1.0	0.0
+es	01_solar	2	12	0.0	1.0
 es	02_wind_on	2	12	0.0	0.0
 es	03_wind_off	2	12	0.0	0.0
 es	04_res	2	12	0.0	0.0
@@ -15227,7 +15227,7 @@ es	06_coal	2	12	0.0	0.0
 es	07_gas	2	12	0.0	0.0
 es	08_non-res	2	12	0.0	0.0
 es	09_hydro_pump	2	12	0.0	0.0
-es	01_solar	2	13	1.0	0.0
+es	01_solar	2	13	0.0	1.0
 es	02_wind_on	2	13	0.0	0.0
 es	03_wind_off	2	13	0.0	0.0
 es	04_res	2	13	0.0	0.0
@@ -15236,7 +15236,7 @@ es	06_coal	2	13	0.0	0.0
 es	07_gas	2	13	0.0	0.0
 es	08_non-res	2	13	0.0	0.0
 es	09_hydro_pump	2	13	0.0	0.0
-es	01_solar	2	14	1.0	0.0
+es	01_solar	2	14	0.0	1.0
 es	02_wind_on	2	14	0.0	0.0
 es	03_wind_off	2	14	0.0	0.0
 es	04_res	2	14	0.0	0.0
@@ -15245,7 +15245,7 @@ es	06_coal	2	14	0.0	0.0
 es	07_gas	2	14	0.0	0.0
 es	08_non-res	2	14	0.0	0.0
 es	09_hydro_pump	2	14	0.0	0.0
-es	01_solar	2	15	1.0	0.0
+es	01_solar	2	15	0.0	1.0
 es	02_wind_on	2	15	0.0	0.0
 es	03_wind_off	2	15	0.0	0.0
 es	04_res	2	15	0.0	0.0
@@ -15254,7 +15254,7 @@ es	06_coal	2	15	0.0	0.0
 es	07_gas	2	15	0.0	0.0
 es	08_non-res	2	15	0.0	0.0
 es	09_hydro_pump	2	15	0.0	0.0
-es	01_solar	2	16	1.0	0.0
+es	01_solar	2	16	0.0	1.0
 es	02_wind_on	2	16	0.0	0.0
 es	03_wind_off	2	16	0.0	0.0
 es	04_res	2	16	0.0	0.0
@@ -15263,7 +15263,7 @@ es	06_coal	2	16	0.0	0.0
 es	07_gas	2	16	0.0	0.0
 es	08_non-res	2	16	0.0	0.0
 es	09_hydro_pump	2	16	0.0	0.0
-es	01_solar	2	17	1.0	0.0
+es	01_solar	2	17	0.0	1.0
 es	02_wind_on	2	17	0.0	0.0
 es	03_wind_off	2	17	0.0	0.0
 es	04_res	2	17	0.0	0.0
@@ -15272,7 +15272,7 @@ es	06_coal	2	17	0.0	0.0
 es	07_gas	2	17	0.0	0.0
 es	08_non-res	2	17	0.0	0.0
 es	09_hydro_pump	2	17	0.0	0.0
-es	01_solar	2	18	1.0	0.0
+es	01_solar	2	18	0.0	1.0
 es	02_wind_on	2	18	0.0	0.0
 es	03_wind_off	2	18	0.0	0.0
 es	04_res	2	18	0.0	0.0
@@ -15281,7 +15281,7 @@ es	06_coal	2	18	0.0	0.0
 es	07_gas	2	18	0.0	0.0
 es	08_non-res	2	18	0.0	0.0
 es	09_hydro_pump	2	18	0.0	0.0
-es	01_solar	2	19	1.0	0.0
+es	01_solar	2	19	0.0	1.0
 es	02_wind_on	2	19	0.0	0.0
 es	03_wind_off	2	19	0.0	0.0
 es	04_res	2	19	0.0	0.0
@@ -15290,7 +15290,7 @@ es	06_coal	2	19	0.0	0.0
 es	07_gas	2	19	0.0	0.0
 es	08_non-res	2	19	0.0	0.0
 es	09_hydro_pump	2	19	0.0	0.0
-es	01_solar	2	20	1.0	0.0
+es	01_solar	2	20	0.0	1.0
 es	02_wind_on	2	20	0.0	0.0
 es	03_wind_off	2	20	0.0	0.0
 es	04_res	2	20	0.0	0.0
@@ -15299,7 +15299,7 @@ es	06_coal	2	20	0.0	0.0
 es	07_gas	2	20	0.0	0.0
 es	08_non-res	2	20	0.0	0.0
 es	09_hydro_pump	2	20	0.0	0.0
-es	01_solar	2	21	1.0	0.0
+es	01_solar	2	21	0.0	1.0
 es	02_wind_on	2	21	0.0	0.0
 es	03_wind_off	2	21	0.0	0.0
 es	04_res	2	21	0.0	0.0
@@ -15308,8 +15308,8 @@ es	06_coal	2	21	0.0	0.0
 es	07_gas	2	21	0.0	0.0
 es	08_non-res	2	21	0.0	0.0
 es	09_hydro_pump	2	21	0.0	0.0
-es	01_solar	2	22	1.0	0.0
-es	02_wind_on	2	22	1.0	0.0
+es	01_solar	2	22	0.0	1.0
+es	02_wind_on	2	22	0.0	1.0
 es	03_wind_off	2	22	0.0	0.0
 es	04_res	2	22	0.0	0.0
 es	05_nuclear	2	22	0.0	0.0
@@ -15317,8 +15317,8 @@ es	06_coal	2	22	0.0	0.0
 es	07_gas	2	22	0.0	0.0
 es	08_non-res	2	22	0.0	0.0
 es	09_hydro_pump	2	22	0.0	0.0
-es	01_solar	2	23	1.0	0.0
-es	02_wind_on	2	23	1.0	0.0
+es	01_solar	2	23	0.0	1.0
+es	02_wind_on	2	23	0.0	1.0
 es	03_wind_off	2	23	0.0	0.0
 es	04_res	2	23	0.0	0.0
 es	05_nuclear	2	23	0.0	0.0
@@ -15326,8 +15326,8 @@ es	06_coal	2	23	0.0	0.0
 es	07_gas	2	23	0.0	0.0
 es	08_non-res	2	23	0.0	0.0
 es	09_hydro_pump	2	23	0.0	0.0
-es	01_solar	2	24	1.0	0.0
-es	02_wind_on	2	24	1.0	0.0
+es	01_solar	2	24	0.0	1.0
+es	02_wind_on	2	24	0.0	1.0
 es	03_wind_off	2	24	0.0	0.0
 es	04_res	2	24	0.0	0.0
 es	05_nuclear	2	24	0.0	0.0
@@ -15335,8 +15335,8 @@ es	06_coal	2	24	0.0	0.0
 es	07_gas	2	24	0.0	0.0
 es	08_non-res	2	24	0.0	0.0
 es	09_hydro_pump	2	24	0.0	0.0
-es	01_solar	2	25	1.0	0.0
-es	02_wind_on	2	25	1.0	0.0
+es	01_solar	2	25	0.0	1.0
+es	02_wind_on	2	25	0.0	1.0
 es	03_wind_off	2	25	0.0	0.0
 es	04_res	2	25	0.0	0.0
 es	05_nuclear	2	25	0.0	0.0
@@ -15344,8 +15344,8 @@ es	06_coal	2	25	0.0	0.0
 es	07_gas	2	25	0.0	0.0
 es	08_non-res	2	25	0.0	0.0
 es	09_hydro_pump	2	25	0.0	0.0
-es	01_solar	2	26	1.0	0.0
-es	02_wind_on	2	26	1.0	0.0
+es	01_solar	2	26	0.0	1.0
+es	02_wind_on	2	26	0.0	1.0
 es	03_wind_off	2	26	0.0	0.0
 es	04_res	2	26	0.0	0.0
 es	05_nuclear	2	26	0.0	0.0
@@ -15353,8 +15353,8 @@ es	06_coal	2	26	0.0	0.0
 es	07_gas	2	26	0.0	0.0
 es	08_non-res	2	26	0.0	0.0
 es	09_hydro_pump	2	26	0.0	0.0
-es	01_solar	2	27	1.0	0.0
-es	02_wind_on	2	27	1.0	0.0
+es	01_solar	2	27	0.0	1.0
+es	02_wind_on	2	27	0.0	1.0
 es	03_wind_off	2	27	0.0	0.0
 es	04_res	2	27	0.0	0.0
 es	05_nuclear	2	27	0.0	0.0
@@ -15362,8 +15362,8 @@ es	06_coal	2	27	0.0	0.0
 es	07_gas	2	27	0.0	0.0
 es	08_non-res	2	27	0.0	0.0
 es	09_hydro_pump	2	27	0.0	0.0
-es	01_solar	2	28	1.0	0.0
-es	02_wind_on	2	28	1.0	0.0
+es	01_solar	2	28	0.0	1.0
+es	02_wind_on	2	28	0.0	1.0
 es	03_wind_off	2	28	0.0	0.0
 es	04_res	2	28	0.0	0.0
 es	05_nuclear	2	28	0.0	0.0
@@ -15371,8 +15371,8 @@ es	06_coal	2	28	0.0	0.0
 es	07_gas	2	28	0.0	0.0
 es	08_non-res	2	28	0.0	0.0
 es	09_hydro_pump	2	28	0.0	0.0
-es	01_solar	2	29	1.0	0.0
-es	02_wind_on	2	29	1.0	0.0
+es	01_solar	2	29	0.0	1.0
+es	02_wind_on	2	29	0.0	1.0
 es	03_wind_off	2	29	0.0	0.0
 es	04_res	2	29	0.0	0.0
 es	05_nuclear	2	29	0.0	0.0
@@ -15380,8 +15380,8 @@ es	06_coal	2	29	0.0	0.0
 es	07_gas	2	29	0.0	0.0
 es	08_non-res	2	29	0.0	0.0
 es	09_hydro_pump	2	29	0.0	0.0
-es	01_solar	2	30	1.0	0.0
-es	02_wind_on	2	30	1.0	0.0
+es	01_solar	2	30	0.0	1.0
+es	02_wind_on	2	30	0.0	1.0
 es	03_wind_off	2	30	0.0	0.0
 es	04_res	2	30	0.0	0.0
 es	05_nuclear	2	30	0.0	0.0
@@ -15389,8 +15389,8 @@ es	06_coal	2	30	0.0	0.0
 es	07_gas	2	30	0.0	0.0
 es	08_non-res	2	30	0.0	0.0
 es	09_hydro_pump	2	30	0.0	0.0
-es	01_solar	2	31	1.0	0.0
-es	02_wind_on	2	31	1.0	0.0
+es	01_solar	2	31	0.0	1.0
+es	02_wind_on	2	31	0.0	1.0
 es	03_wind_off	2	31	0.0	0.0
 es	04_res	2	31	0.0	0.0
 es	05_nuclear	2	31	0.0	0.0
@@ -15398,8 +15398,8 @@ es	06_coal	2	31	0.0	0.0
 es	07_gas	2	31	0.0	0.0
 es	08_non-res	2	31	0.0	0.0
 es	09_hydro_pump	2	31	0.0	0.0
-es	01_solar	2	32	1.0	0.0
-es	02_wind_on	2	32	1.0	0.0
+es	01_solar	2	32	0.0	1.0
+es	02_wind_on	2	32	0.0	1.0
 es	03_wind_off	2	32	0.0	0.0
 es	04_res	2	32	0.0	0.0
 es	05_nuclear	2	32	0.0	0.0
@@ -15407,8 +15407,8 @@ es	06_coal	2	32	0.0	0.0
 es	07_gas	2	32	0.0	0.0
 es	08_non-res	2	32	0.0	0.0
 es	09_hydro_pump	2	32	0.0	0.0
-es	01_solar	2	33	1.0	0.0
-es	02_wind_on	2	33	1.0	0.0
+es	01_solar	2	33	0.0	1.0
+es	02_wind_on	2	33	0.0	1.0
 es	03_wind_off	2	33	0.0	0.0
 es	04_res	2	33	0.0	0.0
 es	05_nuclear	2	33	0.0	0.0
@@ -15416,8 +15416,8 @@ es	06_coal	2	33	0.0	0.0
 es	07_gas	2	33	0.0	0.0
 es	08_non-res	2	33	0.0	0.0
 es	09_hydro_pump	2	33	0.0	0.0
-es	01_solar	2	34	1.0	0.0
-es	02_wind_on	2	34	1.0	0.0
+es	01_solar	2	34	0.0	1.0
+es	02_wind_on	2	34	0.0	1.0
 es	03_wind_off	2	34	0.0	0.0
 es	04_res	2	34	0.0	0.0
 es	05_nuclear	2	34	0.0	0.0
@@ -15425,8 +15425,8 @@ es	06_coal	2	34	0.0	0.0
 es	07_gas	2	34	0.0	0.0
 es	08_non-res	2	34	0.0	0.0
 es	09_hydro_pump	2	34	0.0	0.0
-es	01_solar	2	35	1.0	0.0
-es	02_wind_on	2	35	1.0	0.0
+es	01_solar	2	35	0.0	1.0
+es	02_wind_on	2	35	0.0	1.0
 es	03_wind_off	2	35	0.0	0.0
 es	04_res	2	35	0.0	0.0
 es	05_nuclear	2	35	0.0	0.0
@@ -15434,8 +15434,8 @@ es	06_coal	2	35	0.0	0.0
 es	07_gas	2	35	0.0	0.0
 es	08_non-res	2	35	0.0	0.0
 es	09_hydro_pump	2	35	0.0	0.0
-es	01_solar	2	36	1.0	0.0
-es	02_wind_on	2	36	1.0	0.0
+es	01_solar	2	36	0.0	1.0
+es	02_wind_on	2	36	0.0	1.0
 es	03_wind_off	2	36	0.0	0.0
 es	04_res	2	36	0.0	0.0
 es	05_nuclear	2	36	0.0	0.0
@@ -15443,8 +15443,8 @@ es	06_coal	2	36	0.0	0.0
 es	07_gas	2	36	0.0	0.0
 es	08_non-res	2	36	0.0	0.0
 es	09_hydro_pump	2	36	0.0	0.0
-es	01_solar	2	37	1.0	0.0
-es	02_wind_on	2	37	1.0	0.0
+es	01_solar	2	37	0.0	1.0
+es	02_wind_on	2	37	0.0	1.0
 es	03_wind_off	2	37	0.0	0.0
 es	04_res	2	37	0.0	0.0
 es	05_nuclear	2	37	0.0	0.0
@@ -15452,8 +15452,8 @@ es	06_coal	2	37	0.0	0.0
 es	07_gas	2	37	0.0	0.0
 es	08_non-res	2	37	0.0	0.0
 es	09_hydro_pump	2	37	0.0	0.0
-es	01_solar	2	38	1.0	0.0
-es	02_wind_on	2	38	1.0	0.0
+es	01_solar	2	38	0.0	1.0
+es	02_wind_on	2	38	0.0	1.0
 es	03_wind_off	2	38	0.0	0.0
 es	04_res	2	38	0.0	0.0
 es	05_nuclear	2	38	0.0	0.0
@@ -15461,8 +15461,8 @@ es	06_coal	2	38	0.0	0.0
 es	07_gas	2	38	0.0	0.0
 es	08_non-res	2	38	0.0	0.0
 es	09_hydro_pump	2	38	0.0	0.0
-es	01_solar	2	39	1.0	0.0
-es	02_wind_on	2	39	1.0	0.0
+es	01_solar	2	39	0.0	1.0
+es	02_wind_on	2	39	0.0	1.0
 es	03_wind_off	2	39	0.0	0.0
 es	04_res	2	39	0.0	0.0
 es	05_nuclear	2	39	0.0	0.0
@@ -15470,8 +15470,8 @@ es	06_coal	2	39	0.0	0.0
 es	07_gas	2	39	0.0	0.0
 es	08_non-res	2	39	0.0	0.0
 es	09_hydro_pump	2	39	0.0	0.0
-es	01_solar	2	40	1.0	0.0
-es	02_wind_on	2	40	1.0	0.0
+es	01_solar	2	40	0.0	1.0
+es	02_wind_on	2	40	0.0	1.0
 es	03_wind_off	2	40	0.0	0.0
 es	04_res	2	40	0.0	0.0
 es	05_nuclear	2	40	0.0	0.0
@@ -15479,8 +15479,8 @@ es	06_coal	2	40	0.0	0.0
 es	07_gas	2	40	0.0	0.0
 es	08_non-res	2	40	0.0	0.0
 es	09_hydro_pump	2	40	0.0	0.0
-es	01_solar	2	41	1.0	0.0
-es	02_wind_on	2	41	1.0	0.0
+es	01_solar	2	41	0.0	1.0
+es	02_wind_on	2	41	0.0	1.0
 es	03_wind_off	2	41	0.0	0.0
 es	04_res	2	41	0.0	0.0
 es	05_nuclear	2	41	0.0	0.0
@@ -15488,1149 +15488,1149 @@ es	06_coal	2	41	0.0	0.0
 es	07_gas	2	41	0.0	0.0
 es	08_non-res	2	41	0.0	0.0
 es	09_hydro_pump	2	41	0.0	0.0
-es	01_solar	2	42	1.0	0.0
-es	02_wind_on	2	42	1.0	0.0
-es	03_wind_off	2	42	1.0	0.0
+es	01_solar	2	42	0.0	1.0
+es	02_wind_on	2	42	0.0	1.0
+es	03_wind_off	2	42	0.0	1.0
 es	04_res	2	42	0.0	0.0
 es	05_nuclear	2	42	0.0	0.0
 es	06_coal	2	42	0.0	0.0
 es	07_gas	2	42	0.0	0.0
 es	08_non-res	2	42	0.0	0.0
 es	09_hydro_pump	2	42	0.0	0.0
-es	01_solar	2	43	1.0	0.0
-es	02_wind_on	2	43	1.0	0.0
-es	03_wind_off	2	43	1.0	0.0
+es	01_solar	2	43	0.0	1.0
+es	02_wind_on	2	43	0.0	1.0
+es	03_wind_off	2	43	0.0	1.0
 es	04_res	2	43	0.0	0.0
 es	05_nuclear	2	43	0.0	0.0
 es	06_coal	2	43	0.0	0.0
 es	07_gas	2	43	0.0	0.0
 es	08_non-res	2	43	0.0	0.0
 es	09_hydro_pump	2	43	0.0	0.0
-es	01_solar	2	44	1.0	0.0
-es	02_wind_on	2	44	1.0	0.0
-es	03_wind_off	2	44	1.0	0.0
+es	01_solar	2	44	0.0	1.0
+es	02_wind_on	2	44	0.0	1.0
+es	03_wind_off	2	44	0.0	1.0
 es	04_res	2	44	0.0	0.0
 es	05_nuclear	2	44	0.0	0.0
 es	06_coal	2	44	0.0	0.0
 es	07_gas	2	44	0.0	0.0
 es	08_non-res	2	44	0.0	0.0
 es	09_hydro_pump	2	44	0.0	0.0
-es	01_solar	2	45	1.0	0.0
-es	02_wind_on	2	45	1.0	0.0
-es	03_wind_off	2	45	1.0	0.0
+es	01_solar	2	45	0.0	1.0
+es	02_wind_on	2	45	0.0	1.0
+es	03_wind_off	2	45	0.0	1.0
 es	04_res	2	45	0.0	0.0
 es	05_nuclear	2	45	0.0	0.0
 es	06_coal	2	45	0.0	0.0
 es	07_gas	2	45	0.0	0.0
 es	08_non-res	2	45	0.0	0.0
 es	09_hydro_pump	2	45	0.0	0.0
-es	01_solar	2	46	1.0	0.0
-es	02_wind_on	2	46	1.0	0.0
-es	03_wind_off	2	46	1.0	0.0
+es	01_solar	2	46	0.0	1.0
+es	02_wind_on	2	46	0.0	1.0
+es	03_wind_off	2	46	0.0	1.0
 es	04_res	2	46	0.0	0.0
 es	05_nuclear	2	46	0.0	0.0
 es	06_coal	2	46	0.0	0.0
 es	07_gas	2	46	0.0	0.0
 es	08_non-res	2	46	0.0	0.0
 es	09_hydro_pump	2	46	0.0	0.0
-es	01_solar	2	47	1.0	0.0
-es	02_wind_on	2	47	1.0	0.0
-es	03_wind_off	2	47	1.0	0.0
+es	01_solar	2	47	0.0	1.0
+es	02_wind_on	2	47	0.0	1.0
+es	03_wind_off	2	47	0.0	1.0
 es	04_res	2	47	0.0	0.0
 es	05_nuclear	2	47	0.0	0.0
 es	06_coal	2	47	0.0	0.0
 es	07_gas	2	47	0.0	0.0
 es	08_non-res	2	47	0.0	0.0
 es	09_hydro_pump	2	47	0.0	0.0
-es	01_solar	2	48	1.0	0.0
-es	02_wind_on	2	48	1.0	0.0
-es	03_wind_off	2	48	1.0	0.0
+es	01_solar	2	48	0.0	1.0
+es	02_wind_on	2	48	0.0	1.0
+es	03_wind_off	2	48	0.0	1.0
 es	04_res	2	48	0.0	0.0
 es	05_nuclear	2	48	0.0	0.0
 es	06_coal	2	48	0.0	0.0
 es	07_gas	2	48	0.0	0.0
 es	08_non-res	2	48	0.0	0.0
 es	09_hydro_pump	2	48	0.0	0.0
-es	01_solar	2	49	1.0	0.0
-es	02_wind_on	2	49	1.0	0.0
-es	03_wind_off	2	49	1.0	0.0
+es	01_solar	2	49	0.0	1.0
+es	02_wind_on	2	49	0.0	1.0
+es	03_wind_off	2	49	0.0	1.0
 es	04_res	2	49	0.0	0.0
 es	05_nuclear	2	49	0.0	0.0
 es	06_coal	2	49	0.0	0.0
 es	07_gas	2	49	0.0	0.0
 es	08_non-res	2	49	0.0	0.0
 es	09_hydro_pump	2	49	0.0	0.0
-es	01_solar	2	50	1.0	0.0
-es	02_wind_on	2	50	1.0	0.0
-es	03_wind_off	2	50	1.0	0.0
+es	01_solar	2	50	0.0	1.0
+es	02_wind_on	2	50	0.0	1.0
+es	03_wind_off	2	50	0.0	1.0
 es	04_res	2	50	0.0	0.0
 es	05_nuclear	2	50	0.0	0.0
 es	06_coal	2	50	0.0	0.0
 es	07_gas	2	50	0.0	0.0
 es	08_non-res	2	50	0.0	0.0
 es	09_hydro_pump	2	50	0.0	0.0
-es	01_solar	2	51	1.0	0.0
-es	02_wind_on	2	51	1.0	0.0
-es	03_wind_off	2	51	1.0	0.0
+es	01_solar	2	51	0.0	1.0
+es	02_wind_on	2	51	0.0	1.0
+es	03_wind_off	2	51	0.0	1.0
 es	04_res	2	51	0.0	0.0
 es	05_nuclear	2	51	0.0	0.0
 es	06_coal	2	51	0.0	0.0
 es	07_gas	2	51	0.0	0.0
 es	08_non-res	2	51	0.0	0.0
 es	09_hydro_pump	2	51	0.0	0.0
-es	01_solar	2	52	1.0	0.0
-es	02_wind_on	2	52	1.0	0.0
-es	03_wind_off	2	52	1.0	0.0
+es	01_solar	2	52	0.0	1.0
+es	02_wind_on	2	52	0.0	1.0
+es	03_wind_off	2	52	0.0	1.0
 es	04_res	2	52	0.0	0.0
 es	05_nuclear	2	52	0.0	0.0
 es	06_coal	2	52	0.0	0.0
 es	07_gas	2	52	0.0	0.0
 es	08_non-res	2	52	0.0	0.0
 es	09_hydro_pump	2	52	0.0	0.0
-es	01_solar	2	53	1.0	0.0
-es	02_wind_on	2	53	1.0	0.0
-es	03_wind_off	2	53	1.0	0.0
+es	01_solar	2	53	0.0	1.0
+es	02_wind_on	2	53	0.0	1.0
+es	03_wind_off	2	53	0.0	1.0
 es	04_res	2	53	0.0	0.0
 es	05_nuclear	2	53	0.0	0.0
 es	06_coal	2	53	0.0	0.0
 es	07_gas	2	53	0.0	0.0
 es	08_non-res	2	53	0.0	0.0
 es	09_hydro_pump	2	53	0.0	0.0
-es	01_solar	2	54	1.0	0.0
-es	02_wind_on	2	54	1.0	0.0
-es	03_wind_off	2	54	1.0	0.0
+es	01_solar	2	54	0.0	1.0
+es	02_wind_on	2	54	0.0	1.0
+es	03_wind_off	2	54	0.0	1.0
 es	04_res	2	54	0.0	0.0
 es	05_nuclear	2	54	0.0	0.0
 es	06_coal	2	54	0.0	0.0
 es	07_gas	2	54	0.0	0.0
 es	08_non-res	2	54	0.0	0.0
 es	09_hydro_pump	2	54	0.0	0.0
-es	01_solar	2	55	1.0	0.0
-es	02_wind_on	2	55	1.0	0.0
-es	03_wind_off	2	55	1.0	0.0
+es	01_solar	2	55	0.0	1.0
+es	02_wind_on	2	55	0.0	1.0
+es	03_wind_off	2	55	0.0	1.0
 es	04_res	2	55	0.0	0.0
 es	05_nuclear	2	55	0.0	0.0
 es	06_coal	2	55	0.0	0.0
 es	07_gas	2	55	0.0	0.0
 es	08_non-res	2	55	0.0	0.0
 es	09_hydro_pump	2	55	0.0	0.0
-es	01_solar	2	56	1.0	0.0
-es	02_wind_on	2	56	1.0	0.0
-es	03_wind_off	2	56	1.0	0.0
+es	01_solar	2	56	0.0	1.0
+es	02_wind_on	2	56	0.0	1.0
+es	03_wind_off	2	56	0.0	1.0
 es	04_res	2	56	0.0	0.0
 es	05_nuclear	2	56	0.0	0.0
 es	06_coal	2	56	0.0	0.0
 es	07_gas	2	56	0.0	0.0
 es	08_non-res	2	56	0.0	0.0
 es	09_hydro_pump	2	56	0.0	0.0
-es	01_solar	2	57	1.0	0.0
-es	02_wind_on	2	57	1.0	0.0
-es	03_wind_off	2	57	1.0	0.0
+es	01_solar	2	57	0.0	1.0
+es	02_wind_on	2	57	0.0	1.0
+es	03_wind_off	2	57	0.0	1.0
 es	04_res	2	57	0.0	0.0
 es	05_nuclear	2	57	0.0	0.0
 es	06_coal	2	57	0.0	0.0
 es	07_gas	2	57	0.0	0.0
 es	08_non-res	2	57	0.0	0.0
 es	09_hydro_pump	2	57	0.0	0.0
-es	01_solar	2	58	1.0	0.0
-es	02_wind_on	2	58	1.0	0.0
-es	03_wind_off	2	58	1.0	0.0
+es	01_solar	2	58	0.0	1.0
+es	02_wind_on	2	58	0.0	1.0
+es	03_wind_off	2	58	0.0	1.0
 es	04_res	2	58	0.0	0.0
 es	05_nuclear	2	58	0.0	0.0
 es	06_coal	2	58	0.0	0.0
 es	07_gas	2	58	0.0	0.0
 es	08_non-res	2	58	0.0	0.0
 es	09_hydro_pump	2	58	0.0	0.0
-es	01_solar	2	59	1.0	0.0
-es	02_wind_on	2	59	1.0	0.0
-es	03_wind_off	2	59	1.0	0.0
+es	01_solar	2	59	0.0	1.0
+es	02_wind_on	2	59	0.0	1.0
+es	03_wind_off	2	59	0.0	1.0
 es	04_res	2	59	0.0	0.0
 es	05_nuclear	2	59	0.0	0.0
 es	06_coal	2	59	0.0	0.0
 es	07_gas	2	59	0.0	0.0
 es	08_non-res	2	59	0.0	0.0
 es	09_hydro_pump	2	59	0.0	0.0
-es	01_solar	2	60	1.0	0.0
-es	02_wind_on	2	60	1.0	0.0
-es	03_wind_off	2	60	1.0	0.0
+es	01_solar	2	60	0.0	1.0
+es	02_wind_on	2	60	0.0	1.0
+es	03_wind_off	2	60	0.0	1.0
 es	04_res	2	60	0.0	0.0
 es	05_nuclear	2	60	0.0	0.0
 es	06_coal	2	60	0.0	0.0
 es	07_gas	2	60	0.0	0.0
 es	08_non-res	2	60	0.0	0.0
 es	09_hydro_pump	2	60	0.0	0.0
-es	01_solar	2	61	1.0	0.0
-es	02_wind_on	2	61	1.0	0.0
-es	03_wind_off	2	61	1.0	0.0
+es	01_solar	2	61	0.0	1.0
+es	02_wind_on	2	61	0.0	1.0
+es	03_wind_off	2	61	0.0	1.0
 es	04_res	2	61	0.0	0.0
 es	05_nuclear	2	61	0.0	0.0
 es	06_coal	2	61	0.0	0.0
 es	07_gas	2	61	0.0	0.0
 es	08_non-res	2	61	0.0	0.0
 es	09_hydro_pump	2	61	0.0	0.0
-es	01_solar	2	62	1.0	0.0
-es	02_wind_on	2	62	1.0	0.0
-es	03_wind_off	2	62	1.0	0.0
-es	04_res	2	62	1.0	0.0
+es	01_solar	2	62	0.0	1.0
+es	02_wind_on	2	62	0.0	1.0
+es	03_wind_off	2	62	0.0	1.0
+es	04_res	2	62	0.0	1.0
 es	05_nuclear	2	62	0.0	0.0
 es	06_coal	2	62	0.0	0.0
 es	07_gas	2	62	0.0	0.0
 es	08_non-res	2	62	0.0	0.0
 es	09_hydro_pump	2	62	0.0	0.0
-es	01_solar	2	63	1.0	0.0
-es	02_wind_on	2	63	1.0	0.0
-es	03_wind_off	2	63	1.0	0.0
-es	04_res	2	63	1.0	0.0
+es	01_solar	2	63	0.0	1.0
+es	02_wind_on	2	63	0.0	1.0
+es	03_wind_off	2	63	0.0	1.0
+es	04_res	2	63	0.0	1.0
 es	05_nuclear	2	63	0.0	0.0
 es	06_coal	2	63	0.0	0.0
 es	07_gas	2	63	0.0	0.0
 es	08_non-res	2	63	0.0	0.0
 es	09_hydro_pump	2	63	0.0	0.0
-es	01_solar	2	64	1.0	0.0
-es	02_wind_on	2	64	1.0	0.0
-es	03_wind_off	2	64	1.0	0.0
-es	04_res	2	64	1.0	0.0
+es	01_solar	2	64	0.0	1.0
+es	02_wind_on	2	64	0.0	1.0
+es	03_wind_off	2	64	0.0	1.0
+es	04_res	2	64	0.0	1.0
 es	05_nuclear	2	64	0.0	0.0
 es	06_coal	2	64	0.0	0.0
 es	07_gas	2	64	0.0	0.0
 es	08_non-res	2	64	0.0	0.0
 es	09_hydro_pump	2	64	0.0	0.0
-es	01_solar	2	65	1.0	0.0
-es	02_wind_on	2	65	1.0	0.0
-es	03_wind_off	2	65	1.0	0.0
-es	04_res	2	65	1.0	0.0
+es	01_solar	2	65	0.0	1.0
+es	02_wind_on	2	65	0.0	1.0
+es	03_wind_off	2	65	0.0	1.0
+es	04_res	2	65	0.0	1.0
 es	05_nuclear	2	65	0.0	0.0
 es	06_coal	2	65	0.0	0.0
 es	07_gas	2	65	0.0	0.0
 es	08_non-res	2	65	0.0	0.0
 es	09_hydro_pump	2	65	0.0	0.0
-es	01_solar	2	66	1.0	0.0
-es	02_wind_on	2	66	1.0	0.0
-es	03_wind_off	2	66	1.0	0.0
-es	04_res	2	66	1.0	0.0
+es	01_solar	2	66	0.0	1.0
+es	02_wind_on	2	66	0.0	1.0
+es	03_wind_off	2	66	0.0	1.0
+es	04_res	2	66	0.0	1.0
 es	05_nuclear	2	66	0.0	0.0
 es	06_coal	2	66	0.0	0.0
 es	07_gas	2	66	0.0	0.0
 es	08_non-res	2	66	0.0	0.0
 es	09_hydro_pump	2	66	0.0	0.0
-es	01_solar	2	67	1.0	0.0
-es	02_wind_on	2	67	1.0	0.0
-es	03_wind_off	2	67	1.0	0.0
-es	04_res	2	67	1.0	0.0
+es	01_solar	2	67	0.0	1.0
+es	02_wind_on	2	67	0.0	1.0
+es	03_wind_off	2	67	0.0	1.0
+es	04_res	2	67	0.0	1.0
 es	05_nuclear	2	67	0.0	0.0
 es	06_coal	2	67	0.0	0.0
 es	07_gas	2	67	0.0	0.0
 es	08_non-res	2	67	0.0	0.0
 es	09_hydro_pump	2	67	0.0	0.0
-es	01_solar	2	68	1.0	0.0
-es	02_wind_on	2	68	1.0	0.0
-es	03_wind_off	2	68	1.0	0.0
-es	04_res	2	68	1.0	0.0
+es	01_solar	2	68	0.0	1.0
+es	02_wind_on	2	68	0.0	1.0
+es	03_wind_off	2	68	0.0	1.0
+es	04_res	2	68	0.0	1.0
 es	05_nuclear	2	68	0.0	0.0
 es	06_coal	2	68	0.0	0.0
 es	07_gas	2	68	0.0	0.0
 es	08_non-res	2	68	0.0	0.0
 es	09_hydro_pump	2	68	0.0	0.0
-es	01_solar	2	69	1.0	0.0
-es	02_wind_on	2	69	1.0	0.0
-es	03_wind_off	2	69	1.0	0.0
-es	04_res	2	69	1.0	0.0
+es	01_solar	2	69	0.0	1.0
+es	02_wind_on	2	69	0.0	1.0
+es	03_wind_off	2	69	0.0	1.0
+es	04_res	2	69	0.0	1.0
 es	05_nuclear	2	69	0.0	0.0
 es	06_coal	2	69	0.0	0.0
 es	07_gas	2	69	0.0	0.0
 es	08_non-res	2	69	0.0	0.0
 es	09_hydro_pump	2	69	0.0	0.0
-es	01_solar	2	70	1.0	0.0
-es	02_wind_on	2	70	1.0	0.0
-es	03_wind_off	2	70	1.0	0.0
-es	04_res	2	70	1.0	0.0
+es	01_solar	2	70	0.0	1.0
+es	02_wind_on	2	70	0.0	1.0
+es	03_wind_off	2	70	0.0	1.0
+es	04_res	2	70	0.0	1.0
 es	05_nuclear	2	70	0.0	0.0
 es	06_coal	2	70	0.0	0.0
 es	07_gas	2	70	0.0	0.0
 es	08_non-res	2	70	0.0	0.0
 es	09_hydro_pump	2	70	0.0	0.0
-es	01_solar	2	71	1.0	0.0
-es	02_wind_on	2	71	1.0	0.0
-es	03_wind_off	2	71	1.0	0.0
-es	04_res	2	71	1.0	0.0
+es	01_solar	2	71	0.0	1.0
+es	02_wind_on	2	71	0.0	1.0
+es	03_wind_off	2	71	0.0	1.0
+es	04_res	2	71	0.0	1.0
 es	05_nuclear	2	71	0.0	0.0
 es	06_coal	2	71	0.0	0.0
 es	07_gas	2	71	0.0	0.0
 es	08_non-res	2	71	0.0	0.0
 es	09_hydro_pump	2	71	0.0	0.0
-es	01_solar	2	72	1.0	0.0
-es	02_wind_on	2	72	1.0	0.0
-es	03_wind_off	2	72	1.0	0.0
-es	04_res	2	72	1.0	0.0
+es	01_solar	2	72	0.0	1.0
+es	02_wind_on	2	72	0.0	1.0
+es	03_wind_off	2	72	0.0	1.0
+es	04_res	2	72	0.0	1.0
 es	05_nuclear	2	72	0.0	0.0
 es	06_coal	2	72	0.0	0.0
 es	07_gas	2	72	0.0	0.0
 es	08_non-res	2	72	0.0	0.0
 es	09_hydro_pump	2	72	0.0	0.0
-es	01_solar	2	73	1.0	0.0
-es	02_wind_on	2	73	1.0	0.0
-es	03_wind_off	2	73	1.0	0.0
-es	04_res	2	73	1.0	0.0
+es	01_solar	2	73	0.0	1.0
+es	02_wind_on	2	73	0.0	1.0
+es	03_wind_off	2	73	0.0	1.0
+es	04_res	2	73	0.0	1.0
 es	05_nuclear	2	73	0.0	0.0
 es	06_coal	2	73	0.0	0.0
 es	07_gas	2	73	0.0	0.0
 es	08_non-res	2	73	0.0	0.0
 es	09_hydro_pump	2	73	0.0	0.0
-es	01_solar	2	74	1.0	0.0
-es	02_wind_on	2	74	1.0	0.0
-es	03_wind_off	2	74	1.0	0.0
-es	04_res	2	74	1.0	0.0
+es	01_solar	2	74	0.0	1.0
+es	02_wind_on	2	74	0.0	1.0
+es	03_wind_off	2	74	0.0	1.0
+es	04_res	2	74	0.0	1.0
 es	05_nuclear	2	74	0.0	0.0
 es	06_coal	2	74	0.0	0.0
 es	07_gas	2	74	0.0	0.0
 es	08_non-res	2	74	0.0	0.0
 es	09_hydro_pump	2	74	0.0	0.0
-es	01_solar	2	75	1.0	0.0
-es	02_wind_on	2	75	1.0	0.0
-es	03_wind_off	2	75	1.0	0.0
-es	04_res	2	75	1.0	0.0
+es	01_solar	2	75	0.0	1.0
+es	02_wind_on	2	75	0.0	1.0
+es	03_wind_off	2	75	0.0	1.0
+es	04_res	2	75	0.0	1.0
 es	05_nuclear	2	75	0.0	0.0
 es	06_coal	2	75	0.0	0.0
 es	07_gas	2	75	0.0	0.0
 es	08_non-res	2	75	0.0	0.0
 es	09_hydro_pump	2	75	0.0	0.0
-es	01_solar	2	76	1.0	0.0
-es	02_wind_on	2	76	1.0	0.0
-es	03_wind_off	2	76	1.0	0.0
-es	04_res	2	76	1.0	0.0
+es	01_solar	2	76	0.0	1.0
+es	02_wind_on	2	76	0.0	1.0
+es	03_wind_off	2	76	0.0	1.0
+es	04_res	2	76	0.0	1.0
 es	05_nuclear	2	76	0.0	0.0
 es	06_coal	2	76	0.0	0.0
 es	07_gas	2	76	0.0	0.0
 es	08_non-res	2	76	0.0	0.0
 es	09_hydro_pump	2	76	0.0	0.0
-es	01_solar	2	77	1.0	0.0
-es	02_wind_on	2	77	1.0	0.0
-es	03_wind_off	2	77	1.0	0.0
-es	04_res	2	77	1.0	0.0
+es	01_solar	2	77	0.0	1.0
+es	02_wind_on	2	77	0.0	1.0
+es	03_wind_off	2	77	0.0	1.0
+es	04_res	2	77	0.0	1.0
 es	05_nuclear	2	77	0.0	0.0
 es	06_coal	2	77	0.0	0.0
 es	07_gas	2	77	0.0	0.0
 es	08_non-res	2	77	0.0	0.0
 es	09_hydro_pump	2	77	0.0	0.0
-es	01_solar	2	78	1.0	0.0
-es	02_wind_on	2	78	1.0	0.0
-es	03_wind_off	2	78	1.0	0.0
-es	04_res	2	78	1.0	0.0
+es	01_solar	2	78	0.0	1.0
+es	02_wind_on	2	78	0.0	1.0
+es	03_wind_off	2	78	0.0	1.0
+es	04_res	2	78	0.0	1.0
 es	05_nuclear	2	78	0.0	0.0
 es	06_coal	2	78	0.0	0.0
 es	07_gas	2	78	0.0	0.0
 es	08_non-res	2	78	0.0	0.0
 es	09_hydro_pump	2	78	0.0	0.0
-es	01_solar	2	79	1.0	0.0
-es	02_wind_on	2	79	1.0	0.0
-es	03_wind_off	2	79	1.0	0.0
-es	04_res	2	79	1.0	0.0
+es	01_solar	2	79	0.0	1.0
+es	02_wind_on	2	79	0.0	1.0
+es	03_wind_off	2	79	0.0	1.0
+es	04_res	2	79	0.0	1.0
 es	05_nuclear	2	79	0.0	0.0
 es	06_coal	2	79	0.0	0.0
 es	07_gas	2	79	0.0	0.0
 es	08_non-res	2	79	0.0	0.0
 es	09_hydro_pump	2	79	0.0	0.0
-es	01_solar	2	80	1.0	0.0
-es	02_wind_on	2	80	1.0	0.0
-es	03_wind_off	2	80	1.0	0.0
-es	04_res	2	80	1.0	0.0
+es	01_solar	2	80	0.0	1.0
+es	02_wind_on	2	80	0.0	1.0
+es	03_wind_off	2	80	0.0	1.0
+es	04_res	2	80	0.0	1.0
 es	05_nuclear	2	80	0.0	0.0
 es	06_coal	2	80	0.0	0.0
 es	07_gas	2	80	0.0	0.0
 es	08_non-res	2	80	0.0	0.0
 es	09_hydro_pump	2	80	0.0	0.0
-es	01_solar	2	81	1.0	0.0
-es	02_wind_on	2	81	1.0	0.0
-es	03_wind_off	2	81	1.0	0.0
-es	04_res	2	81	1.0	0.0
+es	01_solar	2	81	0.0	1.0
+es	02_wind_on	2	81	0.0	1.0
+es	03_wind_off	2	81	0.0	1.0
+es	04_res	2	81	0.0	1.0
 es	05_nuclear	2	81	0.0	0.0
 es	06_coal	2	81	0.0	0.0
 es	07_gas	2	81	0.0	0.0
 es	08_non-res	2	81	0.0	0.0
 es	09_hydro_pump	2	81	0.0	0.0
-es	01_solar	2	82	1.0	0.0
-es	02_wind_on	2	82	1.0	0.0
-es	03_wind_off	2	82	1.0	0.0
-es	04_res	2	82	1.0	0.0
-es	05_nuclear	2	82	1.0	0.0
+es	01_solar	2	82	0.0	1.0
+es	02_wind_on	2	82	0.0	1.0
+es	03_wind_off	2	82	0.0	1.0
+es	04_res	2	82	0.0	1.0
+es	05_nuclear	2	82	0.0	1.0
 es	06_coal	2	82	0.0	0.0
 es	07_gas	2	82	0.0	0.0
 es	08_non-res	2	82	0.0	0.0
 es	09_hydro_pump	2	82	0.0	0.0
-es	01_solar	2	83	1.0	0.0
-es	02_wind_on	2	83	1.0	0.0
-es	03_wind_off	2	83	1.0	0.0
-es	04_res	2	83	1.0	0.0
-es	05_nuclear	2	83	1.0	0.0
+es	01_solar	2	83	0.0	1.0
+es	02_wind_on	2	83	0.0	1.0
+es	03_wind_off	2	83	0.0	1.0
+es	04_res	2	83	0.0	1.0
+es	05_nuclear	2	83	0.0	1.0
 es	06_coal	2	83	0.0	0.0
 es	07_gas	2	83	0.0	0.0
 es	08_non-res	2	83	0.0	0.0
 es	09_hydro_pump	2	83	0.0	0.0
-es	01_solar	2	84	1.0	0.0
-es	02_wind_on	2	84	1.0	0.0
-es	03_wind_off	2	84	1.0	0.0
-es	04_res	2	84	1.0	0.0
-es	05_nuclear	2	84	1.0	0.0
+es	01_solar	2	84	0.0	1.0
+es	02_wind_on	2	84	0.0	1.0
+es	03_wind_off	2	84	0.0	1.0
+es	04_res	2	84	0.0	1.0
+es	05_nuclear	2	84	0.0	1.0
 es	06_coal	2	84	0.0	0.0
 es	07_gas	2	84	0.0	0.0
 es	08_non-res	2	84	0.0	0.0
 es	09_hydro_pump	2	84	0.0	0.0
-es	01_solar	2	85	1.0	0.0
-es	02_wind_on	2	85	1.0	0.0
-es	03_wind_off	2	85	1.0	0.0
-es	04_res	2	85	1.0	0.0
-es	05_nuclear	2	85	1.0	0.0
+es	01_solar	2	85	0.0	1.0
+es	02_wind_on	2	85	0.0	1.0
+es	03_wind_off	2	85	0.0	1.0
+es	04_res	2	85	0.0	1.0
+es	05_nuclear	2	85	0.0	1.0
 es	06_coal	2	85	0.0	0.0
 es	07_gas	2	85	0.0	0.0
 es	08_non-res	2	85	0.0	0.0
 es	09_hydro_pump	2	85	0.0	0.0
-es	01_solar	2	86	1.0	0.0
-es	02_wind_on	2	86	1.0	0.0
-es	03_wind_off	2	86	1.0	0.0
-es	04_res	2	86	1.0	0.0
-es	05_nuclear	2	86	1.0	0.0
+es	01_solar	2	86	0.0	1.0
+es	02_wind_on	2	86	0.0	1.0
+es	03_wind_off	2	86	0.0	1.0
+es	04_res	2	86	0.0	1.0
+es	05_nuclear	2	86	0.0	1.0
 es	06_coal	2	86	0.0	0.0
 es	07_gas	2	86	0.0	0.0
 es	08_non-res	2	86	0.0	0.0
 es	09_hydro_pump	2	86	0.0	0.0
-es	01_solar	2	87	1.0	0.0
-es	02_wind_on	2	87	1.0	0.0
-es	03_wind_off	2	87	1.0	0.0
-es	04_res	2	87	1.0	0.0
-es	05_nuclear	2	87	1.0	0.0
+es	01_solar	2	87	0.0	1.0
+es	02_wind_on	2	87	0.0	1.0
+es	03_wind_off	2	87	0.0	1.0
+es	04_res	2	87	0.0	1.0
+es	05_nuclear	2	87	0.0	1.0
 es	06_coal	2	87	0.0	0.0
 es	07_gas	2	87	0.0	0.0
 es	08_non-res	2	87	0.0	0.0
 es	09_hydro_pump	2	87	0.0	0.0
-es	01_solar	2	88	1.0	0.0
-es	02_wind_on	2	88	1.0	0.0
-es	03_wind_off	2	88	1.0	0.0
-es	04_res	2	88	1.0	0.0
-es	05_nuclear	2	88	1.0	0.0
+es	01_solar	2	88	0.0	1.0
+es	02_wind_on	2	88	0.0	1.0
+es	03_wind_off	2	88	0.0	1.0
+es	04_res	2	88	0.0	1.0
+es	05_nuclear	2	88	0.0	1.0
 es	06_coal	2	88	0.0	0.0
 es	07_gas	2	88	0.0	0.0
 es	08_non-res	2	88	0.0	0.0
 es	09_hydro_pump	2	88	0.0	0.0
-es	01_solar	2	89	1.0	0.0
-es	02_wind_on	2	89	1.0	0.0
-es	03_wind_off	2	89	1.0	0.0
-es	04_res	2	89	1.0	0.0
-es	05_nuclear	2	89	1.0	0.0
+es	01_solar	2	89	0.0	1.0
+es	02_wind_on	2	89	0.0	1.0
+es	03_wind_off	2	89	0.0	1.0
+es	04_res	2	89	0.0	1.0
+es	05_nuclear	2	89	0.0	1.0
 es	06_coal	2	89	0.0	0.0
 es	07_gas	2	89	0.0	0.0
 es	08_non-res	2	89	0.0	0.0
 es	09_hydro_pump	2	89	0.0	0.0
-es	01_solar	2	90	1.0	0.0
-es	02_wind_on	2	90	1.0	0.0
-es	03_wind_off	2	90	1.0	0.0
-es	04_res	2	90	1.0	0.0
-es	05_nuclear	2	90	1.0	0.0
+es	01_solar	2	90	0.0	1.0
+es	02_wind_on	2	90	0.0	1.0
+es	03_wind_off	2	90	0.0	1.0
+es	04_res	2	90	0.0	1.0
+es	05_nuclear	2	90	0.0	1.0
 es	06_coal	2	90	0.0	0.0
 es	07_gas	2	90	0.0	0.0
 es	08_non-res	2	90	0.0	0.0
 es	09_hydro_pump	2	90	0.0	0.0
-es	01_solar	2	91	1.0	0.0
-es	02_wind_on	2	91	1.0	0.0
-es	03_wind_off	2	91	1.0	0.0
-es	04_res	2	91	1.0	0.0
-es	05_nuclear	2	91	1.0	0.0
+es	01_solar	2	91	0.0	1.0
+es	02_wind_on	2	91	0.0	1.0
+es	03_wind_off	2	91	0.0	1.0
+es	04_res	2	91	0.0	1.0
+es	05_nuclear	2	91	0.0	1.0
 es	06_coal	2	91	0.0	0.0
 es	07_gas	2	91	0.0	0.0
 es	08_non-res	2	91	0.0	0.0
 es	09_hydro_pump	2	91	0.0	0.0
-es	01_solar	2	92	1.0	0.0
-es	02_wind_on	2	92	1.0	0.0
-es	03_wind_off	2	92	1.0	0.0
-es	04_res	2	92	1.0	0.0
-es	05_nuclear	2	92	1.0	0.0
+es	01_solar	2	92	0.0	1.0
+es	02_wind_on	2	92	0.0	1.0
+es	03_wind_off	2	92	0.0	1.0
+es	04_res	2	92	0.0	1.0
+es	05_nuclear	2	92	0.0	1.0
 es	06_coal	2	92	0.0	0.0
 es	07_gas	2	92	0.0	0.0
 es	08_non-res	2	92	0.0	0.0
 es	09_hydro_pump	2	92	0.0	0.0
-es	01_solar	2	93	1.0	0.0
-es	02_wind_on	2	93	1.0	0.0
-es	03_wind_off	2	93	1.0	0.0
-es	04_res	2	93	1.0	0.0
-es	05_nuclear	2	93	1.0	0.0
+es	01_solar	2	93	0.0	1.0
+es	02_wind_on	2	93	0.0	1.0
+es	03_wind_off	2	93	0.0	1.0
+es	04_res	2	93	0.0	1.0
+es	05_nuclear	2	93	0.0	1.0
 es	06_coal	2	93	0.0	0.0
 es	07_gas	2	93	0.0	0.0
 es	08_non-res	2	93	0.0	0.0
 es	09_hydro_pump	2	93	0.0	0.0
-es	01_solar	2	94	1.0	0.0
-es	02_wind_on	2	94	1.0	0.0
-es	03_wind_off	2	94	1.0	0.0
-es	04_res	2	94	1.0	0.0
-es	05_nuclear	2	94	1.0	0.0
+es	01_solar	2	94	0.0	1.0
+es	02_wind_on	2	94	0.0	1.0
+es	03_wind_off	2	94	0.0	1.0
+es	04_res	2	94	0.0	1.0
+es	05_nuclear	2	94	0.0	1.0
 es	06_coal	2	94	0.0	0.0
 es	07_gas	2	94	0.0	0.0
 es	08_non-res	2	94	0.0	0.0
 es	09_hydro_pump	2	94	0.0	0.0
-es	01_solar	2	95	1.0	0.0
-es	02_wind_on	2	95	1.0	0.0
-es	03_wind_off	2	95	1.0	0.0
-es	04_res	2	95	1.0	0.0
-es	05_nuclear	2	95	1.0	0.0
+es	01_solar	2	95	0.0	1.0
+es	02_wind_on	2	95	0.0	1.0
+es	03_wind_off	2	95	0.0	1.0
+es	04_res	2	95	0.0	1.0
+es	05_nuclear	2	95	0.0	1.0
 es	06_coal	2	95	0.0	0.0
 es	07_gas	2	95	0.0	0.0
 es	08_non-res	2	95	0.0	0.0
 es	09_hydro_pump	2	95	0.0	0.0
-es	01_solar	2	96	1.0	0.0
-es	02_wind_on	2	96	1.0	0.0
-es	03_wind_off	2	96	1.0	0.0
-es	04_res	2	96	1.0	0.0
-es	05_nuclear	2	96	1.0	0.0
+es	01_solar	2	96	0.0	1.0
+es	02_wind_on	2	96	0.0	1.0
+es	03_wind_off	2	96	0.0	1.0
+es	04_res	2	96	0.0	1.0
+es	05_nuclear	2	96	0.0	1.0
 es	06_coal	2	96	0.0	0.0
 es	07_gas	2	96	0.0	0.0
 es	08_non-res	2	96	0.0	0.0
 es	09_hydro_pump	2	96	0.0	0.0
-es	01_solar	2	97	1.0	0.0
-es	02_wind_on	2	97	1.0	0.0
-es	03_wind_off	2	97	1.0	0.0
-es	04_res	2	97	1.0	0.0
-es	05_nuclear	2	97	1.0	0.0
+es	01_solar	2	97	0.0	1.0
+es	02_wind_on	2	97	0.0	1.0
+es	03_wind_off	2	97	0.0	1.0
+es	04_res	2	97	0.0	1.0
+es	05_nuclear	2	97	0.0	1.0
 es	06_coal	2	97	0.0	0.0
 es	07_gas	2	97	0.0	0.0
 es	08_non-res	2	97	0.0	0.0
 es	09_hydro_pump	2	97	0.0	0.0
-es	01_solar	2	98	1.0	0.0
-es	02_wind_on	2	98	1.0	0.0
-es	03_wind_off	2	98	1.0	0.0
-es	04_res	2	98	1.0	0.0
-es	05_nuclear	2	98	1.0	0.0
+es	01_solar	2	98	0.0	1.0
+es	02_wind_on	2	98	0.0	1.0
+es	03_wind_off	2	98	0.0	1.0
+es	04_res	2	98	0.0	1.0
+es	05_nuclear	2	98	0.0	1.0
 es	06_coal	2	98	0.0	0.0
 es	07_gas	2	98	0.0	0.0
 es	08_non-res	2	98	0.0	0.0
 es	09_hydro_pump	2	98	0.0	0.0
-es	01_solar	2	99	1.0	0.0
-es	02_wind_on	2	99	1.0	0.0
-es	03_wind_off	2	99	1.0	0.0
-es	04_res	2	99	1.0	0.0
-es	05_nuclear	2	99	1.0	0.0
+es	01_solar	2	99	0.0	1.0
+es	02_wind_on	2	99	0.0	1.0
+es	03_wind_off	2	99	0.0	1.0
+es	04_res	2	99	0.0	1.0
+es	05_nuclear	2	99	0.0	1.0
 es	06_coal	2	99	0.0	0.0
 es	07_gas	2	99	0.0	0.0
 es	08_non-res	2	99	0.0	0.0
 es	09_hydro_pump	2	99	0.0	0.0
-es	01_solar	2	100	1.0	0.0
-es	02_wind_on	2	100	1.0	0.0
-es	03_wind_off	2	100	1.0	0.0
-es	04_res	2	100	1.0	0.0
-es	05_nuclear	2	100	1.0	0.0
+es	01_solar	2	100	0.0	1.0
+es	02_wind_on	2	100	0.0	1.0
+es	03_wind_off	2	100	0.0	1.0
+es	04_res	2	100	0.0	1.0
+es	05_nuclear	2	100	0.0	1.0
 es	06_coal	2	100	0.0	0.0
 es	07_gas	2	100	0.0	0.0
 es	08_non-res	2	100	0.0	0.0
 es	09_hydro_pump	2	100	0.0	0.0
-es	01_solar	2	101	1.0	0.0
-es	02_wind_on	2	101	1.0	0.0
-es	03_wind_off	2	101	1.0	0.0
-es	04_res	2	101	1.0	0.0
-es	05_nuclear	2	101	1.0	0.0
+es	01_solar	2	101	0.0	1.0
+es	02_wind_on	2	101	0.0	1.0
+es	03_wind_off	2	101	0.0	1.0
+es	04_res	2	101	0.0	1.0
+es	05_nuclear	2	101	0.0	1.0
 es	06_coal	2	101	0.0	0.0
 es	07_gas	2	101	0.0	0.0
 es	08_non-res	2	101	0.0	0.0
 es	09_hydro_pump	2	101	0.0	0.0
-es	01_solar	2	102	1.0	0.0
-es	02_wind_on	2	102	1.0	0.0
-es	03_wind_off	2	102	1.0	0.0
-es	04_res	2	102	1.0	0.0
-es	05_nuclear	2	102	1.0	0.0
-es	06_coal	2	102	1.0	0.0
+es	01_solar	2	102	0.0	1.0
+es	02_wind_on	2	102	0.0	1.0
+es	03_wind_off	2	102	0.0	1.0
+es	04_res	2	102	0.0	1.0
+es	05_nuclear	2	102	0.0	1.0
+es	06_coal	2	102	0.0	1.0
 es	07_gas	2	102	0.0	0.0
 es	08_non-res	2	102	0.0	0.0
 es	09_hydro_pump	2	102	0.0	0.0
-es	01_solar	2	103	1.0	0.0
-es	02_wind_on	2	103	1.0	0.0
-es	03_wind_off	2	103	1.0	0.0
-es	04_res	2	103	1.0	0.0
-es	05_nuclear	2	103	1.0	0.0
-es	06_coal	2	103	1.0	0.0
+es	01_solar	2	103	0.0	1.0
+es	02_wind_on	2	103	0.0	1.0
+es	03_wind_off	2	103	0.0	1.0
+es	04_res	2	103	0.0	1.0
+es	05_nuclear	2	103	0.0	1.0
+es	06_coal	2	103	0.0	1.0
 es	07_gas	2	103	0.0	0.0
 es	08_non-res	2	103	0.0	0.0
 es	09_hydro_pump	2	103	0.0	0.0
-es	01_solar	2	104	1.0	0.0
-es	02_wind_on	2	104	1.0	0.0
-es	03_wind_off	2	104	1.0	0.0
-es	04_res	2	104	1.0	0.0
-es	05_nuclear	2	104	1.0	0.0
-es	06_coal	2	104	1.0	0.0
+es	01_solar	2	104	0.0	1.0
+es	02_wind_on	2	104	0.0	1.0
+es	03_wind_off	2	104	0.0	1.0
+es	04_res	2	104	0.0	1.0
+es	05_nuclear	2	104	0.0	1.0
+es	06_coal	2	104	0.0	1.0
 es	07_gas	2	104	0.0	0.0
 es	08_non-res	2	104	0.0	0.0
 es	09_hydro_pump	2	104	0.0	0.0
-es	01_solar	2	105	1.0	0.0
-es	02_wind_on	2	105	1.0	0.0
-es	03_wind_off	2	105	1.0	0.0
-es	04_res	2	105	1.0	0.0
-es	05_nuclear	2	105	1.0	0.0
-es	06_coal	2	105	1.0	0.0
+es	01_solar	2	105	0.0	1.0
+es	02_wind_on	2	105	0.0	1.0
+es	03_wind_off	2	105	0.0	1.0
+es	04_res	2	105	0.0	1.0
+es	05_nuclear	2	105	0.0	1.0
+es	06_coal	2	105	0.0	1.0
 es	07_gas	2	105	0.0	0.0
 es	08_non-res	2	105	0.0	0.0
 es	09_hydro_pump	2	105	0.0	0.0
-es	01_solar	2	106	1.0	0.0
-es	02_wind_on	2	106	1.0	0.0
-es	03_wind_off	2	106	1.0	0.0
-es	04_res	2	106	1.0	0.0
-es	05_nuclear	2	106	1.0	0.0
-es	06_coal	2	106	1.0	0.0
+es	01_solar	2	106	0.0	1.0
+es	02_wind_on	2	106	0.0	1.0
+es	03_wind_off	2	106	0.0	1.0
+es	04_res	2	106	0.0	1.0
+es	05_nuclear	2	106	0.0	1.0
+es	06_coal	2	106	0.0	1.0
 es	07_gas	2	106	0.0	0.0
 es	08_non-res	2	106	0.0	0.0
 es	09_hydro_pump	2	106	0.0	0.0
-es	01_solar	2	107	1.0	0.0
-es	02_wind_on	2	107	1.0	0.0
-es	03_wind_off	2	107	1.0	0.0
-es	04_res	2	107	1.0	0.0
-es	05_nuclear	2	107	1.0	0.0
-es	06_coal	2	107	1.0	0.0
+es	01_solar	2	107	0.0	1.0
+es	02_wind_on	2	107	0.0	1.0
+es	03_wind_off	2	107	0.0	1.0
+es	04_res	2	107	0.0	1.0
+es	05_nuclear	2	107	0.0	1.0
+es	06_coal	2	107	0.0	1.0
 es	07_gas	2	107	0.0	0.0
 es	08_non-res	2	107	0.0	0.0
 es	09_hydro_pump	2	107	0.0	0.0
-es	01_solar	2	108	1.0	0.0
-es	02_wind_on	2	108	1.0	0.0
-es	03_wind_off	2	108	1.0	0.0
-es	04_res	2	108	1.0	0.0
-es	05_nuclear	2	108	1.0	0.0
-es	06_coal	2	108	1.0	0.0
+es	01_solar	2	108	0.0	1.0
+es	02_wind_on	2	108	0.0	1.0
+es	03_wind_off	2	108	0.0	1.0
+es	04_res	2	108	0.0	1.0
+es	05_nuclear	2	108	0.0	1.0
+es	06_coal	2	108	0.0	1.0
 es	07_gas	2	108	0.0	0.0
 es	08_non-res	2	108	0.0	0.0
 es	09_hydro_pump	2	108	0.0	0.0
-es	01_solar	2	109	1.0	0.0
-es	02_wind_on	2	109	1.0	0.0
-es	03_wind_off	2	109	1.0	0.0
-es	04_res	2	109	1.0	0.0
-es	05_nuclear	2	109	1.0	0.0
-es	06_coal	2	109	1.0	0.0
+es	01_solar	2	109	0.0	1.0
+es	02_wind_on	2	109	0.0	1.0
+es	03_wind_off	2	109	0.0	1.0
+es	04_res	2	109	0.0	1.0
+es	05_nuclear	2	109	0.0	1.0
+es	06_coal	2	109	0.0	1.0
 es	07_gas	2	109	0.0	0.0
 es	08_non-res	2	109	0.0	0.0
 es	09_hydro_pump	2	109	0.0	0.0
-es	01_solar	2	110	1.0	0.0
-es	02_wind_on	2	110	1.0	0.0
-es	03_wind_off	2	110	1.0	0.0
-es	04_res	2	110	1.0	0.0
-es	05_nuclear	2	110	1.0	0.0
-es	06_coal	2	110	1.0	0.0
+es	01_solar	2	110	0.0	1.0
+es	02_wind_on	2	110	0.0	1.0
+es	03_wind_off	2	110	0.0	1.0
+es	04_res	2	110	0.0	1.0
+es	05_nuclear	2	110	0.0	1.0
+es	06_coal	2	110	0.0	1.0
 es	07_gas	2	110	0.0	0.0
 es	08_non-res	2	110	0.0	0.0
 es	09_hydro_pump	2	110	0.0	0.0
-es	01_solar	2	111	1.0	0.0
-es	02_wind_on	2	111	1.0	0.0
-es	03_wind_off	2	111	1.0	0.0
-es	04_res	2	111	1.0	0.0
-es	05_nuclear	2	111	1.0	0.0
-es	06_coal	2	111	1.0	0.0
+es	01_solar	2	111	0.0	1.0
+es	02_wind_on	2	111	0.0	1.0
+es	03_wind_off	2	111	0.0	1.0
+es	04_res	2	111	0.0	1.0
+es	05_nuclear	2	111	0.0	1.0
+es	06_coal	2	111	0.0	1.0
 es	07_gas	2	111	0.0	0.0
 es	08_non-res	2	111	0.0	0.0
 es	09_hydro_pump	2	111	0.0	0.0
-es	01_solar	2	112	1.0	0.0
-es	02_wind_on	2	112	1.0	0.0
-es	03_wind_off	2	112	1.0	0.0
-es	04_res	2	112	1.0	0.0
-es	05_nuclear	2	112	1.0	0.0
-es	06_coal	2	112	1.0	0.0
+es	01_solar	2	112	0.0	1.0
+es	02_wind_on	2	112	0.0	1.0
+es	03_wind_off	2	112	0.0	1.0
+es	04_res	2	112	0.0	1.0
+es	05_nuclear	2	112	0.0	1.0
+es	06_coal	2	112	0.0	1.0
 es	07_gas	2	112	0.0	0.0
 es	08_non-res	2	112	0.0	0.0
 es	09_hydro_pump	2	112	0.0	0.0
-es	01_solar	2	113	1.0	0.0
-es	02_wind_on	2	113	1.0	0.0
-es	03_wind_off	2	113	1.0	0.0
-es	04_res	2	113	1.0	0.0
-es	05_nuclear	2	113	1.0	0.0
-es	06_coal	2	113	1.0	0.0
+es	01_solar	2	113	0.0	1.0
+es	02_wind_on	2	113	0.0	1.0
+es	03_wind_off	2	113	0.0	1.0
+es	04_res	2	113	0.0	1.0
+es	05_nuclear	2	113	0.0	1.0
+es	06_coal	2	113	0.0	1.0
 es	07_gas	2	113	0.0	0.0
 es	08_non-res	2	113	0.0	0.0
 es	09_hydro_pump	2	113	0.0	0.0
-es	01_solar	2	114	1.0	0.0
-es	02_wind_on	2	114	1.0	0.0
-es	03_wind_off	2	114	1.0	0.0
-es	04_res	2	114	1.0	0.0
-es	05_nuclear	2	114	1.0	0.0
-es	06_coal	2	114	1.0	0.0
+es	01_solar	2	114	0.0	1.0
+es	02_wind_on	2	114	0.0	1.0
+es	03_wind_off	2	114	0.0	1.0
+es	04_res	2	114	0.0	1.0
+es	05_nuclear	2	114	0.0	1.0
+es	06_coal	2	114	0.0	1.0
 es	07_gas	2	114	0.0	0.0
 es	08_non-res	2	114	0.0	0.0
 es	09_hydro_pump	2	114	0.0	0.0
-es	01_solar	2	115	1.0	0.0
-es	02_wind_on	2	115	1.0	0.0
-es	03_wind_off	2	115	1.0	0.0
-es	04_res	2	115	1.0	0.0
-es	05_nuclear	2	115	1.0	0.0
-es	06_coal	2	115	1.0	0.0
+es	01_solar	2	115	0.0	1.0
+es	02_wind_on	2	115	0.0	1.0
+es	03_wind_off	2	115	0.0	1.0
+es	04_res	2	115	0.0	1.0
+es	05_nuclear	2	115	0.0	1.0
+es	06_coal	2	115	0.0	1.0
 es	07_gas	2	115	0.0	0.0
 es	08_non-res	2	115	0.0	0.0
 es	09_hydro_pump	2	115	0.0	0.0
-es	01_solar	2	116	1.0	0.0
-es	02_wind_on	2	116	1.0	0.0
-es	03_wind_off	2	116	1.0	0.0
-es	04_res	2	116	1.0	0.0
-es	05_nuclear	2	116	1.0	0.0
-es	06_coal	2	116	1.0	0.0
+es	01_solar	2	116	0.0	1.0
+es	02_wind_on	2	116	0.0	1.0
+es	03_wind_off	2	116	0.0	1.0
+es	04_res	2	116	0.0	1.0
+es	05_nuclear	2	116	0.0	1.0
+es	06_coal	2	116	0.0	1.0
 es	07_gas	2	116	0.0	0.0
 es	08_non-res	2	116	0.0	0.0
 es	09_hydro_pump	2	116	0.0	0.0
-es	01_solar	2	117	1.0	0.0
-es	02_wind_on	2	117	1.0	0.0
-es	03_wind_off	2	117	1.0	0.0
-es	04_res	2	117	1.0	0.0
-es	05_nuclear	2	117	1.0	0.0
-es	06_coal	2	117	1.0	0.0
+es	01_solar	2	117	0.0	1.0
+es	02_wind_on	2	117	0.0	1.0
+es	03_wind_off	2	117	0.0	1.0
+es	04_res	2	117	0.0	1.0
+es	05_nuclear	2	117	0.0	1.0
+es	06_coal	2	117	0.0	1.0
 es	07_gas	2	117	0.0	0.0
 es	08_non-res	2	117	0.0	0.0
 es	09_hydro_pump	2	117	0.0	0.0
-es	01_solar	2	118	1.0	0.0
-es	02_wind_on	2	118	1.0	0.0
-es	03_wind_off	2	118	1.0	0.0
-es	04_res	2	118	1.0	0.0
-es	05_nuclear	2	118	1.0	0.0
-es	06_coal	2	118	1.0	0.0
+es	01_solar	2	118	0.0	1.0
+es	02_wind_on	2	118	0.0	1.0
+es	03_wind_off	2	118	0.0	1.0
+es	04_res	2	118	0.0	1.0
+es	05_nuclear	2	118	0.0	1.0
+es	06_coal	2	118	0.0	1.0
 es	07_gas	2	118	0.0	0.0
 es	08_non-res	2	118	0.0	0.0
 es	09_hydro_pump	2	118	0.0	0.0
-es	01_solar	2	119	1.0	0.0
-es	02_wind_on	2	119	1.0	0.0
-es	03_wind_off	2	119	1.0	0.0
-es	04_res	2	119	1.0	0.0
-es	05_nuclear	2	119	1.0	0.0
-es	06_coal	2	119	1.0	0.0
+es	01_solar	2	119	0.0	1.0
+es	02_wind_on	2	119	0.0	1.0
+es	03_wind_off	2	119	0.0	1.0
+es	04_res	2	119	0.0	1.0
+es	05_nuclear	2	119	0.0	1.0
+es	06_coal	2	119	0.0	1.0
 es	07_gas	2	119	0.0	0.0
 es	08_non-res	2	119	0.0	0.0
 es	09_hydro_pump	2	119	0.0	0.0
-es	01_solar	2	120	1.0	0.0
-es	02_wind_on	2	120	1.0	0.0
-es	03_wind_off	2	120	1.0	0.0
-es	04_res	2	120	1.0	0.0
-es	05_nuclear	2	120	1.0	0.0
-es	06_coal	2	120	1.0	0.0
+es	01_solar	2	120	0.0	1.0
+es	02_wind_on	2	120	0.0	1.0
+es	03_wind_off	2	120	0.0	1.0
+es	04_res	2	120	0.0	1.0
+es	05_nuclear	2	120	0.0	1.0
+es	06_coal	2	120	0.0	1.0
 es	07_gas	2	120	0.0	0.0
 es	08_non-res	2	120	0.0	0.0
 es	09_hydro_pump	2	120	0.0	0.0
-es	01_solar	2	121	1.0	0.0
-es	02_wind_on	2	121	1.0	0.0
-es	03_wind_off	2	121	1.0	0.0
-es	04_res	2	121	1.0	0.0
-es	05_nuclear	2	121	1.0	0.0
-es	06_coal	2	121	1.0	0.0
+es	01_solar	2	121	0.0	1.0
+es	02_wind_on	2	121	0.0	1.0
+es	03_wind_off	2	121	0.0	1.0
+es	04_res	2	121	0.0	1.0
+es	05_nuclear	2	121	0.0	1.0
+es	06_coal	2	121	0.0	1.0
 es	07_gas	2	121	0.0	0.0
 es	08_non-res	2	121	0.0	0.0
 es	09_hydro_pump	2	121	0.0	0.0
-es	01_solar	2	122	1.0	0.0
-es	02_wind_on	2	122	1.0	0.0
-es	03_wind_off	2	122	1.0	0.0
-es	04_res	2	122	1.0	0.0
-es	05_nuclear	2	122	1.0	0.0
-es	06_coal	2	122	1.0	0.0
-es	07_gas	2	122	1.0	0.0
+es	01_solar	2	122	0.0	1.0
+es	02_wind_on	2	122	0.0	1.0
+es	03_wind_off	2	122	0.0	1.0
+es	04_res	2	122	0.0	1.0
+es	05_nuclear	2	122	0.0	1.0
+es	06_coal	2	122	0.0	1.0
+es	07_gas	2	122	0.0	1.0
 es	08_non-res	2	122	0.0	0.0
 es	09_hydro_pump	2	122	0.0	0.0
-es	01_solar	2	123	1.0	0.0
-es	02_wind_on	2	123	1.0	0.0
-es	03_wind_off	2	123	1.0	0.0
-es	04_res	2	123	1.0	0.0
-es	05_nuclear	2	123	1.0	0.0
-es	06_coal	2	123	1.0	0.0
-es	07_gas	2	123	1.0	0.0
+es	01_solar	2	123	0.0	1.0
+es	02_wind_on	2	123	0.0	1.0
+es	03_wind_off	2	123	0.0	1.0
+es	04_res	2	123	0.0	1.0
+es	05_nuclear	2	123	0.0	1.0
+es	06_coal	2	123	0.0	1.0
+es	07_gas	2	123	0.0	1.0
 es	08_non-res	2	123	0.0	0.0
 es	09_hydro_pump	2	123	0.0	0.0
-es	01_solar	2	124	1.0	0.0
-es	02_wind_on	2	124	1.0	0.0
-es	03_wind_off	2	124	1.0	0.0
-es	04_res	2	124	1.0	0.0
-es	05_nuclear	2	124	1.0	0.0
-es	06_coal	2	124	1.0	0.0
-es	07_gas	2	124	1.0	0.0
+es	01_solar	2	124	0.0	1.0
+es	02_wind_on	2	124	0.0	1.0
+es	03_wind_off	2	124	0.0	1.0
+es	04_res	2	124	0.0	1.0
+es	05_nuclear	2	124	0.0	1.0
+es	06_coal	2	124	0.0	1.0
+es	07_gas	2	124	0.0	1.0
 es	08_non-res	2	124	0.0	0.0
 es	09_hydro_pump	2	124	0.0	0.0
-es	01_solar	2	125	1.0	0.0
-es	02_wind_on	2	125	1.0	0.0
-es	03_wind_off	2	125	1.0	0.0
-es	04_res	2	125	1.0	0.0
-es	05_nuclear	2	125	1.0	0.0
-es	06_coal	2	125	1.0	0.0
-es	07_gas	2	125	1.0	0.0
+es	01_solar	2	125	0.0	1.0
+es	02_wind_on	2	125	0.0	1.0
+es	03_wind_off	2	125	0.0	1.0
+es	04_res	2	125	0.0	1.0
+es	05_nuclear	2	125	0.0	1.0
+es	06_coal	2	125	0.0	1.0
+es	07_gas	2	125	0.0	1.0
 es	08_non-res	2	125	0.0	0.0
 es	09_hydro_pump	2	125	0.0	0.0
-es	01_solar	2	126	1.0	0.0
-es	02_wind_on	2	126	1.0	0.0
-es	03_wind_off	2	126	1.0	0.0
-es	04_res	2	126	1.0	0.0
-es	05_nuclear	2	126	1.0	0.0
-es	06_coal	2	126	1.0	0.0
-es	07_gas	2	126	1.0	0.0
+es	01_solar	2	126	0.0	1.0
+es	02_wind_on	2	126	0.0	1.0
+es	03_wind_off	2	126	0.0	1.0
+es	04_res	2	126	0.0	1.0
+es	05_nuclear	2	126	0.0	1.0
+es	06_coal	2	126	0.0	1.0
+es	07_gas	2	126	0.0	1.0
 es	08_non-res	2	126	0.0	0.0
 es	09_hydro_pump	2	126	0.0	0.0
-es	01_solar	2	127	1.0	0.0
-es	02_wind_on	2	127	1.0	0.0
-es	03_wind_off	2	127	1.0	0.0
-es	04_res	2	127	1.0	0.0
-es	05_nuclear	2	127	1.0	0.0
-es	06_coal	2	127	1.0	0.0
-es	07_gas	2	127	1.0	0.0
+es	01_solar	2	127	0.0	1.0
+es	02_wind_on	2	127	0.0	1.0
+es	03_wind_off	2	127	0.0	1.0
+es	04_res	2	127	0.0	1.0
+es	05_nuclear	2	127	0.0	1.0
+es	06_coal	2	127	0.0	1.0
+es	07_gas	2	127	0.0	1.0
 es	08_non-res	2	127	0.0	0.0
 es	09_hydro_pump	2	127	0.0	0.0
-es	01_solar	2	128	1.0	0.0
-es	02_wind_on	2	128	1.0	0.0
-es	03_wind_off	2	128	1.0	0.0
-es	04_res	2	128	1.0	0.0
-es	05_nuclear	2	128	1.0	0.0
-es	06_coal	2	128	1.0	0.0
-es	07_gas	2	128	1.0	0.0
+es	01_solar	2	128	0.0	1.0
+es	02_wind_on	2	128	0.0	1.0
+es	03_wind_off	2	128	0.0	1.0
+es	04_res	2	128	0.0	1.0
+es	05_nuclear	2	128	0.0	1.0
+es	06_coal	2	128	0.0	1.0
+es	07_gas	2	128	0.0	1.0
 es	08_non-res	2	128	0.0	0.0
 es	09_hydro_pump	2	128	0.0	0.0
-es	01_solar	2	129	1.0	0.0
-es	02_wind_on	2	129	1.0	0.0
-es	03_wind_off	2	129	1.0	0.0
-es	04_res	2	129	1.0	0.0
-es	05_nuclear	2	129	1.0	0.0
-es	06_coal	2	129	1.0	0.0
-es	07_gas	2	129	1.0	0.0
+es	01_solar	2	129	0.0	1.0
+es	02_wind_on	2	129	0.0	1.0
+es	03_wind_off	2	129	0.0	1.0
+es	04_res	2	129	0.0	1.0
+es	05_nuclear	2	129	0.0	1.0
+es	06_coal	2	129	0.0	1.0
+es	07_gas	2	129	0.0	1.0
 es	08_non-res	2	129	0.0	0.0
 es	09_hydro_pump	2	129	0.0	0.0
-es	01_solar	2	130	1.0	0.0
-es	02_wind_on	2	130	1.0	0.0
-es	03_wind_off	2	130	1.0	0.0
-es	04_res	2	130	1.0	0.0
-es	05_nuclear	2	130	1.0	0.0
-es	06_coal	2	130	1.0	0.0
-es	07_gas	2	130	1.0	0.0
+es	01_solar	2	130	0.0	1.0
+es	02_wind_on	2	130	0.0	1.0
+es	03_wind_off	2	130	0.0	1.0
+es	04_res	2	130	0.0	1.0
+es	05_nuclear	2	130	0.0	1.0
+es	06_coal	2	130	0.0	1.0
+es	07_gas	2	130	0.0	1.0
 es	08_non-res	2	130	0.0	0.0
 es	09_hydro_pump	2	130	0.0	0.0
-es	01_solar	2	131	1.0	0.0
-es	02_wind_on	2	131	1.0	0.0
-es	03_wind_off	2	131	1.0	0.0
-es	04_res	2	131	1.0	0.0
-es	05_nuclear	2	131	1.0	0.0
-es	06_coal	2	131	1.0	0.0
-es	07_gas	2	131	1.0	0.0
+es	01_solar	2	131	0.0	1.0
+es	02_wind_on	2	131	0.0	1.0
+es	03_wind_off	2	131	0.0	1.0
+es	04_res	2	131	0.0	1.0
+es	05_nuclear	2	131	0.0	1.0
+es	06_coal	2	131	0.0	1.0
+es	07_gas	2	131	0.0	1.0
 es	08_non-res	2	131	0.0	0.0
 es	09_hydro_pump	2	131	0.0	0.0
-es	01_solar	2	132	1.0	0.0
-es	02_wind_on	2	132	1.0	0.0
-es	03_wind_off	2	132	1.0	0.0
-es	04_res	2	132	1.0	0.0
-es	05_nuclear	2	132	1.0	0.0
-es	06_coal	2	132	1.0	0.0
-es	07_gas	2	132	1.0	0.0
+es	01_solar	2	132	0.0	1.0
+es	02_wind_on	2	132	0.0	1.0
+es	03_wind_off	2	132	0.0	1.0
+es	04_res	2	132	0.0	1.0
+es	05_nuclear	2	132	0.0	1.0
+es	06_coal	2	132	0.0	1.0
+es	07_gas	2	132	0.0	1.0
 es	08_non-res	2	132	0.0	0.0
 es	09_hydro_pump	2	132	0.0	0.0
-es	01_solar	2	133	1.0	0.0
-es	02_wind_on	2	133	1.0	0.0
-es	03_wind_off	2	133	1.0	0.0
-es	04_res	2	133	1.0	0.0
-es	05_nuclear	2	133	1.0	0.0
-es	06_coal	2	133	1.0	0.0
-es	07_gas	2	133	1.0	0.0
+es	01_solar	2	133	0.0	1.0
+es	02_wind_on	2	133	0.0	1.0
+es	03_wind_off	2	133	0.0	1.0
+es	04_res	2	133	0.0	1.0
+es	05_nuclear	2	133	0.0	1.0
+es	06_coal	2	133	0.0	1.0
+es	07_gas	2	133	0.0	1.0
 es	08_non-res	2	133	0.0	0.0
 es	09_hydro_pump	2	133	0.0	0.0
-es	01_solar	2	134	1.0	0.0
-es	02_wind_on	2	134	1.0	0.0
-es	03_wind_off	2	134	1.0	0.0
-es	04_res	2	134	1.0	0.0
-es	05_nuclear	2	134	1.0	0.0
-es	06_coal	2	134	1.0	0.0
-es	07_gas	2	134	1.0	0.0
+es	01_solar	2	134	0.0	1.0
+es	02_wind_on	2	134	0.0	1.0
+es	03_wind_off	2	134	0.0	1.0
+es	04_res	2	134	0.0	1.0
+es	05_nuclear	2	134	0.0	1.0
+es	06_coal	2	134	0.0	1.0
+es	07_gas	2	134	0.0	1.0
 es	08_non-res	2	134	0.0	0.0
 es	09_hydro_pump	2	134	0.0	0.0
-es	01_solar	2	135	1.0	0.0
-es	02_wind_on	2	135	1.0	0.0
-es	03_wind_off	2	135	1.0	0.0
-es	04_res	2	135	1.0	0.0
-es	05_nuclear	2	135	1.0	0.0
-es	06_coal	2	135	1.0	0.0
-es	07_gas	2	135	1.0	0.0
+es	01_solar	2	135	0.0	1.0
+es	02_wind_on	2	135	0.0	1.0
+es	03_wind_off	2	135	0.0	1.0
+es	04_res	2	135	0.0	1.0
+es	05_nuclear	2	135	0.0	1.0
+es	06_coal	2	135	0.0	1.0
+es	07_gas	2	135	0.0	1.0
 es	08_non-res	2	135	0.0	0.0
 es	09_hydro_pump	2	135	0.0	0.0
-es	01_solar	2	136	1.0	0.0
-es	02_wind_on	2	136	1.0	0.0
-es	03_wind_off	2	136	1.0	0.0
-es	04_res	2	136	1.0	0.0
-es	05_nuclear	2	136	1.0	0.0
-es	06_coal	2	136	1.0	0.0
-es	07_gas	2	136	1.0	0.0
+es	01_solar	2	136	0.0	1.0
+es	02_wind_on	2	136	0.0	1.0
+es	03_wind_off	2	136	0.0	1.0
+es	04_res	2	136	0.0	1.0
+es	05_nuclear	2	136	0.0	1.0
+es	06_coal	2	136	0.0	1.0
+es	07_gas	2	136	0.0	1.0
 es	08_non-res	2	136	0.0	0.0
 es	09_hydro_pump	2	136	0.0	0.0
-es	01_solar	2	137	1.0	0.0
-es	02_wind_on	2	137	1.0	0.0
-es	03_wind_off	2	137	1.0	0.0
-es	04_res	2	137	1.0	0.0
-es	05_nuclear	2	137	1.0	0.0
-es	06_coal	2	137	1.0	0.0
-es	07_gas	2	137	1.0	0.0
+es	01_solar	2	137	0.0	1.0
+es	02_wind_on	2	137	0.0	1.0
+es	03_wind_off	2	137	0.0	1.0
+es	04_res	2	137	0.0	1.0
+es	05_nuclear	2	137	0.0	1.0
+es	06_coal	2	137	0.0	1.0
+es	07_gas	2	137	0.0	1.0
 es	08_non-res	2	137	0.0	0.0
 es	09_hydro_pump	2	137	0.0	0.0
-es	01_solar	2	138	1.0	0.0
-es	02_wind_on	2	138	1.0	0.0
-es	03_wind_off	2	138	1.0	0.0
-es	04_res	2	138	1.0	0.0
-es	05_nuclear	2	138	1.0	0.0
-es	06_coal	2	138	1.0	0.0
-es	07_gas	2	138	1.0	0.0
+es	01_solar	2	138	0.0	1.0
+es	02_wind_on	2	138	0.0	1.0
+es	03_wind_off	2	138	0.0	1.0
+es	04_res	2	138	0.0	1.0
+es	05_nuclear	2	138	0.0	1.0
+es	06_coal	2	138	0.0	1.0
+es	07_gas	2	138	0.0	1.0
 es	08_non-res	2	138	0.0	0.0
 es	09_hydro_pump	2	138	0.0	0.0
-es	01_solar	2	139	1.0	0.0
-es	02_wind_on	2	139	1.0	0.0
-es	03_wind_off	2	139	1.0	0.0
-es	04_res	2	139	1.0	0.0
-es	05_nuclear	2	139	1.0	0.0
-es	06_coal	2	139	1.0	0.0
-es	07_gas	2	139	1.0	0.0
+es	01_solar	2	139	0.0	1.0
+es	02_wind_on	2	139	0.0	1.0
+es	03_wind_off	2	139	0.0	1.0
+es	04_res	2	139	0.0	1.0
+es	05_nuclear	2	139	0.0	1.0
+es	06_coal	2	139	0.0	1.0
+es	07_gas	2	139	0.0	1.0
 es	08_non-res	2	139	0.0	0.0
 es	09_hydro_pump	2	139	0.0	0.0
-es	01_solar	2	140	1.0	0.0
-es	02_wind_on	2	140	1.0	0.0
-es	03_wind_off	2	140	1.0	0.0
-es	04_res	2	140	1.0	0.0
-es	05_nuclear	2	140	1.0	0.0
-es	06_coal	2	140	1.0	0.0
-es	07_gas	2	140	1.0	0.0
+es	01_solar	2	140	0.0	1.0
+es	02_wind_on	2	140	0.0	1.0
+es	03_wind_off	2	140	0.0	1.0
+es	04_res	2	140	0.0	1.0
+es	05_nuclear	2	140	0.0	1.0
+es	06_coal	2	140	0.0	1.0
+es	07_gas	2	140	0.0	1.0
 es	08_non-res	2	140	0.0	0.0
 es	09_hydro_pump	2	140	0.0	0.0
-es	01_solar	2	141	1.0	0.0
-es	02_wind_on	2	141	1.0	0.0
-es	03_wind_off	2	141	1.0	0.0
-es	04_res	2	141	1.0	0.0
-es	05_nuclear	2	141	1.0	0.0
-es	06_coal	2	141	1.0	0.0
-es	07_gas	2	141	1.0	0.0
+es	01_solar	2	141	0.0	1.0
+es	02_wind_on	2	141	0.0	1.0
+es	03_wind_off	2	141	0.0	1.0
+es	04_res	2	141	0.0	1.0
+es	05_nuclear	2	141	0.0	1.0
+es	06_coal	2	141	0.0	1.0
+es	07_gas	2	141	0.0	1.0
 es	08_non-res	2	141	0.0	0.0
 es	09_hydro_pump	2	141	0.0	0.0
-es	01_solar	2	142	1.0	0.0
-es	02_wind_on	2	142	1.0	0.0
-es	03_wind_off	2	142	1.0	0.0
-es	04_res	2	142	1.0	0.0
-es	05_nuclear	2	142	1.0	0.0
-es	06_coal	2	142	1.0	0.0
-es	07_gas	2	142	1.0	0.0
-es	08_non-res	2	142	1.0	0.0
+es	01_solar	2	142	0.0	1.0
+es	02_wind_on	2	142	0.0	1.0
+es	03_wind_off	2	142	0.0	1.0
+es	04_res	2	142	0.0	1.0
+es	05_nuclear	2	142	0.0	1.0
+es	06_coal	2	142	0.0	1.0
+es	07_gas	2	142	0.0	1.0
+es	08_non-res	2	142	0.0	1.0
 es	09_hydro_pump	2	142	0.0	0.0
-es	01_solar	2	143	1.0	0.0
-es	02_wind_on	2	143	1.0	0.0
-es	03_wind_off	2	143	1.0	0.0
-es	04_res	2	143	1.0	0.0
-es	05_nuclear	2	143	1.0	0.0
-es	06_coal	2	143	1.0	0.0
-es	07_gas	2	143	1.0	0.0
-es	08_non-res	2	143	1.0	0.0
+es	01_solar	2	143	0.0	1.0
+es	02_wind_on	2	143	0.0	1.0
+es	03_wind_off	2	143	0.0	1.0
+es	04_res	2	143	0.0	1.0
+es	05_nuclear	2	143	0.0	1.0
+es	06_coal	2	143	0.0	1.0
+es	07_gas	2	143	0.0	1.0
+es	08_non-res	2	143	0.0	1.0
 es	09_hydro_pump	2	143	0.0	0.0
-es	01_solar	2	144	1.0	0.0
-es	02_wind_on	2	144	1.0	0.0
-es	03_wind_off	2	144	1.0	0.0
-es	04_res	2	144	1.0	0.0
-es	05_nuclear	2	144	1.0	0.0
-es	06_coal	2	144	1.0	0.0
-es	07_gas	2	144	1.0	0.0
-es	08_non-res	2	144	1.0	0.0
+es	01_solar	2	144	0.0	1.0
+es	02_wind_on	2	144	0.0	1.0
+es	03_wind_off	2	144	0.0	1.0
+es	04_res	2	144	0.0	1.0
+es	05_nuclear	2	144	0.0	1.0
+es	06_coal	2	144	0.0	1.0
+es	07_gas	2	144	0.0	1.0
+es	08_non-res	2	144	0.0	1.0
 es	09_hydro_pump	2	144	0.0	0.0
-es	01_solar	2	145	1.0	0.0
-es	02_wind_on	2	145	1.0	0.0
-es	03_wind_off	2	145	1.0	0.0
-es	04_res	2	145	1.0	0.0
-es	05_nuclear	2	145	1.0	0.0
-es	06_coal	2	145	1.0	0.0
-es	07_gas	2	145	1.0	0.0
-es	08_non-res	2	145	1.0	0.0
+es	01_solar	2	145	0.0	1.0
+es	02_wind_on	2	145	0.0	1.0
+es	03_wind_off	2	145	0.0	1.0
+es	04_res	2	145	0.0	1.0
+es	05_nuclear	2	145	0.0	1.0
+es	06_coal	2	145	0.0	1.0
+es	07_gas	2	145	0.0	1.0
+es	08_non-res	2	145	0.0	1.0
 es	09_hydro_pump	2	145	0.0	0.0
-es	01_solar	2	146	1.0	0.0
-es	02_wind_on	2	146	1.0	0.0
-es	03_wind_off	2	146	1.0	0.0
-es	04_res	2	146	1.0	0.0
-es	05_nuclear	2	146	1.0	0.0
-es	06_coal	2	146	1.0	0.0
-es	07_gas	2	146	1.0	0.0
-es	08_non-res	2	146	1.0	0.0
+es	01_solar	2	146	0.0	1.0
+es	02_wind_on	2	146	0.0	1.0
+es	03_wind_off	2	146	0.0	1.0
+es	04_res	2	146	0.0	1.0
+es	05_nuclear	2	146	0.0	1.0
+es	06_coal	2	146	0.0	1.0
+es	07_gas	2	146	0.0	1.0
+es	08_non-res	2	146	0.0	1.0
 es	09_hydro_pump	2	146	0.0	0.0
-es	01_solar	2	147	1.0	0.0
-es	02_wind_on	2	147	1.0	0.0
-es	03_wind_off	2	147	1.0	0.0
-es	04_res	2	147	1.0	0.0
-es	05_nuclear	2	147	1.0	0.0
-es	06_coal	2	147	1.0	0.0
-es	07_gas	2	147	1.0	0.0
-es	08_non-res	2	147	1.0	0.0
+es	01_solar	2	147	0.0	1.0
+es	02_wind_on	2	147	0.0	1.0
+es	03_wind_off	2	147	0.0	1.0
+es	04_res	2	147	0.0	1.0
+es	05_nuclear	2	147	0.0	1.0
+es	06_coal	2	147	0.0	1.0
+es	07_gas	2	147	0.0	1.0
+es	08_non-res	2	147	0.0	1.0
 es	09_hydro_pump	2	147	0.0	0.0
-es	01_solar	2	148	1.0	0.0
-es	02_wind_on	2	148	1.0	0.0
-es	03_wind_off	2	148	1.0	0.0
-es	04_res	2	148	1.0	0.0
-es	05_nuclear	2	148	1.0	0.0
-es	06_coal	2	148	1.0	0.0
-es	07_gas	2	148	1.0	0.0
-es	08_non-res	2	148	1.0	0.0
+es	01_solar	2	148	0.0	1.0
+es	02_wind_on	2	148	0.0	1.0
+es	03_wind_off	2	148	0.0	1.0
+es	04_res	2	148	0.0	1.0
+es	05_nuclear	2	148	0.0	1.0
+es	06_coal	2	148	0.0	1.0
+es	07_gas	2	148	0.0	1.0
+es	08_non-res	2	148	0.0	1.0
 es	09_hydro_pump	2	148	0.0	0.0
-es	01_solar	2	149	1.0	0.0
-es	02_wind_on	2	149	1.0	0.0
-es	03_wind_off	2	149	1.0	0.0
-es	04_res	2	149	1.0	0.0
-es	05_nuclear	2	149	1.0	0.0
-es	06_coal	2	149	1.0	0.0
-es	07_gas	2	149	1.0	0.0
-es	08_non-res	2	149	1.0	0.0
+es	01_solar	2	149	0.0	1.0
+es	02_wind_on	2	149	0.0	1.0
+es	03_wind_off	2	149	0.0	1.0
+es	04_res	2	149	0.0	1.0
+es	05_nuclear	2	149	0.0	1.0
+es	06_coal	2	149	0.0	1.0
+es	07_gas	2	149	0.0	1.0
+es	08_non-res	2	149	0.0	1.0
 es	09_hydro_pump	2	149	0.0	0.0
-es	01_solar	2	150	1.0	0.0
-es	02_wind_on	2	150	1.0	0.0
-es	03_wind_off	2	150	1.0	0.0
-es	04_res	2	150	1.0	0.0
-es	05_nuclear	2	150	1.0	0.0
-es	06_coal	2	150	1.0	0.0
-es	07_gas	2	150	1.0	0.0
-es	08_non-res	2	150	1.0	0.0
+es	01_solar	2	150	0.0	1.0
+es	02_wind_on	2	150	0.0	1.0
+es	03_wind_off	2	150	0.0	1.0
+es	04_res	2	150	0.0	1.0
+es	05_nuclear	2	150	0.0	1.0
+es	06_coal	2	150	0.0	1.0
+es	07_gas	2	150	0.0	1.0
+es	08_non-res	2	150	0.0	1.0
 es	09_hydro_pump	2	150	0.0	0.0
-es	01_solar	2	151	1.0	0.0
-es	02_wind_on	2	151	1.0	0.0
-es	03_wind_off	2	151	1.0	0.0
-es	04_res	2	151	1.0	0.0
-es	05_nuclear	2	151	1.0	0.0
-es	06_coal	2	151	1.0	0.0
-es	07_gas	2	151	1.0	0.0
-es	08_non-res	2	151	1.0	0.0
+es	01_solar	2	151	0.0	1.0
+es	02_wind_on	2	151	0.0	1.0
+es	03_wind_off	2	151	0.0	1.0
+es	04_res	2	151	0.0	1.0
+es	05_nuclear	2	151	0.0	1.0
+es	06_coal	2	151	0.0	1.0
+es	07_gas	2	151	0.0	1.0
+es	08_non-res	2	151	0.0	1.0
 es	09_hydro_pump	2	151	0.0	0.0
-es	01_solar	2	152	1.0	0.0
-es	02_wind_on	2	152	1.0	0.0
-es	03_wind_off	2	152	1.0	0.0
-es	04_res	2	152	1.0	0.0
-es	05_nuclear	2	152	1.0	0.0
-es	06_coal	2	152	1.0	0.0
-es	07_gas	2	152	1.0	0.0
-es	08_non-res	2	152	1.0	0.0
+es	01_solar	2	152	0.0	1.0
+es	02_wind_on	2	152	0.0	1.0
+es	03_wind_off	2	152	0.0	1.0
+es	04_res	2	152	0.0	1.0
+es	05_nuclear	2	152	0.0	1.0
+es	06_coal	2	152	0.0	1.0
+es	07_gas	2	152	0.0	1.0
+es	08_non-res	2	152	0.0	1.0
 es	09_hydro_pump	2	152	0.0	0.0
-es	01_solar	2	153	1.0	0.0
-es	02_wind_on	2	153	1.0	0.0
-es	03_wind_off	2	153	1.0	0.0
-es	04_res	2	153	1.0	0.0
-es	05_nuclear	2	153	1.0	0.0
-es	06_coal	2	153	1.0	0.0
-es	07_gas	2	153	1.0	0.0
-es	08_non-res	2	153	1.0	0.0
+es	01_solar	2	153	0.0	1.0
+es	02_wind_on	2	153	0.0	1.0
+es	03_wind_off	2	153	0.0	1.0
+es	04_res	2	153	0.0	1.0
+es	05_nuclear	2	153	0.0	1.0
+es	06_coal	2	153	0.0	1.0
+es	07_gas	2	153	0.0	1.0
+es	08_non-res	2	153	0.0	1.0
 es	09_hydro_pump	2	153	0.0	0.0
-es	01_solar	2	154	1.0	0.0
-es	02_wind_on	2	154	1.0	0.0
-es	03_wind_off	2	154	1.0	0.0
-es	04_res	2	154	1.0	0.0
-es	05_nuclear	2	154	1.0	0.0
-es	06_coal	2	154	1.0	0.0
-es	07_gas	2	154	1.0	0.0
-es	08_non-res	2	154	1.0	0.0
+es	01_solar	2	154	0.0	1.0
+es	02_wind_on	2	154	0.0	1.0
+es	03_wind_off	2	154	0.0	1.0
+es	04_res	2	154	0.0	1.0
+es	05_nuclear	2	154	0.0	1.0
+es	06_coal	2	154	0.0	1.0
+es	07_gas	2	154	0.0	1.0
+es	08_non-res	2	154	0.0	1.0
 es	09_hydro_pump	2	154	0.0	0.0
-es	01_solar	2	155	1.0	0.0
-es	02_wind_on	2	155	1.0	0.0
-es	03_wind_off	2	155	1.0	0.0
-es	04_res	2	155	1.0	0.0
-es	05_nuclear	2	155	1.0	0.0
-es	06_coal	2	155	1.0	0.0
-es	07_gas	2	155	1.0	0.0
-es	08_non-res	2	155	1.0	0.0
+es	01_solar	2	155	0.0	1.0
+es	02_wind_on	2	155	0.0	1.0
+es	03_wind_off	2	155	0.0	1.0
+es	04_res	2	155	0.0	1.0
+es	05_nuclear	2	155	0.0	1.0
+es	06_coal	2	155	0.0	1.0
+es	07_gas	2	155	0.0	1.0
+es	08_non-res	2	155	0.0	1.0
 es	09_hydro_pump	2	155	0.0	0.0
-es	01_solar	2	156	1.0	0.0
-es	02_wind_on	2	156	1.0	0.0
-es	03_wind_off	2	156	1.0	0.0
-es	04_res	2	156	1.0	0.0
-es	05_nuclear	2	156	1.0	0.0
-es	06_coal	2	156	1.0	0.0
-es	07_gas	2	156	1.0	0.0
-es	08_non-res	2	156	1.0	0.0
+es	01_solar	2	156	0.0	1.0
+es	02_wind_on	2	156	0.0	1.0
+es	03_wind_off	2	156	0.0	1.0
+es	04_res	2	156	0.0	1.0
+es	05_nuclear	2	156	0.0	1.0
+es	06_coal	2	156	0.0	1.0
+es	07_gas	2	156	0.0	1.0
+es	08_non-res	2	156	0.0	1.0
 es	09_hydro_pump	2	156	0.0	0.0
-es	01_solar	2	157	1.0	0.0
-es	02_wind_on	2	157	1.0	0.0
-es	03_wind_off	2	157	1.0	0.0
-es	04_res	2	157	1.0	0.0
-es	05_nuclear	2	157	1.0	0.0
-es	06_coal	2	157	1.0	0.0
-es	07_gas	2	157	1.0	0.0
-es	08_non-res	2	157	1.0	0.0
+es	01_solar	2	157	0.0	1.0
+es	02_wind_on	2	157	0.0	1.0
+es	03_wind_off	2	157	0.0	1.0
+es	04_res	2	157	0.0	1.0
+es	05_nuclear	2	157	0.0	1.0
+es	06_coal	2	157	0.0	1.0
+es	07_gas	2	157	0.0	1.0
+es	08_non-res	2	157	0.0	1.0
 es	09_hydro_pump	2	157	0.0	0.0
-es	01_solar	2	158	1.0	0.0
-es	02_wind_on	2	158	1.0	0.0
-es	03_wind_off	2	158	1.0	0.0
-es	04_res	2	158	1.0	0.0
-es	05_nuclear	2	158	1.0	0.0
-es	06_coal	2	158	1.0	0.0
-es	07_gas	2	158	1.0	0.0
-es	08_non-res	2	158	1.0	0.0
+es	01_solar	2	158	0.0	1.0
+es	02_wind_on	2	158	0.0	1.0
+es	03_wind_off	2	158	0.0	1.0
+es	04_res	2	158	0.0	1.0
+es	05_nuclear	2	158	0.0	1.0
+es	06_coal	2	158	0.0	1.0
+es	07_gas	2	158	0.0	1.0
+es	08_non-res	2	158	0.0	1.0
 es	09_hydro_pump	2	158	0.0	0.0
-es	01_solar	2	159	1.0	0.0
-es	02_wind_on	2	159	1.0	0.0
-es	03_wind_off	2	159	1.0	0.0
-es	04_res	2	159	1.0	0.0
-es	05_nuclear	2	159	1.0	0.0
-es	06_coal	2	159	1.0	0.0
-es	07_gas	2	159	1.0	0.0
-es	08_non-res	2	159	1.0	0.0
+es	01_solar	2	159	0.0	1.0
+es	02_wind_on	2	159	0.0	1.0
+es	03_wind_off	2	159	0.0	1.0
+es	04_res	2	159	0.0	1.0
+es	05_nuclear	2	159	0.0	1.0
+es	06_coal	2	159	0.0	1.0
+es	07_gas	2	159	0.0	1.0
+es	08_non-res	2	159	0.0	1.0
 es	09_hydro_pump	2	159	0.0	0.0
-es	01_solar	2	160	1.0	0.0
-es	02_wind_on	2	160	1.0	0.0
-es	03_wind_off	2	160	1.0	0.0
-es	04_res	2	160	1.0	0.0
-es	05_nuclear	2	160	1.0	0.0
-es	06_coal	2	160	1.0	0.0
-es	07_gas	2	160	1.0	0.0
-es	08_non-res	2	160	1.0	0.0
+es	01_solar	2	160	0.0	1.0
+es	02_wind_on	2	160	0.0	1.0
+es	03_wind_off	2	160	0.0	1.0
+es	04_res	2	160	0.0	1.0
+es	05_nuclear	2	160	0.0	1.0
+es	06_coal	2	160	0.0	1.0
+es	07_gas	2	160	0.0	1.0
+es	08_non-res	2	160	0.0	1.0
 es	09_hydro_pump	2	160	0.0	0.0
-es	01_solar	2	161	1.0	0.0
-es	02_wind_on	2	161	1.0	0.0
-es	03_wind_off	2	161	1.0	0.0
-es	04_res	2	161	1.0	0.0
-es	05_nuclear	2	161	1.0	0.0
-es	06_coal	2	161	1.0	0.0
-es	07_gas	2	161	1.0	0.0
-es	08_non-res	2	161	1.0	0.0
+es	01_solar	2	161	0.0	1.0
+es	02_wind_on	2	161	0.0	1.0
+es	03_wind_off	2	161	0.0	1.0
+es	04_res	2	161	0.0	1.0
+es	05_nuclear	2	161	0.0	1.0
+es	06_coal	2	161	0.0	1.0
+es	07_gas	2	161	0.0	1.0
+es	08_non-res	2	161	0.0	1.0
 es	09_hydro_pump	2	161	0.0	0.0
-es	01_solar	2	162	1.0	0.0
-es	02_wind_on	2	162	1.0	0.0
-es	03_wind_off	2	162	1.0	0.0
-es	04_res	2	162	1.0	0.0
-es	05_nuclear	2	162	1.0	0.0
-es	06_coal	2	162	1.0	0.0
-es	07_gas	2	162	1.0	0.0
-es	08_non-res	2	162	1.0	0.0
-es	09_hydro_pump	2	162	1.0	0.0
-es	01_solar	2	163	1.0	0.0
-es	02_wind_on	2	163	1.0	0.0
-es	03_wind_off	2	163	1.0	0.0
-es	04_res	2	163	1.0	0.0
-es	05_nuclear	2	163	1.0	0.0
-es	06_coal	2	163	1.0	0.0
-es	07_gas	2	163	1.0	0.0
-es	08_non-res	2	163	1.0	0.0
-es	09_hydro_pump	2	163	1.0	0.0
-es	01_solar	2	164	1.0	0.0
-es	02_wind_on	2	164	1.0	0.0
-es	03_wind_off	2	164	1.0	0.0
-es	04_res	2	164	1.0	0.0
-es	05_nuclear	2	164	1.0	0.0
-es	06_coal	2	164	1.0	0.0
-es	07_gas	2	164	1.0	0.0
-es	08_non-res	2	164	1.0	0.0
-es	09_hydro_pump	2	164	1.0	0.0
-es	01_solar	2	165	1.0	0.0
-es	02_wind_on	2	165	1.0	0.0
-es	03_wind_off	2	165	1.0	0.0
-es	04_res	2	165	1.0	0.0
-es	05_nuclear	2	165	1.0	0.0
-es	06_coal	2	165	1.0	0.0
-es	07_gas	2	165	1.0	0.0
-es	08_non-res	2	165	1.0	0.0
-es	09_hydro_pump	2	165	1.0	0.0
-es	01_solar	2	166	1.0	0.0
-es	02_wind_on	2	166	1.0	0.0
-es	03_wind_off	2	166	1.0	0.0
-es	04_res	2	166	1.0	0.0
-es	05_nuclear	2	166	1.0	0.0
-es	06_coal	2	166	1.0	0.0
-es	07_gas	2	166	1.0	0.0
-es	08_non-res	2	166	1.0	0.0
-es	09_hydro_pump	2	166	1.0	0.0
-es	01_solar	2	167	1.0	0.0
-es	02_wind_on	2	167	1.0	0.0
-es	03_wind_off	2	167	1.0	0.0
-es	04_res	2	167	1.0	0.0
-es	05_nuclear	2	167	1.0	0.0
-es	06_coal	2	167	1.0	0.0
-es	07_gas	2	167	1.0	0.0
-es	08_non-res	2	167	1.0	0.0
-es	09_hydro_pump	2	167	1.0	0.0
-es	01_solar	2	168	1.0	0.0
-es	02_wind_on	2	168	1.0	0.0
-es	03_wind_off	2	168	1.0	0.0
-es	04_res	2	168	1.0	0.0
-es	05_nuclear	2	168	1.0	0.0
-es	06_coal	2	168	1.0	0.0
-es	07_gas	2	168	1.0	0.0
-es	08_non-res	2	168	1.0	0.0
-es	09_hydro_pump	2	168	1.0	0.0
+es	01_solar	2	162	0.0	1.0
+es	02_wind_on	2	162	0.0	1.0
+es	03_wind_off	2	162	0.0	1.0
+es	04_res	2	162	0.0	1.0
+es	05_nuclear	2	162	0.0	1.0
+es	06_coal	2	162	0.0	1.0
+es	07_gas	2	162	0.0	1.0
+es	08_non-res	2	162	0.0	1.0
+es	09_hydro_pump	2	162	0.0	1.0
+es	01_solar	2	163	0.0	1.0
+es	02_wind_on	2	163	0.0	1.0
+es	03_wind_off	2	163	0.0	1.0
+es	04_res	2	163	0.0	1.0
+es	05_nuclear	2	163	0.0	1.0
+es	06_coal	2	163	0.0	1.0
+es	07_gas	2	163	0.0	1.0
+es	08_non-res	2	163	0.0	1.0
+es	09_hydro_pump	2	163	0.0	1.0
+es	01_solar	2	164	0.0	1.0
+es	02_wind_on	2	164	0.0	1.0
+es	03_wind_off	2	164	0.0	1.0
+es	04_res	2	164	0.0	1.0
+es	05_nuclear	2	164	0.0	1.0
+es	06_coal	2	164	0.0	1.0
+es	07_gas	2	164	0.0	1.0
+es	08_non-res	2	164	0.0	1.0
+es	09_hydro_pump	2	164	0.0	1.0
+es	01_solar	2	165	0.0	1.0
+es	02_wind_on	2	165	0.0	1.0
+es	03_wind_off	2	165	0.0	1.0
+es	04_res	2	165	0.0	1.0
+es	05_nuclear	2	165	0.0	1.0
+es	06_coal	2	165	0.0	1.0
+es	07_gas	2	165	0.0	1.0
+es	08_non-res	2	165	0.0	1.0
+es	09_hydro_pump	2	165	0.0	1.0
+es	01_solar	2	166	0.0	1.0
+es	02_wind_on	2	166	0.0	1.0
+es	03_wind_off	2	166	0.0	1.0
+es	04_res	2	166	0.0	1.0
+es	05_nuclear	2	166	0.0	1.0
+es	06_coal	2	166	0.0	1.0
+es	07_gas	2	166	0.0	1.0
+es	08_non-res	2	166	0.0	1.0
+es	09_hydro_pump	2	166	0.0	1.0
+es	01_solar	2	167	0.0	1.0
+es	02_wind_on	2	167	0.0	1.0
+es	03_wind_off	2	167	0.0	1.0
+es	04_res	2	167	0.0	1.0
+es	05_nuclear	2	167	0.0	1.0
+es	06_coal	2	167	0.0	1.0
+es	07_gas	2	167	0.0	1.0
+es	08_non-res	2	167	0.0	1.0
+es	09_hydro_pump	2	167	0.0	1.0
+es	01_solar	2	168	0.0	1.0
+es	02_wind_on	2	168	0.0	1.0
+es	03_wind_off	2	168	0.0	1.0
+es	04_res	2	168	0.0	1.0
+es	05_nuclear	2	168	0.0	1.0
+es	06_coal	2	168	0.0	1.0
+es	07_gas	2	168	0.0	1.0
+es	08_non-res	2	168	0.0	1.0
+es	09_hydro_pump	2	168	0.0	1.0
 es	01_solar	2	169	0.0	0.0
 es	02_wind_on	2	169	0.0	0.0
 es	03_wind_off	2	169	0.0	0.0
@@ -16640,7 +16640,7 @@ es	06_coal	2	169	0.0	0.0
 es	07_gas	2	169	0.0	0.0
 es	08_non-res	2	169	0.0	0.0
 es	09_hydro_pump	2	169	0.0	0.0
-es	01_solar	2	170	1.0	0.0
+es	01_solar	2	170	0.0	1.0
 es	02_wind_on	2	170	0.0	0.0
 es	03_wind_off	2	170	0.0	0.0
 es	04_res	2	170	0.0	0.0
@@ -16649,7 +16649,7 @@ es	06_coal	2	170	0.0	0.0
 es	07_gas	2	170	0.0	0.0
 es	08_non-res	2	170	0.0	0.0
 es	09_hydro_pump	2	170	0.0	0.0
-es	01_solar	2	171	1.0	0.0
+es	01_solar	2	171	0.0	1.0
 es	02_wind_on	2	171	0.0	0.0
 es	03_wind_off	2	171	0.0	0.0
 es	04_res	2	171	0.0	0.0
@@ -16658,7 +16658,7 @@ es	06_coal	2	171	0.0	0.0
 es	07_gas	2	171	0.0	0.0
 es	08_non-res	2	171	0.0	0.0
 es	09_hydro_pump	2	171	0.0	0.0
-es	01_solar	2	172	1.0	0.0
+es	01_solar	2	172	0.0	1.0
 es	02_wind_on	2	172	0.0	0.0
 es	03_wind_off	2	172	0.0	0.0
 es	04_res	2	172	0.0	0.0
@@ -16667,7 +16667,7 @@ es	06_coal	2	172	0.0	0.0
 es	07_gas	2	172	0.0	0.0
 es	08_non-res	2	172	0.0	0.0
 es	09_hydro_pump	2	172	0.0	0.0
-es	01_solar	2	173	1.0	0.0
+es	01_solar	2	173	0.0	1.0
 es	02_wind_on	2	173	0.0	0.0
 es	03_wind_off	2	173	0.0	0.0
 es	04_res	2	173	0.0	0.0
@@ -16676,7 +16676,7 @@ es	06_coal	2	173	0.0	0.0
 es	07_gas	2	173	0.0	0.0
 es	08_non-res	2	173	0.0	0.0
 es	09_hydro_pump	2	173	0.0	0.0
-es	01_solar	2	174	1.0	0.0
+es	01_solar	2	174	0.0	1.0
 es	02_wind_on	2	174	0.0	0.0
 es	03_wind_off	2	174	0.0	0.0
 es	04_res	2	174	0.0	0.0
@@ -16685,7 +16685,7 @@ es	06_coal	2	174	0.0	0.0
 es	07_gas	2	174	0.0	0.0
 es	08_non-res	2	174	0.0	0.0
 es	09_hydro_pump	2	174	0.0	0.0
-es	01_solar	2	175	1.0	0.0
+es	01_solar	2	175	0.0	1.0
 es	02_wind_on	2	175	0.0	0.0
 es	03_wind_off	2	175	0.0	0.0
 es	04_res	2	175	0.0	0.0
@@ -16694,7 +16694,7 @@ es	06_coal	2	175	0.0	0.0
 es	07_gas	2	175	0.0	0.0
 es	08_non-res	2	175	0.0	0.0
 es	09_hydro_pump	2	175	0.0	0.0
-es	01_solar	2	176	1.0	0.0
+es	01_solar	2	176	0.0	1.0
 es	02_wind_on	2	176	0.0	0.0
 es	03_wind_off	2	176	0.0	0.0
 es	04_res	2	176	0.0	0.0
@@ -16703,7 +16703,7 @@ es	06_coal	2	176	0.0	0.0
 es	07_gas	2	176	0.0	0.0
 es	08_non-res	2	176	0.0	0.0
 es	09_hydro_pump	2	176	0.0	0.0
-es	01_solar	2	177	1.0	0.0
+es	01_solar	2	177	0.0	1.0
 es	02_wind_on	2	177	0.0	0.0
 es	03_wind_off	2	177	0.0	0.0
 es	04_res	2	177	0.0	0.0
@@ -16712,7 +16712,7 @@ es	06_coal	2	177	0.0	0.0
 es	07_gas	2	177	0.0	0.0
 es	08_non-res	2	177	0.0	0.0
 es	09_hydro_pump	2	177	0.0	0.0
-es	01_solar	2	178	1.0	0.0
+es	01_solar	2	178	0.0	1.0
 es	02_wind_on	2	178	0.0	0.0
 es	03_wind_off	2	178	0.0	0.0
 es	04_res	2	178	0.0	0.0
@@ -16721,7 +16721,7 @@ es	06_coal	2	178	0.0	0.0
 es	07_gas	2	178	0.0	0.0
 es	08_non-res	2	178	0.0	0.0
 es	09_hydro_pump	2	178	0.0	0.0
-es	01_solar	2	179	1.0	0.0
+es	01_solar	2	179	0.0	1.0
 es	02_wind_on	2	179	0.0	0.0
 es	03_wind_off	2	179	0.0	0.0
 es	04_res	2	179	0.0	0.0
@@ -16730,7 +16730,7 @@ es	06_coal	2	179	0.0	0.0
 es	07_gas	2	179	0.0	0.0
 es	08_non-res	2	179	0.0	0.0
 es	09_hydro_pump	2	179	0.0	0.0
-es	01_solar	2	180	1.0	0.0
+es	01_solar	2	180	0.0	1.0
 es	02_wind_on	2	180	0.0	0.0
 es	03_wind_off	2	180	0.0	0.0
 es	04_res	2	180	0.0	0.0
@@ -16739,7 +16739,7 @@ es	06_coal	2	180	0.0	0.0
 es	07_gas	2	180	0.0	0.0
 es	08_non-res	2	180	0.0	0.0
 es	09_hydro_pump	2	180	0.0	0.0
-es	01_solar	2	181	1.0	0.0
+es	01_solar	2	181	0.0	1.0
 es	02_wind_on	2	181	0.0	0.0
 es	03_wind_off	2	181	0.0	0.0
 es	04_res	2	181	0.0	0.0
@@ -16748,7 +16748,7 @@ es	06_coal	2	181	0.0	0.0
 es	07_gas	2	181	0.0	0.0
 es	08_non-res	2	181	0.0	0.0
 es	09_hydro_pump	2	181	0.0	0.0
-es	01_solar	2	182	1.0	0.0
+es	01_solar	2	182	0.0	1.0
 es	02_wind_on	2	182	0.0	0.0
 es	03_wind_off	2	182	0.0	0.0
 es	04_res	2	182	0.0	0.0
@@ -16757,7 +16757,7 @@ es	06_coal	2	182	0.0	0.0
 es	07_gas	2	182	0.0	0.0
 es	08_non-res	2	182	0.0	0.0
 es	09_hydro_pump	2	182	0.0	0.0
-es	01_solar	2	183	1.0	0.0
+es	01_solar	2	183	0.0	1.0
 es	02_wind_on	2	183	0.0	0.0
 es	03_wind_off	2	183	0.0	0.0
 es	04_res	2	183	0.0	0.0
@@ -16766,7 +16766,7 @@ es	06_coal	2	183	0.0	0.0
 es	07_gas	2	183	0.0	0.0
 es	08_non-res	2	183	0.0	0.0
 es	09_hydro_pump	2	183	0.0	0.0
-es	01_solar	2	184	1.0	0.0
+es	01_solar	2	184	0.0	1.0
 es	02_wind_on	2	184	0.0	0.0
 es	03_wind_off	2	184	0.0	0.0
 es	04_res	2	184	0.0	0.0
@@ -16775,7 +16775,7 @@ es	06_coal	2	184	0.0	0.0
 es	07_gas	2	184	0.0	0.0
 es	08_non-res	2	184	0.0	0.0
 es	09_hydro_pump	2	184	0.0	0.0
-es	01_solar	2	185	1.0	0.0
+es	01_solar	2	185	0.0	1.0
 es	02_wind_on	2	185	0.0	0.0
 es	03_wind_off	2	185	0.0	0.0
 es	04_res	2	185	0.0	0.0
@@ -16784,7 +16784,7 @@ es	06_coal	2	185	0.0	0.0
 es	07_gas	2	185	0.0	0.0
 es	08_non-res	2	185	0.0	0.0
 es	09_hydro_pump	2	185	0.0	0.0
-es	01_solar	2	186	1.0	0.0
+es	01_solar	2	186	0.0	1.0
 es	02_wind_on	2	186	0.0	0.0
 es	03_wind_off	2	186	0.0	0.0
 es	04_res	2	186	0.0	0.0
@@ -16793,7 +16793,7 @@ es	06_coal	2	186	0.0	0.0
 es	07_gas	2	186	0.0	0.0
 es	08_non-res	2	186	0.0	0.0
 es	09_hydro_pump	2	186	0.0	0.0
-es	01_solar	2	187	1.0	0.0
+es	01_solar	2	187	0.0	1.0
 es	02_wind_on	2	187	0.0	0.0
 es	03_wind_off	2	187	0.0	0.0
 es	04_res	2	187	0.0	0.0
@@ -16802,7 +16802,7 @@ es	06_coal	2	187	0.0	0.0
 es	07_gas	2	187	0.0	0.0
 es	08_non-res	2	187	0.0	0.0
 es	09_hydro_pump	2	187	0.0	0.0
-es	01_solar	2	188	1.0	0.0
+es	01_solar	2	188	0.0	1.0
 es	02_wind_on	2	188	0.0	0.0
 es	03_wind_off	2	188	0.0	0.0
 es	04_res	2	188	0.0	0.0
@@ -16811,7 +16811,7 @@ es	06_coal	2	188	0.0	0.0
 es	07_gas	2	188	0.0	0.0
 es	08_non-res	2	188	0.0	0.0
 es	09_hydro_pump	2	188	0.0	0.0
-es	01_solar	2	189	1.0	0.0
+es	01_solar	2	189	0.0	1.0
 es	02_wind_on	2	189	0.0	0.0
 es	03_wind_off	2	189	0.0	0.0
 es	04_res	2	189	0.0	0.0
@@ -16820,8 +16820,8 @@ es	06_coal	2	189	0.0	0.0
 es	07_gas	2	189	0.0	0.0
 es	08_non-res	2	189	0.0	0.0
 es	09_hydro_pump	2	189	0.0	0.0
-es	01_solar	2	190	1.0	0.0
-es	02_wind_on	2	190	1.0	0.0
+es	01_solar	2	190	0.0	1.0
+es	02_wind_on	2	190	0.0	1.0
 es	03_wind_off	2	190	0.0	0.0
 es	04_res	2	190	0.0	0.0
 es	05_nuclear	2	190	0.0	0.0
@@ -16829,8 +16829,8 @@ es	06_coal	2	190	0.0	0.0
 es	07_gas	2	190	0.0	0.0
 es	08_non-res	2	190	0.0	0.0
 es	09_hydro_pump	2	190	0.0	0.0
-es	01_solar	2	191	1.0	0.0
-es	02_wind_on	2	191	1.0	0.0
+es	01_solar	2	191	0.0	1.0
+es	02_wind_on	2	191	0.0	1.0
 es	03_wind_off	2	191	0.0	0.0
 es	04_res	2	191	0.0	0.0
 es	05_nuclear	2	191	0.0	0.0
@@ -16838,8 +16838,8 @@ es	06_coal	2	191	0.0	0.0
 es	07_gas	2	191	0.0	0.0
 es	08_non-res	2	191	0.0	0.0
 es	09_hydro_pump	2	191	0.0	0.0
-es	01_solar	2	192	1.0	0.0
-es	02_wind_on	2	192	1.0	0.0
+es	01_solar	2	192	0.0	1.0
+es	02_wind_on	2	192	0.0	1.0
 es	03_wind_off	2	192	0.0	0.0
 es	04_res	2	192	0.0	0.0
 es	05_nuclear	2	192	0.0	0.0
@@ -16847,8 +16847,8 @@ es	06_coal	2	192	0.0	0.0
 es	07_gas	2	192	0.0	0.0
 es	08_non-res	2	192	0.0	0.0
 es	09_hydro_pump	2	192	0.0	0.0
-es	01_solar	2	193	1.0	0.0
-es	02_wind_on	2	193	1.0	0.0
+es	01_solar	2	193	0.0	1.0
+es	02_wind_on	2	193	0.0	1.0
 es	03_wind_off	2	193	0.0	0.0
 es	04_res	2	193	0.0	0.0
 es	05_nuclear	2	193	0.0	0.0
@@ -16856,8 +16856,8 @@ es	06_coal	2	193	0.0	0.0
 es	07_gas	2	193	0.0	0.0
 es	08_non-res	2	193	0.0	0.0
 es	09_hydro_pump	2	193	0.0	0.0
-es	01_solar	2	194	1.0	0.0
-es	02_wind_on	2	194	1.0	0.0
+es	01_solar	2	194	0.0	1.0
+es	02_wind_on	2	194	0.0	1.0
 es	03_wind_off	2	194	0.0	0.0
 es	04_res	2	194	0.0	0.0
 es	05_nuclear	2	194	0.0	0.0
@@ -16865,8 +16865,8 @@ es	06_coal	2	194	0.0	0.0
 es	07_gas	2	194	0.0	0.0
 es	08_non-res	2	194	0.0	0.0
 es	09_hydro_pump	2	194	0.0	0.0
-es	01_solar	2	195	1.0	0.0
-es	02_wind_on	2	195	1.0	0.0
+es	01_solar	2	195	0.0	1.0
+es	02_wind_on	2	195	0.0	1.0
 es	03_wind_off	2	195	0.0	0.0
 es	04_res	2	195	0.0	0.0
 es	05_nuclear	2	195	0.0	0.0
@@ -16874,8 +16874,8 @@ es	06_coal	2	195	0.0	0.0
 es	07_gas	2	195	0.0	0.0
 es	08_non-res	2	195	0.0	0.0
 es	09_hydro_pump	2	195	0.0	0.0
-es	01_solar	2	196	1.0	0.0
-es	02_wind_on	2	196	1.0	0.0
+es	01_solar	2	196	0.0	1.0
+es	02_wind_on	2	196	0.0	1.0
 es	03_wind_off	2	196	0.0	0.0
 es	04_res	2	196	0.0	0.0
 es	05_nuclear	2	196	0.0	0.0
@@ -16883,8 +16883,8 @@ es	06_coal	2	196	0.0	0.0
 es	07_gas	2	196	0.0	0.0
 es	08_non-res	2	196	0.0	0.0
 es	09_hydro_pump	2	196	0.0	0.0
-es	01_solar	2	197	1.0	0.0
-es	02_wind_on	2	197	1.0	0.0
+es	01_solar	2	197	0.0	1.0
+es	02_wind_on	2	197	0.0	1.0
 es	03_wind_off	2	197	0.0	0.0
 es	04_res	2	197	0.0	0.0
 es	05_nuclear	2	197	0.0	0.0
@@ -16892,8 +16892,8 @@ es	06_coal	2	197	0.0	0.0
 es	07_gas	2	197	0.0	0.0
 es	08_non-res	2	197	0.0	0.0
 es	09_hydro_pump	2	197	0.0	0.0
-es	01_solar	2	198	1.0	0.0
-es	02_wind_on	2	198	1.0	0.0
+es	01_solar	2	198	0.0	1.0
+es	02_wind_on	2	198	0.0	1.0
 es	03_wind_off	2	198	0.0	0.0
 es	04_res	2	198	0.0	0.0
 es	05_nuclear	2	198	0.0	0.0
@@ -16901,8 +16901,8 @@ es	06_coal	2	198	0.0	0.0
 es	07_gas	2	198	0.0	0.0
 es	08_non-res	2	198	0.0	0.0
 es	09_hydro_pump	2	198	0.0	0.0
-es	01_solar	2	199	1.0	0.0
-es	02_wind_on	2	199	1.0	0.0
+es	01_solar	2	199	0.0	1.0
+es	02_wind_on	2	199	0.0	1.0
 es	03_wind_off	2	199	0.0	0.0
 es	04_res	2	199	0.0	0.0
 es	05_nuclear	2	199	0.0	0.0
@@ -16910,8 +16910,8 @@ es	06_coal	2	199	0.0	0.0
 es	07_gas	2	199	0.0	0.0
 es	08_non-res	2	199	0.0	0.0
 es	09_hydro_pump	2	199	0.0	0.0
-es	01_solar	2	200	1.0	0.0
-es	02_wind_on	2	200	1.0	0.0
+es	01_solar	2	200	0.0	1.0
+es	02_wind_on	2	200	0.0	1.0
 es	03_wind_off	2	200	0.0	0.0
 es	04_res	2	200	0.0	0.0
 es	05_nuclear	2	200	0.0	0.0
@@ -16919,8 +16919,8 @@ es	06_coal	2	200	0.0	0.0
 es	07_gas	2	200	0.0	0.0
 es	08_non-res	2	200	0.0	0.0
 es	09_hydro_pump	2	200	0.0	0.0
-es	01_solar	2	201	1.0	0.0
-es	02_wind_on	2	201	1.0	0.0
+es	01_solar	2	201	0.0	1.0
+es	02_wind_on	2	201	0.0	1.0
 es	03_wind_off	2	201	0.0	0.0
 es	04_res	2	201	0.0	0.0
 es	05_nuclear	2	201	0.0	0.0
@@ -16928,8 +16928,8 @@ es	06_coal	2	201	0.0	0.0
 es	07_gas	2	201	0.0	0.0
 es	08_non-res	2	201	0.0	0.0
 es	09_hydro_pump	2	201	0.0	0.0
-es	01_solar	2	202	1.0	0.0
-es	02_wind_on	2	202	1.0	0.0
+es	01_solar	2	202	0.0	1.0
+es	02_wind_on	2	202	0.0	1.0
 es	03_wind_off	2	202	0.0	0.0
 es	04_res	2	202	0.0	0.0
 es	05_nuclear	2	202	0.0	0.0
@@ -16937,8 +16937,8 @@ es	06_coal	2	202	0.0	0.0
 es	07_gas	2	202	0.0	0.0
 es	08_non-res	2	202	0.0	0.0
 es	09_hydro_pump	2	202	0.0	0.0
-es	01_solar	2	203	1.0	0.0
-es	02_wind_on	2	203	1.0	0.0
+es	01_solar	2	203	0.0	1.0
+es	02_wind_on	2	203	0.0	1.0
 es	03_wind_off	2	203	0.0	0.0
 es	04_res	2	203	0.0	0.0
 es	05_nuclear	2	203	0.0	0.0
@@ -16946,8 +16946,8 @@ es	06_coal	2	203	0.0	0.0
 es	07_gas	2	203	0.0	0.0
 es	08_non-res	2	203	0.0	0.0
 es	09_hydro_pump	2	203	0.0	0.0
-es	01_solar	2	204	1.0	0.0
-es	02_wind_on	2	204	1.0	0.0
+es	01_solar	2	204	0.0	1.0
+es	02_wind_on	2	204	0.0	1.0
 es	03_wind_off	2	204	0.0	0.0
 es	04_res	2	204	0.0	0.0
 es	05_nuclear	2	204	0.0	0.0
@@ -16955,8 +16955,8 @@ es	06_coal	2	204	0.0	0.0
 es	07_gas	2	204	0.0	0.0
 es	08_non-res	2	204	0.0	0.0
 es	09_hydro_pump	2	204	0.0	0.0
-es	01_solar	2	205	1.0	0.0
-es	02_wind_on	2	205	1.0	0.0
+es	01_solar	2	205	0.0	1.0
+es	02_wind_on	2	205	0.0	1.0
 es	03_wind_off	2	205	0.0	0.0
 es	04_res	2	205	0.0	0.0
 es	05_nuclear	2	205	0.0	0.0
@@ -16964,8 +16964,8 @@ es	06_coal	2	205	0.0	0.0
 es	07_gas	2	205	0.0	0.0
 es	08_non-res	2	205	0.0	0.0
 es	09_hydro_pump	2	205	0.0	0.0
-es	01_solar	2	206	1.0	0.0
-es	02_wind_on	2	206	1.0	0.0
+es	01_solar	2	206	0.0	1.0
+es	02_wind_on	2	206	0.0	1.0
 es	03_wind_off	2	206	0.0	0.0
 es	04_res	2	206	0.0	0.0
 es	05_nuclear	2	206	0.0	0.0
@@ -16973,8 +16973,8 @@ es	06_coal	2	206	0.0	0.0
 es	07_gas	2	206	0.0	0.0
 es	08_non-res	2	206	0.0	0.0
 es	09_hydro_pump	2	206	0.0	0.0
-es	01_solar	2	207	1.0	0.0
-es	02_wind_on	2	207	1.0	0.0
+es	01_solar	2	207	0.0	1.0
+es	02_wind_on	2	207	0.0	1.0
 es	03_wind_off	2	207	0.0	0.0
 es	04_res	2	207	0.0	0.0
 es	05_nuclear	2	207	0.0	0.0
@@ -16982,8 +16982,8 @@ es	06_coal	2	207	0.0	0.0
 es	07_gas	2	207	0.0	0.0
 es	08_non-res	2	207	0.0	0.0
 es	09_hydro_pump	2	207	0.0	0.0
-es	01_solar	2	208	1.0	0.0
-es	02_wind_on	2	208	1.0	0.0
+es	01_solar	2	208	0.0	1.0
+es	02_wind_on	2	208	0.0	1.0
 es	03_wind_off	2	208	0.0	0.0
 es	04_res	2	208	0.0	0.0
 es	05_nuclear	2	208	0.0	0.0
@@ -16991,8 +16991,8 @@ es	06_coal	2	208	0.0	0.0
 es	07_gas	2	208	0.0	0.0
 es	08_non-res	2	208	0.0	0.0
 es	09_hydro_pump	2	208	0.0	0.0
-es	01_solar	2	209	1.0	0.0
-es	02_wind_on	2	209	1.0	0.0
+es	01_solar	2	209	0.0	1.0
+es	02_wind_on	2	209	0.0	1.0
 es	03_wind_off	2	209	0.0	0.0
 es	04_res	2	209	0.0	0.0
 es	05_nuclear	2	209	0.0	0.0
@@ -17000,1149 +17000,1149 @@ es	06_coal	2	209	0.0	0.0
 es	07_gas	2	209	0.0	0.0
 es	08_non-res	2	209	0.0	0.0
 es	09_hydro_pump	2	209	0.0	0.0
-es	01_solar	2	210	1.0	0.0
-es	02_wind_on	2	210	1.0	0.0
-es	03_wind_off	2	210	1.0	0.0
+es	01_solar	2	210	0.0	1.0
+es	02_wind_on	2	210	0.0	1.0
+es	03_wind_off	2	210	0.0	1.0
 es	04_res	2	210	0.0	0.0
 es	05_nuclear	2	210	0.0	0.0
 es	06_coal	2	210	0.0	0.0
 es	07_gas	2	210	0.0	0.0
 es	08_non-res	2	210	0.0	0.0
 es	09_hydro_pump	2	210	0.0	0.0
-es	01_solar	2	211	1.0	0.0
-es	02_wind_on	2	211	1.0	0.0
-es	03_wind_off	2	211	1.0	0.0
+es	01_solar	2	211	0.0	1.0
+es	02_wind_on	2	211	0.0	1.0
+es	03_wind_off	2	211	0.0	1.0
 es	04_res	2	211	0.0	0.0
 es	05_nuclear	2	211	0.0	0.0
 es	06_coal	2	211	0.0	0.0
 es	07_gas	2	211	0.0	0.0
 es	08_non-res	2	211	0.0	0.0
 es	09_hydro_pump	2	211	0.0	0.0
-es	01_solar	2	212	1.0	0.0
-es	02_wind_on	2	212	1.0	0.0
-es	03_wind_off	2	212	1.0	0.0
+es	01_solar	2	212	0.0	1.0
+es	02_wind_on	2	212	0.0	1.0
+es	03_wind_off	2	212	0.0	1.0
 es	04_res	2	212	0.0	0.0
 es	05_nuclear	2	212	0.0	0.0
 es	06_coal	2	212	0.0	0.0
 es	07_gas	2	212	0.0	0.0
 es	08_non-res	2	212	0.0	0.0
 es	09_hydro_pump	2	212	0.0	0.0
-es	01_solar	2	213	1.0	0.0
-es	02_wind_on	2	213	1.0	0.0
-es	03_wind_off	2	213	1.0	0.0
+es	01_solar	2	213	0.0	1.0
+es	02_wind_on	2	213	0.0	1.0
+es	03_wind_off	2	213	0.0	1.0
 es	04_res	2	213	0.0	0.0
 es	05_nuclear	2	213	0.0	0.0
 es	06_coal	2	213	0.0	0.0
 es	07_gas	2	213	0.0	0.0
 es	08_non-res	2	213	0.0	0.0
 es	09_hydro_pump	2	213	0.0	0.0
-es	01_solar	2	214	1.0	0.0
-es	02_wind_on	2	214	1.0	0.0
-es	03_wind_off	2	214	1.0	0.0
+es	01_solar	2	214	0.0	1.0
+es	02_wind_on	2	214	0.0	1.0
+es	03_wind_off	2	214	0.0	1.0
 es	04_res	2	214	0.0	0.0
 es	05_nuclear	2	214	0.0	0.0
 es	06_coal	2	214	0.0	0.0
 es	07_gas	2	214	0.0	0.0
 es	08_non-res	2	214	0.0	0.0
 es	09_hydro_pump	2	214	0.0	0.0
-es	01_solar	2	215	1.0	0.0
-es	02_wind_on	2	215	1.0	0.0
-es	03_wind_off	2	215	1.0	0.0
+es	01_solar	2	215	0.0	1.0
+es	02_wind_on	2	215	0.0	1.0
+es	03_wind_off	2	215	0.0	1.0
 es	04_res	2	215	0.0	0.0
 es	05_nuclear	2	215	0.0	0.0
 es	06_coal	2	215	0.0	0.0
 es	07_gas	2	215	0.0	0.0
 es	08_non-res	2	215	0.0	0.0
 es	09_hydro_pump	2	215	0.0	0.0
-es	01_solar	2	216	1.0	0.0
-es	02_wind_on	2	216	1.0	0.0
-es	03_wind_off	2	216	1.0	0.0
+es	01_solar	2	216	0.0	1.0
+es	02_wind_on	2	216	0.0	1.0
+es	03_wind_off	2	216	0.0	1.0
 es	04_res	2	216	0.0	0.0
 es	05_nuclear	2	216	0.0	0.0
 es	06_coal	2	216	0.0	0.0
 es	07_gas	2	216	0.0	0.0
 es	08_non-res	2	216	0.0	0.0
 es	09_hydro_pump	2	216	0.0	0.0
-es	01_solar	2	217	1.0	0.0
-es	02_wind_on	2	217	1.0	0.0
-es	03_wind_off	2	217	1.0	0.0
+es	01_solar	2	217	0.0	1.0
+es	02_wind_on	2	217	0.0	1.0
+es	03_wind_off	2	217	0.0	1.0
 es	04_res	2	217	0.0	0.0
 es	05_nuclear	2	217	0.0	0.0
 es	06_coal	2	217	0.0	0.0
 es	07_gas	2	217	0.0	0.0
 es	08_non-res	2	217	0.0	0.0
 es	09_hydro_pump	2	217	0.0	0.0
-es	01_solar	2	218	1.0	0.0
-es	02_wind_on	2	218	1.0	0.0
-es	03_wind_off	2	218	1.0	0.0
+es	01_solar	2	218	0.0	1.0
+es	02_wind_on	2	218	0.0	1.0
+es	03_wind_off	2	218	0.0	1.0
 es	04_res	2	218	0.0	0.0
 es	05_nuclear	2	218	0.0	0.0
 es	06_coal	2	218	0.0	0.0
 es	07_gas	2	218	0.0	0.0
 es	08_non-res	2	218	0.0	0.0
 es	09_hydro_pump	2	218	0.0	0.0
-es	01_solar	2	219	1.0	0.0
-es	02_wind_on	2	219	1.0	0.0
-es	03_wind_off	2	219	1.0	0.0
+es	01_solar	2	219	0.0	1.0
+es	02_wind_on	2	219	0.0	1.0
+es	03_wind_off	2	219	0.0	1.0
 es	04_res	2	219	0.0	0.0
 es	05_nuclear	2	219	0.0	0.0
 es	06_coal	2	219	0.0	0.0
 es	07_gas	2	219	0.0	0.0
 es	08_non-res	2	219	0.0	0.0
 es	09_hydro_pump	2	219	0.0	0.0
-es	01_solar	2	220	1.0	0.0
-es	02_wind_on	2	220	1.0	0.0
-es	03_wind_off	2	220	1.0	0.0
+es	01_solar	2	220	0.0	1.0
+es	02_wind_on	2	220	0.0	1.0
+es	03_wind_off	2	220	0.0	1.0
 es	04_res	2	220	0.0	0.0
 es	05_nuclear	2	220	0.0	0.0
 es	06_coal	2	220	0.0	0.0
 es	07_gas	2	220	0.0	0.0
 es	08_non-res	2	220	0.0	0.0
 es	09_hydro_pump	2	220	0.0	0.0
-es	01_solar	2	221	1.0	0.0
-es	02_wind_on	2	221	1.0	0.0
-es	03_wind_off	2	221	1.0	0.0
+es	01_solar	2	221	0.0	1.0
+es	02_wind_on	2	221	0.0	1.0
+es	03_wind_off	2	221	0.0	1.0
 es	04_res	2	221	0.0	0.0
 es	05_nuclear	2	221	0.0	0.0
 es	06_coal	2	221	0.0	0.0
 es	07_gas	2	221	0.0	0.0
 es	08_non-res	2	221	0.0	0.0
 es	09_hydro_pump	2	221	0.0	0.0
-es	01_solar	2	222	1.0	0.0
-es	02_wind_on	2	222	1.0	0.0
-es	03_wind_off	2	222	1.0	0.0
+es	01_solar	2	222	0.0	1.0
+es	02_wind_on	2	222	0.0	1.0
+es	03_wind_off	2	222	0.0	1.0
 es	04_res	2	222	0.0	0.0
 es	05_nuclear	2	222	0.0	0.0
 es	06_coal	2	222	0.0	0.0
 es	07_gas	2	222	0.0	0.0
 es	08_non-res	2	222	0.0	0.0
 es	09_hydro_pump	2	222	0.0	0.0
-es	01_solar	2	223	1.0	0.0
-es	02_wind_on	2	223	1.0	0.0
-es	03_wind_off	2	223	1.0	0.0
+es	01_solar	2	223	0.0	1.0
+es	02_wind_on	2	223	0.0	1.0
+es	03_wind_off	2	223	0.0	1.0
 es	04_res	2	223	0.0	0.0
 es	05_nuclear	2	223	0.0	0.0
 es	06_coal	2	223	0.0	0.0
 es	07_gas	2	223	0.0	0.0
 es	08_non-res	2	223	0.0	0.0
 es	09_hydro_pump	2	223	0.0	0.0
-es	01_solar	2	224	1.0	0.0
-es	02_wind_on	2	224	1.0	0.0
-es	03_wind_off	2	224	1.0	0.0
+es	01_solar	2	224	0.0	1.0
+es	02_wind_on	2	224	0.0	1.0
+es	03_wind_off	2	224	0.0	1.0
 es	04_res	2	224	0.0	0.0
 es	05_nuclear	2	224	0.0	0.0
 es	06_coal	2	224	0.0	0.0
 es	07_gas	2	224	0.0	0.0
 es	08_non-res	2	224	0.0	0.0
 es	09_hydro_pump	2	224	0.0	0.0
-es	01_solar	2	225	1.0	0.0
-es	02_wind_on	2	225	1.0	0.0
-es	03_wind_off	2	225	1.0	0.0
+es	01_solar	2	225	0.0	1.0
+es	02_wind_on	2	225	0.0	1.0
+es	03_wind_off	2	225	0.0	1.0
 es	04_res	2	225	0.0	0.0
 es	05_nuclear	2	225	0.0	0.0
 es	06_coal	2	225	0.0	0.0
 es	07_gas	2	225	0.0	0.0
 es	08_non-res	2	225	0.0	0.0
 es	09_hydro_pump	2	225	0.0	0.0
-es	01_solar	2	226	1.0	0.0
-es	02_wind_on	2	226	1.0	0.0
-es	03_wind_off	2	226	1.0	0.0
+es	01_solar	2	226	0.0	1.0
+es	02_wind_on	2	226	0.0	1.0
+es	03_wind_off	2	226	0.0	1.0
 es	04_res	2	226	0.0	0.0
 es	05_nuclear	2	226	0.0	0.0
 es	06_coal	2	226	0.0	0.0
 es	07_gas	2	226	0.0	0.0
 es	08_non-res	2	226	0.0	0.0
 es	09_hydro_pump	2	226	0.0	0.0
-es	01_solar	2	227	1.0	0.0
-es	02_wind_on	2	227	1.0	0.0
-es	03_wind_off	2	227	1.0	0.0
+es	01_solar	2	227	0.0	1.0
+es	02_wind_on	2	227	0.0	1.0
+es	03_wind_off	2	227	0.0	1.0
 es	04_res	2	227	0.0	0.0
 es	05_nuclear	2	227	0.0	0.0
 es	06_coal	2	227	0.0	0.0
 es	07_gas	2	227	0.0	0.0
 es	08_non-res	2	227	0.0	0.0
 es	09_hydro_pump	2	227	0.0	0.0
-es	01_solar	2	228	1.0	0.0
-es	02_wind_on	2	228	1.0	0.0
-es	03_wind_off	2	228	1.0	0.0
+es	01_solar	2	228	0.0	1.0
+es	02_wind_on	2	228	0.0	1.0
+es	03_wind_off	2	228	0.0	1.0
 es	04_res	2	228	0.0	0.0
 es	05_nuclear	2	228	0.0	0.0
 es	06_coal	2	228	0.0	0.0
 es	07_gas	2	228	0.0	0.0
 es	08_non-res	2	228	0.0	0.0
 es	09_hydro_pump	2	228	0.0	0.0
-es	01_solar	2	229	1.0	0.0
-es	02_wind_on	2	229	1.0	0.0
-es	03_wind_off	2	229	1.0	0.0
+es	01_solar	2	229	0.0	1.0
+es	02_wind_on	2	229	0.0	1.0
+es	03_wind_off	2	229	0.0	1.0
 es	04_res	2	229	0.0	0.0
 es	05_nuclear	2	229	0.0	0.0
 es	06_coal	2	229	0.0	0.0
 es	07_gas	2	229	0.0	0.0
 es	08_non-res	2	229	0.0	0.0
 es	09_hydro_pump	2	229	0.0	0.0
-es	01_solar	2	230	1.0	0.0
-es	02_wind_on	2	230	1.0	0.0
-es	03_wind_off	2	230	1.0	0.0
-es	04_res	2	230	1.0	0.0
+es	01_solar	2	230	0.0	1.0
+es	02_wind_on	2	230	0.0	1.0
+es	03_wind_off	2	230	0.0	1.0
+es	04_res	2	230	0.0	1.0
 es	05_nuclear	2	230	0.0	0.0
 es	06_coal	2	230	0.0	0.0
 es	07_gas	2	230	0.0	0.0
 es	08_non-res	2	230	0.0	0.0
 es	09_hydro_pump	2	230	0.0	0.0
-es	01_solar	2	231	1.0	0.0
-es	02_wind_on	2	231	1.0	0.0
-es	03_wind_off	2	231	1.0	0.0
-es	04_res	2	231	1.0	0.0
+es	01_solar	2	231	0.0	1.0
+es	02_wind_on	2	231	0.0	1.0
+es	03_wind_off	2	231	0.0	1.0
+es	04_res	2	231	0.0	1.0
 es	05_nuclear	2	231	0.0	0.0
 es	06_coal	2	231	0.0	0.0
 es	07_gas	2	231	0.0	0.0
 es	08_non-res	2	231	0.0	0.0
 es	09_hydro_pump	2	231	0.0	0.0
-es	01_solar	2	232	1.0	0.0
-es	02_wind_on	2	232	1.0	0.0
-es	03_wind_off	2	232	1.0	0.0
-es	04_res	2	232	1.0	0.0
+es	01_solar	2	232	0.0	1.0
+es	02_wind_on	2	232	0.0	1.0
+es	03_wind_off	2	232	0.0	1.0
+es	04_res	2	232	0.0	1.0
 es	05_nuclear	2	232	0.0	0.0
 es	06_coal	2	232	0.0	0.0
 es	07_gas	2	232	0.0	0.0
 es	08_non-res	2	232	0.0	0.0
 es	09_hydro_pump	2	232	0.0	0.0
-es	01_solar	2	233	1.0	0.0
-es	02_wind_on	2	233	1.0	0.0
-es	03_wind_off	2	233	1.0	0.0
-es	04_res	2	233	1.0	0.0
+es	01_solar	2	233	0.0	1.0
+es	02_wind_on	2	233	0.0	1.0
+es	03_wind_off	2	233	0.0	1.0
+es	04_res	2	233	0.0	1.0
 es	05_nuclear	2	233	0.0	0.0
 es	06_coal	2	233	0.0	0.0
 es	07_gas	2	233	0.0	0.0
 es	08_non-res	2	233	0.0	0.0
 es	09_hydro_pump	2	233	0.0	0.0
-es	01_solar	2	234	1.0	0.0
-es	02_wind_on	2	234	1.0	0.0
-es	03_wind_off	2	234	1.0	0.0
-es	04_res	2	234	1.0	0.0
+es	01_solar	2	234	0.0	1.0
+es	02_wind_on	2	234	0.0	1.0
+es	03_wind_off	2	234	0.0	1.0
+es	04_res	2	234	0.0	1.0
 es	05_nuclear	2	234	0.0	0.0
 es	06_coal	2	234	0.0	0.0
 es	07_gas	2	234	0.0	0.0
 es	08_non-res	2	234	0.0	0.0
 es	09_hydro_pump	2	234	0.0	0.0
-es	01_solar	2	235	1.0	0.0
-es	02_wind_on	2	235	1.0	0.0
-es	03_wind_off	2	235	1.0	0.0
-es	04_res	2	235	1.0	0.0
+es	01_solar	2	235	0.0	1.0
+es	02_wind_on	2	235	0.0	1.0
+es	03_wind_off	2	235	0.0	1.0
+es	04_res	2	235	0.0	1.0
 es	05_nuclear	2	235	0.0	0.0
 es	06_coal	2	235	0.0	0.0
 es	07_gas	2	235	0.0	0.0
 es	08_non-res	2	235	0.0	0.0
 es	09_hydro_pump	2	235	0.0	0.0
-es	01_solar	2	236	1.0	0.0
-es	02_wind_on	2	236	1.0	0.0
-es	03_wind_off	2	236	1.0	0.0
-es	04_res	2	236	1.0	0.0
+es	01_solar	2	236	0.0	1.0
+es	02_wind_on	2	236	0.0	1.0
+es	03_wind_off	2	236	0.0	1.0
+es	04_res	2	236	0.0	1.0
 es	05_nuclear	2	236	0.0	0.0
 es	06_coal	2	236	0.0	0.0
 es	07_gas	2	236	0.0	0.0
 es	08_non-res	2	236	0.0	0.0
 es	09_hydro_pump	2	236	0.0	0.0
-es	01_solar	2	237	1.0	0.0
-es	02_wind_on	2	237	1.0	0.0
-es	03_wind_off	2	237	1.0	0.0
-es	04_res	2	237	1.0	0.0
+es	01_solar	2	237	0.0	1.0
+es	02_wind_on	2	237	0.0	1.0
+es	03_wind_off	2	237	0.0	1.0
+es	04_res	2	237	0.0	1.0
 es	05_nuclear	2	237	0.0	0.0
 es	06_coal	2	237	0.0	0.0
 es	07_gas	2	237	0.0	0.0
 es	08_non-res	2	237	0.0	0.0
 es	09_hydro_pump	2	237	0.0	0.0
-es	01_solar	2	238	1.0	0.0
-es	02_wind_on	2	238	1.0	0.0
-es	03_wind_off	2	238	1.0	0.0
-es	04_res	2	238	1.0	0.0
+es	01_solar	2	238	0.0	1.0
+es	02_wind_on	2	238	0.0	1.0
+es	03_wind_off	2	238	0.0	1.0
+es	04_res	2	238	0.0	1.0
 es	05_nuclear	2	238	0.0	0.0
 es	06_coal	2	238	0.0	0.0
 es	07_gas	2	238	0.0	0.0
 es	08_non-res	2	238	0.0	0.0
 es	09_hydro_pump	2	238	0.0	0.0
-es	01_solar	2	239	1.0	0.0
-es	02_wind_on	2	239	1.0	0.0
-es	03_wind_off	2	239	1.0	0.0
-es	04_res	2	239	1.0	0.0
+es	01_solar	2	239	0.0	1.0
+es	02_wind_on	2	239	0.0	1.0
+es	03_wind_off	2	239	0.0	1.0
+es	04_res	2	239	0.0	1.0
 es	05_nuclear	2	239	0.0	0.0
 es	06_coal	2	239	0.0	0.0
 es	07_gas	2	239	0.0	0.0
 es	08_non-res	2	239	0.0	0.0
 es	09_hydro_pump	2	239	0.0	0.0
-es	01_solar	2	240	1.0	0.0
-es	02_wind_on	2	240	1.0	0.0
-es	03_wind_off	2	240	1.0	0.0
-es	04_res	2	240	1.0	0.0
+es	01_solar	2	240	0.0	1.0
+es	02_wind_on	2	240	0.0	1.0
+es	03_wind_off	2	240	0.0	1.0
+es	04_res	2	240	0.0	1.0
 es	05_nuclear	2	240	0.0	0.0
 es	06_coal	2	240	0.0	0.0
 es	07_gas	2	240	0.0	0.0
 es	08_non-res	2	240	0.0	0.0
 es	09_hydro_pump	2	240	0.0	0.0
-es	01_solar	2	241	1.0	0.0
-es	02_wind_on	2	241	1.0	0.0
-es	03_wind_off	2	241	1.0	0.0
-es	04_res	2	241	1.0	0.0
+es	01_solar	2	241	0.0	1.0
+es	02_wind_on	2	241	0.0	1.0
+es	03_wind_off	2	241	0.0	1.0
+es	04_res	2	241	0.0	1.0
 es	05_nuclear	2	241	0.0	0.0
 es	06_coal	2	241	0.0	0.0
 es	07_gas	2	241	0.0	0.0
 es	08_non-res	2	241	0.0	0.0
 es	09_hydro_pump	2	241	0.0	0.0
-es	01_solar	2	242	1.0	0.0
-es	02_wind_on	2	242	1.0	0.0
-es	03_wind_off	2	242	1.0	0.0
-es	04_res	2	242	1.0	0.0
+es	01_solar	2	242	0.0	1.0
+es	02_wind_on	2	242	0.0	1.0
+es	03_wind_off	2	242	0.0	1.0
+es	04_res	2	242	0.0	1.0
 es	05_nuclear	2	242	0.0	0.0
 es	06_coal	2	242	0.0	0.0
 es	07_gas	2	242	0.0	0.0
 es	08_non-res	2	242	0.0	0.0
 es	09_hydro_pump	2	242	0.0	0.0
-es	01_solar	2	243	1.0	0.0
-es	02_wind_on	2	243	1.0	0.0
-es	03_wind_off	2	243	1.0	0.0
-es	04_res	2	243	1.0	0.0
+es	01_solar	2	243	0.0	1.0
+es	02_wind_on	2	243	0.0	1.0
+es	03_wind_off	2	243	0.0	1.0
+es	04_res	2	243	0.0	1.0
 es	05_nuclear	2	243	0.0	0.0
 es	06_coal	2	243	0.0	0.0
 es	07_gas	2	243	0.0	0.0
 es	08_non-res	2	243	0.0	0.0
 es	09_hydro_pump	2	243	0.0	0.0
-es	01_solar	2	244	1.0	0.0
-es	02_wind_on	2	244	1.0	0.0
-es	03_wind_off	2	244	1.0	0.0
-es	04_res	2	244	1.0	0.0
+es	01_solar	2	244	0.0	1.0
+es	02_wind_on	2	244	0.0	1.0
+es	03_wind_off	2	244	0.0	1.0
+es	04_res	2	244	0.0	1.0
 es	05_nuclear	2	244	0.0	0.0
 es	06_coal	2	244	0.0	0.0
 es	07_gas	2	244	0.0	0.0
 es	08_non-res	2	244	0.0	0.0
 es	09_hydro_pump	2	244	0.0	0.0
-es	01_solar	2	245	1.0	0.0
-es	02_wind_on	2	245	1.0	0.0
-es	03_wind_off	2	245	1.0	0.0
-es	04_res	2	245	1.0	0.0
+es	01_solar	2	245	0.0	1.0
+es	02_wind_on	2	245	0.0	1.0
+es	03_wind_off	2	245	0.0	1.0
+es	04_res	2	245	0.0	1.0
 es	05_nuclear	2	245	0.0	0.0
 es	06_coal	2	245	0.0	0.0
 es	07_gas	2	245	0.0	0.0
 es	08_non-res	2	245	0.0	0.0
 es	09_hydro_pump	2	245	0.0	0.0
-es	01_solar	2	246	1.0	0.0
-es	02_wind_on	2	246	1.0	0.0
-es	03_wind_off	2	246	1.0	0.0
-es	04_res	2	246	1.0	0.0
+es	01_solar	2	246	0.0	1.0
+es	02_wind_on	2	246	0.0	1.0
+es	03_wind_off	2	246	0.0	1.0
+es	04_res	2	246	0.0	1.0
 es	05_nuclear	2	246	0.0	0.0
 es	06_coal	2	246	0.0	0.0
 es	07_gas	2	246	0.0	0.0
 es	08_non-res	2	246	0.0	0.0
 es	09_hydro_pump	2	246	0.0	0.0
-es	01_solar	2	247	1.0	0.0
-es	02_wind_on	2	247	1.0	0.0
-es	03_wind_off	2	247	1.0	0.0
-es	04_res	2	247	1.0	0.0
+es	01_solar	2	247	0.0	1.0
+es	02_wind_on	2	247	0.0	1.0
+es	03_wind_off	2	247	0.0	1.0
+es	04_res	2	247	0.0	1.0
 es	05_nuclear	2	247	0.0	0.0
 es	06_coal	2	247	0.0	0.0
 es	07_gas	2	247	0.0	0.0
 es	08_non-res	2	247	0.0	0.0
 es	09_hydro_pump	2	247	0.0	0.0
-es	01_solar	2	248	1.0	0.0
-es	02_wind_on	2	248	1.0	0.0
-es	03_wind_off	2	248	1.0	0.0
-es	04_res	2	248	1.0	0.0
+es	01_solar	2	248	0.0	1.0
+es	02_wind_on	2	248	0.0	1.0
+es	03_wind_off	2	248	0.0	1.0
+es	04_res	2	248	0.0	1.0
 es	05_nuclear	2	248	0.0	0.0
 es	06_coal	2	248	0.0	0.0
 es	07_gas	2	248	0.0	0.0
 es	08_non-res	2	248	0.0	0.0
 es	09_hydro_pump	2	248	0.0	0.0
-es	01_solar	2	249	1.0	0.0
-es	02_wind_on	2	249	1.0	0.0
-es	03_wind_off	2	249	1.0	0.0
-es	04_res	2	249	1.0	0.0
+es	01_solar	2	249	0.0	1.0
+es	02_wind_on	2	249	0.0	1.0
+es	03_wind_off	2	249	0.0	1.0
+es	04_res	2	249	0.0	1.0
 es	05_nuclear	2	249	0.0	0.0
 es	06_coal	2	249	0.0	0.0
 es	07_gas	2	249	0.0	0.0
 es	08_non-res	2	249	0.0	0.0
 es	09_hydro_pump	2	249	0.0	0.0
-es	01_solar	2	250	1.0	0.0
-es	02_wind_on	2	250	1.0	0.0
-es	03_wind_off	2	250	1.0	0.0
-es	04_res	2	250	1.0	0.0
-es	05_nuclear	2	250	1.0	0.0
+es	01_solar	2	250	0.0	1.0
+es	02_wind_on	2	250	0.0	1.0
+es	03_wind_off	2	250	0.0	1.0
+es	04_res	2	250	0.0	1.0
+es	05_nuclear	2	250	0.0	1.0
 es	06_coal	2	250	0.0	0.0
 es	07_gas	2	250	0.0	0.0
 es	08_non-res	2	250	0.0	0.0
 es	09_hydro_pump	2	250	0.0	0.0
-es	01_solar	2	251	1.0	0.0
-es	02_wind_on	2	251	1.0	0.0
-es	03_wind_off	2	251	1.0	0.0
-es	04_res	2	251	1.0	0.0
-es	05_nuclear	2	251	1.0	0.0
+es	01_solar	2	251	0.0	1.0
+es	02_wind_on	2	251	0.0	1.0
+es	03_wind_off	2	251	0.0	1.0
+es	04_res	2	251	0.0	1.0
+es	05_nuclear	2	251	0.0	1.0
 es	06_coal	2	251	0.0	0.0
 es	07_gas	2	251	0.0	0.0
 es	08_non-res	2	251	0.0	0.0
 es	09_hydro_pump	2	251	0.0	0.0
-es	01_solar	2	252	1.0	0.0
-es	02_wind_on	2	252	1.0	0.0
-es	03_wind_off	2	252	1.0	0.0
-es	04_res	2	252	1.0	0.0
-es	05_nuclear	2	252	1.0	0.0
+es	01_solar	2	252	0.0	1.0
+es	02_wind_on	2	252	0.0	1.0
+es	03_wind_off	2	252	0.0	1.0
+es	04_res	2	252	0.0	1.0
+es	05_nuclear	2	252	0.0	1.0
 es	06_coal	2	252	0.0	0.0
 es	07_gas	2	252	0.0	0.0
 es	08_non-res	2	252	0.0	0.0
 es	09_hydro_pump	2	252	0.0	0.0
-es	01_solar	2	253	1.0	0.0
-es	02_wind_on	2	253	1.0	0.0
-es	03_wind_off	2	253	1.0	0.0
-es	04_res	2	253	1.0	0.0
-es	05_nuclear	2	253	1.0	0.0
+es	01_solar	2	253	0.0	1.0
+es	02_wind_on	2	253	0.0	1.0
+es	03_wind_off	2	253	0.0	1.0
+es	04_res	2	253	0.0	1.0
+es	05_nuclear	2	253	0.0	1.0
 es	06_coal	2	253	0.0	0.0
 es	07_gas	2	253	0.0	0.0
 es	08_non-res	2	253	0.0	0.0
 es	09_hydro_pump	2	253	0.0	0.0
-es	01_solar	2	254	1.0	0.0
-es	02_wind_on	2	254	1.0	0.0
-es	03_wind_off	2	254	1.0	0.0
-es	04_res	2	254	1.0	0.0
-es	05_nuclear	2	254	1.0	0.0
+es	01_solar	2	254	0.0	1.0
+es	02_wind_on	2	254	0.0	1.0
+es	03_wind_off	2	254	0.0	1.0
+es	04_res	2	254	0.0	1.0
+es	05_nuclear	2	254	0.0	1.0
 es	06_coal	2	254	0.0	0.0
 es	07_gas	2	254	0.0	0.0
 es	08_non-res	2	254	0.0	0.0
 es	09_hydro_pump	2	254	0.0	0.0
-es	01_solar	2	255	1.0	0.0
-es	02_wind_on	2	255	1.0	0.0
-es	03_wind_off	2	255	1.0	0.0
-es	04_res	2	255	1.0	0.0
-es	05_nuclear	2	255	1.0	0.0
+es	01_solar	2	255	0.0	1.0
+es	02_wind_on	2	255	0.0	1.0
+es	03_wind_off	2	255	0.0	1.0
+es	04_res	2	255	0.0	1.0
+es	05_nuclear	2	255	0.0	1.0
 es	06_coal	2	255	0.0	0.0
 es	07_gas	2	255	0.0	0.0
 es	08_non-res	2	255	0.0	0.0
 es	09_hydro_pump	2	255	0.0	0.0
-es	01_solar	2	256	1.0	0.0
-es	02_wind_on	2	256	1.0	0.0
-es	03_wind_off	2	256	1.0	0.0
-es	04_res	2	256	1.0	0.0
-es	05_nuclear	2	256	1.0	0.0
+es	01_solar	2	256	0.0	1.0
+es	02_wind_on	2	256	0.0	1.0
+es	03_wind_off	2	256	0.0	1.0
+es	04_res	2	256	0.0	1.0
+es	05_nuclear	2	256	0.0	1.0
 es	06_coal	2	256	0.0	0.0
 es	07_gas	2	256	0.0	0.0
 es	08_non-res	2	256	0.0	0.0
 es	09_hydro_pump	2	256	0.0	0.0
-es	01_solar	2	257	1.0	0.0
-es	02_wind_on	2	257	1.0	0.0
-es	03_wind_off	2	257	1.0	0.0
-es	04_res	2	257	1.0	0.0
-es	05_nuclear	2	257	1.0	0.0
+es	01_solar	2	257	0.0	1.0
+es	02_wind_on	2	257	0.0	1.0
+es	03_wind_off	2	257	0.0	1.0
+es	04_res	2	257	0.0	1.0
+es	05_nuclear	2	257	0.0	1.0
 es	06_coal	2	257	0.0	0.0
 es	07_gas	2	257	0.0	0.0
 es	08_non-res	2	257	0.0	0.0
 es	09_hydro_pump	2	257	0.0	0.0
-es	01_solar	2	258	1.0	0.0
-es	02_wind_on	2	258	1.0	0.0
-es	03_wind_off	2	258	1.0	0.0
-es	04_res	2	258	1.0	0.0
-es	05_nuclear	2	258	1.0	0.0
+es	01_solar	2	258	0.0	1.0
+es	02_wind_on	2	258	0.0	1.0
+es	03_wind_off	2	258	0.0	1.0
+es	04_res	2	258	0.0	1.0
+es	05_nuclear	2	258	0.0	1.0
 es	06_coal	2	258	0.0	0.0
 es	07_gas	2	258	0.0	0.0
 es	08_non-res	2	258	0.0	0.0
 es	09_hydro_pump	2	258	0.0	0.0
-es	01_solar	2	259	1.0	0.0
-es	02_wind_on	2	259	1.0	0.0
-es	03_wind_off	2	259	1.0	0.0
-es	04_res	2	259	1.0	0.0
-es	05_nuclear	2	259	1.0	0.0
+es	01_solar	2	259	0.0	1.0
+es	02_wind_on	2	259	0.0	1.0
+es	03_wind_off	2	259	0.0	1.0
+es	04_res	2	259	0.0	1.0
+es	05_nuclear	2	259	0.0	1.0
 es	06_coal	2	259	0.0	0.0
 es	07_gas	2	259	0.0	0.0
 es	08_non-res	2	259	0.0	0.0
 es	09_hydro_pump	2	259	0.0	0.0
-es	01_solar	2	260	1.0	0.0
-es	02_wind_on	2	260	1.0	0.0
-es	03_wind_off	2	260	1.0	0.0
-es	04_res	2	260	1.0	0.0
-es	05_nuclear	2	260	1.0	0.0
+es	01_solar	2	260	0.0	1.0
+es	02_wind_on	2	260	0.0	1.0
+es	03_wind_off	2	260	0.0	1.0
+es	04_res	2	260	0.0	1.0
+es	05_nuclear	2	260	0.0	1.0
 es	06_coal	2	260	0.0	0.0
 es	07_gas	2	260	0.0	0.0
 es	08_non-res	2	260	0.0	0.0
 es	09_hydro_pump	2	260	0.0	0.0
-es	01_solar	2	261	1.0	0.0
-es	02_wind_on	2	261	1.0	0.0
-es	03_wind_off	2	261	1.0	0.0
-es	04_res	2	261	1.0	0.0
-es	05_nuclear	2	261	1.0	0.0
+es	01_solar	2	261	0.0	1.0
+es	02_wind_on	2	261	0.0	1.0
+es	03_wind_off	2	261	0.0	1.0
+es	04_res	2	261	0.0	1.0
+es	05_nuclear	2	261	0.0	1.0
 es	06_coal	2	261	0.0	0.0
 es	07_gas	2	261	0.0	0.0
 es	08_non-res	2	261	0.0	0.0
 es	09_hydro_pump	2	261	0.0	0.0
-es	01_solar	2	262	1.0	0.0
-es	02_wind_on	2	262	1.0	0.0
-es	03_wind_off	2	262	1.0	0.0
-es	04_res	2	262	1.0	0.0
-es	05_nuclear	2	262	1.0	0.0
+es	01_solar	2	262	0.0	1.0
+es	02_wind_on	2	262	0.0	1.0
+es	03_wind_off	2	262	0.0	1.0
+es	04_res	2	262	0.0	1.0
+es	05_nuclear	2	262	0.0	1.0
 es	06_coal	2	262	0.0	0.0
 es	07_gas	2	262	0.0	0.0
 es	08_non-res	2	262	0.0	0.0
 es	09_hydro_pump	2	262	0.0	0.0
-es	01_solar	2	263	1.0	0.0
-es	02_wind_on	2	263	1.0	0.0
-es	03_wind_off	2	263	1.0	0.0
-es	04_res	2	263	1.0	0.0
-es	05_nuclear	2	263	1.0	0.0
+es	01_solar	2	263	0.0	1.0
+es	02_wind_on	2	263	0.0	1.0
+es	03_wind_off	2	263	0.0	1.0
+es	04_res	2	263	0.0	1.0
+es	05_nuclear	2	263	0.0	1.0
 es	06_coal	2	263	0.0	0.0
 es	07_gas	2	263	0.0	0.0
 es	08_non-res	2	263	0.0	0.0
 es	09_hydro_pump	2	263	0.0	0.0
-es	01_solar	2	264	1.0	0.0
-es	02_wind_on	2	264	1.0	0.0
-es	03_wind_off	2	264	1.0	0.0
-es	04_res	2	264	1.0	0.0
-es	05_nuclear	2	264	1.0	0.0
+es	01_solar	2	264	0.0	1.0
+es	02_wind_on	2	264	0.0	1.0
+es	03_wind_off	2	264	0.0	1.0
+es	04_res	2	264	0.0	1.0
+es	05_nuclear	2	264	0.0	1.0
 es	06_coal	2	264	0.0	0.0
 es	07_gas	2	264	0.0	0.0
 es	08_non-res	2	264	0.0	0.0
 es	09_hydro_pump	2	264	0.0	0.0
-es	01_solar	2	265	1.0	0.0
-es	02_wind_on	2	265	1.0	0.0
-es	03_wind_off	2	265	1.0	0.0
-es	04_res	2	265	1.0	0.0
-es	05_nuclear	2	265	1.0	0.0
+es	01_solar	2	265	0.0	1.0
+es	02_wind_on	2	265	0.0	1.0
+es	03_wind_off	2	265	0.0	1.0
+es	04_res	2	265	0.0	1.0
+es	05_nuclear	2	265	0.0	1.0
 es	06_coal	2	265	0.0	0.0
 es	07_gas	2	265	0.0	0.0
 es	08_non-res	2	265	0.0	0.0
 es	09_hydro_pump	2	265	0.0	0.0
-es	01_solar	2	266	1.0	0.0
-es	02_wind_on	2	266	1.0	0.0
-es	03_wind_off	2	266	1.0	0.0
-es	04_res	2	266	1.0	0.0
-es	05_nuclear	2	266	1.0	0.0
+es	01_solar	2	266	0.0	1.0
+es	02_wind_on	2	266	0.0	1.0
+es	03_wind_off	2	266	0.0	1.0
+es	04_res	2	266	0.0	1.0
+es	05_nuclear	2	266	0.0	1.0
 es	06_coal	2	266	0.0	0.0
 es	07_gas	2	266	0.0	0.0
 es	08_non-res	2	266	0.0	0.0
 es	09_hydro_pump	2	266	0.0	0.0
-es	01_solar	2	267	1.0	0.0
-es	02_wind_on	2	267	1.0	0.0
-es	03_wind_off	2	267	1.0	0.0
-es	04_res	2	267	1.0	0.0
-es	05_nuclear	2	267	1.0	0.0
+es	01_solar	2	267	0.0	1.0
+es	02_wind_on	2	267	0.0	1.0
+es	03_wind_off	2	267	0.0	1.0
+es	04_res	2	267	0.0	1.0
+es	05_nuclear	2	267	0.0	1.0
 es	06_coal	2	267	0.0	0.0
 es	07_gas	2	267	0.0	0.0
 es	08_non-res	2	267	0.0	0.0
 es	09_hydro_pump	2	267	0.0	0.0
-es	01_solar	2	268	1.0	0.0
-es	02_wind_on	2	268	1.0	0.0
-es	03_wind_off	2	268	1.0	0.0
-es	04_res	2	268	1.0	0.0
-es	05_nuclear	2	268	1.0	0.0
+es	01_solar	2	268	0.0	1.0
+es	02_wind_on	2	268	0.0	1.0
+es	03_wind_off	2	268	0.0	1.0
+es	04_res	2	268	0.0	1.0
+es	05_nuclear	2	268	0.0	1.0
 es	06_coal	2	268	0.0	0.0
 es	07_gas	2	268	0.0	0.0
 es	08_non-res	2	268	0.0	0.0
 es	09_hydro_pump	2	268	0.0	0.0
-es	01_solar	2	269	1.0	0.0
-es	02_wind_on	2	269	1.0	0.0
-es	03_wind_off	2	269	1.0	0.0
-es	04_res	2	269	1.0	0.0
-es	05_nuclear	2	269	1.0	0.0
+es	01_solar	2	269	0.0	1.0
+es	02_wind_on	2	269	0.0	1.0
+es	03_wind_off	2	269	0.0	1.0
+es	04_res	2	269	0.0	1.0
+es	05_nuclear	2	269	0.0	1.0
 es	06_coal	2	269	0.0	0.0
 es	07_gas	2	269	0.0	0.0
 es	08_non-res	2	269	0.0	0.0
 es	09_hydro_pump	2	269	0.0	0.0
-es	01_solar	2	270	1.0	0.0
-es	02_wind_on	2	270	1.0	0.0
-es	03_wind_off	2	270	1.0	0.0
-es	04_res	2	270	1.0	0.0
-es	05_nuclear	2	270	1.0	0.0
-es	06_coal	2	270	1.0	0.0
+es	01_solar	2	270	0.0	1.0
+es	02_wind_on	2	270	0.0	1.0
+es	03_wind_off	2	270	0.0	1.0
+es	04_res	2	270	0.0	1.0
+es	05_nuclear	2	270	0.0	1.0
+es	06_coal	2	270	0.0	1.0
 es	07_gas	2	270	0.0	0.0
 es	08_non-res	2	270	0.0	0.0
 es	09_hydro_pump	2	270	0.0	0.0
-es	01_solar	2	271	1.0	0.0
-es	02_wind_on	2	271	1.0	0.0
-es	03_wind_off	2	271	1.0	0.0
-es	04_res	2	271	1.0	0.0
-es	05_nuclear	2	271	1.0	0.0
-es	06_coal	2	271	1.0	0.0
+es	01_solar	2	271	0.0	1.0
+es	02_wind_on	2	271	0.0	1.0
+es	03_wind_off	2	271	0.0	1.0
+es	04_res	2	271	0.0	1.0
+es	05_nuclear	2	271	0.0	1.0
+es	06_coal	2	271	0.0	1.0
 es	07_gas	2	271	0.0	0.0
 es	08_non-res	2	271	0.0	0.0
 es	09_hydro_pump	2	271	0.0	0.0
-es	01_solar	2	272	1.0	0.0
-es	02_wind_on	2	272	1.0	0.0
-es	03_wind_off	2	272	1.0	0.0
-es	04_res	2	272	1.0	0.0
-es	05_nuclear	2	272	1.0	0.0
-es	06_coal	2	272	1.0	0.0
+es	01_solar	2	272	0.0	1.0
+es	02_wind_on	2	272	0.0	1.0
+es	03_wind_off	2	272	0.0	1.0
+es	04_res	2	272	0.0	1.0
+es	05_nuclear	2	272	0.0	1.0
+es	06_coal	2	272	0.0	1.0
 es	07_gas	2	272	0.0	0.0
 es	08_non-res	2	272	0.0	0.0
 es	09_hydro_pump	2	272	0.0	0.0
-es	01_solar	2	273	1.0	0.0
-es	02_wind_on	2	273	1.0	0.0
-es	03_wind_off	2	273	1.0	0.0
-es	04_res	2	273	1.0	0.0
-es	05_nuclear	2	273	1.0	0.0
-es	06_coal	2	273	1.0	0.0
+es	01_solar	2	273	0.0	1.0
+es	02_wind_on	2	273	0.0	1.0
+es	03_wind_off	2	273	0.0	1.0
+es	04_res	2	273	0.0	1.0
+es	05_nuclear	2	273	0.0	1.0
+es	06_coal	2	273	0.0	1.0
 es	07_gas	2	273	0.0	0.0
 es	08_non-res	2	273	0.0	0.0
 es	09_hydro_pump	2	273	0.0	0.0
-es	01_solar	2	274	1.0	0.0
-es	02_wind_on	2	274	1.0	0.0
-es	03_wind_off	2	274	1.0	0.0
-es	04_res	2	274	1.0	0.0
-es	05_nuclear	2	274	1.0	0.0
-es	06_coal	2	274	1.0	0.0
+es	01_solar	2	274	0.0	1.0
+es	02_wind_on	2	274	0.0	1.0
+es	03_wind_off	2	274	0.0	1.0
+es	04_res	2	274	0.0	1.0
+es	05_nuclear	2	274	0.0	1.0
+es	06_coal	2	274	0.0	1.0
 es	07_gas	2	274	0.0	0.0
 es	08_non-res	2	274	0.0	0.0
 es	09_hydro_pump	2	274	0.0	0.0
-es	01_solar	2	275	1.0	0.0
-es	02_wind_on	2	275	1.0	0.0
-es	03_wind_off	2	275	1.0	0.0
-es	04_res	2	275	1.0	0.0
-es	05_nuclear	2	275	1.0	0.0
-es	06_coal	2	275	1.0	0.0
+es	01_solar	2	275	0.0	1.0
+es	02_wind_on	2	275	0.0	1.0
+es	03_wind_off	2	275	0.0	1.0
+es	04_res	2	275	0.0	1.0
+es	05_nuclear	2	275	0.0	1.0
+es	06_coal	2	275	0.0	1.0
 es	07_gas	2	275	0.0	0.0
 es	08_non-res	2	275	0.0	0.0
 es	09_hydro_pump	2	275	0.0	0.0
-es	01_solar	2	276	1.0	0.0
-es	02_wind_on	2	276	1.0	0.0
-es	03_wind_off	2	276	1.0	0.0
-es	04_res	2	276	1.0	0.0
-es	05_nuclear	2	276	1.0	0.0
-es	06_coal	2	276	1.0	0.0
+es	01_solar	2	276	0.0	1.0
+es	02_wind_on	2	276	0.0	1.0
+es	03_wind_off	2	276	0.0	1.0
+es	04_res	2	276	0.0	1.0
+es	05_nuclear	2	276	0.0	1.0
+es	06_coal	2	276	0.0	1.0
 es	07_gas	2	276	0.0	0.0
 es	08_non-res	2	276	0.0	0.0
 es	09_hydro_pump	2	276	0.0	0.0
-es	01_solar	2	277	1.0	0.0
-es	02_wind_on	2	277	1.0	0.0
-es	03_wind_off	2	277	1.0	0.0
-es	04_res	2	277	1.0	0.0
-es	05_nuclear	2	277	1.0	0.0
-es	06_coal	2	277	1.0	0.0
+es	01_solar	2	277	0.0	1.0
+es	02_wind_on	2	277	0.0	1.0
+es	03_wind_off	2	277	0.0	1.0
+es	04_res	2	277	0.0	1.0
+es	05_nuclear	2	277	0.0	1.0
+es	06_coal	2	277	0.0	1.0
 es	07_gas	2	277	0.0	0.0
 es	08_non-res	2	277	0.0	0.0
 es	09_hydro_pump	2	277	0.0	0.0
-es	01_solar	2	278	1.0	0.0
-es	02_wind_on	2	278	1.0	0.0
-es	03_wind_off	2	278	1.0	0.0
-es	04_res	2	278	1.0	0.0
-es	05_nuclear	2	278	1.0	0.0
-es	06_coal	2	278	1.0	0.0
+es	01_solar	2	278	0.0	1.0
+es	02_wind_on	2	278	0.0	1.0
+es	03_wind_off	2	278	0.0	1.0
+es	04_res	2	278	0.0	1.0
+es	05_nuclear	2	278	0.0	1.0
+es	06_coal	2	278	0.0	1.0
 es	07_gas	2	278	0.0	0.0
 es	08_non-res	2	278	0.0	0.0
 es	09_hydro_pump	2	278	0.0	0.0
-es	01_solar	2	279	1.0	0.0
-es	02_wind_on	2	279	1.0	0.0
-es	03_wind_off	2	279	1.0	0.0
-es	04_res	2	279	1.0	0.0
-es	05_nuclear	2	279	1.0	0.0
-es	06_coal	2	279	1.0	0.0
+es	01_solar	2	279	0.0	1.0
+es	02_wind_on	2	279	0.0	1.0
+es	03_wind_off	2	279	0.0	1.0
+es	04_res	2	279	0.0	1.0
+es	05_nuclear	2	279	0.0	1.0
+es	06_coal	2	279	0.0	1.0
 es	07_gas	2	279	0.0	0.0
 es	08_non-res	2	279	0.0	0.0
 es	09_hydro_pump	2	279	0.0	0.0
-es	01_solar	2	280	1.0	0.0
-es	02_wind_on	2	280	1.0	0.0
-es	03_wind_off	2	280	1.0	0.0
-es	04_res	2	280	1.0	0.0
-es	05_nuclear	2	280	1.0	0.0
-es	06_coal	2	280	1.0	0.0
+es	01_solar	2	280	0.0	1.0
+es	02_wind_on	2	280	0.0	1.0
+es	03_wind_off	2	280	0.0	1.0
+es	04_res	2	280	0.0	1.0
+es	05_nuclear	2	280	0.0	1.0
+es	06_coal	2	280	0.0	1.0
 es	07_gas	2	280	0.0	0.0
 es	08_non-res	2	280	0.0	0.0
 es	09_hydro_pump	2	280	0.0	0.0
-es	01_solar	2	281	1.0	0.0
-es	02_wind_on	2	281	1.0	0.0
-es	03_wind_off	2	281	1.0	0.0
-es	04_res	2	281	1.0	0.0
-es	05_nuclear	2	281	1.0	0.0
-es	06_coal	2	281	1.0	0.0
+es	01_solar	2	281	0.0	1.0
+es	02_wind_on	2	281	0.0	1.0
+es	03_wind_off	2	281	0.0	1.0
+es	04_res	2	281	0.0	1.0
+es	05_nuclear	2	281	0.0	1.0
+es	06_coal	2	281	0.0	1.0
 es	07_gas	2	281	0.0	0.0
 es	08_non-res	2	281	0.0	0.0
 es	09_hydro_pump	2	281	0.0	0.0
-es	01_solar	2	282	1.0	0.0
-es	02_wind_on	2	282	1.0	0.0
-es	03_wind_off	2	282	1.0	0.0
-es	04_res	2	282	1.0	0.0
-es	05_nuclear	2	282	1.0	0.0
-es	06_coal	2	282	1.0	0.0
+es	01_solar	2	282	0.0	1.0
+es	02_wind_on	2	282	0.0	1.0
+es	03_wind_off	2	282	0.0	1.0
+es	04_res	2	282	0.0	1.0
+es	05_nuclear	2	282	0.0	1.0
+es	06_coal	2	282	0.0	1.0
 es	07_gas	2	282	0.0	0.0
 es	08_non-res	2	282	0.0	0.0
 es	09_hydro_pump	2	282	0.0	0.0
-es	01_solar	2	283	1.0	0.0
-es	02_wind_on	2	283	1.0	0.0
-es	03_wind_off	2	283	1.0	0.0
-es	04_res	2	283	1.0	0.0
-es	05_nuclear	2	283	1.0	0.0
-es	06_coal	2	283	1.0	0.0
+es	01_solar	2	283	0.0	1.0
+es	02_wind_on	2	283	0.0	1.0
+es	03_wind_off	2	283	0.0	1.0
+es	04_res	2	283	0.0	1.0
+es	05_nuclear	2	283	0.0	1.0
+es	06_coal	2	283	0.0	1.0
 es	07_gas	2	283	0.0	0.0
 es	08_non-res	2	283	0.0	0.0
 es	09_hydro_pump	2	283	0.0	0.0
-es	01_solar	2	284	1.0	0.0
-es	02_wind_on	2	284	1.0	0.0
-es	03_wind_off	2	284	1.0	0.0
-es	04_res	2	284	1.0	0.0
-es	05_nuclear	2	284	1.0	0.0
-es	06_coal	2	284	1.0	0.0
+es	01_solar	2	284	0.0	1.0
+es	02_wind_on	2	284	0.0	1.0
+es	03_wind_off	2	284	0.0	1.0
+es	04_res	2	284	0.0	1.0
+es	05_nuclear	2	284	0.0	1.0
+es	06_coal	2	284	0.0	1.0
 es	07_gas	2	284	0.0	0.0
 es	08_non-res	2	284	0.0	0.0
 es	09_hydro_pump	2	284	0.0	0.0
-es	01_solar	2	285	1.0	0.0
-es	02_wind_on	2	285	1.0	0.0
-es	03_wind_off	2	285	1.0	0.0
-es	04_res	2	285	1.0	0.0
-es	05_nuclear	2	285	1.0	0.0
-es	06_coal	2	285	1.0	0.0
+es	01_solar	2	285	0.0	1.0
+es	02_wind_on	2	285	0.0	1.0
+es	03_wind_off	2	285	0.0	1.0
+es	04_res	2	285	0.0	1.0
+es	05_nuclear	2	285	0.0	1.0
+es	06_coal	2	285	0.0	1.0
 es	07_gas	2	285	0.0	0.0
 es	08_non-res	2	285	0.0	0.0
 es	09_hydro_pump	2	285	0.0	0.0
-es	01_solar	2	286	1.0	0.0
-es	02_wind_on	2	286	1.0	0.0
-es	03_wind_off	2	286	1.0	0.0
-es	04_res	2	286	1.0	0.0
-es	05_nuclear	2	286	1.0	0.0
-es	06_coal	2	286	1.0	0.0
+es	01_solar	2	286	0.0	1.0
+es	02_wind_on	2	286	0.0	1.0
+es	03_wind_off	2	286	0.0	1.0
+es	04_res	2	286	0.0	1.0
+es	05_nuclear	2	286	0.0	1.0
+es	06_coal	2	286	0.0	1.0
 es	07_gas	2	286	0.0	0.0
 es	08_non-res	2	286	0.0	0.0
 es	09_hydro_pump	2	286	0.0	0.0
-es	01_solar	2	287	1.0	0.0
-es	02_wind_on	2	287	1.0	0.0
-es	03_wind_off	2	287	1.0	0.0
-es	04_res	2	287	1.0	0.0
-es	05_nuclear	2	287	1.0	0.0
-es	06_coal	2	287	1.0	0.0
+es	01_solar	2	287	0.0	1.0
+es	02_wind_on	2	287	0.0	1.0
+es	03_wind_off	2	287	0.0	1.0
+es	04_res	2	287	0.0	1.0
+es	05_nuclear	2	287	0.0	1.0
+es	06_coal	2	287	0.0	1.0
 es	07_gas	2	287	0.0	0.0
 es	08_non-res	2	287	0.0	0.0
 es	09_hydro_pump	2	287	0.0	0.0
-es	01_solar	2	288	1.0	0.0
-es	02_wind_on	2	288	1.0	0.0
-es	03_wind_off	2	288	1.0	0.0
-es	04_res	2	288	1.0	0.0
-es	05_nuclear	2	288	1.0	0.0
-es	06_coal	2	288	1.0	0.0
+es	01_solar	2	288	0.0	1.0
+es	02_wind_on	2	288	0.0	1.0
+es	03_wind_off	2	288	0.0	1.0
+es	04_res	2	288	0.0	1.0
+es	05_nuclear	2	288	0.0	1.0
+es	06_coal	2	288	0.0	1.0
 es	07_gas	2	288	0.0	0.0
 es	08_non-res	2	288	0.0	0.0
 es	09_hydro_pump	2	288	0.0	0.0
-es	01_solar	2	289	1.0	0.0
-es	02_wind_on	2	289	1.0	0.0
-es	03_wind_off	2	289	1.0	0.0
-es	04_res	2	289	1.0	0.0
-es	05_nuclear	2	289	1.0	0.0
-es	06_coal	2	289	1.0	0.0
+es	01_solar	2	289	0.0	1.0
+es	02_wind_on	2	289	0.0	1.0
+es	03_wind_off	2	289	0.0	1.0
+es	04_res	2	289	0.0	1.0
+es	05_nuclear	2	289	0.0	1.0
+es	06_coal	2	289	0.0	1.0
 es	07_gas	2	289	0.0	0.0
 es	08_non-res	2	289	0.0	0.0
 es	09_hydro_pump	2	289	0.0	0.0
-es	01_solar	2	290	1.0	0.0
-es	02_wind_on	2	290	1.0	0.0
-es	03_wind_off	2	290	1.0	0.0
-es	04_res	2	290	1.0	0.0
-es	05_nuclear	2	290	1.0	0.0
-es	06_coal	2	290	1.0	0.0
-es	07_gas	2	290	1.0	0.0
+es	01_solar	2	290	0.0	1.0
+es	02_wind_on	2	290	0.0	1.0
+es	03_wind_off	2	290	0.0	1.0
+es	04_res	2	290	0.0	1.0
+es	05_nuclear	2	290	0.0	1.0
+es	06_coal	2	290	0.0	1.0
+es	07_gas	2	290	0.0	1.0
 es	08_non-res	2	290	0.0	0.0
 es	09_hydro_pump	2	290	0.0	0.0
-es	01_solar	2	291	1.0	0.0
-es	02_wind_on	2	291	1.0	0.0
-es	03_wind_off	2	291	1.0	0.0
-es	04_res	2	291	1.0	0.0
-es	05_nuclear	2	291	1.0	0.0
-es	06_coal	2	291	1.0	0.0
-es	07_gas	2	291	1.0	0.0
+es	01_solar	2	291	0.0	1.0
+es	02_wind_on	2	291	0.0	1.0
+es	03_wind_off	2	291	0.0	1.0
+es	04_res	2	291	0.0	1.0
+es	05_nuclear	2	291	0.0	1.0
+es	06_coal	2	291	0.0	1.0
+es	07_gas	2	291	0.0	1.0
 es	08_non-res	2	291	0.0	0.0
 es	09_hydro_pump	2	291	0.0	0.0
-es	01_solar	2	292	1.0	0.0
-es	02_wind_on	2	292	1.0	0.0
-es	03_wind_off	2	292	1.0	0.0
-es	04_res	2	292	1.0	0.0
-es	05_nuclear	2	292	1.0	0.0
-es	06_coal	2	292	1.0	0.0
-es	07_gas	2	292	1.0	0.0
+es	01_solar	2	292	0.0	1.0
+es	02_wind_on	2	292	0.0	1.0
+es	03_wind_off	2	292	0.0	1.0
+es	04_res	2	292	0.0	1.0
+es	05_nuclear	2	292	0.0	1.0
+es	06_coal	2	292	0.0	1.0
+es	07_gas	2	292	0.0	1.0
 es	08_non-res	2	292	0.0	0.0
 es	09_hydro_pump	2	292	0.0	0.0
-es	01_solar	2	293	1.0	0.0
-es	02_wind_on	2	293	1.0	0.0
-es	03_wind_off	2	293	1.0	0.0
-es	04_res	2	293	1.0	0.0
-es	05_nuclear	2	293	1.0	0.0
-es	06_coal	2	293	1.0	0.0
-es	07_gas	2	293	1.0	0.0
+es	01_solar	2	293	0.0	1.0
+es	02_wind_on	2	293	0.0	1.0
+es	03_wind_off	2	293	0.0	1.0
+es	04_res	2	293	0.0	1.0
+es	05_nuclear	2	293	0.0	1.0
+es	06_coal	2	293	0.0	1.0
+es	07_gas	2	293	0.0	1.0
 es	08_non-res	2	293	0.0	0.0
 es	09_hydro_pump	2	293	0.0	0.0
-es	01_solar	2	294	1.0	0.0
-es	02_wind_on	2	294	1.0	0.0
-es	03_wind_off	2	294	1.0	0.0
-es	04_res	2	294	1.0	0.0
-es	05_nuclear	2	294	1.0	0.0
-es	06_coal	2	294	1.0	0.0
-es	07_gas	2	294	1.0	0.0
+es	01_solar	2	294	0.0	1.0
+es	02_wind_on	2	294	0.0	1.0
+es	03_wind_off	2	294	0.0	1.0
+es	04_res	2	294	0.0	1.0
+es	05_nuclear	2	294	0.0	1.0
+es	06_coal	2	294	0.0	1.0
+es	07_gas	2	294	0.0	1.0
 es	08_non-res	2	294	0.0	0.0
 es	09_hydro_pump	2	294	0.0	0.0
-es	01_solar	2	295	1.0	0.0
-es	02_wind_on	2	295	1.0	0.0
-es	03_wind_off	2	295	1.0	0.0
-es	04_res	2	295	1.0	0.0
-es	05_nuclear	2	295	1.0	0.0
-es	06_coal	2	295	1.0	0.0
-es	07_gas	2	295	1.0	0.0
+es	01_solar	2	295	0.0	1.0
+es	02_wind_on	2	295	0.0	1.0
+es	03_wind_off	2	295	0.0	1.0
+es	04_res	2	295	0.0	1.0
+es	05_nuclear	2	295	0.0	1.0
+es	06_coal	2	295	0.0	1.0
+es	07_gas	2	295	0.0	1.0
 es	08_non-res	2	295	0.0	0.0
 es	09_hydro_pump	2	295	0.0	0.0
-es	01_solar	2	296	1.0	0.0
-es	02_wind_on	2	296	1.0	0.0
-es	03_wind_off	2	296	1.0	0.0
-es	04_res	2	296	1.0	0.0
-es	05_nuclear	2	296	1.0	0.0
-es	06_coal	2	296	1.0	0.0
-es	07_gas	2	296	1.0	0.0
+es	01_solar	2	296	0.0	1.0
+es	02_wind_on	2	296	0.0	1.0
+es	03_wind_off	2	296	0.0	1.0
+es	04_res	2	296	0.0	1.0
+es	05_nuclear	2	296	0.0	1.0
+es	06_coal	2	296	0.0	1.0
+es	07_gas	2	296	0.0	1.0
 es	08_non-res	2	296	0.0	0.0
 es	09_hydro_pump	2	296	0.0	0.0
-es	01_solar	2	297	1.0	0.0
-es	02_wind_on	2	297	1.0	0.0
-es	03_wind_off	2	297	1.0	0.0
-es	04_res	2	297	1.0	0.0
-es	05_nuclear	2	297	1.0	0.0
-es	06_coal	2	297	1.0	0.0
-es	07_gas	2	297	1.0	0.0
+es	01_solar	2	297	0.0	1.0
+es	02_wind_on	2	297	0.0	1.0
+es	03_wind_off	2	297	0.0	1.0
+es	04_res	2	297	0.0	1.0
+es	05_nuclear	2	297	0.0	1.0
+es	06_coal	2	297	0.0	1.0
+es	07_gas	2	297	0.0	1.0
 es	08_non-res	2	297	0.0	0.0
 es	09_hydro_pump	2	297	0.0	0.0
-es	01_solar	2	298	1.0	0.0
-es	02_wind_on	2	298	1.0	0.0
-es	03_wind_off	2	298	1.0	0.0
-es	04_res	2	298	1.0	0.0
-es	05_nuclear	2	298	1.0	0.0
-es	06_coal	2	298	1.0	0.0
-es	07_gas	2	298	1.0	0.0
+es	01_solar	2	298	0.0	1.0
+es	02_wind_on	2	298	0.0	1.0
+es	03_wind_off	2	298	0.0	1.0
+es	04_res	2	298	0.0	1.0
+es	05_nuclear	2	298	0.0	1.0
+es	06_coal	2	298	0.0	1.0
+es	07_gas	2	298	0.0	1.0
 es	08_non-res	2	298	0.0	0.0
 es	09_hydro_pump	2	298	0.0	0.0
-es	01_solar	2	299	1.0	0.0
-es	02_wind_on	2	299	1.0	0.0
-es	03_wind_off	2	299	1.0	0.0
-es	04_res	2	299	1.0	0.0
-es	05_nuclear	2	299	1.0	0.0
-es	06_coal	2	299	1.0	0.0
-es	07_gas	2	299	1.0	0.0
+es	01_solar	2	299	0.0	1.0
+es	02_wind_on	2	299	0.0	1.0
+es	03_wind_off	2	299	0.0	1.0
+es	04_res	2	299	0.0	1.0
+es	05_nuclear	2	299	0.0	1.0
+es	06_coal	2	299	0.0	1.0
+es	07_gas	2	299	0.0	1.0
 es	08_non-res	2	299	0.0	0.0
 es	09_hydro_pump	2	299	0.0	0.0
-es	01_solar	2	300	1.0	0.0
-es	02_wind_on	2	300	1.0	0.0
-es	03_wind_off	2	300	1.0	0.0
-es	04_res	2	300	1.0	0.0
-es	05_nuclear	2	300	1.0	0.0
-es	06_coal	2	300	1.0	0.0
-es	07_gas	2	300	1.0	0.0
+es	01_solar	2	300	0.0	1.0
+es	02_wind_on	2	300	0.0	1.0
+es	03_wind_off	2	300	0.0	1.0
+es	04_res	2	300	0.0	1.0
+es	05_nuclear	2	300	0.0	1.0
+es	06_coal	2	300	0.0	1.0
+es	07_gas	2	300	0.0	1.0
 es	08_non-res	2	300	0.0	0.0
 es	09_hydro_pump	2	300	0.0	0.0
-es	01_solar	2	301	1.0	0.0
-es	02_wind_on	2	301	1.0	0.0
-es	03_wind_off	2	301	1.0	0.0
-es	04_res	2	301	1.0	0.0
-es	05_nuclear	2	301	1.0	0.0
-es	06_coal	2	301	1.0	0.0
-es	07_gas	2	301	1.0	0.0
+es	01_solar	2	301	0.0	1.0
+es	02_wind_on	2	301	0.0	1.0
+es	03_wind_off	2	301	0.0	1.0
+es	04_res	2	301	0.0	1.0
+es	05_nuclear	2	301	0.0	1.0
+es	06_coal	2	301	0.0	1.0
+es	07_gas	2	301	0.0	1.0
 es	08_non-res	2	301	0.0	0.0
 es	09_hydro_pump	2	301	0.0	0.0
-es	01_solar	2	302	1.0	0.0
-es	02_wind_on	2	302	1.0	0.0
-es	03_wind_off	2	302	1.0	0.0
-es	04_res	2	302	1.0	0.0
-es	05_nuclear	2	302	1.0	0.0
-es	06_coal	2	302	1.0	0.0
-es	07_gas	2	302	1.0	0.0
+es	01_solar	2	302	0.0	1.0
+es	02_wind_on	2	302	0.0	1.0
+es	03_wind_off	2	302	0.0	1.0
+es	04_res	2	302	0.0	1.0
+es	05_nuclear	2	302	0.0	1.0
+es	06_coal	2	302	0.0	1.0
+es	07_gas	2	302	0.0	1.0
 es	08_non-res	2	302	0.0	0.0
 es	09_hydro_pump	2	302	0.0	0.0
-es	01_solar	2	303	1.0	0.0
-es	02_wind_on	2	303	1.0	0.0
-es	03_wind_off	2	303	1.0	0.0
-es	04_res	2	303	1.0	0.0
-es	05_nuclear	2	303	1.0	0.0
-es	06_coal	2	303	1.0	0.0
-es	07_gas	2	303	1.0	0.0
+es	01_solar	2	303	0.0	1.0
+es	02_wind_on	2	303	0.0	1.0
+es	03_wind_off	2	303	0.0	1.0
+es	04_res	2	303	0.0	1.0
+es	05_nuclear	2	303	0.0	1.0
+es	06_coal	2	303	0.0	1.0
+es	07_gas	2	303	0.0	1.0
 es	08_non-res	2	303	0.0	0.0
 es	09_hydro_pump	2	303	0.0	0.0
-es	01_solar	2	304	1.0	0.0
-es	02_wind_on	2	304	1.0	0.0
-es	03_wind_off	2	304	1.0	0.0
-es	04_res	2	304	1.0	0.0
-es	05_nuclear	2	304	1.0	0.0
-es	06_coal	2	304	1.0	0.0
-es	07_gas	2	304	1.0	0.0
+es	01_solar	2	304	0.0	1.0
+es	02_wind_on	2	304	0.0	1.0
+es	03_wind_off	2	304	0.0	1.0
+es	04_res	2	304	0.0	1.0
+es	05_nuclear	2	304	0.0	1.0
+es	06_coal	2	304	0.0	1.0
+es	07_gas	2	304	0.0	1.0
 es	08_non-res	2	304	0.0	0.0
 es	09_hydro_pump	2	304	0.0	0.0
-es	01_solar	2	305	1.0	0.0
-es	02_wind_on	2	305	1.0	0.0
-es	03_wind_off	2	305	1.0	0.0
-es	04_res	2	305	1.0	0.0
-es	05_nuclear	2	305	1.0	0.0
-es	06_coal	2	305	1.0	0.0
-es	07_gas	2	305	1.0	0.0
+es	01_solar	2	305	0.0	1.0
+es	02_wind_on	2	305	0.0	1.0
+es	03_wind_off	2	305	0.0	1.0
+es	04_res	2	305	0.0	1.0
+es	05_nuclear	2	305	0.0	1.0
+es	06_coal	2	305	0.0	1.0
+es	07_gas	2	305	0.0	1.0
 es	08_non-res	2	305	0.0	0.0
 es	09_hydro_pump	2	305	0.0	0.0
-es	01_solar	2	306	1.0	0.0
-es	02_wind_on	2	306	1.0	0.0
-es	03_wind_off	2	306	1.0	0.0
-es	04_res	2	306	1.0	0.0
-es	05_nuclear	2	306	1.0	0.0
-es	06_coal	2	306	1.0	0.0
-es	07_gas	2	306	1.0	0.0
+es	01_solar	2	306	0.0	1.0
+es	02_wind_on	2	306	0.0	1.0
+es	03_wind_off	2	306	0.0	1.0
+es	04_res	2	306	0.0	1.0
+es	05_nuclear	2	306	0.0	1.0
+es	06_coal	2	306	0.0	1.0
+es	07_gas	2	306	0.0	1.0
 es	08_non-res	2	306	0.0	0.0
 es	09_hydro_pump	2	306	0.0	0.0
-es	01_solar	2	307	1.0	0.0
-es	02_wind_on	2	307	1.0	0.0
-es	03_wind_off	2	307	1.0	0.0
-es	04_res	2	307	1.0	0.0
-es	05_nuclear	2	307	1.0	0.0
-es	06_coal	2	307	1.0	0.0
-es	07_gas	2	307	1.0	0.0
+es	01_solar	2	307	0.0	1.0
+es	02_wind_on	2	307	0.0	1.0
+es	03_wind_off	2	307	0.0	1.0
+es	04_res	2	307	0.0	1.0
+es	05_nuclear	2	307	0.0	1.0
+es	06_coal	2	307	0.0	1.0
+es	07_gas	2	307	0.0	1.0
 es	08_non-res	2	307	0.0	0.0
 es	09_hydro_pump	2	307	0.0	0.0
-es	01_solar	2	308	1.0	0.0
-es	02_wind_on	2	308	1.0	0.0
-es	03_wind_off	2	308	1.0	0.0
-es	04_res	2	308	1.0	0.0
-es	05_nuclear	2	308	1.0	0.0
-es	06_coal	2	308	1.0	0.0
-es	07_gas	2	308	1.0	0.0
+es	01_solar	2	308	0.0	1.0
+es	02_wind_on	2	308	0.0	1.0
+es	03_wind_off	2	308	0.0	1.0
+es	04_res	2	308	0.0	1.0
+es	05_nuclear	2	308	0.0	1.0
+es	06_coal	2	308	0.0	1.0
+es	07_gas	2	308	0.0	1.0
 es	08_non-res	2	308	0.0	0.0
 es	09_hydro_pump	2	308	0.0	0.0
-es	01_solar	2	309	1.0	0.0
-es	02_wind_on	2	309	1.0	0.0
-es	03_wind_off	2	309	1.0	0.0
-es	04_res	2	309	1.0	0.0
-es	05_nuclear	2	309	1.0	0.0
-es	06_coal	2	309	1.0	0.0
-es	07_gas	2	309	1.0	0.0
+es	01_solar	2	309	0.0	1.0
+es	02_wind_on	2	309	0.0	1.0
+es	03_wind_off	2	309	0.0	1.0
+es	04_res	2	309	0.0	1.0
+es	05_nuclear	2	309	0.0	1.0
+es	06_coal	2	309	0.0	1.0
+es	07_gas	2	309	0.0	1.0
 es	08_non-res	2	309	0.0	0.0
 es	09_hydro_pump	2	309	0.0	0.0
-es	01_solar	2	310	1.0	0.0
-es	02_wind_on	2	310	1.0	0.0
-es	03_wind_off	2	310	1.0	0.0
-es	04_res	2	310	1.0	0.0
-es	05_nuclear	2	310	1.0	0.0
-es	06_coal	2	310	1.0	0.0
-es	07_gas	2	310	1.0	0.0
-es	08_non-res	2	310	1.0	0.0
+es	01_solar	2	310	0.0	1.0
+es	02_wind_on	2	310	0.0	1.0
+es	03_wind_off	2	310	0.0	1.0
+es	04_res	2	310	0.0	1.0
+es	05_nuclear	2	310	0.0	1.0
+es	06_coal	2	310	0.0	1.0
+es	07_gas	2	310	0.0	1.0
+es	08_non-res	2	310	0.0	1.0
 es	09_hydro_pump	2	310	0.0	0.0
-es	01_solar	2	311	1.0	0.0
-es	02_wind_on	2	311	1.0	0.0
-es	03_wind_off	2	311	1.0	0.0
-es	04_res	2	311	1.0	0.0
-es	05_nuclear	2	311	1.0	0.0
-es	06_coal	2	311	1.0	0.0
-es	07_gas	2	311	1.0	0.0
-es	08_non-res	2	311	1.0	0.0
+es	01_solar	2	311	0.0	1.0
+es	02_wind_on	2	311	0.0	1.0
+es	03_wind_off	2	311	0.0	1.0
+es	04_res	2	311	0.0	1.0
+es	05_nuclear	2	311	0.0	1.0
+es	06_coal	2	311	0.0	1.0
+es	07_gas	2	311	0.0	1.0
+es	08_non-res	2	311	0.0	1.0
 es	09_hydro_pump	2	311	0.0	0.0
-es	01_solar	2	312	1.0	0.0
-es	02_wind_on	2	312	1.0	0.0
-es	03_wind_off	2	312	1.0	0.0
-es	04_res	2	312	1.0	0.0
-es	05_nuclear	2	312	1.0	0.0
-es	06_coal	2	312	1.0	0.0
-es	07_gas	2	312	1.0	0.0
-es	08_non-res	2	312	1.0	0.0
+es	01_solar	2	312	0.0	1.0
+es	02_wind_on	2	312	0.0	1.0
+es	03_wind_off	2	312	0.0	1.0
+es	04_res	2	312	0.0	1.0
+es	05_nuclear	2	312	0.0	1.0
+es	06_coal	2	312	0.0	1.0
+es	07_gas	2	312	0.0	1.0
+es	08_non-res	2	312	0.0	1.0
 es	09_hydro_pump	2	312	0.0	0.0
-es	01_solar	2	313	1.0	0.0
-es	02_wind_on	2	313	1.0	0.0
-es	03_wind_off	2	313	1.0	0.0
-es	04_res	2	313	1.0	0.0
-es	05_nuclear	2	313	1.0	0.0
-es	06_coal	2	313	1.0	0.0
-es	07_gas	2	313	1.0	0.0
-es	08_non-res	2	313	1.0	0.0
+es	01_solar	2	313	0.0	1.0
+es	02_wind_on	2	313	0.0	1.0
+es	03_wind_off	2	313	0.0	1.0
+es	04_res	2	313	0.0	1.0
+es	05_nuclear	2	313	0.0	1.0
+es	06_coal	2	313	0.0	1.0
+es	07_gas	2	313	0.0	1.0
+es	08_non-res	2	313	0.0	1.0
 es	09_hydro_pump	2	313	0.0	0.0
-es	01_solar	2	314	1.0	0.0
-es	02_wind_on	2	314	1.0	0.0
-es	03_wind_off	2	314	1.0	0.0
-es	04_res	2	314	1.0	0.0
-es	05_nuclear	2	314	1.0	0.0
-es	06_coal	2	314	1.0	0.0
-es	07_gas	2	314	1.0	0.0
-es	08_non-res	2	314	1.0	0.0
+es	01_solar	2	314	0.0	1.0
+es	02_wind_on	2	314	0.0	1.0
+es	03_wind_off	2	314	0.0	1.0
+es	04_res	2	314	0.0	1.0
+es	05_nuclear	2	314	0.0	1.0
+es	06_coal	2	314	0.0	1.0
+es	07_gas	2	314	0.0	1.0
+es	08_non-res	2	314	0.0	1.0
 es	09_hydro_pump	2	314	0.0	0.0
-es	01_solar	2	315	1.0	0.0
-es	02_wind_on	2	315	1.0	0.0
-es	03_wind_off	2	315	1.0	0.0
-es	04_res	2	315	1.0	0.0
-es	05_nuclear	2	315	1.0	0.0
-es	06_coal	2	315	1.0	0.0
-es	07_gas	2	315	1.0	0.0
-es	08_non-res	2	315	1.0	0.0
+es	01_solar	2	315	0.0	1.0
+es	02_wind_on	2	315	0.0	1.0
+es	03_wind_off	2	315	0.0	1.0
+es	04_res	2	315	0.0	1.0
+es	05_nuclear	2	315	0.0	1.0
+es	06_coal	2	315	0.0	1.0
+es	07_gas	2	315	0.0	1.0
+es	08_non-res	2	315	0.0	1.0
 es	09_hydro_pump	2	315	0.0	0.0
-es	01_solar	2	316	1.0	0.0
-es	02_wind_on	2	316	1.0	0.0
-es	03_wind_off	2	316	1.0	0.0
-es	04_res	2	316	1.0	0.0
-es	05_nuclear	2	316	1.0	0.0
-es	06_coal	2	316	1.0	0.0
-es	07_gas	2	316	1.0	0.0
-es	08_non-res	2	316	1.0	0.0
+es	01_solar	2	316	0.0	1.0
+es	02_wind_on	2	316	0.0	1.0
+es	03_wind_off	2	316	0.0	1.0
+es	04_res	2	316	0.0	1.0
+es	05_nuclear	2	316	0.0	1.0
+es	06_coal	2	316	0.0	1.0
+es	07_gas	2	316	0.0	1.0
+es	08_non-res	2	316	0.0	1.0
 es	09_hydro_pump	2	316	0.0	0.0
-es	01_solar	2	317	1.0	0.0
-es	02_wind_on	2	317	1.0	0.0
-es	03_wind_off	2	317	1.0	0.0
-es	04_res	2	317	1.0	0.0
-es	05_nuclear	2	317	1.0	0.0
-es	06_coal	2	317	1.0	0.0
-es	07_gas	2	317	1.0	0.0
-es	08_non-res	2	317	1.0	0.0
+es	01_solar	2	317	0.0	1.0
+es	02_wind_on	2	317	0.0	1.0
+es	03_wind_off	2	317	0.0	1.0
+es	04_res	2	317	0.0	1.0
+es	05_nuclear	2	317	0.0	1.0
+es	06_coal	2	317	0.0	1.0
+es	07_gas	2	317	0.0	1.0
+es	08_non-res	2	317	0.0	1.0
 es	09_hydro_pump	2	317	0.0	0.0
-es	01_solar	2	318	1.0	0.0
-es	02_wind_on	2	318	1.0	0.0
-es	03_wind_off	2	318	1.0	0.0
-es	04_res	2	318	1.0	0.0
-es	05_nuclear	2	318	1.0	0.0
-es	06_coal	2	318	1.0	0.0
-es	07_gas	2	318	1.0	0.0
-es	08_non-res	2	318	1.0	0.0
+es	01_solar	2	318	0.0	1.0
+es	02_wind_on	2	318	0.0	1.0
+es	03_wind_off	2	318	0.0	1.0
+es	04_res	2	318	0.0	1.0
+es	05_nuclear	2	318	0.0	1.0
+es	06_coal	2	318	0.0	1.0
+es	07_gas	2	318	0.0	1.0
+es	08_non-res	2	318	0.0	1.0
 es	09_hydro_pump	2	318	0.0	0.0
-es	01_solar	2	319	1.0	0.0
-es	02_wind_on	2	319	1.0	0.0
-es	03_wind_off	2	319	1.0	0.0
-es	04_res	2	319	1.0	0.0
-es	05_nuclear	2	319	1.0	0.0
-es	06_coal	2	319	1.0	0.0
-es	07_gas	2	319	1.0	0.0
-es	08_non-res	2	319	1.0	0.0
+es	01_solar	2	319	0.0	1.0
+es	02_wind_on	2	319	0.0	1.0
+es	03_wind_off	2	319	0.0	1.0
+es	04_res	2	319	0.0	1.0
+es	05_nuclear	2	319	0.0	1.0
+es	06_coal	2	319	0.0	1.0
+es	07_gas	2	319	0.0	1.0
+es	08_non-res	2	319	0.0	1.0
 es	09_hydro_pump	2	319	0.0	0.0
-es	01_solar	2	320	1.0	0.0
-es	02_wind_on	2	320	1.0	0.0
-es	03_wind_off	2	320	1.0	0.0
-es	04_res	2	320	1.0	0.0
-es	05_nuclear	2	320	1.0	0.0
-es	06_coal	2	320	1.0	0.0
-es	07_gas	2	320	1.0	0.0
-es	08_non-res	2	320	1.0	0.0
+es	01_solar	2	320	0.0	1.0
+es	02_wind_on	2	320	0.0	1.0
+es	03_wind_off	2	320	0.0	1.0
+es	04_res	2	320	0.0	1.0
+es	05_nuclear	2	320	0.0	1.0
+es	06_coal	2	320	0.0	1.0
+es	07_gas	2	320	0.0	1.0
+es	08_non-res	2	320	0.0	1.0
 es	09_hydro_pump	2	320	0.0	0.0
-es	01_solar	2	321	1.0	0.0
-es	02_wind_on	2	321	1.0	0.0
-es	03_wind_off	2	321	1.0	0.0
-es	04_res	2	321	1.0	0.0
-es	05_nuclear	2	321	1.0	0.0
-es	06_coal	2	321	1.0	0.0
-es	07_gas	2	321	1.0	0.0
-es	08_non-res	2	321	1.0	0.0
+es	01_solar	2	321	0.0	1.0
+es	02_wind_on	2	321	0.0	1.0
+es	03_wind_off	2	321	0.0	1.0
+es	04_res	2	321	0.0	1.0
+es	05_nuclear	2	321	0.0	1.0
+es	06_coal	2	321	0.0	1.0
+es	07_gas	2	321	0.0	1.0
+es	08_non-res	2	321	0.0	1.0
 es	09_hydro_pump	2	321	0.0	0.0
-es	01_solar	2	322	1.0	0.0
-es	02_wind_on	2	322	1.0	0.0
-es	03_wind_off	2	322	1.0	0.0
-es	04_res	2	322	1.0	0.0
-es	05_nuclear	2	322	1.0	0.0
-es	06_coal	2	322	1.0	0.0
-es	07_gas	2	322	1.0	0.0
-es	08_non-res	2	322	1.0	0.0
+es	01_solar	2	322	0.0	1.0
+es	02_wind_on	2	322	0.0	1.0
+es	03_wind_off	2	322	0.0	1.0
+es	04_res	2	322	0.0	1.0
+es	05_nuclear	2	322	0.0	1.0
+es	06_coal	2	322	0.0	1.0
+es	07_gas	2	322	0.0	1.0
+es	08_non-res	2	322	0.0	1.0
 es	09_hydro_pump	2	322	0.0	0.0
-es	01_solar	2	323	1.0	0.0
-es	02_wind_on	2	323	1.0	0.0
-es	03_wind_off	2	323	1.0	0.0
-es	04_res	2	323	1.0	0.0
-es	05_nuclear	2	323	1.0	0.0
-es	06_coal	2	323	1.0	0.0
-es	07_gas	2	323	1.0	0.0
-es	08_non-res	2	323	1.0	0.0
+es	01_solar	2	323	0.0	1.0
+es	02_wind_on	2	323	0.0	1.0
+es	03_wind_off	2	323	0.0	1.0
+es	04_res	2	323	0.0	1.0
+es	05_nuclear	2	323	0.0	1.0
+es	06_coal	2	323	0.0	1.0
+es	07_gas	2	323	0.0	1.0
+es	08_non-res	2	323	0.0	1.0
 es	09_hydro_pump	2	323	0.0	0.0
-es	01_solar	2	324	1.0	0.0
-es	02_wind_on	2	324	1.0	0.0
-es	03_wind_off	2	324	1.0	0.0
-es	04_res	2	324	1.0	0.0
-es	05_nuclear	2	324	1.0	0.0
-es	06_coal	2	324	1.0	0.0
-es	07_gas	2	324	1.0	0.0
-es	08_non-res	2	324	1.0	0.0
+es	01_solar	2	324	0.0	1.0
+es	02_wind_on	2	324	0.0	1.0
+es	03_wind_off	2	324	0.0	1.0
+es	04_res	2	324	0.0	1.0
+es	05_nuclear	2	324	0.0	1.0
+es	06_coal	2	324	0.0	1.0
+es	07_gas	2	324	0.0	1.0
+es	08_non-res	2	324	0.0	1.0
 es	09_hydro_pump	2	324	0.0	0.0
-es	01_solar	2	325	1.0	0.0
-es	02_wind_on	2	325	1.0	0.0
-es	03_wind_off	2	325	1.0	0.0
-es	04_res	2	325	1.0	0.0
-es	05_nuclear	2	325	1.0	0.0
-es	06_coal	2	325	1.0	0.0
-es	07_gas	2	325	1.0	0.0
-es	08_non-res	2	325	1.0	0.0
+es	01_solar	2	325	0.0	1.0
+es	02_wind_on	2	325	0.0	1.0
+es	03_wind_off	2	325	0.0	1.0
+es	04_res	2	325	0.0	1.0
+es	05_nuclear	2	325	0.0	1.0
+es	06_coal	2	325	0.0	1.0
+es	07_gas	2	325	0.0	1.0
+es	08_non-res	2	325	0.0	1.0
 es	09_hydro_pump	2	325	0.0	0.0
-es	01_solar	2	326	1.0	0.0
-es	02_wind_on	2	326	1.0	0.0
-es	03_wind_off	2	326	1.0	0.0
-es	04_res	2	326	1.0	0.0
-es	05_nuclear	2	326	1.0	0.0
-es	06_coal	2	326	1.0	0.0
-es	07_gas	2	326	1.0	0.0
-es	08_non-res	2	326	1.0	0.0
+es	01_solar	2	326	0.0	1.0
+es	02_wind_on	2	326	0.0	1.0
+es	03_wind_off	2	326	0.0	1.0
+es	04_res	2	326	0.0	1.0
+es	05_nuclear	2	326	0.0	1.0
+es	06_coal	2	326	0.0	1.0
+es	07_gas	2	326	0.0	1.0
+es	08_non-res	2	326	0.0	1.0
 es	09_hydro_pump	2	326	0.0	0.0
-es	01_solar	2	327	1.0	0.0
-es	02_wind_on	2	327	1.0	0.0
-es	03_wind_off	2	327	1.0	0.0
-es	04_res	2	327	1.0	0.0
-es	05_nuclear	2	327	1.0	0.0
-es	06_coal	2	327	1.0	0.0
-es	07_gas	2	327	1.0	0.0
-es	08_non-res	2	327	1.0	0.0
+es	01_solar	2	327	0.0	1.0
+es	02_wind_on	2	327	0.0	1.0
+es	03_wind_off	2	327	0.0	1.0
+es	04_res	2	327	0.0	1.0
+es	05_nuclear	2	327	0.0	1.0
+es	06_coal	2	327	0.0	1.0
+es	07_gas	2	327	0.0	1.0
+es	08_non-res	2	327	0.0	1.0
 es	09_hydro_pump	2	327	0.0	0.0
-es	01_solar	2	328	1.0	0.0
-es	02_wind_on	2	328	1.0	0.0
-es	03_wind_off	2	328	1.0	0.0
-es	04_res	2	328	1.0	0.0
-es	05_nuclear	2	328	1.0	0.0
-es	06_coal	2	328	1.0	0.0
-es	07_gas	2	328	1.0	0.0
-es	08_non-res	2	328	1.0	0.0
+es	01_solar	2	328	0.0	1.0
+es	02_wind_on	2	328	0.0	1.0
+es	03_wind_off	2	328	0.0	1.0
+es	04_res	2	328	0.0	1.0
+es	05_nuclear	2	328	0.0	1.0
+es	06_coal	2	328	0.0	1.0
+es	07_gas	2	328	0.0	1.0
+es	08_non-res	2	328	0.0	1.0
 es	09_hydro_pump	2	328	0.0	0.0
-es	01_solar	2	329	1.0	0.0
-es	02_wind_on	2	329	1.0	0.0
-es	03_wind_off	2	329	1.0	0.0
-es	04_res	2	329	1.0	0.0
-es	05_nuclear	2	329	1.0	0.0
-es	06_coal	2	329	1.0	0.0
-es	07_gas	2	329	1.0	0.0
-es	08_non-res	2	329	1.0	0.0
+es	01_solar	2	329	0.0	1.0
+es	02_wind_on	2	329	0.0	1.0
+es	03_wind_off	2	329	0.0	1.0
+es	04_res	2	329	0.0	1.0
+es	05_nuclear	2	329	0.0	1.0
+es	06_coal	2	329	0.0	1.0
+es	07_gas	2	329	0.0	1.0
+es	08_non-res	2	329	0.0	1.0
 es	09_hydro_pump	2	329	0.0	0.0
-es	01_solar	2	330	1.0	0.0
-es	02_wind_on	2	330	1.0	0.0
-es	03_wind_off	2	330	1.0	0.0
-es	04_res	2	330	1.0	0.0
-es	05_nuclear	2	330	1.0	0.0
-es	06_coal	2	330	1.0	0.0
-es	07_gas	2	330	1.0	0.0
-es	08_non-res	2	330	1.0	0.0
-es	09_hydro_pump	2	330	1.0	0.0
-es	01_solar	2	331	1.0	0.0
-es	02_wind_on	2	331	1.0	0.0
-es	03_wind_off	2	331	1.0	0.0
-es	04_res	2	331	1.0	0.0
-es	05_nuclear	2	331	1.0	0.0
-es	06_coal	2	331	1.0	0.0
-es	07_gas	2	331	1.0	0.0
-es	08_non-res	2	331	1.0	0.0
-es	09_hydro_pump	2	331	1.0	0.0
-es	01_solar	2	332	1.0	0.0
-es	02_wind_on	2	332	1.0	0.0
-es	03_wind_off	2	332	1.0	0.0
-es	04_res	2	332	1.0	0.0
-es	05_nuclear	2	332	1.0	0.0
-es	06_coal	2	332	1.0	0.0
-es	07_gas	2	332	1.0	0.0
-es	08_non-res	2	332	1.0	0.0
-es	09_hydro_pump	2	332	1.0	0.0
-es	01_solar	2	333	1.0	0.0
-es	02_wind_on	2	333	1.0	0.0
-es	03_wind_off	2	333	1.0	0.0
-es	04_res	2	333	1.0	0.0
-es	05_nuclear	2	333	1.0	0.0
-es	06_coal	2	333	1.0	0.0
-es	07_gas	2	333	1.0	0.0
-es	08_non-res	2	333	1.0	0.0
-es	09_hydro_pump	2	333	1.0	0.0
-es	01_solar	2	334	1.0	0.0
-es	02_wind_on	2	334	1.0	0.0
-es	03_wind_off	2	334	1.0	0.0
-es	04_res	2	334	1.0	0.0
-es	05_nuclear	2	334	1.0	0.0
-es	06_coal	2	334	1.0	0.0
-es	07_gas	2	334	1.0	0.0
-es	08_non-res	2	334	1.0	0.0
-es	09_hydro_pump	2	334	1.0	0.0
-es	01_solar	2	335	1.0	0.0
-es	02_wind_on	2	335	1.0	0.0
-es	03_wind_off	2	335	1.0	0.0
-es	04_res	2	335	1.0	0.0
-es	05_nuclear	2	335	1.0	0.0
-es	06_coal	2	335	1.0	0.0
-es	07_gas	2	335	1.0	0.0
-es	08_non-res	2	335	1.0	0.0
-es	09_hydro_pump	2	335	1.0	0.0
-es	01_solar	2	336	1.0	0.0
-es	02_wind_on	2	336	1.0	0.0
-es	03_wind_off	2	336	1.0	0.0
-es	04_res	2	336	1.0	0.0
-es	05_nuclear	2	336	1.0	0.0
-es	06_coal	2	336	1.0	0.0
-es	07_gas	2	336	1.0	0.0
-es	08_non-res	2	336	1.0	0.0
-es	09_hydro_pump	2	336	1.0	0.0
+es	01_solar	2	330	0.0	1.0
+es	02_wind_on	2	330	0.0	1.0
+es	03_wind_off	2	330	0.0	1.0
+es	04_res	2	330	0.0	1.0
+es	05_nuclear	2	330	0.0	1.0
+es	06_coal	2	330	0.0	1.0
+es	07_gas	2	330	0.0	1.0
+es	08_non-res	2	330	0.0	1.0
+es	09_hydro_pump	2	330	0.0	1.0
+es	01_solar	2	331	0.0	1.0
+es	02_wind_on	2	331	0.0	1.0
+es	03_wind_off	2	331	0.0	1.0
+es	04_res	2	331	0.0	1.0
+es	05_nuclear	2	331	0.0	1.0
+es	06_coal	2	331	0.0	1.0
+es	07_gas	2	331	0.0	1.0
+es	08_non-res	2	331	0.0	1.0
+es	09_hydro_pump	2	331	0.0	1.0
+es	01_solar	2	332	0.0	1.0
+es	02_wind_on	2	332	0.0	1.0
+es	03_wind_off	2	332	0.0	1.0
+es	04_res	2	332	0.0	1.0
+es	05_nuclear	2	332	0.0	1.0
+es	06_coal	2	332	0.0	1.0
+es	07_gas	2	332	0.0	1.0
+es	08_non-res	2	332	0.0	1.0
+es	09_hydro_pump	2	332	0.0	1.0
+es	01_solar	2	333	0.0	1.0
+es	02_wind_on	2	333	0.0	1.0
+es	03_wind_off	2	333	0.0	1.0
+es	04_res	2	333	0.0	1.0
+es	05_nuclear	2	333	0.0	1.0
+es	06_coal	2	333	0.0	1.0
+es	07_gas	2	333	0.0	1.0
+es	08_non-res	2	333	0.0	1.0
+es	09_hydro_pump	2	333	0.0	1.0
+es	01_solar	2	334	0.0	1.0
+es	02_wind_on	2	334	0.0	1.0
+es	03_wind_off	2	334	0.0	1.0
+es	04_res	2	334	0.0	1.0
+es	05_nuclear	2	334	0.0	1.0
+es	06_coal	2	334	0.0	1.0
+es	07_gas	2	334	0.0	1.0
+es	08_non-res	2	334	0.0	1.0
+es	09_hydro_pump	2	334	0.0	1.0
+es	01_solar	2	335	0.0	1.0
+es	02_wind_on	2	335	0.0	1.0
+es	03_wind_off	2	335	0.0	1.0
+es	04_res	2	335	0.0	1.0
+es	05_nuclear	2	335	0.0	1.0
+es	06_coal	2	335	0.0	1.0
+es	07_gas	2	335	0.0	1.0
+es	08_non-res	2	335	0.0	1.0
+es	09_hydro_pump	2	335	0.0	1.0
+es	01_solar	2	336	0.0	1.0
+es	02_wind_on	2	336	0.0	1.0
+es	03_wind_off	2	336	0.0	1.0
+es	04_res	2	336	0.0	1.0
+es	05_nuclear	2	336	0.0	1.0
+es	06_coal	2	336	0.0	1.0
+es	07_gas	2	336	0.0	1.0
+es	08_non-res	2	336	0.0	1.0
+es	09_hydro_pump	2	336	0.0	1.0
 fr	01_solar	2	1	0.0	0.0
 fr	02_wind_on	2	1	0.0	0.0
 fr	03_wind_off	2	1	0.0	0.0
@@ -18152,7 +18152,7 @@ fr	06_coal	2	1	0.0	0.0
 fr	07_gas	2	1	0.0	0.0
 fr	08_non-res	2	1	0.0	0.0
 fr	09_hydro_pump	2	1	0.0	0.0
-fr	01_solar	2	2	1.0	0.0
+fr	01_solar	2	2	0.0	1.0
 fr	02_wind_on	2	2	0.0	0.0
 fr	03_wind_off	2	2	0.0	0.0
 fr	04_res	2	2	0.0	0.0
@@ -18161,7 +18161,7 @@ fr	06_coal	2	2	0.0	0.0
 fr	07_gas	2	2	0.0	0.0
 fr	08_non-res	2	2	0.0	0.0
 fr	09_hydro_pump	2	2	0.0	0.0
-fr	01_solar	2	3	1.0	0.0
+fr	01_solar	2	3	0.0	1.0
 fr	02_wind_on	2	3	0.0	0.0
 fr	03_wind_off	2	3	0.0	0.0
 fr	04_res	2	3	0.0	0.0
@@ -18170,7 +18170,7 @@ fr	06_coal	2	3	0.0	0.0
 fr	07_gas	2	3	0.0	0.0
 fr	08_non-res	2	3	0.0	0.0
 fr	09_hydro_pump	2	3	0.0	0.0
-fr	01_solar	2	4	1.0	0.0
+fr	01_solar	2	4	0.0	1.0
 fr	02_wind_on	2	4	0.0	0.0
 fr	03_wind_off	2	4	0.0	0.0
 fr	04_res	2	4	0.0	0.0
@@ -18179,7 +18179,7 @@ fr	06_coal	2	4	0.0	0.0
 fr	07_gas	2	4	0.0	0.0
 fr	08_non-res	2	4	0.0	0.0
 fr	09_hydro_pump	2	4	0.0	0.0
-fr	01_solar	2	5	1.0	0.0
+fr	01_solar	2	5	0.0	1.0
 fr	02_wind_on	2	5	0.0	0.0
 fr	03_wind_off	2	5	0.0	0.0
 fr	04_res	2	5	0.0	0.0
@@ -18188,7 +18188,7 @@ fr	06_coal	2	5	0.0	0.0
 fr	07_gas	2	5	0.0	0.0
 fr	08_non-res	2	5	0.0	0.0
 fr	09_hydro_pump	2	5	0.0	0.0
-fr	01_solar	2	6	1.0	0.0
+fr	01_solar	2	6	0.0	1.0
 fr	02_wind_on	2	6	0.0	0.0
 fr	03_wind_off	2	6	0.0	0.0
 fr	04_res	2	6	0.0	0.0
@@ -18197,7 +18197,7 @@ fr	06_coal	2	6	0.0	0.0
 fr	07_gas	2	6	0.0	0.0
 fr	08_non-res	2	6	0.0	0.0
 fr	09_hydro_pump	2	6	0.0	0.0
-fr	01_solar	2	7	1.0	0.0
+fr	01_solar	2	7	0.0	1.0
 fr	02_wind_on	2	7	0.0	0.0
 fr	03_wind_off	2	7	0.0	0.0
 fr	04_res	2	7	0.0	0.0
@@ -18206,7 +18206,7 @@ fr	06_coal	2	7	0.0	0.0
 fr	07_gas	2	7	0.0	0.0
 fr	08_non-res	2	7	0.0	0.0
 fr	09_hydro_pump	2	7	0.0	0.0
-fr	01_solar	2	8	1.0	0.0
+fr	01_solar	2	8	0.0	1.0
 fr	02_wind_on	2	8	0.0	0.0
 fr	03_wind_off	2	8	0.0	0.0
 fr	04_res	2	8	0.0	0.0
@@ -18215,7 +18215,7 @@ fr	06_coal	2	8	0.0	0.0
 fr	07_gas	2	8	0.0	0.0
 fr	08_non-res	2	8	0.0	0.0
 fr	09_hydro_pump	2	8	0.0	0.0
-fr	01_solar	2	9	1.0	0.0
+fr	01_solar	2	9	0.0	1.0
 fr	02_wind_on	2	9	0.0	0.0
 fr	03_wind_off	2	9	0.0	0.0
 fr	04_res	2	9	0.0	0.0
@@ -18224,7 +18224,7 @@ fr	06_coal	2	9	0.0	0.0
 fr	07_gas	2	9	0.0	0.0
 fr	08_non-res	2	9	0.0	0.0
 fr	09_hydro_pump	2	9	0.0	0.0
-fr	01_solar	2	10	1.0	0.0
+fr	01_solar	2	10	0.0	1.0
 fr	02_wind_on	2	10	0.0	0.0
 fr	03_wind_off	2	10	0.0	0.0
 fr	04_res	2	10	0.0	0.0
@@ -18233,7 +18233,7 @@ fr	06_coal	2	10	0.0	0.0
 fr	07_gas	2	10	0.0	0.0
 fr	08_non-res	2	10	0.0	0.0
 fr	09_hydro_pump	2	10	0.0	0.0
-fr	01_solar	2	11	1.0	0.0
+fr	01_solar	2	11	0.0	1.0
 fr	02_wind_on	2	11	0.0	0.0
 fr	03_wind_off	2	11	0.0	0.0
 fr	04_res	2	11	0.0	0.0
@@ -18242,7 +18242,7 @@ fr	06_coal	2	11	0.0	0.0
 fr	07_gas	2	11	0.0	0.0
 fr	08_non-res	2	11	0.0	0.0
 fr	09_hydro_pump	2	11	0.0	0.0
-fr	01_solar	2	12	1.0	0.0
+fr	01_solar	2	12	0.0	1.0
 fr	02_wind_on	2	12	0.0	0.0
 fr	03_wind_off	2	12	0.0	0.0
 fr	04_res	2	12	0.0	0.0
@@ -18251,7 +18251,7 @@ fr	06_coal	2	12	0.0	0.0
 fr	07_gas	2	12	0.0	0.0
 fr	08_non-res	2	12	0.0	0.0
 fr	09_hydro_pump	2	12	0.0	0.0
-fr	01_solar	2	13	1.0	0.0
+fr	01_solar	2	13	0.0	1.0
 fr	02_wind_on	2	13	0.0	0.0
 fr	03_wind_off	2	13	0.0	0.0
 fr	04_res	2	13	0.0	0.0
@@ -18260,7 +18260,7 @@ fr	06_coal	2	13	0.0	0.0
 fr	07_gas	2	13	0.0	0.0
 fr	08_non-res	2	13	0.0	0.0
 fr	09_hydro_pump	2	13	0.0	0.0
-fr	01_solar	2	14	1.0	0.0
+fr	01_solar	2	14	0.0	1.0
 fr	02_wind_on	2	14	0.0	0.0
 fr	03_wind_off	2	14	0.0	0.0
 fr	04_res	2	14	0.0	0.0
@@ -18269,7 +18269,7 @@ fr	06_coal	2	14	0.0	0.0
 fr	07_gas	2	14	0.0	0.0
 fr	08_non-res	2	14	0.0	0.0
 fr	09_hydro_pump	2	14	0.0	0.0
-fr	01_solar	2	15	1.0	0.0
+fr	01_solar	2	15	0.0	1.0
 fr	02_wind_on	2	15	0.0	0.0
 fr	03_wind_off	2	15	0.0	0.0
 fr	04_res	2	15	0.0	0.0
@@ -18278,7 +18278,7 @@ fr	06_coal	2	15	0.0	0.0
 fr	07_gas	2	15	0.0	0.0
 fr	08_non-res	2	15	0.0	0.0
 fr	09_hydro_pump	2	15	0.0	0.0
-fr	01_solar	2	16	1.0	0.0
+fr	01_solar	2	16	0.0	1.0
 fr	02_wind_on	2	16	0.0	0.0
 fr	03_wind_off	2	16	0.0	0.0
 fr	04_res	2	16	0.0	0.0
@@ -18287,7 +18287,7 @@ fr	06_coal	2	16	0.0	0.0
 fr	07_gas	2	16	0.0	0.0
 fr	08_non-res	2	16	0.0	0.0
 fr	09_hydro_pump	2	16	0.0	0.0
-fr	01_solar	2	17	1.0	0.0
+fr	01_solar	2	17	0.0	1.0
 fr	02_wind_on	2	17	0.0	0.0
 fr	03_wind_off	2	17	0.0	0.0
 fr	04_res	2	17	0.0	0.0
@@ -18296,7 +18296,7 @@ fr	06_coal	2	17	0.0	0.0
 fr	07_gas	2	17	0.0	0.0
 fr	08_non-res	2	17	0.0	0.0
 fr	09_hydro_pump	2	17	0.0	0.0
-fr	01_solar	2	18	1.0	0.0
+fr	01_solar	2	18	0.0	1.0
 fr	02_wind_on	2	18	0.0	0.0
 fr	03_wind_off	2	18	0.0	0.0
 fr	04_res	2	18	0.0	0.0
@@ -18305,7 +18305,7 @@ fr	06_coal	2	18	0.0	0.0
 fr	07_gas	2	18	0.0	0.0
 fr	08_non-res	2	18	0.0	0.0
 fr	09_hydro_pump	2	18	0.0	0.0
-fr	01_solar	2	19	1.0	0.0
+fr	01_solar	2	19	0.0	1.0
 fr	02_wind_on	2	19	0.0	0.0
 fr	03_wind_off	2	19	0.0	0.0
 fr	04_res	2	19	0.0	0.0
@@ -18314,7 +18314,7 @@ fr	06_coal	2	19	0.0	0.0
 fr	07_gas	2	19	0.0	0.0
 fr	08_non-res	2	19	0.0	0.0
 fr	09_hydro_pump	2	19	0.0	0.0
-fr	01_solar	2	20	1.0	0.0
+fr	01_solar	2	20	0.0	1.0
 fr	02_wind_on	2	20	0.0	0.0
 fr	03_wind_off	2	20	0.0	0.0
 fr	04_res	2	20	0.0	0.0
@@ -18323,7 +18323,7 @@ fr	06_coal	2	20	0.0	0.0
 fr	07_gas	2	20	0.0	0.0
 fr	08_non-res	2	20	0.0	0.0
 fr	09_hydro_pump	2	20	0.0	0.0
-fr	01_solar	2	21	1.0	0.0
+fr	01_solar	2	21	0.0	1.0
 fr	02_wind_on	2	21	0.0	0.0
 fr	03_wind_off	2	21	0.0	0.0
 fr	04_res	2	21	0.0	0.0
@@ -18332,8 +18332,8 @@ fr	06_coal	2	21	0.0	0.0
 fr	07_gas	2	21	0.0	0.0
 fr	08_non-res	2	21	0.0	0.0
 fr	09_hydro_pump	2	21	0.0	0.0
-fr	01_solar	2	22	1.0	0.0
-fr	02_wind_on	2	22	1.0	0.0
+fr	01_solar	2	22	0.0	1.0
+fr	02_wind_on	2	22	0.0	1.0
 fr	03_wind_off	2	22	0.0	0.0
 fr	04_res	2	22	0.0	0.0
 fr	05_nuclear	2	22	0.0	0.0
@@ -18341,8 +18341,8 @@ fr	06_coal	2	22	0.0	0.0
 fr	07_gas	2	22	0.0	0.0
 fr	08_non-res	2	22	0.0	0.0
 fr	09_hydro_pump	2	22	0.0	0.0
-fr	01_solar	2	23	1.0	0.0
-fr	02_wind_on	2	23	1.0	0.0
+fr	01_solar	2	23	0.0	1.0
+fr	02_wind_on	2	23	0.0	1.0
 fr	03_wind_off	2	23	0.0	0.0
 fr	04_res	2	23	0.0	0.0
 fr	05_nuclear	2	23	0.0	0.0
@@ -18350,8 +18350,8 @@ fr	06_coal	2	23	0.0	0.0
 fr	07_gas	2	23	0.0	0.0
 fr	08_non-res	2	23	0.0	0.0
 fr	09_hydro_pump	2	23	0.0	0.0
-fr	01_solar	2	24	1.0	0.0
-fr	02_wind_on	2	24	1.0	0.0
+fr	01_solar	2	24	0.0	1.0
+fr	02_wind_on	2	24	0.0	1.0
 fr	03_wind_off	2	24	0.0	0.0
 fr	04_res	2	24	0.0	0.0
 fr	05_nuclear	2	24	0.0	0.0
@@ -18359,8 +18359,8 @@ fr	06_coal	2	24	0.0	0.0
 fr	07_gas	2	24	0.0	0.0
 fr	08_non-res	2	24	0.0	0.0
 fr	09_hydro_pump	2	24	0.0	0.0
-fr	01_solar	2	25	1.0	0.0
-fr	02_wind_on	2	25	1.0	0.0
+fr	01_solar	2	25	0.0	1.0
+fr	02_wind_on	2	25	0.0	1.0
 fr	03_wind_off	2	25	0.0	0.0
 fr	04_res	2	25	0.0	0.0
 fr	05_nuclear	2	25	0.0	0.0
@@ -18368,8 +18368,8 @@ fr	06_coal	2	25	0.0	0.0
 fr	07_gas	2	25	0.0	0.0
 fr	08_non-res	2	25	0.0	0.0
 fr	09_hydro_pump	2	25	0.0	0.0
-fr	01_solar	2	26	1.0	0.0
-fr	02_wind_on	2	26	1.0	0.0
+fr	01_solar	2	26	0.0	1.0
+fr	02_wind_on	2	26	0.0	1.0
 fr	03_wind_off	2	26	0.0	0.0
 fr	04_res	2	26	0.0	0.0
 fr	05_nuclear	2	26	0.0	0.0
@@ -18377,8 +18377,8 @@ fr	06_coal	2	26	0.0	0.0
 fr	07_gas	2	26	0.0	0.0
 fr	08_non-res	2	26	0.0	0.0
 fr	09_hydro_pump	2	26	0.0	0.0
-fr	01_solar	2	27	1.0	0.0
-fr	02_wind_on	2	27	1.0	0.0
+fr	01_solar	2	27	0.0	1.0
+fr	02_wind_on	2	27	0.0	1.0
 fr	03_wind_off	2	27	0.0	0.0
 fr	04_res	2	27	0.0	0.0
 fr	05_nuclear	2	27	0.0	0.0
@@ -18386,8 +18386,8 @@ fr	06_coal	2	27	0.0	0.0
 fr	07_gas	2	27	0.0	0.0
 fr	08_non-res	2	27	0.0	0.0
 fr	09_hydro_pump	2	27	0.0	0.0
-fr	01_solar	2	28	1.0	0.0
-fr	02_wind_on	2	28	1.0	0.0
+fr	01_solar	2	28	0.0	1.0
+fr	02_wind_on	2	28	0.0	1.0
 fr	03_wind_off	2	28	0.0	0.0
 fr	04_res	2	28	0.0	0.0
 fr	05_nuclear	2	28	0.0	0.0
@@ -18395,8 +18395,8 @@ fr	06_coal	2	28	0.0	0.0
 fr	07_gas	2	28	0.0	0.0
 fr	08_non-res	2	28	0.0	0.0
 fr	09_hydro_pump	2	28	0.0	0.0
-fr	01_solar	2	29	1.0	0.0
-fr	02_wind_on	2	29	1.0	0.0
+fr	01_solar	2	29	0.0	1.0
+fr	02_wind_on	2	29	0.0	1.0
 fr	03_wind_off	2	29	0.0	0.0
 fr	04_res	2	29	0.0	0.0
 fr	05_nuclear	2	29	0.0	0.0
@@ -18404,8 +18404,8 @@ fr	06_coal	2	29	0.0	0.0
 fr	07_gas	2	29	0.0	0.0
 fr	08_non-res	2	29	0.0	0.0
 fr	09_hydro_pump	2	29	0.0	0.0
-fr	01_solar	2	30	1.0	0.0
-fr	02_wind_on	2	30	1.0	0.0
+fr	01_solar	2	30	0.0	1.0
+fr	02_wind_on	2	30	0.0	1.0
 fr	03_wind_off	2	30	0.0	0.0
 fr	04_res	2	30	0.0	0.0
 fr	05_nuclear	2	30	0.0	0.0
@@ -18413,8 +18413,8 @@ fr	06_coal	2	30	0.0	0.0
 fr	07_gas	2	30	0.0	0.0
 fr	08_non-res	2	30	0.0	0.0
 fr	09_hydro_pump	2	30	0.0	0.0
-fr	01_solar	2	31	1.0	0.0
-fr	02_wind_on	2	31	1.0	0.0
+fr	01_solar	2	31	0.0	1.0
+fr	02_wind_on	2	31	0.0	1.0
 fr	03_wind_off	2	31	0.0	0.0
 fr	04_res	2	31	0.0	0.0
 fr	05_nuclear	2	31	0.0	0.0
@@ -18422,8 +18422,8 @@ fr	06_coal	2	31	0.0	0.0
 fr	07_gas	2	31	0.0	0.0
 fr	08_non-res	2	31	0.0	0.0
 fr	09_hydro_pump	2	31	0.0	0.0
-fr	01_solar	2	32	1.0	0.0
-fr	02_wind_on	2	32	1.0	0.0
+fr	01_solar	2	32	0.0	1.0
+fr	02_wind_on	2	32	0.0	1.0
 fr	03_wind_off	2	32	0.0	0.0
 fr	04_res	2	32	0.0	0.0
 fr	05_nuclear	2	32	0.0	0.0
@@ -18431,8 +18431,8 @@ fr	06_coal	2	32	0.0	0.0
 fr	07_gas	2	32	0.0	0.0
 fr	08_non-res	2	32	0.0	0.0
 fr	09_hydro_pump	2	32	0.0	0.0
-fr	01_solar	2	33	1.0	0.0
-fr	02_wind_on	2	33	1.0	0.0
+fr	01_solar	2	33	0.0	1.0
+fr	02_wind_on	2	33	0.0	1.0
 fr	03_wind_off	2	33	0.0	0.0
 fr	04_res	2	33	0.0	0.0
 fr	05_nuclear	2	33	0.0	0.0
@@ -18440,8 +18440,8 @@ fr	06_coal	2	33	0.0	0.0
 fr	07_gas	2	33	0.0	0.0
 fr	08_non-res	2	33	0.0	0.0
 fr	09_hydro_pump	2	33	0.0	0.0
-fr	01_solar	2	34	1.0	0.0
-fr	02_wind_on	2	34	1.0	0.0
+fr	01_solar	2	34	0.0	1.0
+fr	02_wind_on	2	34	0.0	1.0
 fr	03_wind_off	2	34	0.0	0.0
 fr	04_res	2	34	0.0	0.0
 fr	05_nuclear	2	34	0.0	0.0
@@ -18449,8 +18449,8 @@ fr	06_coal	2	34	0.0	0.0
 fr	07_gas	2	34	0.0	0.0
 fr	08_non-res	2	34	0.0	0.0
 fr	09_hydro_pump	2	34	0.0	0.0
-fr	01_solar	2	35	1.0	0.0
-fr	02_wind_on	2	35	1.0	0.0
+fr	01_solar	2	35	0.0	1.0
+fr	02_wind_on	2	35	0.0	1.0
 fr	03_wind_off	2	35	0.0	0.0
 fr	04_res	2	35	0.0	0.0
 fr	05_nuclear	2	35	0.0	0.0
@@ -18458,8 +18458,8 @@ fr	06_coal	2	35	0.0	0.0
 fr	07_gas	2	35	0.0	0.0
 fr	08_non-res	2	35	0.0	0.0
 fr	09_hydro_pump	2	35	0.0	0.0
-fr	01_solar	2	36	1.0	0.0
-fr	02_wind_on	2	36	1.0	0.0
+fr	01_solar	2	36	0.0	1.0
+fr	02_wind_on	2	36	0.0	1.0
 fr	03_wind_off	2	36	0.0	0.0
 fr	04_res	2	36	0.0	0.0
 fr	05_nuclear	2	36	0.0	0.0
@@ -18467,8 +18467,8 @@ fr	06_coal	2	36	0.0	0.0
 fr	07_gas	2	36	0.0	0.0
 fr	08_non-res	2	36	0.0	0.0
 fr	09_hydro_pump	2	36	0.0	0.0
-fr	01_solar	2	37	1.0	0.0
-fr	02_wind_on	2	37	1.0	0.0
+fr	01_solar	2	37	0.0	1.0
+fr	02_wind_on	2	37	0.0	1.0
 fr	03_wind_off	2	37	0.0	0.0
 fr	04_res	2	37	0.0	0.0
 fr	05_nuclear	2	37	0.0	0.0
@@ -18476,8 +18476,8 @@ fr	06_coal	2	37	0.0	0.0
 fr	07_gas	2	37	0.0	0.0
 fr	08_non-res	2	37	0.0	0.0
 fr	09_hydro_pump	2	37	0.0	0.0
-fr	01_solar	2	38	1.0	0.0
-fr	02_wind_on	2	38	1.0	0.0
+fr	01_solar	2	38	0.0	1.0
+fr	02_wind_on	2	38	0.0	1.0
 fr	03_wind_off	2	38	0.0	0.0
 fr	04_res	2	38	0.0	0.0
 fr	05_nuclear	2	38	0.0	0.0
@@ -18485,8 +18485,8 @@ fr	06_coal	2	38	0.0	0.0
 fr	07_gas	2	38	0.0	0.0
 fr	08_non-res	2	38	0.0	0.0
 fr	09_hydro_pump	2	38	0.0	0.0
-fr	01_solar	2	39	1.0	0.0
-fr	02_wind_on	2	39	1.0	0.0
+fr	01_solar	2	39	0.0	1.0
+fr	02_wind_on	2	39	0.0	1.0
 fr	03_wind_off	2	39	0.0	0.0
 fr	04_res	2	39	0.0	0.0
 fr	05_nuclear	2	39	0.0	0.0
@@ -18494,8 +18494,8 @@ fr	06_coal	2	39	0.0	0.0
 fr	07_gas	2	39	0.0	0.0
 fr	08_non-res	2	39	0.0	0.0
 fr	09_hydro_pump	2	39	0.0	0.0
-fr	01_solar	2	40	1.0	0.0
-fr	02_wind_on	2	40	1.0	0.0
+fr	01_solar	2	40	0.0	1.0
+fr	02_wind_on	2	40	0.0	1.0
 fr	03_wind_off	2	40	0.0	0.0
 fr	04_res	2	40	0.0	0.0
 fr	05_nuclear	2	40	0.0	0.0
@@ -18503,8 +18503,8 @@ fr	06_coal	2	40	0.0	0.0
 fr	07_gas	2	40	0.0	0.0
 fr	08_non-res	2	40	0.0	0.0
 fr	09_hydro_pump	2	40	0.0	0.0
-fr	01_solar	2	41	1.0	0.0
-fr	02_wind_on	2	41	1.0	0.0
+fr	01_solar	2	41	0.0	1.0
+fr	02_wind_on	2	41	0.0	1.0
 fr	03_wind_off	2	41	0.0	0.0
 fr	04_res	2	41	0.0	0.0
 fr	05_nuclear	2	41	0.0	0.0
@@ -18512,1149 +18512,1149 @@ fr	06_coal	2	41	0.0	0.0
 fr	07_gas	2	41	0.0	0.0
 fr	08_non-res	2	41	0.0	0.0
 fr	09_hydro_pump	2	41	0.0	0.0
-fr	01_solar	2	42	1.0	0.0
-fr	02_wind_on	2	42	1.0	0.0
-fr	03_wind_off	2	42	1.0	0.0
+fr	01_solar	2	42	0.0	1.0
+fr	02_wind_on	2	42	0.0	1.0
+fr	03_wind_off	2	42	0.0	1.0
 fr	04_res	2	42	0.0	0.0
 fr	05_nuclear	2	42	0.0	0.0
 fr	06_coal	2	42	0.0	0.0
 fr	07_gas	2	42	0.0	0.0
 fr	08_non-res	2	42	0.0	0.0
 fr	09_hydro_pump	2	42	0.0	0.0
-fr	01_solar	2	43	1.0	0.0
-fr	02_wind_on	2	43	1.0	0.0
-fr	03_wind_off	2	43	1.0	0.0
+fr	01_solar	2	43	0.0	1.0
+fr	02_wind_on	2	43	0.0	1.0
+fr	03_wind_off	2	43	0.0	1.0
 fr	04_res	2	43	0.0	0.0
 fr	05_nuclear	2	43	0.0	0.0
 fr	06_coal	2	43	0.0	0.0
 fr	07_gas	2	43	0.0	0.0
 fr	08_non-res	2	43	0.0	0.0
 fr	09_hydro_pump	2	43	0.0	0.0
-fr	01_solar	2	44	1.0	0.0
-fr	02_wind_on	2	44	1.0	0.0
-fr	03_wind_off	2	44	1.0	0.0
+fr	01_solar	2	44	0.0	1.0
+fr	02_wind_on	2	44	0.0	1.0
+fr	03_wind_off	2	44	0.0	1.0
 fr	04_res	2	44	0.0	0.0
 fr	05_nuclear	2	44	0.0	0.0
 fr	06_coal	2	44	0.0	0.0
 fr	07_gas	2	44	0.0	0.0
 fr	08_non-res	2	44	0.0	0.0
 fr	09_hydro_pump	2	44	0.0	0.0
-fr	01_solar	2	45	1.0	0.0
-fr	02_wind_on	2	45	1.0	0.0
-fr	03_wind_off	2	45	1.0	0.0
+fr	01_solar	2	45	0.0	1.0
+fr	02_wind_on	2	45	0.0	1.0
+fr	03_wind_off	2	45	0.0	1.0
 fr	04_res	2	45	0.0	0.0
 fr	05_nuclear	2	45	0.0	0.0
 fr	06_coal	2	45	0.0	0.0
 fr	07_gas	2	45	0.0	0.0
 fr	08_non-res	2	45	0.0	0.0
 fr	09_hydro_pump	2	45	0.0	0.0
-fr	01_solar	2	46	1.0	0.0
-fr	02_wind_on	2	46	1.0	0.0
-fr	03_wind_off	2	46	1.0	0.0
+fr	01_solar	2	46	0.0	1.0
+fr	02_wind_on	2	46	0.0	1.0
+fr	03_wind_off	2	46	0.0	1.0
 fr	04_res	2	46	0.0	0.0
 fr	05_nuclear	2	46	0.0	0.0
 fr	06_coal	2	46	0.0	0.0
 fr	07_gas	2	46	0.0	0.0
 fr	08_non-res	2	46	0.0	0.0
 fr	09_hydro_pump	2	46	0.0	0.0
-fr	01_solar	2	47	1.0	0.0
-fr	02_wind_on	2	47	1.0	0.0
-fr	03_wind_off	2	47	1.0	0.0
+fr	01_solar	2	47	0.0	1.0
+fr	02_wind_on	2	47	0.0	1.0
+fr	03_wind_off	2	47	0.0	1.0
 fr	04_res	2	47	0.0	0.0
 fr	05_nuclear	2	47	0.0	0.0
 fr	06_coal	2	47	0.0	0.0
 fr	07_gas	2	47	0.0	0.0
 fr	08_non-res	2	47	0.0	0.0
 fr	09_hydro_pump	2	47	0.0	0.0
-fr	01_solar	2	48	1.0	0.0
-fr	02_wind_on	2	48	1.0	0.0
-fr	03_wind_off	2	48	1.0	0.0
+fr	01_solar	2	48	0.0	1.0
+fr	02_wind_on	2	48	0.0	1.0
+fr	03_wind_off	2	48	0.0	1.0
 fr	04_res	2	48	0.0	0.0
 fr	05_nuclear	2	48	0.0	0.0
 fr	06_coal	2	48	0.0	0.0
 fr	07_gas	2	48	0.0	0.0
 fr	08_non-res	2	48	0.0	0.0
 fr	09_hydro_pump	2	48	0.0	0.0
-fr	01_solar	2	49	1.0	0.0
-fr	02_wind_on	2	49	1.0	0.0
-fr	03_wind_off	2	49	1.0	0.0
+fr	01_solar	2	49	0.0	1.0
+fr	02_wind_on	2	49	0.0	1.0
+fr	03_wind_off	2	49	0.0	1.0
 fr	04_res	2	49	0.0	0.0
 fr	05_nuclear	2	49	0.0	0.0
 fr	06_coal	2	49	0.0	0.0
 fr	07_gas	2	49	0.0	0.0
 fr	08_non-res	2	49	0.0	0.0
 fr	09_hydro_pump	2	49	0.0	0.0
-fr	01_solar	2	50	1.0	0.0
-fr	02_wind_on	2	50	1.0	0.0
-fr	03_wind_off	2	50	1.0	0.0
+fr	01_solar	2	50	0.0	1.0
+fr	02_wind_on	2	50	0.0	1.0
+fr	03_wind_off	2	50	0.0	1.0
 fr	04_res	2	50	0.0	0.0
 fr	05_nuclear	2	50	0.0	0.0
 fr	06_coal	2	50	0.0	0.0
 fr	07_gas	2	50	0.0	0.0
 fr	08_non-res	2	50	0.0	0.0
 fr	09_hydro_pump	2	50	0.0	0.0
-fr	01_solar	2	51	1.0	0.0
-fr	02_wind_on	2	51	1.0	0.0
-fr	03_wind_off	2	51	1.0	0.0
+fr	01_solar	2	51	0.0	1.0
+fr	02_wind_on	2	51	0.0	1.0
+fr	03_wind_off	2	51	0.0	1.0
 fr	04_res	2	51	0.0	0.0
 fr	05_nuclear	2	51	0.0	0.0
 fr	06_coal	2	51	0.0	0.0
 fr	07_gas	2	51	0.0	0.0
 fr	08_non-res	2	51	0.0	0.0
 fr	09_hydro_pump	2	51	0.0	0.0
-fr	01_solar	2	52	1.0	0.0
-fr	02_wind_on	2	52	1.0	0.0
-fr	03_wind_off	2	52	1.0	0.0
+fr	01_solar	2	52	0.0	1.0
+fr	02_wind_on	2	52	0.0	1.0
+fr	03_wind_off	2	52	0.0	1.0
 fr	04_res	2	52	0.0	0.0
 fr	05_nuclear	2	52	0.0	0.0
 fr	06_coal	2	52	0.0	0.0
 fr	07_gas	2	52	0.0	0.0
 fr	08_non-res	2	52	0.0	0.0
 fr	09_hydro_pump	2	52	0.0	0.0
-fr	01_solar	2	53	1.0	0.0
-fr	02_wind_on	2	53	1.0	0.0
-fr	03_wind_off	2	53	1.0	0.0
+fr	01_solar	2	53	0.0	1.0
+fr	02_wind_on	2	53	0.0	1.0
+fr	03_wind_off	2	53	0.0	1.0
 fr	04_res	2	53	0.0	0.0
 fr	05_nuclear	2	53	0.0	0.0
 fr	06_coal	2	53	0.0	0.0
 fr	07_gas	2	53	0.0	0.0
 fr	08_non-res	2	53	0.0	0.0
 fr	09_hydro_pump	2	53	0.0	0.0
-fr	01_solar	2	54	1.0	0.0
-fr	02_wind_on	2	54	1.0	0.0
-fr	03_wind_off	2	54	1.0	0.0
+fr	01_solar	2	54	0.0	1.0
+fr	02_wind_on	2	54	0.0	1.0
+fr	03_wind_off	2	54	0.0	1.0
 fr	04_res	2	54	0.0	0.0
 fr	05_nuclear	2	54	0.0	0.0
 fr	06_coal	2	54	0.0	0.0
 fr	07_gas	2	54	0.0	0.0
 fr	08_non-res	2	54	0.0	0.0
 fr	09_hydro_pump	2	54	0.0	0.0
-fr	01_solar	2	55	1.0	0.0
-fr	02_wind_on	2	55	1.0	0.0
-fr	03_wind_off	2	55	1.0	0.0
+fr	01_solar	2	55	0.0	1.0
+fr	02_wind_on	2	55	0.0	1.0
+fr	03_wind_off	2	55	0.0	1.0
 fr	04_res	2	55	0.0	0.0
 fr	05_nuclear	2	55	0.0	0.0
 fr	06_coal	2	55	0.0	0.0
 fr	07_gas	2	55	0.0	0.0
 fr	08_non-res	2	55	0.0	0.0
 fr	09_hydro_pump	2	55	0.0	0.0
-fr	01_solar	2	56	1.0	0.0
-fr	02_wind_on	2	56	1.0	0.0
-fr	03_wind_off	2	56	1.0	0.0
+fr	01_solar	2	56	0.0	1.0
+fr	02_wind_on	2	56	0.0	1.0
+fr	03_wind_off	2	56	0.0	1.0
 fr	04_res	2	56	0.0	0.0
 fr	05_nuclear	2	56	0.0	0.0
 fr	06_coal	2	56	0.0	0.0
 fr	07_gas	2	56	0.0	0.0
 fr	08_non-res	2	56	0.0	0.0
 fr	09_hydro_pump	2	56	0.0	0.0
-fr	01_solar	2	57	1.0	0.0
-fr	02_wind_on	2	57	1.0	0.0
-fr	03_wind_off	2	57	1.0	0.0
+fr	01_solar	2	57	0.0	1.0
+fr	02_wind_on	2	57	0.0	1.0
+fr	03_wind_off	2	57	0.0	1.0
 fr	04_res	2	57	0.0	0.0
 fr	05_nuclear	2	57	0.0	0.0
 fr	06_coal	2	57	0.0	0.0
 fr	07_gas	2	57	0.0	0.0
 fr	08_non-res	2	57	0.0	0.0
 fr	09_hydro_pump	2	57	0.0	0.0
-fr	01_solar	2	58	1.0	0.0
-fr	02_wind_on	2	58	1.0	0.0
-fr	03_wind_off	2	58	1.0	0.0
+fr	01_solar	2	58	0.0	1.0
+fr	02_wind_on	2	58	0.0	1.0
+fr	03_wind_off	2	58	0.0	1.0
 fr	04_res	2	58	0.0	0.0
 fr	05_nuclear	2	58	0.0	0.0
 fr	06_coal	2	58	0.0	0.0
 fr	07_gas	2	58	0.0	0.0
 fr	08_non-res	2	58	0.0	0.0
 fr	09_hydro_pump	2	58	0.0	0.0
-fr	01_solar	2	59	1.0	0.0
-fr	02_wind_on	2	59	1.0	0.0
-fr	03_wind_off	2	59	1.0	0.0
+fr	01_solar	2	59	0.0	1.0
+fr	02_wind_on	2	59	0.0	1.0
+fr	03_wind_off	2	59	0.0	1.0
 fr	04_res	2	59	0.0	0.0
 fr	05_nuclear	2	59	0.0	0.0
 fr	06_coal	2	59	0.0	0.0
 fr	07_gas	2	59	0.0	0.0
 fr	08_non-res	2	59	0.0	0.0
 fr	09_hydro_pump	2	59	0.0	0.0
-fr	01_solar	2	60	1.0	0.0
-fr	02_wind_on	2	60	1.0	0.0
-fr	03_wind_off	2	60	1.0	0.0
+fr	01_solar	2	60	0.0	1.0
+fr	02_wind_on	2	60	0.0	1.0
+fr	03_wind_off	2	60	0.0	1.0
 fr	04_res	2	60	0.0	0.0
 fr	05_nuclear	2	60	0.0	0.0
 fr	06_coal	2	60	0.0	0.0
 fr	07_gas	2	60	0.0	0.0
 fr	08_non-res	2	60	0.0	0.0
 fr	09_hydro_pump	2	60	0.0	0.0
-fr	01_solar	2	61	1.0	0.0
-fr	02_wind_on	2	61	1.0	0.0
-fr	03_wind_off	2	61	1.0	0.0
+fr	01_solar	2	61	0.0	1.0
+fr	02_wind_on	2	61	0.0	1.0
+fr	03_wind_off	2	61	0.0	1.0
 fr	04_res	2	61	0.0	0.0
 fr	05_nuclear	2	61	0.0	0.0
 fr	06_coal	2	61	0.0	0.0
 fr	07_gas	2	61	0.0	0.0
 fr	08_non-res	2	61	0.0	0.0
 fr	09_hydro_pump	2	61	0.0	0.0
-fr	01_solar	2	62	1.0	0.0
-fr	02_wind_on	2	62	1.0	0.0
-fr	03_wind_off	2	62	1.0	0.0
-fr	04_res	2	62	1.0	0.0
+fr	01_solar	2	62	0.0	1.0
+fr	02_wind_on	2	62	0.0	1.0
+fr	03_wind_off	2	62	0.0	1.0
+fr	04_res	2	62	0.0	1.0
 fr	05_nuclear	2	62	0.0	0.0
 fr	06_coal	2	62	0.0	0.0
 fr	07_gas	2	62	0.0	0.0
 fr	08_non-res	2	62	0.0	0.0
 fr	09_hydro_pump	2	62	0.0	0.0
-fr	01_solar	2	63	1.0	0.0
-fr	02_wind_on	2	63	1.0	0.0
-fr	03_wind_off	2	63	1.0	0.0
-fr	04_res	2	63	1.0	0.0
+fr	01_solar	2	63	0.0	1.0
+fr	02_wind_on	2	63	0.0	1.0
+fr	03_wind_off	2	63	0.0	1.0
+fr	04_res	2	63	0.0	1.0
 fr	05_nuclear	2	63	0.0	0.0
 fr	06_coal	2	63	0.0	0.0
 fr	07_gas	2	63	0.0	0.0
 fr	08_non-res	2	63	0.0	0.0
 fr	09_hydro_pump	2	63	0.0	0.0
-fr	01_solar	2	64	1.0	0.0
-fr	02_wind_on	2	64	1.0	0.0
-fr	03_wind_off	2	64	1.0	0.0
-fr	04_res	2	64	1.0	0.0
+fr	01_solar	2	64	0.0	1.0
+fr	02_wind_on	2	64	0.0	1.0
+fr	03_wind_off	2	64	0.0	1.0
+fr	04_res	2	64	0.0	1.0
 fr	05_nuclear	2	64	0.0	0.0
 fr	06_coal	2	64	0.0	0.0
 fr	07_gas	2	64	0.0	0.0
 fr	08_non-res	2	64	0.0	0.0
 fr	09_hydro_pump	2	64	0.0	0.0
-fr	01_solar	2	65	1.0	0.0
-fr	02_wind_on	2	65	1.0	0.0
-fr	03_wind_off	2	65	1.0	0.0
-fr	04_res	2	65	1.0	0.0
+fr	01_solar	2	65	0.0	1.0
+fr	02_wind_on	2	65	0.0	1.0
+fr	03_wind_off	2	65	0.0	1.0
+fr	04_res	2	65	0.0	1.0
 fr	05_nuclear	2	65	0.0	0.0
 fr	06_coal	2	65	0.0	0.0
 fr	07_gas	2	65	0.0	0.0
 fr	08_non-res	2	65	0.0	0.0
 fr	09_hydro_pump	2	65	0.0	0.0
-fr	01_solar	2	66	1.0	0.0
-fr	02_wind_on	2	66	1.0	0.0
-fr	03_wind_off	2	66	1.0	0.0
-fr	04_res	2	66	1.0	0.0
+fr	01_solar	2	66	0.0	1.0
+fr	02_wind_on	2	66	0.0	1.0
+fr	03_wind_off	2	66	0.0	1.0
+fr	04_res	2	66	0.0	1.0
 fr	05_nuclear	2	66	0.0	0.0
 fr	06_coal	2	66	0.0	0.0
 fr	07_gas	2	66	0.0	0.0
 fr	08_non-res	2	66	0.0	0.0
 fr	09_hydro_pump	2	66	0.0	0.0
-fr	01_solar	2	67	1.0	0.0
-fr	02_wind_on	2	67	1.0	0.0
-fr	03_wind_off	2	67	1.0	0.0
-fr	04_res	2	67	1.0	0.0
+fr	01_solar	2	67	0.0	1.0
+fr	02_wind_on	2	67	0.0	1.0
+fr	03_wind_off	2	67	0.0	1.0
+fr	04_res	2	67	0.0	1.0
 fr	05_nuclear	2	67	0.0	0.0
 fr	06_coal	2	67	0.0	0.0
 fr	07_gas	2	67	0.0	0.0
 fr	08_non-res	2	67	0.0	0.0
 fr	09_hydro_pump	2	67	0.0	0.0
-fr	01_solar	2	68	1.0	0.0
-fr	02_wind_on	2	68	1.0	0.0
-fr	03_wind_off	2	68	1.0	0.0
-fr	04_res	2	68	1.0	0.0
+fr	01_solar	2	68	0.0	1.0
+fr	02_wind_on	2	68	0.0	1.0
+fr	03_wind_off	2	68	0.0	1.0
+fr	04_res	2	68	0.0	1.0
 fr	05_nuclear	2	68	0.0	0.0
 fr	06_coal	2	68	0.0	0.0
 fr	07_gas	2	68	0.0	0.0
 fr	08_non-res	2	68	0.0	0.0
 fr	09_hydro_pump	2	68	0.0	0.0
-fr	01_solar	2	69	1.0	0.0
-fr	02_wind_on	2	69	1.0	0.0
-fr	03_wind_off	2	69	1.0	0.0
-fr	04_res	2	69	1.0	0.0
+fr	01_solar	2	69	0.0	1.0
+fr	02_wind_on	2	69	0.0	1.0
+fr	03_wind_off	2	69	0.0	1.0
+fr	04_res	2	69	0.0	1.0
 fr	05_nuclear	2	69	0.0	0.0
 fr	06_coal	2	69	0.0	0.0
 fr	07_gas	2	69	0.0	0.0
 fr	08_non-res	2	69	0.0	0.0
 fr	09_hydro_pump	2	69	0.0	0.0
-fr	01_solar	2	70	1.0	0.0
-fr	02_wind_on	2	70	1.0	0.0
-fr	03_wind_off	2	70	1.0	0.0
-fr	04_res	2	70	1.0	0.0
+fr	01_solar	2	70	0.0	1.0
+fr	02_wind_on	2	70	0.0	1.0
+fr	03_wind_off	2	70	0.0	1.0
+fr	04_res	2	70	0.0	1.0
 fr	05_nuclear	2	70	0.0	0.0
 fr	06_coal	2	70	0.0	0.0
 fr	07_gas	2	70	0.0	0.0
 fr	08_non-res	2	70	0.0	0.0
 fr	09_hydro_pump	2	70	0.0	0.0
-fr	01_solar	2	71	1.0	0.0
-fr	02_wind_on	2	71	1.0	0.0
-fr	03_wind_off	2	71	1.0	0.0
-fr	04_res	2	71	1.0	0.0
+fr	01_solar	2	71	0.0	1.0
+fr	02_wind_on	2	71	0.0	1.0
+fr	03_wind_off	2	71	0.0	1.0
+fr	04_res	2	71	0.0	1.0
 fr	05_nuclear	2	71	0.0	0.0
 fr	06_coal	2	71	0.0	0.0
 fr	07_gas	2	71	0.0	0.0
 fr	08_non-res	2	71	0.0	0.0
 fr	09_hydro_pump	2	71	0.0	0.0
-fr	01_solar	2	72	1.0	0.0
-fr	02_wind_on	2	72	1.0	0.0
-fr	03_wind_off	2	72	1.0	0.0
-fr	04_res	2	72	1.0	0.0
+fr	01_solar	2	72	0.0	1.0
+fr	02_wind_on	2	72	0.0	1.0
+fr	03_wind_off	2	72	0.0	1.0
+fr	04_res	2	72	0.0	1.0
 fr	05_nuclear	2	72	0.0	0.0
 fr	06_coal	2	72	0.0	0.0
 fr	07_gas	2	72	0.0	0.0
 fr	08_non-res	2	72	0.0	0.0
 fr	09_hydro_pump	2	72	0.0	0.0
-fr	01_solar	2	73	1.0	0.0
-fr	02_wind_on	2	73	1.0	0.0
-fr	03_wind_off	2	73	1.0	0.0
-fr	04_res	2	73	1.0	0.0
+fr	01_solar	2	73	0.0	1.0
+fr	02_wind_on	2	73	0.0	1.0
+fr	03_wind_off	2	73	0.0	1.0
+fr	04_res	2	73	0.0	1.0
 fr	05_nuclear	2	73	0.0	0.0
 fr	06_coal	2	73	0.0	0.0
 fr	07_gas	2	73	0.0	0.0
 fr	08_non-res	2	73	0.0	0.0
 fr	09_hydro_pump	2	73	0.0	0.0
-fr	01_solar	2	74	1.0	0.0
-fr	02_wind_on	2	74	1.0	0.0
-fr	03_wind_off	2	74	1.0	0.0
-fr	04_res	2	74	1.0	0.0
+fr	01_solar	2	74	0.0	1.0
+fr	02_wind_on	2	74	0.0	1.0
+fr	03_wind_off	2	74	0.0	1.0
+fr	04_res	2	74	0.0	1.0
 fr	05_nuclear	2	74	0.0	0.0
 fr	06_coal	2	74	0.0	0.0
 fr	07_gas	2	74	0.0	0.0
 fr	08_non-res	2	74	0.0	0.0
 fr	09_hydro_pump	2	74	0.0	0.0
-fr	01_solar	2	75	1.0	0.0
-fr	02_wind_on	2	75	1.0	0.0
-fr	03_wind_off	2	75	1.0	0.0
-fr	04_res	2	75	1.0	0.0
+fr	01_solar	2	75	0.0	1.0
+fr	02_wind_on	2	75	0.0	1.0
+fr	03_wind_off	2	75	0.0	1.0
+fr	04_res	2	75	0.0	1.0
 fr	05_nuclear	2	75	0.0	0.0
 fr	06_coal	2	75	0.0	0.0
 fr	07_gas	2	75	0.0	0.0
 fr	08_non-res	2	75	0.0	0.0
 fr	09_hydro_pump	2	75	0.0	0.0
-fr	01_solar	2	76	1.0	0.0
-fr	02_wind_on	2	76	1.0	0.0
-fr	03_wind_off	2	76	1.0	0.0
-fr	04_res	2	76	1.0	0.0
+fr	01_solar	2	76	0.0	1.0
+fr	02_wind_on	2	76	0.0	1.0
+fr	03_wind_off	2	76	0.0	1.0
+fr	04_res	2	76	0.0	1.0
 fr	05_nuclear	2	76	0.0	0.0
 fr	06_coal	2	76	0.0	0.0
 fr	07_gas	2	76	0.0	0.0
 fr	08_non-res	2	76	0.0	0.0
 fr	09_hydro_pump	2	76	0.0	0.0
-fr	01_solar	2	77	1.0	0.0
-fr	02_wind_on	2	77	1.0	0.0
-fr	03_wind_off	2	77	1.0	0.0
-fr	04_res	2	77	1.0	0.0
+fr	01_solar	2	77	0.0	1.0
+fr	02_wind_on	2	77	0.0	1.0
+fr	03_wind_off	2	77	0.0	1.0
+fr	04_res	2	77	0.0	1.0
 fr	05_nuclear	2	77	0.0	0.0
 fr	06_coal	2	77	0.0	0.0
 fr	07_gas	2	77	0.0	0.0
 fr	08_non-res	2	77	0.0	0.0
 fr	09_hydro_pump	2	77	0.0	0.0
-fr	01_solar	2	78	1.0	0.0
-fr	02_wind_on	2	78	1.0	0.0
-fr	03_wind_off	2	78	1.0	0.0
-fr	04_res	2	78	1.0	0.0
+fr	01_solar	2	78	0.0	1.0
+fr	02_wind_on	2	78	0.0	1.0
+fr	03_wind_off	2	78	0.0	1.0
+fr	04_res	2	78	0.0	1.0
 fr	05_nuclear	2	78	0.0	0.0
 fr	06_coal	2	78	0.0	0.0
 fr	07_gas	2	78	0.0	0.0
 fr	08_non-res	2	78	0.0	0.0
 fr	09_hydro_pump	2	78	0.0	0.0
-fr	01_solar	2	79	1.0	0.0
-fr	02_wind_on	2	79	1.0	0.0
-fr	03_wind_off	2	79	1.0	0.0
-fr	04_res	2	79	1.0	0.0
+fr	01_solar	2	79	0.0	1.0
+fr	02_wind_on	2	79	0.0	1.0
+fr	03_wind_off	2	79	0.0	1.0
+fr	04_res	2	79	0.0	1.0
 fr	05_nuclear	2	79	0.0	0.0
 fr	06_coal	2	79	0.0	0.0
 fr	07_gas	2	79	0.0	0.0
 fr	08_non-res	2	79	0.0	0.0
 fr	09_hydro_pump	2	79	0.0	0.0
-fr	01_solar	2	80	1.0	0.0
-fr	02_wind_on	2	80	1.0	0.0
-fr	03_wind_off	2	80	1.0	0.0
-fr	04_res	2	80	1.0	0.0
+fr	01_solar	2	80	0.0	1.0
+fr	02_wind_on	2	80	0.0	1.0
+fr	03_wind_off	2	80	0.0	1.0
+fr	04_res	2	80	0.0	1.0
 fr	05_nuclear	2	80	0.0	0.0
 fr	06_coal	2	80	0.0	0.0
 fr	07_gas	2	80	0.0	0.0
 fr	08_non-res	2	80	0.0	0.0
 fr	09_hydro_pump	2	80	0.0	0.0
-fr	01_solar	2	81	1.0	0.0
-fr	02_wind_on	2	81	1.0	0.0
-fr	03_wind_off	2	81	1.0	0.0
-fr	04_res	2	81	1.0	0.0
+fr	01_solar	2	81	0.0	1.0
+fr	02_wind_on	2	81	0.0	1.0
+fr	03_wind_off	2	81	0.0	1.0
+fr	04_res	2	81	0.0	1.0
 fr	05_nuclear	2	81	0.0	0.0
 fr	06_coal	2	81	0.0	0.0
 fr	07_gas	2	81	0.0	0.0
 fr	08_non-res	2	81	0.0	0.0
 fr	09_hydro_pump	2	81	0.0	0.0
-fr	01_solar	2	82	1.0	0.0
-fr	02_wind_on	2	82	1.0	0.0
-fr	03_wind_off	2	82	1.0	0.0
-fr	04_res	2	82	1.0	0.0
-fr	05_nuclear	2	82	1.0	0.0
+fr	01_solar	2	82	0.0	1.0
+fr	02_wind_on	2	82	0.0	1.0
+fr	03_wind_off	2	82	0.0	1.0
+fr	04_res	2	82	0.0	1.0
+fr	05_nuclear	2	82	0.0	1.0
 fr	06_coal	2	82	0.0	0.0
 fr	07_gas	2	82	0.0	0.0
 fr	08_non-res	2	82	0.0	0.0
 fr	09_hydro_pump	2	82	0.0	0.0
-fr	01_solar	2	83	1.0	0.0
-fr	02_wind_on	2	83	1.0	0.0
-fr	03_wind_off	2	83	1.0	0.0
-fr	04_res	2	83	1.0	0.0
-fr	05_nuclear	2	83	1.0	0.0
+fr	01_solar	2	83	0.0	1.0
+fr	02_wind_on	2	83	0.0	1.0
+fr	03_wind_off	2	83	0.0	1.0
+fr	04_res	2	83	0.0	1.0
+fr	05_nuclear	2	83	0.0	1.0
 fr	06_coal	2	83	0.0	0.0
 fr	07_gas	2	83	0.0	0.0
 fr	08_non-res	2	83	0.0	0.0
 fr	09_hydro_pump	2	83	0.0	0.0
-fr	01_solar	2	84	1.0	0.0
-fr	02_wind_on	2	84	1.0	0.0
-fr	03_wind_off	2	84	1.0	0.0
-fr	04_res	2	84	1.0	0.0
-fr	05_nuclear	2	84	1.0	0.0
+fr	01_solar	2	84	0.0	1.0
+fr	02_wind_on	2	84	0.0	1.0
+fr	03_wind_off	2	84	0.0	1.0
+fr	04_res	2	84	0.0	1.0
+fr	05_nuclear	2	84	0.0	1.0
 fr	06_coal	2	84	0.0	0.0
 fr	07_gas	2	84	0.0	0.0
 fr	08_non-res	2	84	0.0	0.0
 fr	09_hydro_pump	2	84	0.0	0.0
-fr	01_solar	2	85	1.0	0.0
-fr	02_wind_on	2	85	1.0	0.0
-fr	03_wind_off	2	85	1.0	0.0
-fr	04_res	2	85	1.0	0.0
-fr	05_nuclear	2	85	1.0	0.0
+fr	01_solar	2	85	0.0	1.0
+fr	02_wind_on	2	85	0.0	1.0
+fr	03_wind_off	2	85	0.0	1.0
+fr	04_res	2	85	0.0	1.0
+fr	05_nuclear	2	85	0.0	1.0
 fr	06_coal	2	85	0.0	0.0
 fr	07_gas	2	85	0.0	0.0
 fr	08_non-res	2	85	0.0	0.0
 fr	09_hydro_pump	2	85	0.0	0.0
-fr	01_solar	2	86	1.0	0.0
-fr	02_wind_on	2	86	1.0	0.0
-fr	03_wind_off	2	86	1.0	0.0
-fr	04_res	2	86	1.0	0.0
-fr	05_nuclear	2	86	1.0	0.0
+fr	01_solar	2	86	0.0	1.0
+fr	02_wind_on	2	86	0.0	1.0
+fr	03_wind_off	2	86	0.0	1.0
+fr	04_res	2	86	0.0	1.0
+fr	05_nuclear	2	86	0.0	1.0
 fr	06_coal	2	86	0.0	0.0
 fr	07_gas	2	86	0.0	0.0
 fr	08_non-res	2	86	0.0	0.0
 fr	09_hydro_pump	2	86	0.0	0.0
-fr	01_solar	2	87	1.0	0.0
-fr	02_wind_on	2	87	1.0	0.0
-fr	03_wind_off	2	87	1.0	0.0
-fr	04_res	2	87	1.0	0.0
-fr	05_nuclear	2	87	1.0	0.0
+fr	01_solar	2	87	0.0	1.0
+fr	02_wind_on	2	87	0.0	1.0
+fr	03_wind_off	2	87	0.0	1.0
+fr	04_res	2	87	0.0	1.0
+fr	05_nuclear	2	87	0.0	1.0
 fr	06_coal	2	87	0.0	0.0
 fr	07_gas	2	87	0.0	0.0
 fr	08_non-res	2	87	0.0	0.0
 fr	09_hydro_pump	2	87	0.0	0.0
-fr	01_solar	2	88	1.0	0.0
-fr	02_wind_on	2	88	1.0	0.0
-fr	03_wind_off	2	88	1.0	0.0
-fr	04_res	2	88	1.0	0.0
-fr	05_nuclear	2	88	1.0	0.0
+fr	01_solar	2	88	0.0	1.0
+fr	02_wind_on	2	88	0.0	1.0
+fr	03_wind_off	2	88	0.0	1.0
+fr	04_res	2	88	0.0	1.0
+fr	05_nuclear	2	88	0.0	1.0
 fr	06_coal	2	88	0.0	0.0
 fr	07_gas	2	88	0.0	0.0
 fr	08_non-res	2	88	0.0	0.0
 fr	09_hydro_pump	2	88	0.0	0.0
-fr	01_solar	2	89	1.0	0.0
-fr	02_wind_on	2	89	1.0	0.0
-fr	03_wind_off	2	89	1.0	0.0
-fr	04_res	2	89	1.0	0.0
-fr	05_nuclear	2	89	1.0	0.0
+fr	01_solar	2	89	0.0	1.0
+fr	02_wind_on	2	89	0.0	1.0
+fr	03_wind_off	2	89	0.0	1.0
+fr	04_res	2	89	0.0	1.0
+fr	05_nuclear	2	89	0.0	1.0
 fr	06_coal	2	89	0.0	0.0
 fr	07_gas	2	89	0.0	0.0
 fr	08_non-res	2	89	0.0	0.0
 fr	09_hydro_pump	2	89	0.0	0.0
-fr	01_solar	2	90	1.0	0.0
-fr	02_wind_on	2	90	1.0	0.0
-fr	03_wind_off	2	90	1.0	0.0
-fr	04_res	2	90	1.0	0.0
-fr	05_nuclear	2	90	1.0	0.0
+fr	01_solar	2	90	0.0	1.0
+fr	02_wind_on	2	90	0.0	1.0
+fr	03_wind_off	2	90	0.0	1.0
+fr	04_res	2	90	0.0	1.0
+fr	05_nuclear	2	90	0.0	1.0
 fr	06_coal	2	90	0.0	0.0
 fr	07_gas	2	90	0.0	0.0
 fr	08_non-res	2	90	0.0	0.0
 fr	09_hydro_pump	2	90	0.0	0.0
-fr	01_solar	2	91	1.0	0.0
-fr	02_wind_on	2	91	1.0	0.0
-fr	03_wind_off	2	91	1.0	0.0
-fr	04_res	2	91	1.0	0.0
-fr	05_nuclear	2	91	1.0	0.0
+fr	01_solar	2	91	0.0	1.0
+fr	02_wind_on	2	91	0.0	1.0
+fr	03_wind_off	2	91	0.0	1.0
+fr	04_res	2	91	0.0	1.0
+fr	05_nuclear	2	91	0.0	1.0
 fr	06_coal	2	91	0.0	0.0
 fr	07_gas	2	91	0.0	0.0
 fr	08_non-res	2	91	0.0	0.0
 fr	09_hydro_pump	2	91	0.0	0.0
-fr	01_solar	2	92	1.0	0.0
-fr	02_wind_on	2	92	1.0	0.0
-fr	03_wind_off	2	92	1.0	0.0
-fr	04_res	2	92	1.0	0.0
-fr	05_nuclear	2	92	1.0	0.0
+fr	01_solar	2	92	0.0	1.0
+fr	02_wind_on	2	92	0.0	1.0
+fr	03_wind_off	2	92	0.0	1.0
+fr	04_res	2	92	0.0	1.0
+fr	05_nuclear	2	92	0.0	1.0
 fr	06_coal	2	92	0.0	0.0
 fr	07_gas	2	92	0.0	0.0
 fr	08_non-res	2	92	0.0	0.0
 fr	09_hydro_pump	2	92	0.0	0.0
-fr	01_solar	2	93	1.0	0.0
-fr	02_wind_on	2	93	1.0	0.0
-fr	03_wind_off	2	93	1.0	0.0
-fr	04_res	2	93	1.0	0.0
-fr	05_nuclear	2	93	1.0	0.0
+fr	01_solar	2	93	0.0	1.0
+fr	02_wind_on	2	93	0.0	1.0
+fr	03_wind_off	2	93	0.0	1.0
+fr	04_res	2	93	0.0	1.0
+fr	05_nuclear	2	93	0.0	1.0
 fr	06_coal	2	93	0.0	0.0
 fr	07_gas	2	93	0.0	0.0
 fr	08_non-res	2	93	0.0	0.0
 fr	09_hydro_pump	2	93	0.0	0.0
-fr	01_solar	2	94	1.0	0.0
-fr	02_wind_on	2	94	1.0	0.0
-fr	03_wind_off	2	94	1.0	0.0
-fr	04_res	2	94	1.0	0.0
-fr	05_nuclear	2	94	1.0	0.0
+fr	01_solar	2	94	0.0	1.0
+fr	02_wind_on	2	94	0.0	1.0
+fr	03_wind_off	2	94	0.0	1.0
+fr	04_res	2	94	0.0	1.0
+fr	05_nuclear	2	94	0.0	1.0
 fr	06_coal	2	94	0.0	0.0
 fr	07_gas	2	94	0.0	0.0
 fr	08_non-res	2	94	0.0	0.0
 fr	09_hydro_pump	2	94	0.0	0.0
-fr	01_solar	2	95	1.0	0.0
-fr	02_wind_on	2	95	1.0	0.0
-fr	03_wind_off	2	95	1.0	0.0
-fr	04_res	2	95	1.0	0.0
-fr	05_nuclear	2	95	1.0	0.0
+fr	01_solar	2	95	0.0	1.0
+fr	02_wind_on	2	95	0.0	1.0
+fr	03_wind_off	2	95	0.0	1.0
+fr	04_res	2	95	0.0	1.0
+fr	05_nuclear	2	95	0.0	1.0
 fr	06_coal	2	95	0.0	0.0
 fr	07_gas	2	95	0.0	0.0
 fr	08_non-res	2	95	0.0	0.0
 fr	09_hydro_pump	2	95	0.0	0.0
-fr	01_solar	2	96	1.0	0.0
-fr	02_wind_on	2	96	1.0	0.0
-fr	03_wind_off	2	96	1.0	0.0
-fr	04_res	2	96	1.0	0.0
-fr	05_nuclear	2	96	1.0	0.0
+fr	01_solar	2	96	0.0	1.0
+fr	02_wind_on	2	96	0.0	1.0
+fr	03_wind_off	2	96	0.0	1.0
+fr	04_res	2	96	0.0	1.0
+fr	05_nuclear	2	96	0.0	1.0
 fr	06_coal	2	96	0.0	0.0
 fr	07_gas	2	96	0.0	0.0
 fr	08_non-res	2	96	0.0	0.0
 fr	09_hydro_pump	2	96	0.0	0.0
-fr	01_solar	2	97	1.0	0.0
-fr	02_wind_on	2	97	1.0	0.0
-fr	03_wind_off	2	97	1.0	0.0
-fr	04_res	2	97	1.0	0.0
-fr	05_nuclear	2	97	1.0	0.0
+fr	01_solar	2	97	0.0	1.0
+fr	02_wind_on	2	97	0.0	1.0
+fr	03_wind_off	2	97	0.0	1.0
+fr	04_res	2	97	0.0	1.0
+fr	05_nuclear	2	97	0.0	1.0
 fr	06_coal	2	97	0.0	0.0
 fr	07_gas	2	97	0.0	0.0
 fr	08_non-res	2	97	0.0	0.0
 fr	09_hydro_pump	2	97	0.0	0.0
-fr	01_solar	2	98	1.0	0.0
-fr	02_wind_on	2	98	1.0	0.0
-fr	03_wind_off	2	98	1.0	0.0
-fr	04_res	2	98	1.0	0.0
-fr	05_nuclear	2	98	1.0	0.0
+fr	01_solar	2	98	0.0	1.0
+fr	02_wind_on	2	98	0.0	1.0
+fr	03_wind_off	2	98	0.0	1.0
+fr	04_res	2	98	0.0	1.0
+fr	05_nuclear	2	98	0.0	1.0
 fr	06_coal	2	98	0.0	0.0
 fr	07_gas	2	98	0.0	0.0
 fr	08_non-res	2	98	0.0	0.0
 fr	09_hydro_pump	2	98	0.0	0.0
-fr	01_solar	2	99	1.0	0.0
-fr	02_wind_on	2	99	1.0	0.0
-fr	03_wind_off	2	99	1.0	0.0
-fr	04_res	2	99	1.0	0.0
-fr	05_nuclear	2	99	1.0	0.0
+fr	01_solar	2	99	0.0	1.0
+fr	02_wind_on	2	99	0.0	1.0
+fr	03_wind_off	2	99	0.0	1.0
+fr	04_res	2	99	0.0	1.0
+fr	05_nuclear	2	99	0.0	1.0
 fr	06_coal	2	99	0.0	0.0
 fr	07_gas	2	99	0.0	0.0
 fr	08_non-res	2	99	0.0	0.0
 fr	09_hydro_pump	2	99	0.0	0.0
-fr	01_solar	2	100	1.0	0.0
-fr	02_wind_on	2	100	1.0	0.0
-fr	03_wind_off	2	100	1.0	0.0
-fr	04_res	2	100	1.0	0.0
-fr	05_nuclear	2	100	1.0	0.0
+fr	01_solar	2	100	0.0	1.0
+fr	02_wind_on	2	100	0.0	1.0
+fr	03_wind_off	2	100	0.0	1.0
+fr	04_res	2	100	0.0	1.0
+fr	05_nuclear	2	100	0.0	1.0
 fr	06_coal	2	100	0.0	0.0
 fr	07_gas	2	100	0.0	0.0
 fr	08_non-res	2	100	0.0	0.0
 fr	09_hydro_pump	2	100	0.0	0.0
-fr	01_solar	2	101	1.0	0.0
-fr	02_wind_on	2	101	1.0	0.0
-fr	03_wind_off	2	101	1.0	0.0
-fr	04_res	2	101	1.0	0.0
-fr	05_nuclear	2	101	1.0	0.0
+fr	01_solar	2	101	0.0	1.0
+fr	02_wind_on	2	101	0.0	1.0
+fr	03_wind_off	2	101	0.0	1.0
+fr	04_res	2	101	0.0	1.0
+fr	05_nuclear	2	101	0.0	1.0
 fr	06_coal	2	101	0.0	0.0
 fr	07_gas	2	101	0.0	0.0
 fr	08_non-res	2	101	0.0	0.0
 fr	09_hydro_pump	2	101	0.0	0.0
-fr	01_solar	2	102	1.0	0.0
-fr	02_wind_on	2	102	1.0	0.0
-fr	03_wind_off	2	102	1.0	0.0
-fr	04_res	2	102	1.0	0.0
-fr	05_nuclear	2	102	1.0	0.0
-fr	06_coal	2	102	1.0	0.0
+fr	01_solar	2	102	0.0	1.0
+fr	02_wind_on	2	102	0.0	1.0
+fr	03_wind_off	2	102	0.0	1.0
+fr	04_res	2	102	0.0	1.0
+fr	05_nuclear	2	102	0.0	1.0
+fr	06_coal	2	102	0.0	1.0
 fr	07_gas	2	102	0.0	0.0
 fr	08_non-res	2	102	0.0	0.0
 fr	09_hydro_pump	2	102	0.0	0.0
-fr	01_solar	2	103	1.0	0.0
-fr	02_wind_on	2	103	1.0	0.0
-fr	03_wind_off	2	103	1.0	0.0
-fr	04_res	2	103	1.0	0.0
-fr	05_nuclear	2	103	1.0	0.0
-fr	06_coal	2	103	1.0	0.0
+fr	01_solar	2	103	0.0	1.0
+fr	02_wind_on	2	103	0.0	1.0
+fr	03_wind_off	2	103	0.0	1.0
+fr	04_res	2	103	0.0	1.0
+fr	05_nuclear	2	103	0.0	1.0
+fr	06_coal	2	103	0.0	1.0
 fr	07_gas	2	103	0.0	0.0
 fr	08_non-res	2	103	0.0	0.0
 fr	09_hydro_pump	2	103	0.0	0.0
-fr	01_solar	2	104	1.0	0.0
-fr	02_wind_on	2	104	1.0	0.0
-fr	03_wind_off	2	104	1.0	0.0
-fr	04_res	2	104	1.0	0.0
-fr	05_nuclear	2	104	1.0	0.0
-fr	06_coal	2	104	1.0	0.0
+fr	01_solar	2	104	0.0	1.0
+fr	02_wind_on	2	104	0.0	1.0
+fr	03_wind_off	2	104	0.0	1.0
+fr	04_res	2	104	0.0	1.0
+fr	05_nuclear	2	104	0.0	1.0
+fr	06_coal	2	104	0.0	1.0
 fr	07_gas	2	104	0.0	0.0
 fr	08_non-res	2	104	0.0	0.0
 fr	09_hydro_pump	2	104	0.0	0.0
-fr	01_solar	2	105	1.0	0.0
-fr	02_wind_on	2	105	1.0	0.0
-fr	03_wind_off	2	105	1.0	0.0
-fr	04_res	2	105	1.0	0.0
-fr	05_nuclear	2	105	1.0	0.0
-fr	06_coal	2	105	1.0	0.0
+fr	01_solar	2	105	0.0	1.0
+fr	02_wind_on	2	105	0.0	1.0
+fr	03_wind_off	2	105	0.0	1.0
+fr	04_res	2	105	0.0	1.0
+fr	05_nuclear	2	105	0.0	1.0
+fr	06_coal	2	105	0.0	1.0
 fr	07_gas	2	105	0.0	0.0
 fr	08_non-res	2	105	0.0	0.0
 fr	09_hydro_pump	2	105	0.0	0.0
-fr	01_solar	2	106	1.0	0.0
-fr	02_wind_on	2	106	1.0	0.0
-fr	03_wind_off	2	106	1.0	0.0
-fr	04_res	2	106	1.0	0.0
-fr	05_nuclear	2	106	1.0	0.0
-fr	06_coal	2	106	1.0	0.0
+fr	01_solar	2	106	0.0	1.0
+fr	02_wind_on	2	106	0.0	1.0
+fr	03_wind_off	2	106	0.0	1.0
+fr	04_res	2	106	0.0	1.0
+fr	05_nuclear	2	106	0.0	1.0
+fr	06_coal	2	106	0.0	1.0
 fr	07_gas	2	106	0.0	0.0
 fr	08_non-res	2	106	0.0	0.0
 fr	09_hydro_pump	2	106	0.0	0.0
-fr	01_solar	2	107	1.0	0.0
-fr	02_wind_on	2	107	1.0	0.0
-fr	03_wind_off	2	107	1.0	0.0
-fr	04_res	2	107	1.0	0.0
-fr	05_nuclear	2	107	1.0	0.0
-fr	06_coal	2	107	1.0	0.0
+fr	01_solar	2	107	0.0	1.0
+fr	02_wind_on	2	107	0.0	1.0
+fr	03_wind_off	2	107	0.0	1.0
+fr	04_res	2	107	0.0	1.0
+fr	05_nuclear	2	107	0.0	1.0
+fr	06_coal	2	107	0.0	1.0
 fr	07_gas	2	107	0.0	0.0
 fr	08_non-res	2	107	0.0	0.0
 fr	09_hydro_pump	2	107	0.0	0.0
-fr	01_solar	2	108	1.0	0.0
-fr	02_wind_on	2	108	1.0	0.0
-fr	03_wind_off	2	108	1.0	0.0
-fr	04_res	2	108	1.0	0.0
-fr	05_nuclear	2	108	1.0	0.0
-fr	06_coal	2	108	1.0	0.0
+fr	01_solar	2	108	0.0	1.0
+fr	02_wind_on	2	108	0.0	1.0
+fr	03_wind_off	2	108	0.0	1.0
+fr	04_res	2	108	0.0	1.0
+fr	05_nuclear	2	108	0.0	1.0
+fr	06_coal	2	108	0.0	1.0
 fr	07_gas	2	108	0.0	0.0
 fr	08_non-res	2	108	0.0	0.0
 fr	09_hydro_pump	2	108	0.0	0.0
-fr	01_solar	2	109	1.0	0.0
-fr	02_wind_on	2	109	1.0	0.0
-fr	03_wind_off	2	109	1.0	0.0
-fr	04_res	2	109	1.0	0.0
-fr	05_nuclear	2	109	1.0	0.0
-fr	06_coal	2	109	1.0	0.0
+fr	01_solar	2	109	0.0	1.0
+fr	02_wind_on	2	109	0.0	1.0
+fr	03_wind_off	2	109	0.0	1.0
+fr	04_res	2	109	0.0	1.0
+fr	05_nuclear	2	109	0.0	1.0
+fr	06_coal	2	109	0.0	1.0
 fr	07_gas	2	109	0.0	0.0
 fr	08_non-res	2	109	0.0	0.0
 fr	09_hydro_pump	2	109	0.0	0.0
-fr	01_solar	2	110	1.0	0.0
-fr	02_wind_on	2	110	1.0	0.0
-fr	03_wind_off	2	110	1.0	0.0
-fr	04_res	2	110	1.0	0.0
-fr	05_nuclear	2	110	1.0	0.0
-fr	06_coal	2	110	1.0	0.0
+fr	01_solar	2	110	0.0	1.0
+fr	02_wind_on	2	110	0.0	1.0
+fr	03_wind_off	2	110	0.0	1.0
+fr	04_res	2	110	0.0	1.0
+fr	05_nuclear	2	110	0.0	1.0
+fr	06_coal	2	110	0.0	1.0
 fr	07_gas	2	110	0.0	0.0
 fr	08_non-res	2	110	0.0	0.0
 fr	09_hydro_pump	2	110	0.0	0.0
-fr	01_solar	2	111	1.0	0.0
-fr	02_wind_on	2	111	1.0	0.0
-fr	03_wind_off	2	111	1.0	0.0
-fr	04_res	2	111	1.0	0.0
-fr	05_nuclear	2	111	1.0	0.0
-fr	06_coal	2	111	1.0	0.0
+fr	01_solar	2	111	0.0	1.0
+fr	02_wind_on	2	111	0.0	1.0
+fr	03_wind_off	2	111	0.0	1.0
+fr	04_res	2	111	0.0	1.0
+fr	05_nuclear	2	111	0.0	1.0
+fr	06_coal	2	111	0.0	1.0
 fr	07_gas	2	111	0.0	0.0
 fr	08_non-res	2	111	0.0	0.0
 fr	09_hydro_pump	2	111	0.0	0.0
-fr	01_solar	2	112	1.0	0.0
-fr	02_wind_on	2	112	1.0	0.0
-fr	03_wind_off	2	112	1.0	0.0
-fr	04_res	2	112	1.0	0.0
-fr	05_nuclear	2	112	1.0	0.0
-fr	06_coal	2	112	1.0	0.0
+fr	01_solar	2	112	0.0	1.0
+fr	02_wind_on	2	112	0.0	1.0
+fr	03_wind_off	2	112	0.0	1.0
+fr	04_res	2	112	0.0	1.0
+fr	05_nuclear	2	112	0.0	1.0
+fr	06_coal	2	112	0.0	1.0
 fr	07_gas	2	112	0.0	0.0
 fr	08_non-res	2	112	0.0	0.0
 fr	09_hydro_pump	2	112	0.0	0.0
-fr	01_solar	2	113	1.0	0.0
-fr	02_wind_on	2	113	1.0	0.0
-fr	03_wind_off	2	113	1.0	0.0
-fr	04_res	2	113	1.0	0.0
-fr	05_nuclear	2	113	1.0	0.0
-fr	06_coal	2	113	1.0	0.0
+fr	01_solar	2	113	0.0	1.0
+fr	02_wind_on	2	113	0.0	1.0
+fr	03_wind_off	2	113	0.0	1.0
+fr	04_res	2	113	0.0	1.0
+fr	05_nuclear	2	113	0.0	1.0
+fr	06_coal	2	113	0.0	1.0
 fr	07_gas	2	113	0.0	0.0
 fr	08_non-res	2	113	0.0	0.0
 fr	09_hydro_pump	2	113	0.0	0.0
-fr	01_solar	2	114	1.0	0.0
-fr	02_wind_on	2	114	1.0	0.0
-fr	03_wind_off	2	114	1.0	0.0
-fr	04_res	2	114	1.0	0.0
-fr	05_nuclear	2	114	1.0	0.0
-fr	06_coal	2	114	1.0	0.0
+fr	01_solar	2	114	0.0	1.0
+fr	02_wind_on	2	114	0.0	1.0
+fr	03_wind_off	2	114	0.0	1.0
+fr	04_res	2	114	0.0	1.0
+fr	05_nuclear	2	114	0.0	1.0
+fr	06_coal	2	114	0.0	1.0
 fr	07_gas	2	114	0.0	0.0
 fr	08_non-res	2	114	0.0	0.0
 fr	09_hydro_pump	2	114	0.0	0.0
-fr	01_solar	2	115	1.0	0.0
-fr	02_wind_on	2	115	1.0	0.0
-fr	03_wind_off	2	115	1.0	0.0
-fr	04_res	2	115	1.0	0.0
-fr	05_nuclear	2	115	1.0	0.0
-fr	06_coal	2	115	1.0	0.0
+fr	01_solar	2	115	0.0	1.0
+fr	02_wind_on	2	115	0.0	1.0
+fr	03_wind_off	2	115	0.0	1.0
+fr	04_res	2	115	0.0	1.0
+fr	05_nuclear	2	115	0.0	1.0
+fr	06_coal	2	115	0.0	1.0
 fr	07_gas	2	115	0.0	0.0
 fr	08_non-res	2	115	0.0	0.0
 fr	09_hydro_pump	2	115	0.0	0.0
-fr	01_solar	2	116	1.0	0.0
-fr	02_wind_on	2	116	1.0	0.0
-fr	03_wind_off	2	116	1.0	0.0
-fr	04_res	2	116	1.0	0.0
-fr	05_nuclear	2	116	1.0	0.0
-fr	06_coal	2	116	1.0	0.0
+fr	01_solar	2	116	0.0	1.0
+fr	02_wind_on	2	116	0.0	1.0
+fr	03_wind_off	2	116	0.0	1.0
+fr	04_res	2	116	0.0	1.0
+fr	05_nuclear	2	116	0.0	1.0
+fr	06_coal	2	116	0.0	1.0
 fr	07_gas	2	116	0.0	0.0
 fr	08_non-res	2	116	0.0	0.0
 fr	09_hydro_pump	2	116	0.0	0.0
-fr	01_solar	2	117	1.0	0.0
-fr	02_wind_on	2	117	1.0	0.0
-fr	03_wind_off	2	117	1.0	0.0
-fr	04_res	2	117	1.0	0.0
-fr	05_nuclear	2	117	1.0	0.0
-fr	06_coal	2	117	1.0	0.0
+fr	01_solar	2	117	0.0	1.0
+fr	02_wind_on	2	117	0.0	1.0
+fr	03_wind_off	2	117	0.0	1.0
+fr	04_res	2	117	0.0	1.0
+fr	05_nuclear	2	117	0.0	1.0
+fr	06_coal	2	117	0.0	1.0
 fr	07_gas	2	117	0.0	0.0
 fr	08_non-res	2	117	0.0	0.0
 fr	09_hydro_pump	2	117	0.0	0.0
-fr	01_solar	2	118	1.0	0.0
-fr	02_wind_on	2	118	1.0	0.0
-fr	03_wind_off	2	118	1.0	0.0
-fr	04_res	2	118	1.0	0.0
-fr	05_nuclear	2	118	1.0	0.0
-fr	06_coal	2	118	1.0	0.0
+fr	01_solar	2	118	0.0	1.0
+fr	02_wind_on	2	118	0.0	1.0
+fr	03_wind_off	2	118	0.0	1.0
+fr	04_res	2	118	0.0	1.0
+fr	05_nuclear	2	118	0.0	1.0
+fr	06_coal	2	118	0.0	1.0
 fr	07_gas	2	118	0.0	0.0
 fr	08_non-res	2	118	0.0	0.0
 fr	09_hydro_pump	2	118	0.0	0.0
-fr	01_solar	2	119	1.0	0.0
-fr	02_wind_on	2	119	1.0	0.0
-fr	03_wind_off	2	119	1.0	0.0
-fr	04_res	2	119	1.0	0.0
-fr	05_nuclear	2	119	1.0	0.0
-fr	06_coal	2	119	1.0	0.0
+fr	01_solar	2	119	0.0	1.0
+fr	02_wind_on	2	119	0.0	1.0
+fr	03_wind_off	2	119	0.0	1.0
+fr	04_res	2	119	0.0	1.0
+fr	05_nuclear	2	119	0.0	1.0
+fr	06_coal	2	119	0.0	1.0
 fr	07_gas	2	119	0.0	0.0
 fr	08_non-res	2	119	0.0	0.0
 fr	09_hydro_pump	2	119	0.0	0.0
-fr	01_solar	2	120	1.0	0.0
-fr	02_wind_on	2	120	1.0	0.0
-fr	03_wind_off	2	120	1.0	0.0
-fr	04_res	2	120	1.0	0.0
-fr	05_nuclear	2	120	1.0	0.0
-fr	06_coal	2	120	1.0	0.0
+fr	01_solar	2	120	0.0	1.0
+fr	02_wind_on	2	120	0.0	1.0
+fr	03_wind_off	2	120	0.0	1.0
+fr	04_res	2	120	0.0	1.0
+fr	05_nuclear	2	120	0.0	1.0
+fr	06_coal	2	120	0.0	1.0
 fr	07_gas	2	120	0.0	0.0
 fr	08_non-res	2	120	0.0	0.0
 fr	09_hydro_pump	2	120	0.0	0.0
-fr	01_solar	2	121	1.0	0.0
-fr	02_wind_on	2	121	1.0	0.0
-fr	03_wind_off	2	121	1.0	0.0
-fr	04_res	2	121	1.0	0.0
-fr	05_nuclear	2	121	1.0	0.0
-fr	06_coal	2	121	1.0	0.0
+fr	01_solar	2	121	0.0	1.0
+fr	02_wind_on	2	121	0.0	1.0
+fr	03_wind_off	2	121	0.0	1.0
+fr	04_res	2	121	0.0	1.0
+fr	05_nuclear	2	121	0.0	1.0
+fr	06_coal	2	121	0.0	1.0
 fr	07_gas	2	121	0.0	0.0
 fr	08_non-res	2	121	0.0	0.0
 fr	09_hydro_pump	2	121	0.0	0.0
-fr	01_solar	2	122	1.0	0.0
-fr	02_wind_on	2	122	1.0	0.0
-fr	03_wind_off	2	122	1.0	0.0
-fr	04_res	2	122	1.0	0.0
-fr	05_nuclear	2	122	1.0	0.0
-fr	06_coal	2	122	1.0	0.0
-fr	07_gas	2	122	1.0	0.0
+fr	01_solar	2	122	0.0	1.0
+fr	02_wind_on	2	122	0.0	1.0
+fr	03_wind_off	2	122	0.0	1.0
+fr	04_res	2	122	0.0	1.0
+fr	05_nuclear	2	122	0.0	1.0
+fr	06_coal	2	122	0.0	1.0
+fr	07_gas	2	122	0.0	1.0
 fr	08_non-res	2	122	0.0	0.0
 fr	09_hydro_pump	2	122	0.0	0.0
-fr	01_solar	2	123	1.0	0.0
-fr	02_wind_on	2	123	1.0	0.0
-fr	03_wind_off	2	123	1.0	0.0
-fr	04_res	2	123	1.0	0.0
-fr	05_nuclear	2	123	1.0	0.0
-fr	06_coal	2	123	1.0	0.0
-fr	07_gas	2	123	1.0	0.0
+fr	01_solar	2	123	0.0	1.0
+fr	02_wind_on	2	123	0.0	1.0
+fr	03_wind_off	2	123	0.0	1.0
+fr	04_res	2	123	0.0	1.0
+fr	05_nuclear	2	123	0.0	1.0
+fr	06_coal	2	123	0.0	1.0
+fr	07_gas	2	123	0.0	1.0
 fr	08_non-res	2	123	0.0	0.0
 fr	09_hydro_pump	2	123	0.0	0.0
-fr	01_solar	2	124	1.0	0.0
-fr	02_wind_on	2	124	1.0	0.0
-fr	03_wind_off	2	124	1.0	0.0
-fr	04_res	2	124	1.0	0.0
-fr	05_nuclear	2	124	1.0	0.0
-fr	06_coal	2	124	1.0	0.0
-fr	07_gas	2	124	1.0	0.0
+fr	01_solar	2	124	0.0	1.0
+fr	02_wind_on	2	124	0.0	1.0
+fr	03_wind_off	2	124	0.0	1.0
+fr	04_res	2	124	0.0	1.0
+fr	05_nuclear	2	124	0.0	1.0
+fr	06_coal	2	124	0.0	1.0
+fr	07_gas	2	124	0.0	1.0
 fr	08_non-res	2	124	0.0	0.0
 fr	09_hydro_pump	2	124	0.0	0.0
-fr	01_solar	2	125	1.0	0.0
-fr	02_wind_on	2	125	1.0	0.0
-fr	03_wind_off	2	125	1.0	0.0
-fr	04_res	2	125	1.0	0.0
-fr	05_nuclear	2	125	1.0	0.0
-fr	06_coal	2	125	1.0	0.0
-fr	07_gas	2	125	1.0	0.0
+fr	01_solar	2	125	0.0	1.0
+fr	02_wind_on	2	125	0.0	1.0
+fr	03_wind_off	2	125	0.0	1.0
+fr	04_res	2	125	0.0	1.0
+fr	05_nuclear	2	125	0.0	1.0
+fr	06_coal	2	125	0.0	1.0
+fr	07_gas	2	125	0.0	1.0
 fr	08_non-res	2	125	0.0	0.0
 fr	09_hydro_pump	2	125	0.0	0.0
-fr	01_solar	2	126	1.0	0.0
-fr	02_wind_on	2	126	1.0	0.0
-fr	03_wind_off	2	126	1.0	0.0
-fr	04_res	2	126	1.0	0.0
-fr	05_nuclear	2	126	1.0	0.0
-fr	06_coal	2	126	1.0	0.0
-fr	07_gas	2	126	1.0	0.0
+fr	01_solar	2	126	0.0	1.0
+fr	02_wind_on	2	126	0.0	1.0
+fr	03_wind_off	2	126	0.0	1.0
+fr	04_res	2	126	0.0	1.0
+fr	05_nuclear	2	126	0.0	1.0
+fr	06_coal	2	126	0.0	1.0
+fr	07_gas	2	126	0.0	1.0
 fr	08_non-res	2	126	0.0	0.0
 fr	09_hydro_pump	2	126	0.0	0.0
-fr	01_solar	2	127	1.0	0.0
-fr	02_wind_on	2	127	1.0	0.0
-fr	03_wind_off	2	127	1.0	0.0
-fr	04_res	2	127	1.0	0.0
-fr	05_nuclear	2	127	1.0	0.0
-fr	06_coal	2	127	1.0	0.0
-fr	07_gas	2	127	1.0	0.0
+fr	01_solar	2	127	0.0	1.0
+fr	02_wind_on	2	127	0.0	1.0
+fr	03_wind_off	2	127	0.0	1.0
+fr	04_res	2	127	0.0	1.0
+fr	05_nuclear	2	127	0.0	1.0
+fr	06_coal	2	127	0.0	1.0
+fr	07_gas	2	127	0.0	1.0
 fr	08_non-res	2	127	0.0	0.0
 fr	09_hydro_pump	2	127	0.0	0.0
-fr	01_solar	2	128	1.0	0.0
-fr	02_wind_on	2	128	1.0	0.0
-fr	03_wind_off	2	128	1.0	0.0
-fr	04_res	2	128	1.0	0.0
-fr	05_nuclear	2	128	1.0	0.0
-fr	06_coal	2	128	1.0	0.0
-fr	07_gas	2	128	1.0	0.0
+fr	01_solar	2	128	0.0	1.0
+fr	02_wind_on	2	128	0.0	1.0
+fr	03_wind_off	2	128	0.0	1.0
+fr	04_res	2	128	0.0	1.0
+fr	05_nuclear	2	128	0.0	1.0
+fr	06_coal	2	128	0.0	1.0
+fr	07_gas	2	128	0.0	1.0
 fr	08_non-res	2	128	0.0	0.0
 fr	09_hydro_pump	2	128	0.0	0.0
-fr	01_solar	2	129	1.0	0.0
-fr	02_wind_on	2	129	1.0	0.0
-fr	03_wind_off	2	129	1.0	0.0
-fr	04_res	2	129	1.0	0.0
-fr	05_nuclear	2	129	1.0	0.0
-fr	06_coal	2	129	1.0	0.0
-fr	07_gas	2	129	1.0	0.0
+fr	01_solar	2	129	0.0	1.0
+fr	02_wind_on	2	129	0.0	1.0
+fr	03_wind_off	2	129	0.0	1.0
+fr	04_res	2	129	0.0	1.0
+fr	05_nuclear	2	129	0.0	1.0
+fr	06_coal	2	129	0.0	1.0
+fr	07_gas	2	129	0.0	1.0
 fr	08_non-res	2	129	0.0	0.0
 fr	09_hydro_pump	2	129	0.0	0.0
-fr	01_solar	2	130	1.0	0.0
-fr	02_wind_on	2	130	1.0	0.0
-fr	03_wind_off	2	130	1.0	0.0
-fr	04_res	2	130	1.0	0.0
-fr	05_nuclear	2	130	1.0	0.0
-fr	06_coal	2	130	1.0	0.0
-fr	07_gas	2	130	1.0	0.0
+fr	01_solar	2	130	0.0	1.0
+fr	02_wind_on	2	130	0.0	1.0
+fr	03_wind_off	2	130	0.0	1.0
+fr	04_res	2	130	0.0	1.0
+fr	05_nuclear	2	130	0.0	1.0
+fr	06_coal	2	130	0.0	1.0
+fr	07_gas	2	130	0.0	1.0
 fr	08_non-res	2	130	0.0	0.0
 fr	09_hydro_pump	2	130	0.0	0.0
-fr	01_solar	2	131	1.0	0.0
-fr	02_wind_on	2	131	1.0	0.0
-fr	03_wind_off	2	131	1.0	0.0
-fr	04_res	2	131	1.0	0.0
-fr	05_nuclear	2	131	1.0	0.0
-fr	06_coal	2	131	1.0	0.0
-fr	07_gas	2	131	1.0	0.0
+fr	01_solar	2	131	0.0	1.0
+fr	02_wind_on	2	131	0.0	1.0
+fr	03_wind_off	2	131	0.0	1.0
+fr	04_res	2	131	0.0	1.0
+fr	05_nuclear	2	131	0.0	1.0
+fr	06_coal	2	131	0.0	1.0
+fr	07_gas	2	131	0.0	1.0
 fr	08_non-res	2	131	0.0	0.0
 fr	09_hydro_pump	2	131	0.0	0.0
-fr	01_solar	2	132	1.0	0.0
-fr	02_wind_on	2	132	1.0	0.0
-fr	03_wind_off	2	132	1.0	0.0
-fr	04_res	2	132	1.0	0.0
-fr	05_nuclear	2	132	1.0	0.0
-fr	06_coal	2	132	1.0	0.0
-fr	07_gas	2	132	1.0	0.0
+fr	01_solar	2	132	0.0	1.0
+fr	02_wind_on	2	132	0.0	1.0
+fr	03_wind_off	2	132	0.0	1.0
+fr	04_res	2	132	0.0	1.0
+fr	05_nuclear	2	132	0.0	1.0
+fr	06_coal	2	132	0.0	1.0
+fr	07_gas	2	132	0.0	1.0
 fr	08_non-res	2	132	0.0	0.0
 fr	09_hydro_pump	2	132	0.0	0.0
-fr	01_solar	2	133	1.0	0.0
-fr	02_wind_on	2	133	1.0	0.0
-fr	03_wind_off	2	133	1.0	0.0
-fr	04_res	2	133	1.0	0.0
-fr	05_nuclear	2	133	1.0	0.0
-fr	06_coal	2	133	1.0	0.0
-fr	07_gas	2	133	1.0	0.0
+fr	01_solar	2	133	0.0	1.0
+fr	02_wind_on	2	133	0.0	1.0
+fr	03_wind_off	2	133	0.0	1.0
+fr	04_res	2	133	0.0	1.0
+fr	05_nuclear	2	133	0.0	1.0
+fr	06_coal	2	133	0.0	1.0
+fr	07_gas	2	133	0.0	1.0
 fr	08_non-res	2	133	0.0	0.0
 fr	09_hydro_pump	2	133	0.0	0.0
-fr	01_solar	2	134	1.0	0.0
-fr	02_wind_on	2	134	1.0	0.0
-fr	03_wind_off	2	134	1.0	0.0
-fr	04_res	2	134	1.0	0.0
-fr	05_nuclear	2	134	1.0	0.0
-fr	06_coal	2	134	1.0	0.0
-fr	07_gas	2	134	1.0	0.0
+fr	01_solar	2	134	0.0	1.0
+fr	02_wind_on	2	134	0.0	1.0
+fr	03_wind_off	2	134	0.0	1.0
+fr	04_res	2	134	0.0	1.0
+fr	05_nuclear	2	134	0.0	1.0
+fr	06_coal	2	134	0.0	1.0
+fr	07_gas	2	134	0.0	1.0
 fr	08_non-res	2	134	0.0	0.0
 fr	09_hydro_pump	2	134	0.0	0.0
-fr	01_solar	2	135	1.0	0.0
-fr	02_wind_on	2	135	1.0	0.0
-fr	03_wind_off	2	135	1.0	0.0
-fr	04_res	2	135	1.0	0.0
-fr	05_nuclear	2	135	1.0	0.0
-fr	06_coal	2	135	1.0	0.0
-fr	07_gas	2	135	1.0	0.0
+fr	01_solar	2	135	0.0	1.0
+fr	02_wind_on	2	135	0.0	1.0
+fr	03_wind_off	2	135	0.0	1.0
+fr	04_res	2	135	0.0	1.0
+fr	05_nuclear	2	135	0.0	1.0
+fr	06_coal	2	135	0.0	1.0
+fr	07_gas	2	135	0.0	1.0
 fr	08_non-res	2	135	0.0	0.0
 fr	09_hydro_pump	2	135	0.0	0.0
-fr	01_solar	2	136	1.0	0.0
-fr	02_wind_on	2	136	1.0	0.0
-fr	03_wind_off	2	136	1.0	0.0
-fr	04_res	2	136	1.0	0.0
-fr	05_nuclear	2	136	1.0	0.0
-fr	06_coal	2	136	1.0	0.0
-fr	07_gas	2	136	1.0	0.0
+fr	01_solar	2	136	0.0	1.0
+fr	02_wind_on	2	136	0.0	1.0
+fr	03_wind_off	2	136	0.0	1.0
+fr	04_res	2	136	0.0	1.0
+fr	05_nuclear	2	136	0.0	1.0
+fr	06_coal	2	136	0.0	1.0
+fr	07_gas	2	136	0.0	1.0
 fr	08_non-res	2	136	0.0	0.0
 fr	09_hydro_pump	2	136	0.0	0.0
-fr	01_solar	2	137	1.0	0.0
-fr	02_wind_on	2	137	1.0	0.0
-fr	03_wind_off	2	137	1.0	0.0
-fr	04_res	2	137	1.0	0.0
-fr	05_nuclear	2	137	1.0	0.0
-fr	06_coal	2	137	1.0	0.0
-fr	07_gas	2	137	1.0	0.0
+fr	01_solar	2	137	0.0	1.0
+fr	02_wind_on	2	137	0.0	1.0
+fr	03_wind_off	2	137	0.0	1.0
+fr	04_res	2	137	0.0	1.0
+fr	05_nuclear	2	137	0.0	1.0
+fr	06_coal	2	137	0.0	1.0
+fr	07_gas	2	137	0.0	1.0
 fr	08_non-res	2	137	0.0	0.0
 fr	09_hydro_pump	2	137	0.0	0.0
-fr	01_solar	2	138	1.0	0.0
-fr	02_wind_on	2	138	1.0	0.0
-fr	03_wind_off	2	138	1.0	0.0
-fr	04_res	2	138	1.0	0.0
-fr	05_nuclear	2	138	1.0	0.0
-fr	06_coal	2	138	1.0	0.0
-fr	07_gas	2	138	1.0	0.0
+fr	01_solar	2	138	0.0	1.0
+fr	02_wind_on	2	138	0.0	1.0
+fr	03_wind_off	2	138	0.0	1.0
+fr	04_res	2	138	0.0	1.0
+fr	05_nuclear	2	138	0.0	1.0
+fr	06_coal	2	138	0.0	1.0
+fr	07_gas	2	138	0.0	1.0
 fr	08_non-res	2	138	0.0	0.0
 fr	09_hydro_pump	2	138	0.0	0.0
-fr	01_solar	2	139	1.0	0.0
-fr	02_wind_on	2	139	1.0	0.0
-fr	03_wind_off	2	139	1.0	0.0
-fr	04_res	2	139	1.0	0.0
-fr	05_nuclear	2	139	1.0	0.0
-fr	06_coal	2	139	1.0	0.0
-fr	07_gas	2	139	1.0	0.0
+fr	01_solar	2	139	0.0	1.0
+fr	02_wind_on	2	139	0.0	1.0
+fr	03_wind_off	2	139	0.0	1.0
+fr	04_res	2	139	0.0	1.0
+fr	05_nuclear	2	139	0.0	1.0
+fr	06_coal	2	139	0.0	1.0
+fr	07_gas	2	139	0.0	1.0
 fr	08_non-res	2	139	0.0	0.0
 fr	09_hydro_pump	2	139	0.0	0.0
-fr	01_solar	2	140	1.0	0.0
-fr	02_wind_on	2	140	1.0	0.0
-fr	03_wind_off	2	140	1.0	0.0
-fr	04_res	2	140	1.0	0.0
-fr	05_nuclear	2	140	1.0	0.0
-fr	06_coal	2	140	1.0	0.0
-fr	07_gas	2	140	1.0	0.0
+fr	01_solar	2	140	0.0	1.0
+fr	02_wind_on	2	140	0.0	1.0
+fr	03_wind_off	2	140	0.0	1.0
+fr	04_res	2	140	0.0	1.0
+fr	05_nuclear	2	140	0.0	1.0
+fr	06_coal	2	140	0.0	1.0
+fr	07_gas	2	140	0.0	1.0
 fr	08_non-res	2	140	0.0	0.0
 fr	09_hydro_pump	2	140	0.0	0.0
-fr	01_solar	2	141	1.0	0.0
-fr	02_wind_on	2	141	1.0	0.0
-fr	03_wind_off	2	141	1.0	0.0
-fr	04_res	2	141	1.0	0.0
-fr	05_nuclear	2	141	1.0	0.0
-fr	06_coal	2	141	1.0	0.0
-fr	07_gas	2	141	1.0	0.0
+fr	01_solar	2	141	0.0	1.0
+fr	02_wind_on	2	141	0.0	1.0
+fr	03_wind_off	2	141	0.0	1.0
+fr	04_res	2	141	0.0	1.0
+fr	05_nuclear	2	141	0.0	1.0
+fr	06_coal	2	141	0.0	1.0
+fr	07_gas	2	141	0.0	1.0
 fr	08_non-res	2	141	0.0	0.0
 fr	09_hydro_pump	2	141	0.0	0.0
-fr	01_solar	2	142	1.0	0.0
-fr	02_wind_on	2	142	1.0	0.0
-fr	03_wind_off	2	142	1.0	0.0
-fr	04_res	2	142	1.0	0.0
-fr	05_nuclear	2	142	1.0	0.0
-fr	06_coal	2	142	1.0	0.0
-fr	07_gas	2	142	1.0	0.0
-fr	08_non-res	2	142	1.0	0.0
+fr	01_solar	2	142	0.0	1.0
+fr	02_wind_on	2	142	0.0	1.0
+fr	03_wind_off	2	142	0.0	1.0
+fr	04_res	2	142	0.0	1.0
+fr	05_nuclear	2	142	0.0	1.0
+fr	06_coal	2	142	0.0	1.0
+fr	07_gas	2	142	0.0	1.0
+fr	08_non-res	2	142	0.0	1.0
 fr	09_hydro_pump	2	142	0.0	0.0
-fr	01_solar	2	143	1.0	0.0
-fr	02_wind_on	2	143	1.0	0.0
-fr	03_wind_off	2	143	1.0	0.0
-fr	04_res	2	143	1.0	0.0
-fr	05_nuclear	2	143	1.0	0.0
-fr	06_coal	2	143	1.0	0.0
-fr	07_gas	2	143	1.0	0.0
-fr	08_non-res	2	143	1.0	0.0
+fr	01_solar	2	143	0.0	1.0
+fr	02_wind_on	2	143	0.0	1.0
+fr	03_wind_off	2	143	0.0	1.0
+fr	04_res	2	143	0.0	1.0
+fr	05_nuclear	2	143	0.0	1.0
+fr	06_coal	2	143	0.0	1.0
+fr	07_gas	2	143	0.0	1.0
+fr	08_non-res	2	143	0.0	1.0
 fr	09_hydro_pump	2	143	0.0	0.0
-fr	01_solar	2	144	1.0	0.0
-fr	02_wind_on	2	144	1.0	0.0
-fr	03_wind_off	2	144	1.0	0.0
-fr	04_res	2	144	1.0	0.0
-fr	05_nuclear	2	144	1.0	0.0
-fr	06_coal	2	144	1.0	0.0
-fr	07_gas	2	144	1.0	0.0
-fr	08_non-res	2	144	1.0	0.0
+fr	01_solar	2	144	0.0	1.0
+fr	02_wind_on	2	144	0.0	1.0
+fr	03_wind_off	2	144	0.0	1.0
+fr	04_res	2	144	0.0	1.0
+fr	05_nuclear	2	144	0.0	1.0
+fr	06_coal	2	144	0.0	1.0
+fr	07_gas	2	144	0.0	1.0
+fr	08_non-res	2	144	0.0	1.0
 fr	09_hydro_pump	2	144	0.0	0.0
-fr	01_solar	2	145	1.0	0.0
-fr	02_wind_on	2	145	1.0	0.0
-fr	03_wind_off	2	145	1.0	0.0
-fr	04_res	2	145	1.0	0.0
-fr	05_nuclear	2	145	1.0	0.0
-fr	06_coal	2	145	1.0	0.0
-fr	07_gas	2	145	1.0	0.0
-fr	08_non-res	2	145	1.0	0.0
+fr	01_solar	2	145	0.0	1.0
+fr	02_wind_on	2	145	0.0	1.0
+fr	03_wind_off	2	145	0.0	1.0
+fr	04_res	2	145	0.0	1.0
+fr	05_nuclear	2	145	0.0	1.0
+fr	06_coal	2	145	0.0	1.0
+fr	07_gas	2	145	0.0	1.0
+fr	08_non-res	2	145	0.0	1.0
 fr	09_hydro_pump	2	145	0.0	0.0
-fr	01_solar	2	146	1.0	0.0
-fr	02_wind_on	2	146	1.0	0.0
-fr	03_wind_off	2	146	1.0	0.0
-fr	04_res	2	146	1.0	0.0
-fr	05_nuclear	2	146	1.0	0.0
-fr	06_coal	2	146	1.0	0.0
-fr	07_gas	2	146	1.0	0.0
-fr	08_non-res	2	146	1.0	0.0
+fr	01_solar	2	146	0.0	1.0
+fr	02_wind_on	2	146	0.0	1.0
+fr	03_wind_off	2	146	0.0	1.0
+fr	04_res	2	146	0.0	1.0
+fr	05_nuclear	2	146	0.0	1.0
+fr	06_coal	2	146	0.0	1.0
+fr	07_gas	2	146	0.0	1.0
+fr	08_non-res	2	146	0.0	1.0
 fr	09_hydro_pump	2	146	0.0	0.0
-fr	01_solar	2	147	1.0	0.0
-fr	02_wind_on	2	147	1.0	0.0
-fr	03_wind_off	2	147	1.0	0.0
-fr	04_res	2	147	1.0	0.0
-fr	05_nuclear	2	147	1.0	0.0
-fr	06_coal	2	147	1.0	0.0
-fr	07_gas	2	147	1.0	0.0
-fr	08_non-res	2	147	1.0	0.0
+fr	01_solar	2	147	0.0	1.0
+fr	02_wind_on	2	147	0.0	1.0
+fr	03_wind_off	2	147	0.0	1.0
+fr	04_res	2	147	0.0	1.0
+fr	05_nuclear	2	147	0.0	1.0
+fr	06_coal	2	147	0.0	1.0
+fr	07_gas	2	147	0.0	1.0
+fr	08_non-res	2	147	0.0	1.0
 fr	09_hydro_pump	2	147	0.0	0.0
-fr	01_solar	2	148	1.0	0.0
-fr	02_wind_on	2	148	1.0	0.0
-fr	03_wind_off	2	148	1.0	0.0
-fr	04_res	2	148	1.0	0.0
-fr	05_nuclear	2	148	1.0	0.0
-fr	06_coal	2	148	1.0	0.0
-fr	07_gas	2	148	1.0	0.0
-fr	08_non-res	2	148	1.0	0.0
+fr	01_solar	2	148	0.0	1.0
+fr	02_wind_on	2	148	0.0	1.0
+fr	03_wind_off	2	148	0.0	1.0
+fr	04_res	2	148	0.0	1.0
+fr	05_nuclear	2	148	0.0	1.0
+fr	06_coal	2	148	0.0	1.0
+fr	07_gas	2	148	0.0	1.0
+fr	08_non-res	2	148	0.0	1.0
 fr	09_hydro_pump	2	148	0.0	0.0
-fr	01_solar	2	149	1.0	0.0
-fr	02_wind_on	2	149	1.0	0.0
-fr	03_wind_off	2	149	1.0	0.0
-fr	04_res	2	149	1.0	0.0
-fr	05_nuclear	2	149	1.0	0.0
-fr	06_coal	2	149	1.0	0.0
-fr	07_gas	2	149	1.0	0.0
-fr	08_non-res	2	149	1.0	0.0
+fr	01_solar	2	149	0.0	1.0
+fr	02_wind_on	2	149	0.0	1.0
+fr	03_wind_off	2	149	0.0	1.0
+fr	04_res	2	149	0.0	1.0
+fr	05_nuclear	2	149	0.0	1.0
+fr	06_coal	2	149	0.0	1.0
+fr	07_gas	2	149	0.0	1.0
+fr	08_non-res	2	149	0.0	1.0
 fr	09_hydro_pump	2	149	0.0	0.0
-fr	01_solar	2	150	1.0	0.0
-fr	02_wind_on	2	150	1.0	0.0
-fr	03_wind_off	2	150	1.0	0.0
-fr	04_res	2	150	1.0	0.0
-fr	05_nuclear	2	150	1.0	0.0
-fr	06_coal	2	150	1.0	0.0
-fr	07_gas	2	150	1.0	0.0
-fr	08_non-res	2	150	1.0	0.0
+fr	01_solar	2	150	0.0	1.0
+fr	02_wind_on	2	150	0.0	1.0
+fr	03_wind_off	2	150	0.0	1.0
+fr	04_res	2	150	0.0	1.0
+fr	05_nuclear	2	150	0.0	1.0
+fr	06_coal	2	150	0.0	1.0
+fr	07_gas	2	150	0.0	1.0
+fr	08_non-res	2	150	0.0	1.0
 fr	09_hydro_pump	2	150	0.0	0.0
-fr	01_solar	2	151	1.0	0.0
-fr	02_wind_on	2	151	1.0	0.0
-fr	03_wind_off	2	151	1.0	0.0
-fr	04_res	2	151	1.0	0.0
-fr	05_nuclear	2	151	1.0	0.0
-fr	06_coal	2	151	1.0	0.0
-fr	07_gas	2	151	1.0	0.0
-fr	08_non-res	2	151	1.0	0.0
+fr	01_solar	2	151	0.0	1.0
+fr	02_wind_on	2	151	0.0	1.0
+fr	03_wind_off	2	151	0.0	1.0
+fr	04_res	2	151	0.0	1.0
+fr	05_nuclear	2	151	0.0	1.0
+fr	06_coal	2	151	0.0	1.0
+fr	07_gas	2	151	0.0	1.0
+fr	08_non-res	2	151	0.0	1.0
 fr	09_hydro_pump	2	151	0.0	0.0
-fr	01_solar	2	152	1.0	0.0
-fr	02_wind_on	2	152	1.0	0.0
-fr	03_wind_off	2	152	1.0	0.0
-fr	04_res	2	152	1.0	0.0
-fr	05_nuclear	2	152	1.0	0.0
-fr	06_coal	2	152	1.0	0.0
-fr	07_gas	2	152	1.0	0.0
-fr	08_non-res	2	152	1.0	0.0
+fr	01_solar	2	152	0.0	1.0
+fr	02_wind_on	2	152	0.0	1.0
+fr	03_wind_off	2	152	0.0	1.0
+fr	04_res	2	152	0.0	1.0
+fr	05_nuclear	2	152	0.0	1.0
+fr	06_coal	2	152	0.0	1.0
+fr	07_gas	2	152	0.0	1.0
+fr	08_non-res	2	152	0.0	1.0
 fr	09_hydro_pump	2	152	0.0	0.0
-fr	01_solar	2	153	1.0	0.0
-fr	02_wind_on	2	153	1.0	0.0
-fr	03_wind_off	2	153	1.0	0.0
-fr	04_res	2	153	1.0	0.0
-fr	05_nuclear	2	153	1.0	0.0
-fr	06_coal	2	153	1.0	0.0
-fr	07_gas	2	153	1.0	0.0
-fr	08_non-res	2	153	1.0	0.0
+fr	01_solar	2	153	0.0	1.0
+fr	02_wind_on	2	153	0.0	1.0
+fr	03_wind_off	2	153	0.0	1.0
+fr	04_res	2	153	0.0	1.0
+fr	05_nuclear	2	153	0.0	1.0
+fr	06_coal	2	153	0.0	1.0
+fr	07_gas	2	153	0.0	1.0
+fr	08_non-res	2	153	0.0	1.0
 fr	09_hydro_pump	2	153	0.0	0.0
-fr	01_solar	2	154	1.0	0.0
-fr	02_wind_on	2	154	1.0	0.0
-fr	03_wind_off	2	154	1.0	0.0
-fr	04_res	2	154	1.0	0.0
-fr	05_nuclear	2	154	1.0	0.0
-fr	06_coal	2	154	1.0	0.0
-fr	07_gas	2	154	1.0	0.0
-fr	08_non-res	2	154	1.0	0.0
+fr	01_solar	2	154	0.0	1.0
+fr	02_wind_on	2	154	0.0	1.0
+fr	03_wind_off	2	154	0.0	1.0
+fr	04_res	2	154	0.0	1.0
+fr	05_nuclear	2	154	0.0	1.0
+fr	06_coal	2	154	0.0	1.0
+fr	07_gas	2	154	0.0	1.0
+fr	08_non-res	2	154	0.0	1.0
 fr	09_hydro_pump	2	154	0.0	0.0
-fr	01_solar	2	155	1.0	0.0
-fr	02_wind_on	2	155	1.0	0.0
-fr	03_wind_off	2	155	1.0	0.0
-fr	04_res	2	155	1.0	0.0
-fr	05_nuclear	2	155	1.0	0.0
-fr	06_coal	2	155	1.0	0.0
-fr	07_gas	2	155	1.0	0.0
-fr	08_non-res	2	155	1.0	0.0
+fr	01_solar	2	155	0.0	1.0
+fr	02_wind_on	2	155	0.0	1.0
+fr	03_wind_off	2	155	0.0	1.0
+fr	04_res	2	155	0.0	1.0
+fr	05_nuclear	2	155	0.0	1.0
+fr	06_coal	2	155	0.0	1.0
+fr	07_gas	2	155	0.0	1.0
+fr	08_non-res	2	155	0.0	1.0
 fr	09_hydro_pump	2	155	0.0	0.0
-fr	01_solar	2	156	1.0	0.0
-fr	02_wind_on	2	156	1.0	0.0
-fr	03_wind_off	2	156	1.0	0.0
-fr	04_res	2	156	1.0	0.0
-fr	05_nuclear	2	156	1.0	0.0
-fr	06_coal	2	156	1.0	0.0
-fr	07_gas	2	156	1.0	0.0
-fr	08_non-res	2	156	1.0	0.0
+fr	01_solar	2	156	0.0	1.0
+fr	02_wind_on	2	156	0.0	1.0
+fr	03_wind_off	2	156	0.0	1.0
+fr	04_res	2	156	0.0	1.0
+fr	05_nuclear	2	156	0.0	1.0
+fr	06_coal	2	156	0.0	1.0
+fr	07_gas	2	156	0.0	1.0
+fr	08_non-res	2	156	0.0	1.0
 fr	09_hydro_pump	2	156	0.0	0.0
-fr	01_solar	2	157	1.0	0.0
-fr	02_wind_on	2	157	1.0	0.0
-fr	03_wind_off	2	157	1.0	0.0
-fr	04_res	2	157	1.0	0.0
-fr	05_nuclear	2	157	1.0	0.0
-fr	06_coal	2	157	1.0	0.0
-fr	07_gas	2	157	1.0	0.0
-fr	08_non-res	2	157	1.0	0.0
+fr	01_solar	2	157	0.0	1.0
+fr	02_wind_on	2	157	0.0	1.0
+fr	03_wind_off	2	157	0.0	1.0
+fr	04_res	2	157	0.0	1.0
+fr	05_nuclear	2	157	0.0	1.0
+fr	06_coal	2	157	0.0	1.0
+fr	07_gas	2	157	0.0	1.0
+fr	08_non-res	2	157	0.0	1.0
 fr	09_hydro_pump	2	157	0.0	0.0
-fr	01_solar	2	158	1.0	0.0
-fr	02_wind_on	2	158	1.0	0.0
-fr	03_wind_off	2	158	1.0	0.0
-fr	04_res	2	158	1.0	0.0
-fr	05_nuclear	2	158	1.0	0.0
-fr	06_coal	2	158	1.0	0.0
-fr	07_gas	2	158	1.0	0.0
-fr	08_non-res	2	158	1.0	0.0
+fr	01_solar	2	158	0.0	1.0
+fr	02_wind_on	2	158	0.0	1.0
+fr	03_wind_off	2	158	0.0	1.0
+fr	04_res	2	158	0.0	1.0
+fr	05_nuclear	2	158	0.0	1.0
+fr	06_coal	2	158	0.0	1.0
+fr	07_gas	2	158	0.0	1.0
+fr	08_non-res	2	158	0.0	1.0
 fr	09_hydro_pump	2	158	0.0	0.0
-fr	01_solar	2	159	1.0	0.0
-fr	02_wind_on	2	159	1.0	0.0
-fr	03_wind_off	2	159	1.0	0.0
-fr	04_res	2	159	1.0	0.0
-fr	05_nuclear	2	159	1.0	0.0
-fr	06_coal	2	159	1.0	0.0
-fr	07_gas	2	159	1.0	0.0
-fr	08_non-res	2	159	1.0	0.0
+fr	01_solar	2	159	0.0	1.0
+fr	02_wind_on	2	159	0.0	1.0
+fr	03_wind_off	2	159	0.0	1.0
+fr	04_res	2	159	0.0	1.0
+fr	05_nuclear	2	159	0.0	1.0
+fr	06_coal	2	159	0.0	1.0
+fr	07_gas	2	159	0.0	1.0
+fr	08_non-res	2	159	0.0	1.0
 fr	09_hydro_pump	2	159	0.0	0.0
-fr	01_solar	2	160	1.0	0.0
-fr	02_wind_on	2	160	1.0	0.0
-fr	03_wind_off	2	160	1.0	0.0
-fr	04_res	2	160	1.0	0.0
-fr	05_nuclear	2	160	1.0	0.0
-fr	06_coal	2	160	1.0	0.0
-fr	07_gas	2	160	1.0	0.0
-fr	08_non-res	2	160	1.0	0.0
+fr	01_solar	2	160	0.0	1.0
+fr	02_wind_on	2	160	0.0	1.0
+fr	03_wind_off	2	160	0.0	1.0
+fr	04_res	2	160	0.0	1.0
+fr	05_nuclear	2	160	0.0	1.0
+fr	06_coal	2	160	0.0	1.0
+fr	07_gas	2	160	0.0	1.0
+fr	08_non-res	2	160	0.0	1.0
 fr	09_hydro_pump	2	160	0.0	0.0
-fr	01_solar	2	161	1.0	0.0
-fr	02_wind_on	2	161	1.0	0.0
-fr	03_wind_off	2	161	1.0	0.0
-fr	04_res	2	161	1.0	0.0
-fr	05_nuclear	2	161	1.0	0.0
-fr	06_coal	2	161	1.0	0.0
-fr	07_gas	2	161	1.0	0.0
-fr	08_non-res	2	161	1.0	0.0
+fr	01_solar	2	161	0.0	1.0
+fr	02_wind_on	2	161	0.0	1.0
+fr	03_wind_off	2	161	0.0	1.0
+fr	04_res	2	161	0.0	1.0
+fr	05_nuclear	2	161	0.0	1.0
+fr	06_coal	2	161	0.0	1.0
+fr	07_gas	2	161	0.0	1.0
+fr	08_non-res	2	161	0.0	1.0
 fr	09_hydro_pump	2	161	0.0	0.0
-fr	01_solar	2	162	1.0	0.0
-fr	02_wind_on	2	162	1.0	0.0
-fr	03_wind_off	2	162	1.0	0.0
-fr	04_res	2	162	1.0	0.0
-fr	05_nuclear	2	162	1.0	0.0
-fr	06_coal	2	162	1.0	0.0
-fr	07_gas	2	162	1.0	0.0
-fr	08_non-res	2	162	1.0	0.0
-fr	09_hydro_pump	2	162	1.0	0.0
-fr	01_solar	2	163	1.0	0.0
-fr	02_wind_on	2	163	1.0	0.0
-fr	03_wind_off	2	163	1.0	0.0
-fr	04_res	2	163	1.0	0.0
-fr	05_nuclear	2	163	1.0	0.0
-fr	06_coal	2	163	1.0	0.0
-fr	07_gas	2	163	1.0	0.0
-fr	08_non-res	2	163	1.0	0.0
-fr	09_hydro_pump	2	163	1.0	0.0
-fr	01_solar	2	164	1.0	0.0
-fr	02_wind_on	2	164	1.0	0.0
-fr	03_wind_off	2	164	1.0	0.0
-fr	04_res	2	164	1.0	0.0
-fr	05_nuclear	2	164	1.0	0.0
-fr	06_coal	2	164	1.0	0.0
-fr	07_gas	2	164	1.0	0.0
-fr	08_non-res	2	164	1.0	0.0
-fr	09_hydro_pump	2	164	1.0	0.0
-fr	01_solar	2	165	1.0	0.0
-fr	02_wind_on	2	165	1.0	0.0
-fr	03_wind_off	2	165	1.0	0.0
-fr	04_res	2	165	1.0	0.0
-fr	05_nuclear	2	165	1.0	0.0
-fr	06_coal	2	165	1.0	0.0
-fr	07_gas	2	165	1.0	0.0
-fr	08_non-res	2	165	1.0	0.0
-fr	09_hydro_pump	2	165	1.0	0.0
-fr	01_solar	2	166	1.0	0.0
-fr	02_wind_on	2	166	1.0	0.0
-fr	03_wind_off	2	166	1.0	0.0
-fr	04_res	2	166	1.0	0.0
-fr	05_nuclear	2	166	1.0	0.0
-fr	06_coal	2	166	1.0	0.0
-fr	07_gas	2	166	1.0	0.0
-fr	08_non-res	2	166	1.0	0.0
-fr	09_hydro_pump	2	166	1.0	0.0
-fr	01_solar	2	167	1.0	0.0
-fr	02_wind_on	2	167	1.0	0.0
-fr	03_wind_off	2	167	1.0	0.0
-fr	04_res	2	167	1.0	0.0
-fr	05_nuclear	2	167	1.0	0.0
-fr	06_coal	2	167	1.0	0.0
-fr	07_gas	2	167	1.0	0.0
-fr	08_non-res	2	167	1.0	0.0
-fr	09_hydro_pump	2	167	1.0	0.0
-fr	01_solar	2	168	1.0	0.0
-fr	02_wind_on	2	168	1.0	0.0
-fr	03_wind_off	2	168	1.0	0.0
-fr	04_res	2	168	1.0	0.0
-fr	05_nuclear	2	168	1.0	0.0
-fr	06_coal	2	168	1.0	0.0
-fr	07_gas	2	168	1.0	0.0
-fr	08_non-res	2	168	1.0	0.0
-fr	09_hydro_pump	2	168	1.0	0.0
+fr	01_solar	2	162	0.0	1.0
+fr	02_wind_on	2	162	0.0	1.0
+fr	03_wind_off	2	162	0.0	1.0
+fr	04_res	2	162	0.0	1.0
+fr	05_nuclear	2	162	0.0	1.0
+fr	06_coal	2	162	0.0	1.0
+fr	07_gas	2	162	0.0	1.0
+fr	08_non-res	2	162	0.0	1.0
+fr	09_hydro_pump	2	162	0.0	1.0
+fr	01_solar	2	163	0.0	1.0
+fr	02_wind_on	2	163	0.0	1.0
+fr	03_wind_off	2	163	0.0	1.0
+fr	04_res	2	163	0.0	1.0
+fr	05_nuclear	2	163	0.0	1.0
+fr	06_coal	2	163	0.0	1.0
+fr	07_gas	2	163	0.0	1.0
+fr	08_non-res	2	163	0.0	1.0
+fr	09_hydro_pump	2	163	0.0	1.0
+fr	01_solar	2	164	0.0	1.0
+fr	02_wind_on	2	164	0.0	1.0
+fr	03_wind_off	2	164	0.0	1.0
+fr	04_res	2	164	0.0	1.0
+fr	05_nuclear	2	164	0.0	1.0
+fr	06_coal	2	164	0.0	1.0
+fr	07_gas	2	164	0.0	1.0
+fr	08_non-res	2	164	0.0	1.0
+fr	09_hydro_pump	2	164	0.0	1.0
+fr	01_solar	2	165	0.0	1.0
+fr	02_wind_on	2	165	0.0	1.0
+fr	03_wind_off	2	165	0.0	1.0
+fr	04_res	2	165	0.0	1.0
+fr	05_nuclear	2	165	0.0	1.0
+fr	06_coal	2	165	0.0	1.0
+fr	07_gas	2	165	0.0	1.0
+fr	08_non-res	2	165	0.0	1.0
+fr	09_hydro_pump	2	165	0.0	1.0
+fr	01_solar	2	166	0.0	1.0
+fr	02_wind_on	2	166	0.0	1.0
+fr	03_wind_off	2	166	0.0	1.0
+fr	04_res	2	166	0.0	1.0
+fr	05_nuclear	2	166	0.0	1.0
+fr	06_coal	2	166	0.0	1.0
+fr	07_gas	2	166	0.0	1.0
+fr	08_non-res	2	166	0.0	1.0
+fr	09_hydro_pump	2	166	0.0	1.0
+fr	01_solar	2	167	0.0	1.0
+fr	02_wind_on	2	167	0.0	1.0
+fr	03_wind_off	2	167	0.0	1.0
+fr	04_res	2	167	0.0	1.0
+fr	05_nuclear	2	167	0.0	1.0
+fr	06_coal	2	167	0.0	1.0
+fr	07_gas	2	167	0.0	1.0
+fr	08_non-res	2	167	0.0	1.0
+fr	09_hydro_pump	2	167	0.0	1.0
+fr	01_solar	2	168	0.0	1.0
+fr	02_wind_on	2	168	0.0	1.0
+fr	03_wind_off	2	168	0.0	1.0
+fr	04_res	2	168	0.0	1.0
+fr	05_nuclear	2	168	0.0	1.0
+fr	06_coal	2	168	0.0	1.0
+fr	07_gas	2	168	0.0	1.0
+fr	08_non-res	2	168	0.0	1.0
+fr	09_hydro_pump	2	168	0.0	1.0
 fr	01_solar	2	169	0.0	0.0
 fr	02_wind_on	2	169	0.0	0.0
 fr	03_wind_off	2	169	0.0	0.0
@@ -19664,7 +19664,7 @@ fr	06_coal	2	169	0.0	0.0
 fr	07_gas	2	169	0.0	0.0
 fr	08_non-res	2	169	0.0	0.0
 fr	09_hydro_pump	2	169	0.0	0.0
-fr	01_solar	2	170	1.0	0.0
+fr	01_solar	2	170	0.0	1.0
 fr	02_wind_on	2	170	0.0	0.0
 fr	03_wind_off	2	170	0.0	0.0
 fr	04_res	2	170	0.0	0.0
@@ -19673,7 +19673,7 @@ fr	06_coal	2	170	0.0	0.0
 fr	07_gas	2	170	0.0	0.0
 fr	08_non-res	2	170	0.0	0.0
 fr	09_hydro_pump	2	170	0.0	0.0
-fr	01_solar	2	171	1.0	0.0
+fr	01_solar	2	171	0.0	1.0
 fr	02_wind_on	2	171	0.0	0.0
 fr	03_wind_off	2	171	0.0	0.0
 fr	04_res	2	171	0.0	0.0
@@ -19682,7 +19682,7 @@ fr	06_coal	2	171	0.0	0.0
 fr	07_gas	2	171	0.0	0.0
 fr	08_non-res	2	171	0.0	0.0
 fr	09_hydro_pump	2	171	0.0	0.0
-fr	01_solar	2	172	1.0	0.0
+fr	01_solar	2	172	0.0	1.0
 fr	02_wind_on	2	172	0.0	0.0
 fr	03_wind_off	2	172	0.0	0.0
 fr	04_res	2	172	0.0	0.0
@@ -19691,7 +19691,7 @@ fr	06_coal	2	172	0.0	0.0
 fr	07_gas	2	172	0.0	0.0
 fr	08_non-res	2	172	0.0	0.0
 fr	09_hydro_pump	2	172	0.0	0.0
-fr	01_solar	2	173	1.0	0.0
+fr	01_solar	2	173	0.0	1.0
 fr	02_wind_on	2	173	0.0	0.0
 fr	03_wind_off	2	173	0.0	0.0
 fr	04_res	2	173	0.0	0.0
@@ -19700,7 +19700,7 @@ fr	06_coal	2	173	0.0	0.0
 fr	07_gas	2	173	0.0	0.0
 fr	08_non-res	2	173	0.0	0.0
 fr	09_hydro_pump	2	173	0.0	0.0
-fr	01_solar	2	174	1.0	0.0
+fr	01_solar	2	174	0.0	1.0
 fr	02_wind_on	2	174	0.0	0.0
 fr	03_wind_off	2	174	0.0	0.0
 fr	04_res	2	174	0.0	0.0
@@ -19709,7 +19709,7 @@ fr	06_coal	2	174	0.0	0.0
 fr	07_gas	2	174	0.0	0.0
 fr	08_non-res	2	174	0.0	0.0
 fr	09_hydro_pump	2	174	0.0	0.0
-fr	01_solar	2	175	1.0	0.0
+fr	01_solar	2	175	0.0	1.0
 fr	02_wind_on	2	175	0.0	0.0
 fr	03_wind_off	2	175	0.0	0.0
 fr	04_res	2	175	0.0	0.0
@@ -19718,7 +19718,7 @@ fr	06_coal	2	175	0.0	0.0
 fr	07_gas	2	175	0.0	0.0
 fr	08_non-res	2	175	0.0	0.0
 fr	09_hydro_pump	2	175	0.0	0.0
-fr	01_solar	2	176	1.0	0.0
+fr	01_solar	2	176	0.0	1.0
 fr	02_wind_on	2	176	0.0	0.0
 fr	03_wind_off	2	176	0.0	0.0
 fr	04_res	2	176	0.0	0.0
@@ -19727,7 +19727,7 @@ fr	06_coal	2	176	0.0	0.0
 fr	07_gas	2	176	0.0	0.0
 fr	08_non-res	2	176	0.0	0.0
 fr	09_hydro_pump	2	176	0.0	0.0
-fr	01_solar	2	177	1.0	0.0
+fr	01_solar	2	177	0.0	1.0
 fr	02_wind_on	2	177	0.0	0.0
 fr	03_wind_off	2	177	0.0	0.0
 fr	04_res	2	177	0.0	0.0
@@ -19736,7 +19736,7 @@ fr	06_coal	2	177	0.0	0.0
 fr	07_gas	2	177	0.0	0.0
 fr	08_non-res	2	177	0.0	0.0
 fr	09_hydro_pump	2	177	0.0	0.0
-fr	01_solar	2	178	1.0	0.0
+fr	01_solar	2	178	0.0	1.0
 fr	02_wind_on	2	178	0.0	0.0
 fr	03_wind_off	2	178	0.0	0.0
 fr	04_res	2	178	0.0	0.0
@@ -19745,7 +19745,7 @@ fr	06_coal	2	178	0.0	0.0
 fr	07_gas	2	178	0.0	0.0
 fr	08_non-res	2	178	0.0	0.0
 fr	09_hydro_pump	2	178	0.0	0.0
-fr	01_solar	2	179	1.0	0.0
+fr	01_solar	2	179	0.0	1.0
 fr	02_wind_on	2	179	0.0	0.0
 fr	03_wind_off	2	179	0.0	0.0
 fr	04_res	2	179	0.0	0.0
@@ -19754,7 +19754,7 @@ fr	06_coal	2	179	0.0	0.0
 fr	07_gas	2	179	0.0	0.0
 fr	08_non-res	2	179	0.0	0.0
 fr	09_hydro_pump	2	179	0.0	0.0
-fr	01_solar	2	180	1.0	0.0
+fr	01_solar	2	180	0.0	1.0
 fr	02_wind_on	2	180	0.0	0.0
 fr	03_wind_off	2	180	0.0	0.0
 fr	04_res	2	180	0.0	0.0
@@ -19763,7 +19763,7 @@ fr	06_coal	2	180	0.0	0.0
 fr	07_gas	2	180	0.0	0.0
 fr	08_non-res	2	180	0.0	0.0
 fr	09_hydro_pump	2	180	0.0	0.0
-fr	01_solar	2	181	1.0	0.0
+fr	01_solar	2	181	0.0	1.0
 fr	02_wind_on	2	181	0.0	0.0
 fr	03_wind_off	2	181	0.0	0.0
 fr	04_res	2	181	0.0	0.0
@@ -19772,7 +19772,7 @@ fr	06_coal	2	181	0.0	0.0
 fr	07_gas	2	181	0.0	0.0
 fr	08_non-res	2	181	0.0	0.0
 fr	09_hydro_pump	2	181	0.0	0.0
-fr	01_solar	2	182	1.0	0.0
+fr	01_solar	2	182	0.0	1.0
 fr	02_wind_on	2	182	0.0	0.0
 fr	03_wind_off	2	182	0.0	0.0
 fr	04_res	2	182	0.0	0.0
@@ -19781,7 +19781,7 @@ fr	06_coal	2	182	0.0	0.0
 fr	07_gas	2	182	0.0	0.0
 fr	08_non-res	2	182	0.0	0.0
 fr	09_hydro_pump	2	182	0.0	0.0
-fr	01_solar	2	183	1.0	0.0
+fr	01_solar	2	183	0.0	1.0
 fr	02_wind_on	2	183	0.0	0.0
 fr	03_wind_off	2	183	0.0	0.0
 fr	04_res	2	183	0.0	0.0
@@ -19790,7 +19790,7 @@ fr	06_coal	2	183	0.0	0.0
 fr	07_gas	2	183	0.0	0.0
 fr	08_non-res	2	183	0.0	0.0
 fr	09_hydro_pump	2	183	0.0	0.0
-fr	01_solar	2	184	1.0	0.0
+fr	01_solar	2	184	0.0	1.0
 fr	02_wind_on	2	184	0.0	0.0
 fr	03_wind_off	2	184	0.0	0.0
 fr	04_res	2	184	0.0	0.0
@@ -19799,7 +19799,7 @@ fr	06_coal	2	184	0.0	0.0
 fr	07_gas	2	184	0.0	0.0
 fr	08_non-res	2	184	0.0	0.0
 fr	09_hydro_pump	2	184	0.0	0.0
-fr	01_solar	2	185	1.0	0.0
+fr	01_solar	2	185	0.0	1.0
 fr	02_wind_on	2	185	0.0	0.0
 fr	03_wind_off	2	185	0.0	0.0
 fr	04_res	2	185	0.0	0.0
@@ -19808,7 +19808,7 @@ fr	06_coal	2	185	0.0	0.0
 fr	07_gas	2	185	0.0	0.0
 fr	08_non-res	2	185	0.0	0.0
 fr	09_hydro_pump	2	185	0.0	0.0
-fr	01_solar	2	186	1.0	0.0
+fr	01_solar	2	186	0.0	1.0
 fr	02_wind_on	2	186	0.0	0.0
 fr	03_wind_off	2	186	0.0	0.0
 fr	04_res	2	186	0.0	0.0
@@ -19817,7 +19817,7 @@ fr	06_coal	2	186	0.0	0.0
 fr	07_gas	2	186	0.0	0.0
 fr	08_non-res	2	186	0.0	0.0
 fr	09_hydro_pump	2	186	0.0	0.0
-fr	01_solar	2	187	1.0	0.0
+fr	01_solar	2	187	0.0	1.0
 fr	02_wind_on	2	187	0.0	0.0
 fr	03_wind_off	2	187	0.0	0.0
 fr	04_res	2	187	0.0	0.0
@@ -19826,7 +19826,7 @@ fr	06_coal	2	187	0.0	0.0
 fr	07_gas	2	187	0.0	0.0
 fr	08_non-res	2	187	0.0	0.0
 fr	09_hydro_pump	2	187	0.0	0.0
-fr	01_solar	2	188	1.0	0.0
+fr	01_solar	2	188	0.0	1.0
 fr	02_wind_on	2	188	0.0	0.0
 fr	03_wind_off	2	188	0.0	0.0
 fr	04_res	2	188	0.0	0.0
@@ -19835,7 +19835,7 @@ fr	06_coal	2	188	0.0	0.0
 fr	07_gas	2	188	0.0	0.0
 fr	08_non-res	2	188	0.0	0.0
 fr	09_hydro_pump	2	188	0.0	0.0
-fr	01_solar	2	189	1.0	0.0
+fr	01_solar	2	189	0.0	1.0
 fr	02_wind_on	2	189	0.0	0.0
 fr	03_wind_off	2	189	0.0	0.0
 fr	04_res	2	189	0.0	0.0
@@ -19844,8 +19844,8 @@ fr	06_coal	2	189	0.0	0.0
 fr	07_gas	2	189	0.0	0.0
 fr	08_non-res	2	189	0.0	0.0
 fr	09_hydro_pump	2	189	0.0	0.0
-fr	01_solar	2	190	1.0	0.0
-fr	02_wind_on	2	190	1.0	0.0
+fr	01_solar	2	190	0.0	1.0
+fr	02_wind_on	2	190	0.0	1.0
 fr	03_wind_off	2	190	0.0	0.0
 fr	04_res	2	190	0.0	0.0
 fr	05_nuclear	2	190	0.0	0.0
@@ -19853,8 +19853,8 @@ fr	06_coal	2	190	0.0	0.0
 fr	07_gas	2	190	0.0	0.0
 fr	08_non-res	2	190	0.0	0.0
 fr	09_hydro_pump	2	190	0.0	0.0
-fr	01_solar	2	191	1.0	0.0
-fr	02_wind_on	2	191	1.0	0.0
+fr	01_solar	2	191	0.0	1.0
+fr	02_wind_on	2	191	0.0	1.0
 fr	03_wind_off	2	191	0.0	0.0
 fr	04_res	2	191	0.0	0.0
 fr	05_nuclear	2	191	0.0	0.0
@@ -19862,8 +19862,8 @@ fr	06_coal	2	191	0.0	0.0
 fr	07_gas	2	191	0.0	0.0
 fr	08_non-res	2	191	0.0	0.0
 fr	09_hydro_pump	2	191	0.0	0.0
-fr	01_solar	2	192	1.0	0.0
-fr	02_wind_on	2	192	1.0	0.0
+fr	01_solar	2	192	0.0	1.0
+fr	02_wind_on	2	192	0.0	1.0
 fr	03_wind_off	2	192	0.0	0.0
 fr	04_res	2	192	0.0	0.0
 fr	05_nuclear	2	192	0.0	0.0
@@ -19871,8 +19871,8 @@ fr	06_coal	2	192	0.0	0.0
 fr	07_gas	2	192	0.0	0.0
 fr	08_non-res	2	192	0.0	0.0
 fr	09_hydro_pump	2	192	0.0	0.0
-fr	01_solar	2	193	1.0	0.0
-fr	02_wind_on	2	193	1.0	0.0
+fr	01_solar	2	193	0.0	1.0
+fr	02_wind_on	2	193	0.0	1.0
 fr	03_wind_off	2	193	0.0	0.0
 fr	04_res	2	193	0.0	0.0
 fr	05_nuclear	2	193	0.0	0.0
@@ -19880,8 +19880,8 @@ fr	06_coal	2	193	0.0	0.0
 fr	07_gas	2	193	0.0	0.0
 fr	08_non-res	2	193	0.0	0.0
 fr	09_hydro_pump	2	193	0.0	0.0
-fr	01_solar	2	194	1.0	0.0
-fr	02_wind_on	2	194	1.0	0.0
+fr	01_solar	2	194	0.0	1.0
+fr	02_wind_on	2	194	0.0	1.0
 fr	03_wind_off	2	194	0.0	0.0
 fr	04_res	2	194	0.0	0.0
 fr	05_nuclear	2	194	0.0	0.0
@@ -19889,8 +19889,8 @@ fr	06_coal	2	194	0.0	0.0
 fr	07_gas	2	194	0.0	0.0
 fr	08_non-res	2	194	0.0	0.0
 fr	09_hydro_pump	2	194	0.0	0.0
-fr	01_solar	2	195	1.0	0.0
-fr	02_wind_on	2	195	1.0	0.0
+fr	01_solar	2	195	0.0	1.0
+fr	02_wind_on	2	195	0.0	1.0
 fr	03_wind_off	2	195	0.0	0.0
 fr	04_res	2	195	0.0	0.0
 fr	05_nuclear	2	195	0.0	0.0
@@ -19898,8 +19898,8 @@ fr	06_coal	2	195	0.0	0.0
 fr	07_gas	2	195	0.0	0.0
 fr	08_non-res	2	195	0.0	0.0
 fr	09_hydro_pump	2	195	0.0	0.0
-fr	01_solar	2	196	1.0	0.0
-fr	02_wind_on	2	196	1.0	0.0
+fr	01_solar	2	196	0.0	1.0
+fr	02_wind_on	2	196	0.0	1.0
 fr	03_wind_off	2	196	0.0	0.0
 fr	04_res	2	196	0.0	0.0
 fr	05_nuclear	2	196	0.0	0.0
@@ -19907,8 +19907,8 @@ fr	06_coal	2	196	0.0	0.0
 fr	07_gas	2	196	0.0	0.0
 fr	08_non-res	2	196	0.0	0.0
 fr	09_hydro_pump	2	196	0.0	0.0
-fr	01_solar	2	197	1.0	0.0
-fr	02_wind_on	2	197	1.0	0.0
+fr	01_solar	2	197	0.0	1.0
+fr	02_wind_on	2	197	0.0	1.0
 fr	03_wind_off	2	197	0.0	0.0
 fr	04_res	2	197	0.0	0.0
 fr	05_nuclear	2	197	0.0	0.0
@@ -19916,8 +19916,8 @@ fr	06_coal	2	197	0.0	0.0
 fr	07_gas	2	197	0.0	0.0
 fr	08_non-res	2	197	0.0	0.0
 fr	09_hydro_pump	2	197	0.0	0.0
-fr	01_solar	2	198	1.0	0.0
-fr	02_wind_on	2	198	1.0	0.0
+fr	01_solar	2	198	0.0	1.0
+fr	02_wind_on	2	198	0.0	1.0
 fr	03_wind_off	2	198	0.0	0.0
 fr	04_res	2	198	0.0	0.0
 fr	05_nuclear	2	198	0.0	0.0
@@ -19925,8 +19925,8 @@ fr	06_coal	2	198	0.0	0.0
 fr	07_gas	2	198	0.0	0.0
 fr	08_non-res	2	198	0.0	0.0
 fr	09_hydro_pump	2	198	0.0	0.0
-fr	01_solar	2	199	1.0	0.0
-fr	02_wind_on	2	199	1.0	0.0
+fr	01_solar	2	199	0.0	1.0
+fr	02_wind_on	2	199	0.0	1.0
 fr	03_wind_off	2	199	0.0	0.0
 fr	04_res	2	199	0.0	0.0
 fr	05_nuclear	2	199	0.0	0.0
@@ -19934,8 +19934,8 @@ fr	06_coal	2	199	0.0	0.0
 fr	07_gas	2	199	0.0	0.0
 fr	08_non-res	2	199	0.0	0.0
 fr	09_hydro_pump	2	199	0.0	0.0
-fr	01_solar	2	200	1.0	0.0
-fr	02_wind_on	2	200	1.0	0.0
+fr	01_solar	2	200	0.0	1.0
+fr	02_wind_on	2	200	0.0	1.0
 fr	03_wind_off	2	200	0.0	0.0
 fr	04_res	2	200	0.0	0.0
 fr	05_nuclear	2	200	0.0	0.0
@@ -19943,8 +19943,8 @@ fr	06_coal	2	200	0.0	0.0
 fr	07_gas	2	200	0.0	0.0
 fr	08_non-res	2	200	0.0	0.0
 fr	09_hydro_pump	2	200	0.0	0.0
-fr	01_solar	2	201	1.0	0.0
-fr	02_wind_on	2	201	1.0	0.0
+fr	01_solar	2	201	0.0	1.0
+fr	02_wind_on	2	201	0.0	1.0
 fr	03_wind_off	2	201	0.0	0.0
 fr	04_res	2	201	0.0	0.0
 fr	05_nuclear	2	201	0.0	0.0
@@ -19952,8 +19952,8 @@ fr	06_coal	2	201	0.0	0.0
 fr	07_gas	2	201	0.0	0.0
 fr	08_non-res	2	201	0.0	0.0
 fr	09_hydro_pump	2	201	0.0	0.0
-fr	01_solar	2	202	1.0	0.0
-fr	02_wind_on	2	202	1.0	0.0
+fr	01_solar	2	202	0.0	1.0
+fr	02_wind_on	2	202	0.0	1.0
 fr	03_wind_off	2	202	0.0	0.0
 fr	04_res	2	202	0.0	0.0
 fr	05_nuclear	2	202	0.0	0.0
@@ -19961,8 +19961,8 @@ fr	06_coal	2	202	0.0	0.0
 fr	07_gas	2	202	0.0	0.0
 fr	08_non-res	2	202	0.0	0.0
 fr	09_hydro_pump	2	202	0.0	0.0
-fr	01_solar	2	203	1.0	0.0
-fr	02_wind_on	2	203	1.0	0.0
+fr	01_solar	2	203	0.0	1.0
+fr	02_wind_on	2	203	0.0	1.0
 fr	03_wind_off	2	203	0.0	0.0
 fr	04_res	2	203	0.0	0.0
 fr	05_nuclear	2	203	0.0	0.0
@@ -19970,8 +19970,8 @@ fr	06_coal	2	203	0.0	0.0
 fr	07_gas	2	203	0.0	0.0
 fr	08_non-res	2	203	0.0	0.0
 fr	09_hydro_pump	2	203	0.0	0.0
-fr	01_solar	2	204	1.0	0.0
-fr	02_wind_on	2	204	1.0	0.0
+fr	01_solar	2	204	0.0	1.0
+fr	02_wind_on	2	204	0.0	1.0
 fr	03_wind_off	2	204	0.0	0.0
 fr	04_res	2	204	0.0	0.0
 fr	05_nuclear	2	204	0.0	0.0
@@ -19979,8 +19979,8 @@ fr	06_coal	2	204	0.0	0.0
 fr	07_gas	2	204	0.0	0.0
 fr	08_non-res	2	204	0.0	0.0
 fr	09_hydro_pump	2	204	0.0	0.0
-fr	01_solar	2	205	1.0	0.0
-fr	02_wind_on	2	205	1.0	0.0
+fr	01_solar	2	205	0.0	1.0
+fr	02_wind_on	2	205	0.0	1.0
 fr	03_wind_off	2	205	0.0	0.0
 fr	04_res	2	205	0.0	0.0
 fr	05_nuclear	2	205	0.0	0.0
@@ -19988,8 +19988,8 @@ fr	06_coal	2	205	0.0	0.0
 fr	07_gas	2	205	0.0	0.0
 fr	08_non-res	2	205	0.0	0.0
 fr	09_hydro_pump	2	205	0.0	0.0
-fr	01_solar	2	206	1.0	0.0
-fr	02_wind_on	2	206	1.0	0.0
+fr	01_solar	2	206	0.0	1.0
+fr	02_wind_on	2	206	0.0	1.0
 fr	03_wind_off	2	206	0.0	0.0
 fr	04_res	2	206	0.0	0.0
 fr	05_nuclear	2	206	0.0	0.0
@@ -19997,8 +19997,8 @@ fr	06_coal	2	206	0.0	0.0
 fr	07_gas	2	206	0.0	0.0
 fr	08_non-res	2	206	0.0	0.0
 fr	09_hydro_pump	2	206	0.0	0.0
-fr	01_solar	2	207	1.0	0.0
-fr	02_wind_on	2	207	1.0	0.0
+fr	01_solar	2	207	0.0	1.0
+fr	02_wind_on	2	207	0.0	1.0
 fr	03_wind_off	2	207	0.0	0.0
 fr	04_res	2	207	0.0	0.0
 fr	05_nuclear	2	207	0.0	0.0
@@ -20006,8 +20006,8 @@ fr	06_coal	2	207	0.0	0.0
 fr	07_gas	2	207	0.0	0.0
 fr	08_non-res	2	207	0.0	0.0
 fr	09_hydro_pump	2	207	0.0	0.0
-fr	01_solar	2	208	1.0	0.0
-fr	02_wind_on	2	208	1.0	0.0
+fr	01_solar	2	208	0.0	1.0
+fr	02_wind_on	2	208	0.0	1.0
 fr	03_wind_off	2	208	0.0	0.0
 fr	04_res	2	208	0.0	0.0
 fr	05_nuclear	2	208	0.0	0.0
@@ -20015,8 +20015,8 @@ fr	06_coal	2	208	0.0	0.0
 fr	07_gas	2	208	0.0	0.0
 fr	08_non-res	2	208	0.0	0.0
 fr	09_hydro_pump	2	208	0.0	0.0
-fr	01_solar	2	209	1.0	0.0
-fr	02_wind_on	2	209	1.0	0.0
+fr	01_solar	2	209	0.0	1.0
+fr	02_wind_on	2	209	0.0	1.0
 fr	03_wind_off	2	209	0.0	0.0
 fr	04_res	2	209	0.0	0.0
 fr	05_nuclear	2	209	0.0	0.0
@@ -20024,1149 +20024,1149 @@ fr	06_coal	2	209	0.0	0.0
 fr	07_gas	2	209	0.0	0.0
 fr	08_non-res	2	209	0.0	0.0
 fr	09_hydro_pump	2	209	0.0	0.0
-fr	01_solar	2	210	1.0	0.0
-fr	02_wind_on	2	210	1.0	0.0
-fr	03_wind_off	2	210	1.0	0.0
+fr	01_solar	2	210	0.0	1.0
+fr	02_wind_on	2	210	0.0	1.0
+fr	03_wind_off	2	210	0.0	1.0
 fr	04_res	2	210	0.0	0.0
 fr	05_nuclear	2	210	0.0	0.0
 fr	06_coal	2	210	0.0	0.0
 fr	07_gas	2	210	0.0	0.0
 fr	08_non-res	2	210	0.0	0.0
 fr	09_hydro_pump	2	210	0.0	0.0
-fr	01_solar	2	211	1.0	0.0
-fr	02_wind_on	2	211	1.0	0.0
-fr	03_wind_off	2	211	1.0	0.0
+fr	01_solar	2	211	0.0	1.0
+fr	02_wind_on	2	211	0.0	1.0
+fr	03_wind_off	2	211	0.0	1.0
 fr	04_res	2	211	0.0	0.0
 fr	05_nuclear	2	211	0.0	0.0
 fr	06_coal	2	211	0.0	0.0
 fr	07_gas	2	211	0.0	0.0
 fr	08_non-res	2	211	0.0	0.0
 fr	09_hydro_pump	2	211	0.0	0.0
-fr	01_solar	2	212	1.0	0.0
-fr	02_wind_on	2	212	1.0	0.0
-fr	03_wind_off	2	212	1.0	0.0
+fr	01_solar	2	212	0.0	1.0
+fr	02_wind_on	2	212	0.0	1.0
+fr	03_wind_off	2	212	0.0	1.0
 fr	04_res	2	212	0.0	0.0
 fr	05_nuclear	2	212	0.0	0.0
 fr	06_coal	2	212	0.0	0.0
 fr	07_gas	2	212	0.0	0.0
 fr	08_non-res	2	212	0.0	0.0
 fr	09_hydro_pump	2	212	0.0	0.0
-fr	01_solar	2	213	1.0	0.0
-fr	02_wind_on	2	213	1.0	0.0
-fr	03_wind_off	2	213	1.0	0.0
+fr	01_solar	2	213	0.0	1.0
+fr	02_wind_on	2	213	0.0	1.0
+fr	03_wind_off	2	213	0.0	1.0
 fr	04_res	2	213	0.0	0.0
 fr	05_nuclear	2	213	0.0	0.0
 fr	06_coal	2	213	0.0	0.0
 fr	07_gas	2	213	0.0	0.0
 fr	08_non-res	2	213	0.0	0.0
 fr	09_hydro_pump	2	213	0.0	0.0
-fr	01_solar	2	214	1.0	0.0
-fr	02_wind_on	2	214	1.0	0.0
-fr	03_wind_off	2	214	1.0	0.0
+fr	01_solar	2	214	0.0	1.0
+fr	02_wind_on	2	214	0.0	1.0
+fr	03_wind_off	2	214	0.0	1.0
 fr	04_res	2	214	0.0	0.0
 fr	05_nuclear	2	214	0.0	0.0
 fr	06_coal	2	214	0.0	0.0
 fr	07_gas	2	214	0.0	0.0
 fr	08_non-res	2	214	0.0	0.0
 fr	09_hydro_pump	2	214	0.0	0.0
-fr	01_solar	2	215	1.0	0.0
-fr	02_wind_on	2	215	1.0	0.0
-fr	03_wind_off	2	215	1.0	0.0
+fr	01_solar	2	215	0.0	1.0
+fr	02_wind_on	2	215	0.0	1.0
+fr	03_wind_off	2	215	0.0	1.0
 fr	04_res	2	215	0.0	0.0
 fr	05_nuclear	2	215	0.0	0.0
 fr	06_coal	2	215	0.0	0.0
 fr	07_gas	2	215	0.0	0.0
 fr	08_non-res	2	215	0.0	0.0
 fr	09_hydro_pump	2	215	0.0	0.0
-fr	01_solar	2	216	1.0	0.0
-fr	02_wind_on	2	216	1.0	0.0
-fr	03_wind_off	2	216	1.0	0.0
+fr	01_solar	2	216	0.0	1.0
+fr	02_wind_on	2	216	0.0	1.0
+fr	03_wind_off	2	216	0.0	1.0
 fr	04_res	2	216	0.0	0.0
 fr	05_nuclear	2	216	0.0	0.0
 fr	06_coal	2	216	0.0	0.0
 fr	07_gas	2	216	0.0	0.0
 fr	08_non-res	2	216	0.0	0.0
 fr	09_hydro_pump	2	216	0.0	0.0
-fr	01_solar	2	217	1.0	0.0
-fr	02_wind_on	2	217	1.0	0.0
-fr	03_wind_off	2	217	1.0	0.0
+fr	01_solar	2	217	0.0	1.0
+fr	02_wind_on	2	217	0.0	1.0
+fr	03_wind_off	2	217	0.0	1.0
 fr	04_res	2	217	0.0	0.0
 fr	05_nuclear	2	217	0.0	0.0
 fr	06_coal	2	217	0.0	0.0
 fr	07_gas	2	217	0.0	0.0
 fr	08_non-res	2	217	0.0	0.0
 fr	09_hydro_pump	2	217	0.0	0.0
-fr	01_solar	2	218	1.0	0.0
-fr	02_wind_on	2	218	1.0	0.0
-fr	03_wind_off	2	218	1.0	0.0
+fr	01_solar	2	218	0.0	1.0
+fr	02_wind_on	2	218	0.0	1.0
+fr	03_wind_off	2	218	0.0	1.0
 fr	04_res	2	218	0.0	0.0
 fr	05_nuclear	2	218	0.0	0.0
 fr	06_coal	2	218	0.0	0.0
 fr	07_gas	2	218	0.0	0.0
 fr	08_non-res	2	218	0.0	0.0
 fr	09_hydro_pump	2	218	0.0	0.0
-fr	01_solar	2	219	1.0	0.0
-fr	02_wind_on	2	219	1.0	0.0
-fr	03_wind_off	2	219	1.0	0.0
+fr	01_solar	2	219	0.0	1.0
+fr	02_wind_on	2	219	0.0	1.0
+fr	03_wind_off	2	219	0.0	1.0
 fr	04_res	2	219	0.0	0.0
 fr	05_nuclear	2	219	0.0	0.0
 fr	06_coal	2	219	0.0	0.0
 fr	07_gas	2	219	0.0	0.0
 fr	08_non-res	2	219	0.0	0.0
 fr	09_hydro_pump	2	219	0.0	0.0
-fr	01_solar	2	220	1.0	0.0
-fr	02_wind_on	2	220	1.0	0.0
-fr	03_wind_off	2	220	1.0	0.0
+fr	01_solar	2	220	0.0	1.0
+fr	02_wind_on	2	220	0.0	1.0
+fr	03_wind_off	2	220	0.0	1.0
 fr	04_res	2	220	0.0	0.0
 fr	05_nuclear	2	220	0.0	0.0
 fr	06_coal	2	220	0.0	0.0
 fr	07_gas	2	220	0.0	0.0
 fr	08_non-res	2	220	0.0	0.0
 fr	09_hydro_pump	2	220	0.0	0.0
-fr	01_solar	2	221	1.0	0.0
-fr	02_wind_on	2	221	1.0	0.0
-fr	03_wind_off	2	221	1.0	0.0
+fr	01_solar	2	221	0.0	1.0
+fr	02_wind_on	2	221	0.0	1.0
+fr	03_wind_off	2	221	0.0	1.0
 fr	04_res	2	221	0.0	0.0
 fr	05_nuclear	2	221	0.0	0.0
 fr	06_coal	2	221	0.0	0.0
 fr	07_gas	2	221	0.0	0.0
 fr	08_non-res	2	221	0.0	0.0
 fr	09_hydro_pump	2	221	0.0	0.0
-fr	01_solar	2	222	1.0	0.0
-fr	02_wind_on	2	222	1.0	0.0
-fr	03_wind_off	2	222	1.0	0.0
+fr	01_solar	2	222	0.0	1.0
+fr	02_wind_on	2	222	0.0	1.0
+fr	03_wind_off	2	222	0.0	1.0
 fr	04_res	2	222	0.0	0.0
 fr	05_nuclear	2	222	0.0	0.0
 fr	06_coal	2	222	0.0	0.0
 fr	07_gas	2	222	0.0	0.0
 fr	08_non-res	2	222	0.0	0.0
 fr	09_hydro_pump	2	222	0.0	0.0
-fr	01_solar	2	223	1.0	0.0
-fr	02_wind_on	2	223	1.0	0.0
-fr	03_wind_off	2	223	1.0	0.0
+fr	01_solar	2	223	0.0	1.0
+fr	02_wind_on	2	223	0.0	1.0
+fr	03_wind_off	2	223	0.0	1.0
 fr	04_res	2	223	0.0	0.0
 fr	05_nuclear	2	223	0.0	0.0
 fr	06_coal	2	223	0.0	0.0
 fr	07_gas	2	223	0.0	0.0
 fr	08_non-res	2	223	0.0	0.0
 fr	09_hydro_pump	2	223	0.0	0.0
-fr	01_solar	2	224	1.0	0.0
-fr	02_wind_on	2	224	1.0	0.0
-fr	03_wind_off	2	224	1.0	0.0
+fr	01_solar	2	224	0.0	1.0
+fr	02_wind_on	2	224	0.0	1.0
+fr	03_wind_off	2	224	0.0	1.0
 fr	04_res	2	224	0.0	0.0
 fr	05_nuclear	2	224	0.0	0.0
 fr	06_coal	2	224	0.0	0.0
 fr	07_gas	2	224	0.0	0.0
 fr	08_non-res	2	224	0.0	0.0
 fr	09_hydro_pump	2	224	0.0	0.0
-fr	01_solar	2	225	1.0	0.0
-fr	02_wind_on	2	225	1.0	0.0
-fr	03_wind_off	2	225	1.0	0.0
+fr	01_solar	2	225	0.0	1.0
+fr	02_wind_on	2	225	0.0	1.0
+fr	03_wind_off	2	225	0.0	1.0
 fr	04_res	2	225	0.0	0.0
 fr	05_nuclear	2	225	0.0	0.0
 fr	06_coal	2	225	0.0	0.0
 fr	07_gas	2	225	0.0	0.0
 fr	08_non-res	2	225	0.0	0.0
 fr	09_hydro_pump	2	225	0.0	0.0
-fr	01_solar	2	226	1.0	0.0
-fr	02_wind_on	2	226	1.0	0.0
-fr	03_wind_off	2	226	1.0	0.0
+fr	01_solar	2	226	0.0	1.0
+fr	02_wind_on	2	226	0.0	1.0
+fr	03_wind_off	2	226	0.0	1.0
 fr	04_res	2	226	0.0	0.0
 fr	05_nuclear	2	226	0.0	0.0
 fr	06_coal	2	226	0.0	0.0
 fr	07_gas	2	226	0.0	0.0
 fr	08_non-res	2	226	0.0	0.0
 fr	09_hydro_pump	2	226	0.0	0.0
-fr	01_solar	2	227	1.0	0.0
-fr	02_wind_on	2	227	1.0	0.0
-fr	03_wind_off	2	227	1.0	0.0
+fr	01_solar	2	227	0.0	1.0
+fr	02_wind_on	2	227	0.0	1.0
+fr	03_wind_off	2	227	0.0	1.0
 fr	04_res	2	227	0.0	0.0
 fr	05_nuclear	2	227	0.0	0.0
 fr	06_coal	2	227	0.0	0.0
 fr	07_gas	2	227	0.0	0.0
 fr	08_non-res	2	227	0.0	0.0
 fr	09_hydro_pump	2	227	0.0	0.0
-fr	01_solar	2	228	1.0	0.0
-fr	02_wind_on	2	228	1.0	0.0
-fr	03_wind_off	2	228	1.0	0.0
+fr	01_solar	2	228	0.0	1.0
+fr	02_wind_on	2	228	0.0	1.0
+fr	03_wind_off	2	228	0.0	1.0
 fr	04_res	2	228	0.0	0.0
 fr	05_nuclear	2	228	0.0	0.0
 fr	06_coal	2	228	0.0	0.0
 fr	07_gas	2	228	0.0	0.0
 fr	08_non-res	2	228	0.0	0.0
 fr	09_hydro_pump	2	228	0.0	0.0
-fr	01_solar	2	229	1.0	0.0
-fr	02_wind_on	2	229	1.0	0.0
-fr	03_wind_off	2	229	1.0	0.0
+fr	01_solar	2	229	0.0	1.0
+fr	02_wind_on	2	229	0.0	1.0
+fr	03_wind_off	2	229	0.0	1.0
 fr	04_res	2	229	0.0	0.0
 fr	05_nuclear	2	229	0.0	0.0
 fr	06_coal	2	229	0.0	0.0
 fr	07_gas	2	229	0.0	0.0
 fr	08_non-res	2	229	0.0	0.0
 fr	09_hydro_pump	2	229	0.0	0.0
-fr	01_solar	2	230	1.0	0.0
-fr	02_wind_on	2	230	1.0	0.0
-fr	03_wind_off	2	230	1.0	0.0
-fr	04_res	2	230	1.0	0.0
+fr	01_solar	2	230	0.0	1.0
+fr	02_wind_on	2	230	0.0	1.0
+fr	03_wind_off	2	230	0.0	1.0
+fr	04_res	2	230	0.0	1.0
 fr	05_nuclear	2	230	0.0	0.0
 fr	06_coal	2	230	0.0	0.0
 fr	07_gas	2	230	0.0	0.0
 fr	08_non-res	2	230	0.0	0.0
 fr	09_hydro_pump	2	230	0.0	0.0
-fr	01_solar	2	231	1.0	0.0
-fr	02_wind_on	2	231	1.0	0.0
-fr	03_wind_off	2	231	1.0	0.0
-fr	04_res	2	231	1.0	0.0
+fr	01_solar	2	231	0.0	1.0
+fr	02_wind_on	2	231	0.0	1.0
+fr	03_wind_off	2	231	0.0	1.0
+fr	04_res	2	231	0.0	1.0
 fr	05_nuclear	2	231	0.0	0.0
 fr	06_coal	2	231	0.0	0.0
 fr	07_gas	2	231	0.0	0.0
 fr	08_non-res	2	231	0.0	0.0
 fr	09_hydro_pump	2	231	0.0	0.0
-fr	01_solar	2	232	1.0	0.0
-fr	02_wind_on	2	232	1.0	0.0
-fr	03_wind_off	2	232	1.0	0.0
-fr	04_res	2	232	1.0	0.0
+fr	01_solar	2	232	0.0	1.0
+fr	02_wind_on	2	232	0.0	1.0
+fr	03_wind_off	2	232	0.0	1.0
+fr	04_res	2	232	0.0	1.0
 fr	05_nuclear	2	232	0.0	0.0
 fr	06_coal	2	232	0.0	0.0
 fr	07_gas	2	232	0.0	0.0
 fr	08_non-res	2	232	0.0	0.0
 fr	09_hydro_pump	2	232	0.0	0.0
-fr	01_solar	2	233	1.0	0.0
-fr	02_wind_on	2	233	1.0	0.0
-fr	03_wind_off	2	233	1.0	0.0
-fr	04_res	2	233	1.0	0.0
+fr	01_solar	2	233	0.0	1.0
+fr	02_wind_on	2	233	0.0	1.0
+fr	03_wind_off	2	233	0.0	1.0
+fr	04_res	2	233	0.0	1.0
 fr	05_nuclear	2	233	0.0	0.0
 fr	06_coal	2	233	0.0	0.0
 fr	07_gas	2	233	0.0	0.0
 fr	08_non-res	2	233	0.0	0.0
 fr	09_hydro_pump	2	233	0.0	0.0
-fr	01_solar	2	234	1.0	0.0
-fr	02_wind_on	2	234	1.0	0.0
-fr	03_wind_off	2	234	1.0	0.0
-fr	04_res	2	234	1.0	0.0
+fr	01_solar	2	234	0.0	1.0
+fr	02_wind_on	2	234	0.0	1.0
+fr	03_wind_off	2	234	0.0	1.0
+fr	04_res	2	234	0.0	1.0
 fr	05_nuclear	2	234	0.0	0.0
 fr	06_coal	2	234	0.0	0.0
 fr	07_gas	2	234	0.0	0.0
 fr	08_non-res	2	234	0.0	0.0
 fr	09_hydro_pump	2	234	0.0	0.0
-fr	01_solar	2	235	1.0	0.0
-fr	02_wind_on	2	235	1.0	0.0
-fr	03_wind_off	2	235	1.0	0.0
-fr	04_res	2	235	1.0	0.0
+fr	01_solar	2	235	0.0	1.0
+fr	02_wind_on	2	235	0.0	1.0
+fr	03_wind_off	2	235	0.0	1.0
+fr	04_res	2	235	0.0	1.0
 fr	05_nuclear	2	235	0.0	0.0
 fr	06_coal	2	235	0.0	0.0
 fr	07_gas	2	235	0.0	0.0
 fr	08_non-res	2	235	0.0	0.0
 fr	09_hydro_pump	2	235	0.0	0.0
-fr	01_solar	2	236	1.0	0.0
-fr	02_wind_on	2	236	1.0	0.0
-fr	03_wind_off	2	236	1.0	0.0
-fr	04_res	2	236	1.0	0.0
+fr	01_solar	2	236	0.0	1.0
+fr	02_wind_on	2	236	0.0	1.0
+fr	03_wind_off	2	236	0.0	1.0
+fr	04_res	2	236	0.0	1.0
 fr	05_nuclear	2	236	0.0	0.0
 fr	06_coal	2	236	0.0	0.0
 fr	07_gas	2	236	0.0	0.0
 fr	08_non-res	2	236	0.0	0.0
 fr	09_hydro_pump	2	236	0.0	0.0
-fr	01_solar	2	237	1.0	0.0
-fr	02_wind_on	2	237	1.0	0.0
-fr	03_wind_off	2	237	1.0	0.0
-fr	04_res	2	237	1.0	0.0
+fr	01_solar	2	237	0.0	1.0
+fr	02_wind_on	2	237	0.0	1.0
+fr	03_wind_off	2	237	0.0	1.0
+fr	04_res	2	237	0.0	1.0
 fr	05_nuclear	2	237	0.0	0.0
 fr	06_coal	2	237	0.0	0.0
 fr	07_gas	2	237	0.0	0.0
 fr	08_non-res	2	237	0.0	0.0
 fr	09_hydro_pump	2	237	0.0	0.0
-fr	01_solar	2	238	1.0	0.0
-fr	02_wind_on	2	238	1.0	0.0
-fr	03_wind_off	2	238	1.0	0.0
-fr	04_res	2	238	1.0	0.0
+fr	01_solar	2	238	0.0	1.0
+fr	02_wind_on	2	238	0.0	1.0
+fr	03_wind_off	2	238	0.0	1.0
+fr	04_res	2	238	0.0	1.0
 fr	05_nuclear	2	238	0.0	0.0
 fr	06_coal	2	238	0.0	0.0
 fr	07_gas	2	238	0.0	0.0
 fr	08_non-res	2	238	0.0	0.0
 fr	09_hydro_pump	2	238	0.0	0.0
-fr	01_solar	2	239	1.0	0.0
-fr	02_wind_on	2	239	1.0	0.0
-fr	03_wind_off	2	239	1.0	0.0
-fr	04_res	2	239	1.0	0.0
+fr	01_solar	2	239	0.0	1.0
+fr	02_wind_on	2	239	0.0	1.0
+fr	03_wind_off	2	239	0.0	1.0
+fr	04_res	2	239	0.0	1.0
 fr	05_nuclear	2	239	0.0	0.0
 fr	06_coal	2	239	0.0	0.0
 fr	07_gas	2	239	0.0	0.0
 fr	08_non-res	2	239	0.0	0.0
 fr	09_hydro_pump	2	239	0.0	0.0
-fr	01_solar	2	240	1.0	0.0
-fr	02_wind_on	2	240	1.0	0.0
-fr	03_wind_off	2	240	1.0	0.0
-fr	04_res	2	240	1.0	0.0
+fr	01_solar	2	240	0.0	1.0
+fr	02_wind_on	2	240	0.0	1.0
+fr	03_wind_off	2	240	0.0	1.0
+fr	04_res	2	240	0.0	1.0
 fr	05_nuclear	2	240	0.0	0.0
 fr	06_coal	2	240	0.0	0.0
 fr	07_gas	2	240	0.0	0.0
 fr	08_non-res	2	240	0.0	0.0
 fr	09_hydro_pump	2	240	0.0	0.0
-fr	01_solar	2	241	1.0	0.0
-fr	02_wind_on	2	241	1.0	0.0
-fr	03_wind_off	2	241	1.0	0.0
-fr	04_res	2	241	1.0	0.0
+fr	01_solar	2	241	0.0	1.0
+fr	02_wind_on	2	241	0.0	1.0
+fr	03_wind_off	2	241	0.0	1.0
+fr	04_res	2	241	0.0	1.0
 fr	05_nuclear	2	241	0.0	0.0
 fr	06_coal	2	241	0.0	0.0
 fr	07_gas	2	241	0.0	0.0
 fr	08_non-res	2	241	0.0	0.0
 fr	09_hydro_pump	2	241	0.0	0.0
-fr	01_solar	2	242	1.0	0.0
-fr	02_wind_on	2	242	1.0	0.0
-fr	03_wind_off	2	242	1.0	0.0
-fr	04_res	2	242	1.0	0.0
+fr	01_solar	2	242	0.0	1.0
+fr	02_wind_on	2	242	0.0	1.0
+fr	03_wind_off	2	242	0.0	1.0
+fr	04_res	2	242	0.0	1.0
 fr	05_nuclear	2	242	0.0	0.0
 fr	06_coal	2	242	0.0	0.0
 fr	07_gas	2	242	0.0	0.0
 fr	08_non-res	2	242	0.0	0.0
 fr	09_hydro_pump	2	242	0.0	0.0
-fr	01_solar	2	243	1.0	0.0
-fr	02_wind_on	2	243	1.0	0.0
-fr	03_wind_off	2	243	1.0	0.0
-fr	04_res	2	243	1.0	0.0
+fr	01_solar	2	243	0.0	1.0
+fr	02_wind_on	2	243	0.0	1.0
+fr	03_wind_off	2	243	0.0	1.0
+fr	04_res	2	243	0.0	1.0
 fr	05_nuclear	2	243	0.0	0.0
 fr	06_coal	2	243	0.0	0.0
 fr	07_gas	2	243	0.0	0.0
 fr	08_non-res	2	243	0.0	0.0
 fr	09_hydro_pump	2	243	0.0	0.0
-fr	01_solar	2	244	1.0	0.0
-fr	02_wind_on	2	244	1.0	0.0
-fr	03_wind_off	2	244	1.0	0.0
-fr	04_res	2	244	1.0	0.0
+fr	01_solar	2	244	0.0	1.0
+fr	02_wind_on	2	244	0.0	1.0
+fr	03_wind_off	2	244	0.0	1.0
+fr	04_res	2	244	0.0	1.0
 fr	05_nuclear	2	244	0.0	0.0
 fr	06_coal	2	244	0.0	0.0
 fr	07_gas	2	244	0.0	0.0
 fr	08_non-res	2	244	0.0	0.0
 fr	09_hydro_pump	2	244	0.0	0.0
-fr	01_solar	2	245	1.0	0.0
-fr	02_wind_on	2	245	1.0	0.0
-fr	03_wind_off	2	245	1.0	0.0
-fr	04_res	2	245	1.0	0.0
+fr	01_solar	2	245	0.0	1.0
+fr	02_wind_on	2	245	0.0	1.0
+fr	03_wind_off	2	245	0.0	1.0
+fr	04_res	2	245	0.0	1.0
 fr	05_nuclear	2	245	0.0	0.0
 fr	06_coal	2	245	0.0	0.0
 fr	07_gas	2	245	0.0	0.0
 fr	08_non-res	2	245	0.0	0.0
 fr	09_hydro_pump	2	245	0.0	0.0
-fr	01_solar	2	246	1.0	0.0
-fr	02_wind_on	2	246	1.0	0.0
-fr	03_wind_off	2	246	1.0	0.0
-fr	04_res	2	246	1.0	0.0
+fr	01_solar	2	246	0.0	1.0
+fr	02_wind_on	2	246	0.0	1.0
+fr	03_wind_off	2	246	0.0	1.0
+fr	04_res	2	246	0.0	1.0
 fr	05_nuclear	2	246	0.0	0.0
 fr	06_coal	2	246	0.0	0.0
 fr	07_gas	2	246	0.0	0.0
 fr	08_non-res	2	246	0.0	0.0
 fr	09_hydro_pump	2	246	0.0	0.0
-fr	01_solar	2	247	1.0	0.0
-fr	02_wind_on	2	247	1.0	0.0
-fr	03_wind_off	2	247	1.0	0.0
-fr	04_res	2	247	1.0	0.0
+fr	01_solar	2	247	0.0	1.0
+fr	02_wind_on	2	247	0.0	1.0
+fr	03_wind_off	2	247	0.0	1.0
+fr	04_res	2	247	0.0	1.0
 fr	05_nuclear	2	247	0.0	0.0
 fr	06_coal	2	247	0.0	0.0
 fr	07_gas	2	247	0.0	0.0
 fr	08_non-res	2	247	0.0	0.0
 fr	09_hydro_pump	2	247	0.0	0.0
-fr	01_solar	2	248	1.0	0.0
-fr	02_wind_on	2	248	1.0	0.0
-fr	03_wind_off	2	248	1.0	0.0
-fr	04_res	2	248	1.0	0.0
+fr	01_solar	2	248	0.0	1.0
+fr	02_wind_on	2	248	0.0	1.0
+fr	03_wind_off	2	248	0.0	1.0
+fr	04_res	2	248	0.0	1.0
 fr	05_nuclear	2	248	0.0	0.0
 fr	06_coal	2	248	0.0	0.0
 fr	07_gas	2	248	0.0	0.0
 fr	08_non-res	2	248	0.0	0.0
 fr	09_hydro_pump	2	248	0.0	0.0
-fr	01_solar	2	249	1.0	0.0
-fr	02_wind_on	2	249	1.0	0.0
-fr	03_wind_off	2	249	1.0	0.0
-fr	04_res	2	249	1.0	0.0
+fr	01_solar	2	249	0.0	1.0
+fr	02_wind_on	2	249	0.0	1.0
+fr	03_wind_off	2	249	0.0	1.0
+fr	04_res	2	249	0.0	1.0
 fr	05_nuclear	2	249	0.0	0.0
 fr	06_coal	2	249	0.0	0.0
 fr	07_gas	2	249	0.0	0.0
 fr	08_non-res	2	249	0.0	0.0
 fr	09_hydro_pump	2	249	0.0	0.0
-fr	01_solar	2	250	1.0	0.0
-fr	02_wind_on	2	250	1.0	0.0
-fr	03_wind_off	2	250	1.0	0.0
-fr	04_res	2	250	1.0	0.0
-fr	05_nuclear	2	250	1.0	0.0
+fr	01_solar	2	250	0.0	1.0
+fr	02_wind_on	2	250	0.0	1.0
+fr	03_wind_off	2	250	0.0	1.0
+fr	04_res	2	250	0.0	1.0
+fr	05_nuclear	2	250	0.0	1.0
 fr	06_coal	2	250	0.0	0.0
 fr	07_gas	2	250	0.0	0.0
 fr	08_non-res	2	250	0.0	0.0
 fr	09_hydro_pump	2	250	0.0	0.0
-fr	01_solar	2	251	1.0	0.0
-fr	02_wind_on	2	251	1.0	0.0
-fr	03_wind_off	2	251	1.0	0.0
-fr	04_res	2	251	1.0	0.0
-fr	05_nuclear	2	251	1.0	0.0
+fr	01_solar	2	251	0.0	1.0
+fr	02_wind_on	2	251	0.0	1.0
+fr	03_wind_off	2	251	0.0	1.0
+fr	04_res	2	251	0.0	1.0
+fr	05_nuclear	2	251	0.0	1.0
 fr	06_coal	2	251	0.0	0.0
 fr	07_gas	2	251	0.0	0.0
 fr	08_non-res	2	251	0.0	0.0
 fr	09_hydro_pump	2	251	0.0	0.0
-fr	01_solar	2	252	1.0	0.0
-fr	02_wind_on	2	252	1.0	0.0
-fr	03_wind_off	2	252	1.0	0.0
-fr	04_res	2	252	1.0	0.0
-fr	05_nuclear	2	252	1.0	0.0
+fr	01_solar	2	252	0.0	1.0
+fr	02_wind_on	2	252	0.0	1.0
+fr	03_wind_off	2	252	0.0	1.0
+fr	04_res	2	252	0.0	1.0
+fr	05_nuclear	2	252	0.0	1.0
 fr	06_coal	2	252	0.0	0.0
 fr	07_gas	2	252	0.0	0.0
 fr	08_non-res	2	252	0.0	0.0
 fr	09_hydro_pump	2	252	0.0	0.0
-fr	01_solar	2	253	1.0	0.0
-fr	02_wind_on	2	253	1.0	0.0
-fr	03_wind_off	2	253	1.0	0.0
-fr	04_res	2	253	1.0	0.0
-fr	05_nuclear	2	253	1.0	0.0
+fr	01_solar	2	253	0.0	1.0
+fr	02_wind_on	2	253	0.0	1.0
+fr	03_wind_off	2	253	0.0	1.0
+fr	04_res	2	253	0.0	1.0
+fr	05_nuclear	2	253	0.0	1.0
 fr	06_coal	2	253	0.0	0.0
 fr	07_gas	2	253	0.0	0.0
 fr	08_non-res	2	253	0.0	0.0
 fr	09_hydro_pump	2	253	0.0	0.0
-fr	01_solar	2	254	1.0	0.0
-fr	02_wind_on	2	254	1.0	0.0
-fr	03_wind_off	2	254	1.0	0.0
-fr	04_res	2	254	1.0	0.0
-fr	05_nuclear	2	254	1.0	0.0
+fr	01_solar	2	254	0.0	1.0
+fr	02_wind_on	2	254	0.0	1.0
+fr	03_wind_off	2	254	0.0	1.0
+fr	04_res	2	254	0.0	1.0
+fr	05_nuclear	2	254	0.0	1.0
 fr	06_coal	2	254	0.0	0.0
 fr	07_gas	2	254	0.0	0.0
 fr	08_non-res	2	254	0.0	0.0
 fr	09_hydro_pump	2	254	0.0	0.0
-fr	01_solar	2	255	1.0	0.0
-fr	02_wind_on	2	255	1.0	0.0
-fr	03_wind_off	2	255	1.0	0.0
-fr	04_res	2	255	1.0	0.0
-fr	05_nuclear	2	255	1.0	0.0
+fr	01_solar	2	255	0.0	1.0
+fr	02_wind_on	2	255	0.0	1.0
+fr	03_wind_off	2	255	0.0	1.0
+fr	04_res	2	255	0.0	1.0
+fr	05_nuclear	2	255	0.0	1.0
 fr	06_coal	2	255	0.0	0.0
 fr	07_gas	2	255	0.0	0.0
 fr	08_non-res	2	255	0.0	0.0
 fr	09_hydro_pump	2	255	0.0	0.0
-fr	01_solar	2	256	1.0	0.0
-fr	02_wind_on	2	256	1.0	0.0
-fr	03_wind_off	2	256	1.0	0.0
-fr	04_res	2	256	1.0	0.0
-fr	05_nuclear	2	256	1.0	0.0
+fr	01_solar	2	256	0.0	1.0
+fr	02_wind_on	2	256	0.0	1.0
+fr	03_wind_off	2	256	0.0	1.0
+fr	04_res	2	256	0.0	1.0
+fr	05_nuclear	2	256	0.0	1.0
 fr	06_coal	2	256	0.0	0.0
 fr	07_gas	2	256	0.0	0.0
 fr	08_non-res	2	256	0.0	0.0
 fr	09_hydro_pump	2	256	0.0	0.0
-fr	01_solar	2	257	1.0	0.0
-fr	02_wind_on	2	257	1.0	0.0
-fr	03_wind_off	2	257	1.0	0.0
-fr	04_res	2	257	1.0	0.0
-fr	05_nuclear	2	257	1.0	0.0
+fr	01_solar	2	257	0.0	1.0
+fr	02_wind_on	2	257	0.0	1.0
+fr	03_wind_off	2	257	0.0	1.0
+fr	04_res	2	257	0.0	1.0
+fr	05_nuclear	2	257	0.0	1.0
 fr	06_coal	2	257	0.0	0.0
 fr	07_gas	2	257	0.0	0.0
 fr	08_non-res	2	257	0.0	0.0
 fr	09_hydro_pump	2	257	0.0	0.0
-fr	01_solar	2	258	1.0	0.0
-fr	02_wind_on	2	258	1.0	0.0
-fr	03_wind_off	2	258	1.0	0.0
-fr	04_res	2	258	1.0	0.0
-fr	05_nuclear	2	258	1.0	0.0
+fr	01_solar	2	258	0.0	1.0
+fr	02_wind_on	2	258	0.0	1.0
+fr	03_wind_off	2	258	0.0	1.0
+fr	04_res	2	258	0.0	1.0
+fr	05_nuclear	2	258	0.0	1.0
 fr	06_coal	2	258	0.0	0.0
 fr	07_gas	2	258	0.0	0.0
 fr	08_non-res	2	258	0.0	0.0
 fr	09_hydro_pump	2	258	0.0	0.0
-fr	01_solar	2	259	1.0	0.0
-fr	02_wind_on	2	259	1.0	0.0
-fr	03_wind_off	2	259	1.0	0.0
-fr	04_res	2	259	1.0	0.0
-fr	05_nuclear	2	259	1.0	0.0
+fr	01_solar	2	259	0.0	1.0
+fr	02_wind_on	2	259	0.0	1.0
+fr	03_wind_off	2	259	0.0	1.0
+fr	04_res	2	259	0.0	1.0
+fr	05_nuclear	2	259	0.0	1.0
 fr	06_coal	2	259	0.0	0.0
 fr	07_gas	2	259	0.0	0.0
 fr	08_non-res	2	259	0.0	0.0
 fr	09_hydro_pump	2	259	0.0	0.0
-fr	01_solar	2	260	1.0	0.0
-fr	02_wind_on	2	260	1.0	0.0
-fr	03_wind_off	2	260	1.0	0.0
-fr	04_res	2	260	1.0	0.0
-fr	05_nuclear	2	260	1.0	0.0
+fr	01_solar	2	260	0.0	1.0
+fr	02_wind_on	2	260	0.0	1.0
+fr	03_wind_off	2	260	0.0	1.0
+fr	04_res	2	260	0.0	1.0
+fr	05_nuclear	2	260	0.0	1.0
 fr	06_coal	2	260	0.0	0.0
 fr	07_gas	2	260	0.0	0.0
 fr	08_non-res	2	260	0.0	0.0
 fr	09_hydro_pump	2	260	0.0	0.0
-fr	01_solar	2	261	1.0	0.0
-fr	02_wind_on	2	261	1.0	0.0
-fr	03_wind_off	2	261	1.0	0.0
-fr	04_res	2	261	1.0	0.0
-fr	05_nuclear	2	261	1.0	0.0
+fr	01_solar	2	261	0.0	1.0
+fr	02_wind_on	2	261	0.0	1.0
+fr	03_wind_off	2	261	0.0	1.0
+fr	04_res	2	261	0.0	1.0
+fr	05_nuclear	2	261	0.0	1.0
 fr	06_coal	2	261	0.0	0.0
 fr	07_gas	2	261	0.0	0.0
 fr	08_non-res	2	261	0.0	0.0
 fr	09_hydro_pump	2	261	0.0	0.0
-fr	01_solar	2	262	1.0	0.0
-fr	02_wind_on	2	262	1.0	0.0
-fr	03_wind_off	2	262	1.0	0.0
-fr	04_res	2	262	1.0	0.0
-fr	05_nuclear	2	262	1.0	0.0
+fr	01_solar	2	262	0.0	1.0
+fr	02_wind_on	2	262	0.0	1.0
+fr	03_wind_off	2	262	0.0	1.0
+fr	04_res	2	262	0.0	1.0
+fr	05_nuclear	2	262	0.0	1.0
 fr	06_coal	2	262	0.0	0.0
 fr	07_gas	2	262	0.0	0.0
 fr	08_non-res	2	262	0.0	0.0
 fr	09_hydro_pump	2	262	0.0	0.0
-fr	01_solar	2	263	1.0	0.0
-fr	02_wind_on	2	263	1.0	0.0
-fr	03_wind_off	2	263	1.0	0.0
-fr	04_res	2	263	1.0	0.0
-fr	05_nuclear	2	263	1.0	0.0
+fr	01_solar	2	263	0.0	1.0
+fr	02_wind_on	2	263	0.0	1.0
+fr	03_wind_off	2	263	0.0	1.0
+fr	04_res	2	263	0.0	1.0
+fr	05_nuclear	2	263	0.0	1.0
 fr	06_coal	2	263	0.0	0.0
 fr	07_gas	2	263	0.0	0.0
 fr	08_non-res	2	263	0.0	0.0
 fr	09_hydro_pump	2	263	0.0	0.0
-fr	01_solar	2	264	1.0	0.0
-fr	02_wind_on	2	264	1.0	0.0
-fr	03_wind_off	2	264	1.0	0.0
-fr	04_res	2	264	1.0	0.0
-fr	05_nuclear	2	264	1.0	0.0
+fr	01_solar	2	264	0.0	1.0
+fr	02_wind_on	2	264	0.0	1.0
+fr	03_wind_off	2	264	0.0	1.0
+fr	04_res	2	264	0.0	1.0
+fr	05_nuclear	2	264	0.0	1.0
 fr	06_coal	2	264	0.0	0.0
 fr	07_gas	2	264	0.0	0.0
 fr	08_non-res	2	264	0.0	0.0
 fr	09_hydro_pump	2	264	0.0	0.0
-fr	01_solar	2	265	1.0	0.0
-fr	02_wind_on	2	265	1.0	0.0
-fr	03_wind_off	2	265	1.0	0.0
-fr	04_res	2	265	1.0	0.0
-fr	05_nuclear	2	265	1.0	0.0
+fr	01_solar	2	265	0.0	1.0
+fr	02_wind_on	2	265	0.0	1.0
+fr	03_wind_off	2	265	0.0	1.0
+fr	04_res	2	265	0.0	1.0
+fr	05_nuclear	2	265	0.0	1.0
 fr	06_coal	2	265	0.0	0.0
 fr	07_gas	2	265	0.0	0.0
 fr	08_non-res	2	265	0.0	0.0
 fr	09_hydro_pump	2	265	0.0	0.0
-fr	01_solar	2	266	1.0	0.0
-fr	02_wind_on	2	266	1.0	0.0
-fr	03_wind_off	2	266	1.0	0.0
-fr	04_res	2	266	1.0	0.0
-fr	05_nuclear	2	266	1.0	0.0
+fr	01_solar	2	266	0.0	1.0
+fr	02_wind_on	2	266	0.0	1.0
+fr	03_wind_off	2	266	0.0	1.0
+fr	04_res	2	266	0.0	1.0
+fr	05_nuclear	2	266	0.0	1.0
 fr	06_coal	2	266	0.0	0.0
 fr	07_gas	2	266	0.0	0.0
 fr	08_non-res	2	266	0.0	0.0
 fr	09_hydro_pump	2	266	0.0	0.0
-fr	01_solar	2	267	1.0	0.0
-fr	02_wind_on	2	267	1.0	0.0
-fr	03_wind_off	2	267	1.0	0.0
-fr	04_res	2	267	1.0	0.0
-fr	05_nuclear	2	267	1.0	0.0
+fr	01_solar	2	267	0.0	1.0
+fr	02_wind_on	2	267	0.0	1.0
+fr	03_wind_off	2	267	0.0	1.0
+fr	04_res	2	267	0.0	1.0
+fr	05_nuclear	2	267	0.0	1.0
 fr	06_coal	2	267	0.0	0.0
 fr	07_gas	2	267	0.0	0.0
 fr	08_non-res	2	267	0.0	0.0
 fr	09_hydro_pump	2	267	0.0	0.0
-fr	01_solar	2	268	1.0	0.0
-fr	02_wind_on	2	268	1.0	0.0
-fr	03_wind_off	2	268	1.0	0.0
-fr	04_res	2	268	1.0	0.0
-fr	05_nuclear	2	268	1.0	0.0
+fr	01_solar	2	268	0.0	1.0
+fr	02_wind_on	2	268	0.0	1.0
+fr	03_wind_off	2	268	0.0	1.0
+fr	04_res	2	268	0.0	1.0
+fr	05_nuclear	2	268	0.0	1.0
 fr	06_coal	2	268	0.0	0.0
 fr	07_gas	2	268	0.0	0.0
 fr	08_non-res	2	268	0.0	0.0
 fr	09_hydro_pump	2	268	0.0	0.0
-fr	01_solar	2	269	1.0	0.0
-fr	02_wind_on	2	269	1.0	0.0
-fr	03_wind_off	2	269	1.0	0.0
-fr	04_res	2	269	1.0	0.0
-fr	05_nuclear	2	269	1.0	0.0
+fr	01_solar	2	269	0.0	1.0
+fr	02_wind_on	2	269	0.0	1.0
+fr	03_wind_off	2	269	0.0	1.0
+fr	04_res	2	269	0.0	1.0
+fr	05_nuclear	2	269	0.0	1.0
 fr	06_coal	2	269	0.0	0.0
 fr	07_gas	2	269	0.0	0.0
 fr	08_non-res	2	269	0.0	0.0
 fr	09_hydro_pump	2	269	0.0	0.0
-fr	01_solar	2	270	1.0	0.0
-fr	02_wind_on	2	270	1.0	0.0
-fr	03_wind_off	2	270	1.0	0.0
-fr	04_res	2	270	1.0	0.0
-fr	05_nuclear	2	270	1.0	0.0
-fr	06_coal	2	270	1.0	0.0
+fr	01_solar	2	270	0.0	1.0
+fr	02_wind_on	2	270	0.0	1.0
+fr	03_wind_off	2	270	0.0	1.0
+fr	04_res	2	270	0.0	1.0
+fr	05_nuclear	2	270	0.0	1.0
+fr	06_coal	2	270	0.0	1.0
 fr	07_gas	2	270	0.0	0.0
 fr	08_non-res	2	270	0.0	0.0
 fr	09_hydro_pump	2	270	0.0	0.0
-fr	01_solar	2	271	1.0	0.0
-fr	02_wind_on	2	271	1.0	0.0
-fr	03_wind_off	2	271	1.0	0.0
-fr	04_res	2	271	1.0	0.0
-fr	05_nuclear	2	271	1.0	0.0
-fr	06_coal	2	271	1.0	0.0
+fr	01_solar	2	271	0.0	1.0
+fr	02_wind_on	2	271	0.0	1.0
+fr	03_wind_off	2	271	0.0	1.0
+fr	04_res	2	271	0.0	1.0
+fr	05_nuclear	2	271	0.0	1.0
+fr	06_coal	2	271	0.0	1.0
 fr	07_gas	2	271	0.0	0.0
 fr	08_non-res	2	271	0.0	0.0
 fr	09_hydro_pump	2	271	0.0	0.0
-fr	01_solar	2	272	1.0	0.0
-fr	02_wind_on	2	272	1.0	0.0
-fr	03_wind_off	2	272	1.0	0.0
-fr	04_res	2	272	1.0	0.0
-fr	05_nuclear	2	272	1.0	0.0
-fr	06_coal	2	272	1.0	0.0
+fr	01_solar	2	272	0.0	1.0
+fr	02_wind_on	2	272	0.0	1.0
+fr	03_wind_off	2	272	0.0	1.0
+fr	04_res	2	272	0.0	1.0
+fr	05_nuclear	2	272	0.0	1.0
+fr	06_coal	2	272	0.0	1.0
 fr	07_gas	2	272	0.0	0.0
 fr	08_non-res	2	272	0.0	0.0
 fr	09_hydro_pump	2	272	0.0	0.0
-fr	01_solar	2	273	1.0	0.0
-fr	02_wind_on	2	273	1.0	0.0
-fr	03_wind_off	2	273	1.0	0.0
-fr	04_res	2	273	1.0	0.0
-fr	05_nuclear	2	273	1.0	0.0
-fr	06_coal	2	273	1.0	0.0
+fr	01_solar	2	273	0.0	1.0
+fr	02_wind_on	2	273	0.0	1.0
+fr	03_wind_off	2	273	0.0	1.0
+fr	04_res	2	273	0.0	1.0
+fr	05_nuclear	2	273	0.0	1.0
+fr	06_coal	2	273	0.0	1.0
 fr	07_gas	2	273	0.0	0.0
 fr	08_non-res	2	273	0.0	0.0
 fr	09_hydro_pump	2	273	0.0	0.0
-fr	01_solar	2	274	1.0	0.0
-fr	02_wind_on	2	274	1.0	0.0
-fr	03_wind_off	2	274	1.0	0.0
-fr	04_res	2	274	1.0	0.0
-fr	05_nuclear	2	274	1.0	0.0
-fr	06_coal	2	274	1.0	0.0
+fr	01_solar	2	274	0.0	1.0
+fr	02_wind_on	2	274	0.0	1.0
+fr	03_wind_off	2	274	0.0	1.0
+fr	04_res	2	274	0.0	1.0
+fr	05_nuclear	2	274	0.0	1.0
+fr	06_coal	2	274	0.0	1.0
 fr	07_gas	2	274	0.0	0.0
 fr	08_non-res	2	274	0.0	0.0
 fr	09_hydro_pump	2	274	0.0	0.0
-fr	01_solar	2	275	1.0	0.0
-fr	02_wind_on	2	275	1.0	0.0
-fr	03_wind_off	2	275	1.0	0.0
-fr	04_res	2	275	1.0	0.0
-fr	05_nuclear	2	275	1.0	0.0
-fr	06_coal	2	275	1.0	0.0
+fr	01_solar	2	275	0.0	1.0
+fr	02_wind_on	2	275	0.0	1.0
+fr	03_wind_off	2	275	0.0	1.0
+fr	04_res	2	275	0.0	1.0
+fr	05_nuclear	2	275	0.0	1.0
+fr	06_coal	2	275	0.0	1.0
 fr	07_gas	2	275	0.0	0.0
 fr	08_non-res	2	275	0.0	0.0
 fr	09_hydro_pump	2	275	0.0	0.0
-fr	01_solar	2	276	1.0	0.0
-fr	02_wind_on	2	276	1.0	0.0
-fr	03_wind_off	2	276	1.0	0.0
-fr	04_res	2	276	1.0	0.0
-fr	05_nuclear	2	276	1.0	0.0
-fr	06_coal	2	276	1.0	0.0
+fr	01_solar	2	276	0.0	1.0
+fr	02_wind_on	2	276	0.0	1.0
+fr	03_wind_off	2	276	0.0	1.0
+fr	04_res	2	276	0.0	1.0
+fr	05_nuclear	2	276	0.0	1.0
+fr	06_coal	2	276	0.0	1.0
 fr	07_gas	2	276	0.0	0.0
 fr	08_non-res	2	276	0.0	0.0
 fr	09_hydro_pump	2	276	0.0	0.0
-fr	01_solar	2	277	1.0	0.0
-fr	02_wind_on	2	277	1.0	0.0
-fr	03_wind_off	2	277	1.0	0.0
-fr	04_res	2	277	1.0	0.0
-fr	05_nuclear	2	277	1.0	0.0
-fr	06_coal	2	277	1.0	0.0
+fr	01_solar	2	277	0.0	1.0
+fr	02_wind_on	2	277	0.0	1.0
+fr	03_wind_off	2	277	0.0	1.0
+fr	04_res	2	277	0.0	1.0
+fr	05_nuclear	2	277	0.0	1.0
+fr	06_coal	2	277	0.0	1.0
 fr	07_gas	2	277	0.0	0.0
 fr	08_non-res	2	277	0.0	0.0
 fr	09_hydro_pump	2	277	0.0	0.0
-fr	01_solar	2	278	1.0	0.0
-fr	02_wind_on	2	278	1.0	0.0
-fr	03_wind_off	2	278	1.0	0.0
-fr	04_res	2	278	1.0	0.0
-fr	05_nuclear	2	278	1.0	0.0
-fr	06_coal	2	278	1.0	0.0
+fr	01_solar	2	278	0.0	1.0
+fr	02_wind_on	2	278	0.0	1.0
+fr	03_wind_off	2	278	0.0	1.0
+fr	04_res	2	278	0.0	1.0
+fr	05_nuclear	2	278	0.0	1.0
+fr	06_coal	2	278	0.0	1.0
 fr	07_gas	2	278	0.0	0.0
 fr	08_non-res	2	278	0.0	0.0
 fr	09_hydro_pump	2	278	0.0	0.0
-fr	01_solar	2	279	1.0	0.0
-fr	02_wind_on	2	279	1.0	0.0
-fr	03_wind_off	2	279	1.0	0.0
-fr	04_res	2	279	1.0	0.0
-fr	05_nuclear	2	279	1.0	0.0
-fr	06_coal	2	279	1.0	0.0
+fr	01_solar	2	279	0.0	1.0
+fr	02_wind_on	2	279	0.0	1.0
+fr	03_wind_off	2	279	0.0	1.0
+fr	04_res	2	279	0.0	1.0
+fr	05_nuclear	2	279	0.0	1.0
+fr	06_coal	2	279	0.0	1.0
 fr	07_gas	2	279	0.0	0.0
 fr	08_non-res	2	279	0.0	0.0
 fr	09_hydro_pump	2	279	0.0	0.0
-fr	01_solar	2	280	1.0	0.0
-fr	02_wind_on	2	280	1.0	0.0
-fr	03_wind_off	2	280	1.0	0.0
-fr	04_res	2	280	1.0	0.0
-fr	05_nuclear	2	280	1.0	0.0
-fr	06_coal	2	280	1.0	0.0
+fr	01_solar	2	280	0.0	1.0
+fr	02_wind_on	2	280	0.0	1.0
+fr	03_wind_off	2	280	0.0	1.0
+fr	04_res	2	280	0.0	1.0
+fr	05_nuclear	2	280	0.0	1.0
+fr	06_coal	2	280	0.0	1.0
 fr	07_gas	2	280	0.0	0.0
 fr	08_non-res	2	280	0.0	0.0
 fr	09_hydro_pump	2	280	0.0	0.0
-fr	01_solar	2	281	1.0	0.0
-fr	02_wind_on	2	281	1.0	0.0
-fr	03_wind_off	2	281	1.0	0.0
-fr	04_res	2	281	1.0	0.0
-fr	05_nuclear	2	281	1.0	0.0
-fr	06_coal	2	281	1.0	0.0
+fr	01_solar	2	281	0.0	1.0
+fr	02_wind_on	2	281	0.0	1.0
+fr	03_wind_off	2	281	0.0	1.0
+fr	04_res	2	281	0.0	1.0
+fr	05_nuclear	2	281	0.0	1.0
+fr	06_coal	2	281	0.0	1.0
 fr	07_gas	2	281	0.0	0.0
 fr	08_non-res	2	281	0.0	0.0
 fr	09_hydro_pump	2	281	0.0	0.0
-fr	01_solar	2	282	1.0	0.0
-fr	02_wind_on	2	282	1.0	0.0
-fr	03_wind_off	2	282	1.0	0.0
-fr	04_res	2	282	1.0	0.0
-fr	05_nuclear	2	282	1.0	0.0
-fr	06_coal	2	282	1.0	0.0
+fr	01_solar	2	282	0.0	1.0
+fr	02_wind_on	2	282	0.0	1.0
+fr	03_wind_off	2	282	0.0	1.0
+fr	04_res	2	282	0.0	1.0
+fr	05_nuclear	2	282	0.0	1.0
+fr	06_coal	2	282	0.0	1.0
 fr	07_gas	2	282	0.0	0.0
 fr	08_non-res	2	282	0.0	0.0
 fr	09_hydro_pump	2	282	0.0	0.0
-fr	01_solar	2	283	1.0	0.0
-fr	02_wind_on	2	283	1.0	0.0
-fr	03_wind_off	2	283	1.0	0.0
-fr	04_res	2	283	1.0	0.0
-fr	05_nuclear	2	283	1.0	0.0
-fr	06_coal	2	283	1.0	0.0
+fr	01_solar	2	283	0.0	1.0
+fr	02_wind_on	2	283	0.0	1.0
+fr	03_wind_off	2	283	0.0	1.0
+fr	04_res	2	283	0.0	1.0
+fr	05_nuclear	2	283	0.0	1.0
+fr	06_coal	2	283	0.0	1.0
 fr	07_gas	2	283	0.0	0.0
 fr	08_non-res	2	283	0.0	0.0
 fr	09_hydro_pump	2	283	0.0	0.0
-fr	01_solar	2	284	1.0	0.0
-fr	02_wind_on	2	284	1.0	0.0
-fr	03_wind_off	2	284	1.0	0.0
-fr	04_res	2	284	1.0	0.0
-fr	05_nuclear	2	284	1.0	0.0
-fr	06_coal	2	284	1.0	0.0
+fr	01_solar	2	284	0.0	1.0
+fr	02_wind_on	2	284	0.0	1.0
+fr	03_wind_off	2	284	0.0	1.0
+fr	04_res	2	284	0.0	1.0
+fr	05_nuclear	2	284	0.0	1.0
+fr	06_coal	2	284	0.0	1.0
 fr	07_gas	2	284	0.0	0.0
 fr	08_non-res	2	284	0.0	0.0
 fr	09_hydro_pump	2	284	0.0	0.0
-fr	01_solar	2	285	1.0	0.0
-fr	02_wind_on	2	285	1.0	0.0
-fr	03_wind_off	2	285	1.0	0.0
-fr	04_res	2	285	1.0	0.0
-fr	05_nuclear	2	285	1.0	0.0
-fr	06_coal	2	285	1.0	0.0
+fr	01_solar	2	285	0.0	1.0
+fr	02_wind_on	2	285	0.0	1.0
+fr	03_wind_off	2	285	0.0	1.0
+fr	04_res	2	285	0.0	1.0
+fr	05_nuclear	2	285	0.0	1.0
+fr	06_coal	2	285	0.0	1.0
 fr	07_gas	2	285	0.0	0.0
 fr	08_non-res	2	285	0.0	0.0
 fr	09_hydro_pump	2	285	0.0	0.0
-fr	01_solar	2	286	1.0	0.0
-fr	02_wind_on	2	286	1.0	0.0
-fr	03_wind_off	2	286	1.0	0.0
-fr	04_res	2	286	1.0	0.0
-fr	05_nuclear	2	286	1.0	0.0
-fr	06_coal	2	286	1.0	0.0
+fr	01_solar	2	286	0.0	1.0
+fr	02_wind_on	2	286	0.0	1.0
+fr	03_wind_off	2	286	0.0	1.0
+fr	04_res	2	286	0.0	1.0
+fr	05_nuclear	2	286	0.0	1.0
+fr	06_coal	2	286	0.0	1.0
 fr	07_gas	2	286	0.0	0.0
 fr	08_non-res	2	286	0.0	0.0
 fr	09_hydro_pump	2	286	0.0	0.0
-fr	01_solar	2	287	1.0	0.0
-fr	02_wind_on	2	287	1.0	0.0
-fr	03_wind_off	2	287	1.0	0.0
-fr	04_res	2	287	1.0	0.0
-fr	05_nuclear	2	287	1.0	0.0
-fr	06_coal	2	287	1.0	0.0
+fr	01_solar	2	287	0.0	1.0
+fr	02_wind_on	2	287	0.0	1.0
+fr	03_wind_off	2	287	0.0	1.0
+fr	04_res	2	287	0.0	1.0
+fr	05_nuclear	2	287	0.0	1.0
+fr	06_coal	2	287	0.0	1.0
 fr	07_gas	2	287	0.0	0.0
 fr	08_non-res	2	287	0.0	0.0
 fr	09_hydro_pump	2	287	0.0	0.0
-fr	01_solar	2	288	1.0	0.0
-fr	02_wind_on	2	288	1.0	0.0
-fr	03_wind_off	2	288	1.0	0.0
-fr	04_res	2	288	1.0	0.0
-fr	05_nuclear	2	288	1.0	0.0
-fr	06_coal	2	288	1.0	0.0
+fr	01_solar	2	288	0.0	1.0
+fr	02_wind_on	2	288	0.0	1.0
+fr	03_wind_off	2	288	0.0	1.0
+fr	04_res	2	288	0.0	1.0
+fr	05_nuclear	2	288	0.0	1.0
+fr	06_coal	2	288	0.0	1.0
 fr	07_gas	2	288	0.0	0.0
 fr	08_non-res	2	288	0.0	0.0
 fr	09_hydro_pump	2	288	0.0	0.0
-fr	01_solar	2	289	1.0	0.0
-fr	02_wind_on	2	289	1.0	0.0
-fr	03_wind_off	2	289	1.0	0.0
-fr	04_res	2	289	1.0	0.0
-fr	05_nuclear	2	289	1.0	0.0
-fr	06_coal	2	289	1.0	0.0
+fr	01_solar	2	289	0.0	1.0
+fr	02_wind_on	2	289	0.0	1.0
+fr	03_wind_off	2	289	0.0	1.0
+fr	04_res	2	289	0.0	1.0
+fr	05_nuclear	2	289	0.0	1.0
+fr	06_coal	2	289	0.0	1.0
 fr	07_gas	2	289	0.0	0.0
 fr	08_non-res	2	289	0.0	0.0
 fr	09_hydro_pump	2	289	0.0	0.0
-fr	01_solar	2	290	1.0	0.0
-fr	02_wind_on	2	290	1.0	0.0
-fr	03_wind_off	2	290	1.0	0.0
-fr	04_res	2	290	1.0	0.0
-fr	05_nuclear	2	290	1.0	0.0
-fr	06_coal	2	290	1.0	0.0
-fr	07_gas	2	290	1.0	0.0
+fr	01_solar	2	290	0.0	1.0
+fr	02_wind_on	2	290	0.0	1.0
+fr	03_wind_off	2	290	0.0	1.0
+fr	04_res	2	290	0.0	1.0
+fr	05_nuclear	2	290	0.0	1.0
+fr	06_coal	2	290	0.0	1.0
+fr	07_gas	2	290	0.0	1.0
 fr	08_non-res	2	290	0.0	0.0
 fr	09_hydro_pump	2	290	0.0	0.0
-fr	01_solar	2	291	1.0	0.0
-fr	02_wind_on	2	291	1.0	0.0
-fr	03_wind_off	2	291	1.0	0.0
-fr	04_res	2	291	1.0	0.0
-fr	05_nuclear	2	291	1.0	0.0
-fr	06_coal	2	291	1.0	0.0
-fr	07_gas	2	291	1.0	0.0
+fr	01_solar	2	291	0.0	1.0
+fr	02_wind_on	2	291	0.0	1.0
+fr	03_wind_off	2	291	0.0	1.0
+fr	04_res	2	291	0.0	1.0
+fr	05_nuclear	2	291	0.0	1.0
+fr	06_coal	2	291	0.0	1.0
+fr	07_gas	2	291	0.0	1.0
 fr	08_non-res	2	291	0.0	0.0
 fr	09_hydro_pump	2	291	0.0	0.0
-fr	01_solar	2	292	1.0	0.0
-fr	02_wind_on	2	292	1.0	0.0
-fr	03_wind_off	2	292	1.0	0.0
-fr	04_res	2	292	1.0	0.0
-fr	05_nuclear	2	292	1.0	0.0
-fr	06_coal	2	292	1.0	0.0
-fr	07_gas	2	292	1.0	0.0
+fr	01_solar	2	292	0.0	1.0
+fr	02_wind_on	2	292	0.0	1.0
+fr	03_wind_off	2	292	0.0	1.0
+fr	04_res	2	292	0.0	1.0
+fr	05_nuclear	2	292	0.0	1.0
+fr	06_coal	2	292	0.0	1.0
+fr	07_gas	2	292	0.0	1.0
 fr	08_non-res	2	292	0.0	0.0
 fr	09_hydro_pump	2	292	0.0	0.0
-fr	01_solar	2	293	1.0	0.0
-fr	02_wind_on	2	293	1.0	0.0
-fr	03_wind_off	2	293	1.0	0.0
-fr	04_res	2	293	1.0	0.0
-fr	05_nuclear	2	293	1.0	0.0
-fr	06_coal	2	293	1.0	0.0
-fr	07_gas	2	293	1.0	0.0
+fr	01_solar	2	293	0.0	1.0
+fr	02_wind_on	2	293	0.0	1.0
+fr	03_wind_off	2	293	0.0	1.0
+fr	04_res	2	293	0.0	1.0
+fr	05_nuclear	2	293	0.0	1.0
+fr	06_coal	2	293	0.0	1.0
+fr	07_gas	2	293	0.0	1.0
 fr	08_non-res	2	293	0.0	0.0
 fr	09_hydro_pump	2	293	0.0	0.0
-fr	01_solar	2	294	1.0	0.0
-fr	02_wind_on	2	294	1.0	0.0
-fr	03_wind_off	2	294	1.0	0.0
-fr	04_res	2	294	1.0	0.0
-fr	05_nuclear	2	294	1.0	0.0
-fr	06_coal	2	294	1.0	0.0
-fr	07_gas	2	294	1.0	0.0
+fr	01_solar	2	294	0.0	1.0
+fr	02_wind_on	2	294	0.0	1.0
+fr	03_wind_off	2	294	0.0	1.0
+fr	04_res	2	294	0.0	1.0
+fr	05_nuclear	2	294	0.0	1.0
+fr	06_coal	2	294	0.0	1.0
+fr	07_gas	2	294	0.0	1.0
 fr	08_non-res	2	294	0.0	0.0
 fr	09_hydro_pump	2	294	0.0	0.0
-fr	01_solar	2	295	1.0	0.0
-fr	02_wind_on	2	295	1.0	0.0
-fr	03_wind_off	2	295	1.0	0.0
-fr	04_res	2	295	1.0	0.0
-fr	05_nuclear	2	295	1.0	0.0
-fr	06_coal	2	295	1.0	0.0
-fr	07_gas	2	295	1.0	0.0
+fr	01_solar	2	295	0.0	1.0
+fr	02_wind_on	2	295	0.0	1.0
+fr	03_wind_off	2	295	0.0	1.0
+fr	04_res	2	295	0.0	1.0
+fr	05_nuclear	2	295	0.0	1.0
+fr	06_coal	2	295	0.0	1.0
+fr	07_gas	2	295	0.0	1.0
 fr	08_non-res	2	295	0.0	0.0
 fr	09_hydro_pump	2	295	0.0	0.0
-fr	01_solar	2	296	1.0	0.0
-fr	02_wind_on	2	296	1.0	0.0
-fr	03_wind_off	2	296	1.0	0.0
-fr	04_res	2	296	1.0	0.0
-fr	05_nuclear	2	296	1.0	0.0
-fr	06_coal	2	296	1.0	0.0
-fr	07_gas	2	296	1.0	0.0
+fr	01_solar	2	296	0.0	1.0
+fr	02_wind_on	2	296	0.0	1.0
+fr	03_wind_off	2	296	0.0	1.0
+fr	04_res	2	296	0.0	1.0
+fr	05_nuclear	2	296	0.0	1.0
+fr	06_coal	2	296	0.0	1.0
+fr	07_gas	2	296	0.0	1.0
 fr	08_non-res	2	296	0.0	0.0
 fr	09_hydro_pump	2	296	0.0	0.0
-fr	01_solar	2	297	1.0	0.0
-fr	02_wind_on	2	297	1.0	0.0
-fr	03_wind_off	2	297	1.0	0.0
-fr	04_res	2	297	1.0	0.0
-fr	05_nuclear	2	297	1.0	0.0
-fr	06_coal	2	297	1.0	0.0
-fr	07_gas	2	297	1.0	0.0
+fr	01_solar	2	297	0.0	1.0
+fr	02_wind_on	2	297	0.0	1.0
+fr	03_wind_off	2	297	0.0	1.0
+fr	04_res	2	297	0.0	1.0
+fr	05_nuclear	2	297	0.0	1.0
+fr	06_coal	2	297	0.0	1.0
+fr	07_gas	2	297	0.0	1.0
 fr	08_non-res	2	297	0.0	0.0
 fr	09_hydro_pump	2	297	0.0	0.0
-fr	01_solar	2	298	1.0	0.0
-fr	02_wind_on	2	298	1.0	0.0
-fr	03_wind_off	2	298	1.0	0.0
-fr	04_res	2	298	1.0	0.0
-fr	05_nuclear	2	298	1.0	0.0
-fr	06_coal	2	298	1.0	0.0
-fr	07_gas	2	298	1.0	0.0
+fr	01_solar	2	298	0.0	1.0
+fr	02_wind_on	2	298	0.0	1.0
+fr	03_wind_off	2	298	0.0	1.0
+fr	04_res	2	298	0.0	1.0
+fr	05_nuclear	2	298	0.0	1.0
+fr	06_coal	2	298	0.0	1.0
+fr	07_gas	2	298	0.0	1.0
 fr	08_non-res	2	298	0.0	0.0
 fr	09_hydro_pump	2	298	0.0	0.0
-fr	01_solar	2	299	1.0	0.0
-fr	02_wind_on	2	299	1.0	0.0
-fr	03_wind_off	2	299	1.0	0.0
-fr	04_res	2	299	1.0	0.0
-fr	05_nuclear	2	299	1.0	0.0
-fr	06_coal	2	299	1.0	0.0
-fr	07_gas	2	299	1.0	0.0
+fr	01_solar	2	299	0.0	1.0
+fr	02_wind_on	2	299	0.0	1.0
+fr	03_wind_off	2	299	0.0	1.0
+fr	04_res	2	299	0.0	1.0
+fr	05_nuclear	2	299	0.0	1.0
+fr	06_coal	2	299	0.0	1.0
+fr	07_gas	2	299	0.0	1.0
 fr	08_non-res	2	299	0.0	0.0
 fr	09_hydro_pump	2	299	0.0	0.0
-fr	01_solar	2	300	1.0	0.0
-fr	02_wind_on	2	300	1.0	0.0
-fr	03_wind_off	2	300	1.0	0.0
-fr	04_res	2	300	1.0	0.0
-fr	05_nuclear	2	300	1.0	0.0
-fr	06_coal	2	300	1.0	0.0
-fr	07_gas	2	300	1.0	0.0
+fr	01_solar	2	300	0.0	1.0
+fr	02_wind_on	2	300	0.0	1.0
+fr	03_wind_off	2	300	0.0	1.0
+fr	04_res	2	300	0.0	1.0
+fr	05_nuclear	2	300	0.0	1.0
+fr	06_coal	2	300	0.0	1.0
+fr	07_gas	2	300	0.0	1.0
 fr	08_non-res	2	300	0.0	0.0
 fr	09_hydro_pump	2	300	0.0	0.0
-fr	01_solar	2	301	1.0	0.0
-fr	02_wind_on	2	301	1.0	0.0
-fr	03_wind_off	2	301	1.0	0.0
-fr	04_res	2	301	1.0	0.0
-fr	05_nuclear	2	301	1.0	0.0
-fr	06_coal	2	301	1.0	0.0
-fr	07_gas	2	301	1.0	0.0
+fr	01_solar	2	301	0.0	1.0
+fr	02_wind_on	2	301	0.0	1.0
+fr	03_wind_off	2	301	0.0	1.0
+fr	04_res	2	301	0.0	1.0
+fr	05_nuclear	2	301	0.0	1.0
+fr	06_coal	2	301	0.0	1.0
+fr	07_gas	2	301	0.0	1.0
 fr	08_non-res	2	301	0.0	0.0
 fr	09_hydro_pump	2	301	0.0	0.0
-fr	01_solar	2	302	1.0	0.0
-fr	02_wind_on	2	302	1.0	0.0
-fr	03_wind_off	2	302	1.0	0.0
-fr	04_res	2	302	1.0	0.0
-fr	05_nuclear	2	302	1.0	0.0
-fr	06_coal	2	302	1.0	0.0
-fr	07_gas	2	302	1.0	0.0
+fr	01_solar	2	302	0.0	1.0
+fr	02_wind_on	2	302	0.0	1.0
+fr	03_wind_off	2	302	0.0	1.0
+fr	04_res	2	302	0.0	1.0
+fr	05_nuclear	2	302	0.0	1.0
+fr	06_coal	2	302	0.0	1.0
+fr	07_gas	2	302	0.0	1.0
 fr	08_non-res	2	302	0.0	0.0
 fr	09_hydro_pump	2	302	0.0	0.0
-fr	01_solar	2	303	1.0	0.0
-fr	02_wind_on	2	303	1.0	0.0
-fr	03_wind_off	2	303	1.0	0.0
-fr	04_res	2	303	1.0	0.0
-fr	05_nuclear	2	303	1.0	0.0
-fr	06_coal	2	303	1.0	0.0
-fr	07_gas	2	303	1.0	0.0
+fr	01_solar	2	303	0.0	1.0
+fr	02_wind_on	2	303	0.0	1.0
+fr	03_wind_off	2	303	0.0	1.0
+fr	04_res	2	303	0.0	1.0
+fr	05_nuclear	2	303	0.0	1.0
+fr	06_coal	2	303	0.0	1.0
+fr	07_gas	2	303	0.0	1.0
 fr	08_non-res	2	303	0.0	0.0
 fr	09_hydro_pump	2	303	0.0	0.0
-fr	01_solar	2	304	1.0	0.0
-fr	02_wind_on	2	304	1.0	0.0
-fr	03_wind_off	2	304	1.0	0.0
-fr	04_res	2	304	1.0	0.0
-fr	05_nuclear	2	304	1.0	0.0
-fr	06_coal	2	304	1.0	0.0
-fr	07_gas	2	304	1.0	0.0
+fr	01_solar	2	304	0.0	1.0
+fr	02_wind_on	2	304	0.0	1.0
+fr	03_wind_off	2	304	0.0	1.0
+fr	04_res	2	304	0.0	1.0
+fr	05_nuclear	2	304	0.0	1.0
+fr	06_coal	2	304	0.0	1.0
+fr	07_gas	2	304	0.0	1.0
 fr	08_non-res	2	304	0.0	0.0
 fr	09_hydro_pump	2	304	0.0	0.0
-fr	01_solar	2	305	1.0	0.0
-fr	02_wind_on	2	305	1.0	0.0
-fr	03_wind_off	2	305	1.0	0.0
-fr	04_res	2	305	1.0	0.0
-fr	05_nuclear	2	305	1.0	0.0
-fr	06_coal	2	305	1.0	0.0
-fr	07_gas	2	305	1.0	0.0
+fr	01_solar	2	305	0.0	1.0
+fr	02_wind_on	2	305	0.0	1.0
+fr	03_wind_off	2	305	0.0	1.0
+fr	04_res	2	305	0.0	1.0
+fr	05_nuclear	2	305	0.0	1.0
+fr	06_coal	2	305	0.0	1.0
+fr	07_gas	2	305	0.0	1.0
 fr	08_non-res	2	305	0.0	0.0
 fr	09_hydro_pump	2	305	0.0	0.0
-fr	01_solar	2	306	1.0	0.0
-fr	02_wind_on	2	306	1.0	0.0
-fr	03_wind_off	2	306	1.0	0.0
-fr	04_res	2	306	1.0	0.0
-fr	05_nuclear	2	306	1.0	0.0
-fr	06_coal	2	306	1.0	0.0
-fr	07_gas	2	306	1.0	0.0
+fr	01_solar	2	306	0.0	1.0
+fr	02_wind_on	2	306	0.0	1.0
+fr	03_wind_off	2	306	0.0	1.0
+fr	04_res	2	306	0.0	1.0
+fr	05_nuclear	2	306	0.0	1.0
+fr	06_coal	2	306	0.0	1.0
+fr	07_gas	2	306	0.0	1.0
 fr	08_non-res	2	306	0.0	0.0
 fr	09_hydro_pump	2	306	0.0	0.0
-fr	01_solar	2	307	1.0	0.0
-fr	02_wind_on	2	307	1.0	0.0
-fr	03_wind_off	2	307	1.0	0.0
-fr	04_res	2	307	1.0	0.0
-fr	05_nuclear	2	307	1.0	0.0
-fr	06_coal	2	307	1.0	0.0
-fr	07_gas	2	307	1.0	0.0
+fr	01_solar	2	307	0.0	1.0
+fr	02_wind_on	2	307	0.0	1.0
+fr	03_wind_off	2	307	0.0	1.0
+fr	04_res	2	307	0.0	1.0
+fr	05_nuclear	2	307	0.0	1.0
+fr	06_coal	2	307	0.0	1.0
+fr	07_gas	2	307	0.0	1.0
 fr	08_non-res	2	307	0.0	0.0
 fr	09_hydro_pump	2	307	0.0	0.0
-fr	01_solar	2	308	1.0	0.0
-fr	02_wind_on	2	308	1.0	0.0
-fr	03_wind_off	2	308	1.0	0.0
-fr	04_res	2	308	1.0	0.0
-fr	05_nuclear	2	308	1.0	0.0
-fr	06_coal	2	308	1.0	0.0
-fr	07_gas	2	308	1.0	0.0
+fr	01_solar	2	308	0.0	1.0
+fr	02_wind_on	2	308	0.0	1.0
+fr	03_wind_off	2	308	0.0	1.0
+fr	04_res	2	308	0.0	1.0
+fr	05_nuclear	2	308	0.0	1.0
+fr	06_coal	2	308	0.0	1.0
+fr	07_gas	2	308	0.0	1.0
 fr	08_non-res	2	308	0.0	0.0
 fr	09_hydro_pump	2	308	0.0	0.0
-fr	01_solar	2	309	1.0	0.0
-fr	02_wind_on	2	309	1.0	0.0
-fr	03_wind_off	2	309	1.0	0.0
-fr	04_res	2	309	1.0	0.0
-fr	05_nuclear	2	309	1.0	0.0
-fr	06_coal	2	309	1.0	0.0
-fr	07_gas	2	309	1.0	0.0
+fr	01_solar	2	309	0.0	1.0
+fr	02_wind_on	2	309	0.0	1.0
+fr	03_wind_off	2	309	0.0	1.0
+fr	04_res	2	309	0.0	1.0
+fr	05_nuclear	2	309	0.0	1.0
+fr	06_coal	2	309	0.0	1.0
+fr	07_gas	2	309	0.0	1.0
 fr	08_non-res	2	309	0.0	0.0
 fr	09_hydro_pump	2	309	0.0	0.0
-fr	01_solar	2	310	1.0	0.0
-fr	02_wind_on	2	310	1.0	0.0
-fr	03_wind_off	2	310	1.0	0.0
-fr	04_res	2	310	1.0	0.0
-fr	05_nuclear	2	310	1.0	0.0
-fr	06_coal	2	310	1.0	0.0
-fr	07_gas	2	310	1.0	0.0
-fr	08_non-res	2	310	1.0	0.0
+fr	01_solar	2	310	0.0	1.0
+fr	02_wind_on	2	310	0.0	1.0
+fr	03_wind_off	2	310	0.0	1.0
+fr	04_res	2	310	0.0	1.0
+fr	05_nuclear	2	310	0.0	1.0
+fr	06_coal	2	310	0.0	1.0
+fr	07_gas	2	310	0.0	1.0
+fr	08_non-res	2	310	0.0	1.0
 fr	09_hydro_pump	2	310	0.0	0.0
-fr	01_solar	2	311	1.0	0.0
-fr	02_wind_on	2	311	1.0	0.0
-fr	03_wind_off	2	311	1.0	0.0
-fr	04_res	2	311	1.0	0.0
-fr	05_nuclear	2	311	1.0	0.0
-fr	06_coal	2	311	1.0	0.0
-fr	07_gas	2	311	1.0	0.0
-fr	08_non-res	2	311	1.0	0.0
+fr	01_solar	2	311	0.0	1.0
+fr	02_wind_on	2	311	0.0	1.0
+fr	03_wind_off	2	311	0.0	1.0
+fr	04_res	2	311	0.0	1.0
+fr	05_nuclear	2	311	0.0	1.0
+fr	06_coal	2	311	0.0	1.0
+fr	07_gas	2	311	0.0	1.0
+fr	08_non-res	2	311	0.0	1.0
 fr	09_hydro_pump	2	311	0.0	0.0
-fr	01_solar	2	312	1.0	0.0
-fr	02_wind_on	2	312	1.0	0.0
-fr	03_wind_off	2	312	1.0	0.0
-fr	04_res	2	312	1.0	0.0
-fr	05_nuclear	2	312	1.0	0.0
-fr	06_coal	2	312	1.0	0.0
-fr	07_gas	2	312	1.0	0.0
-fr	08_non-res	2	312	1.0	0.0
+fr	01_solar	2	312	0.0	1.0
+fr	02_wind_on	2	312	0.0	1.0
+fr	03_wind_off	2	312	0.0	1.0
+fr	04_res	2	312	0.0	1.0
+fr	05_nuclear	2	312	0.0	1.0
+fr	06_coal	2	312	0.0	1.0
+fr	07_gas	2	312	0.0	1.0
+fr	08_non-res	2	312	0.0	1.0
 fr	09_hydro_pump	2	312	0.0	0.0
-fr	01_solar	2	313	1.0	0.0
-fr	02_wind_on	2	313	1.0	0.0
-fr	03_wind_off	2	313	1.0	0.0
-fr	04_res	2	313	1.0	0.0
-fr	05_nuclear	2	313	1.0	0.0
-fr	06_coal	2	313	1.0	0.0
-fr	07_gas	2	313	1.0	0.0
-fr	08_non-res	2	313	1.0	0.0
+fr	01_solar	2	313	0.0	1.0
+fr	02_wind_on	2	313	0.0	1.0
+fr	03_wind_off	2	313	0.0	1.0
+fr	04_res	2	313	0.0	1.0
+fr	05_nuclear	2	313	0.0	1.0
+fr	06_coal	2	313	0.0	1.0
+fr	07_gas	2	313	0.0	1.0
+fr	08_non-res	2	313	0.0	1.0
 fr	09_hydro_pump	2	313	0.0	0.0
-fr	01_solar	2	314	1.0	0.0
-fr	02_wind_on	2	314	1.0	0.0
-fr	03_wind_off	2	314	1.0	0.0
-fr	04_res	2	314	1.0	0.0
-fr	05_nuclear	2	314	1.0	0.0
-fr	06_coal	2	314	1.0	0.0
-fr	07_gas	2	314	1.0	0.0
-fr	08_non-res	2	314	1.0	0.0
+fr	01_solar	2	314	0.0	1.0
+fr	02_wind_on	2	314	0.0	1.0
+fr	03_wind_off	2	314	0.0	1.0
+fr	04_res	2	314	0.0	1.0
+fr	05_nuclear	2	314	0.0	1.0
+fr	06_coal	2	314	0.0	1.0
+fr	07_gas	2	314	0.0	1.0
+fr	08_non-res	2	314	0.0	1.0
 fr	09_hydro_pump	2	314	0.0	0.0
-fr	01_solar	2	315	1.0	0.0
-fr	02_wind_on	2	315	1.0	0.0
-fr	03_wind_off	2	315	1.0	0.0
-fr	04_res	2	315	1.0	0.0
-fr	05_nuclear	2	315	1.0	0.0
-fr	06_coal	2	315	1.0	0.0
-fr	07_gas	2	315	1.0	0.0
-fr	08_non-res	2	315	1.0	0.0
+fr	01_solar	2	315	0.0	1.0
+fr	02_wind_on	2	315	0.0	1.0
+fr	03_wind_off	2	315	0.0	1.0
+fr	04_res	2	315	0.0	1.0
+fr	05_nuclear	2	315	0.0	1.0
+fr	06_coal	2	315	0.0	1.0
+fr	07_gas	2	315	0.0	1.0
+fr	08_non-res	2	315	0.0	1.0
 fr	09_hydro_pump	2	315	0.0	0.0
-fr	01_solar	2	316	1.0	0.0
-fr	02_wind_on	2	316	1.0	0.0
-fr	03_wind_off	2	316	1.0	0.0
-fr	04_res	2	316	1.0	0.0
-fr	05_nuclear	2	316	1.0	0.0
-fr	06_coal	2	316	1.0	0.0
-fr	07_gas	2	316	1.0	0.0
-fr	08_non-res	2	316	1.0	0.0
+fr	01_solar	2	316	0.0	1.0
+fr	02_wind_on	2	316	0.0	1.0
+fr	03_wind_off	2	316	0.0	1.0
+fr	04_res	2	316	0.0	1.0
+fr	05_nuclear	2	316	0.0	1.0
+fr	06_coal	2	316	0.0	1.0
+fr	07_gas	2	316	0.0	1.0
+fr	08_non-res	2	316	0.0	1.0
 fr	09_hydro_pump	2	316	0.0	0.0
-fr	01_solar	2	317	1.0	0.0
-fr	02_wind_on	2	317	1.0	0.0
-fr	03_wind_off	2	317	1.0	0.0
-fr	04_res	2	317	1.0	0.0
-fr	05_nuclear	2	317	1.0	0.0
-fr	06_coal	2	317	1.0	0.0
-fr	07_gas	2	317	1.0	0.0
-fr	08_non-res	2	317	1.0	0.0
+fr	01_solar	2	317	0.0	1.0
+fr	02_wind_on	2	317	0.0	1.0
+fr	03_wind_off	2	317	0.0	1.0
+fr	04_res	2	317	0.0	1.0
+fr	05_nuclear	2	317	0.0	1.0
+fr	06_coal	2	317	0.0	1.0
+fr	07_gas	2	317	0.0	1.0
+fr	08_non-res	2	317	0.0	1.0
 fr	09_hydro_pump	2	317	0.0	0.0
-fr	01_solar	2	318	1.0	0.0
-fr	02_wind_on	2	318	1.0	0.0
-fr	03_wind_off	2	318	1.0	0.0
-fr	04_res	2	318	1.0	0.0
-fr	05_nuclear	2	318	1.0	0.0
-fr	06_coal	2	318	1.0	0.0
-fr	07_gas	2	318	1.0	0.0
-fr	08_non-res	2	318	1.0	0.0
+fr	01_solar	2	318	0.0	1.0
+fr	02_wind_on	2	318	0.0	1.0
+fr	03_wind_off	2	318	0.0	1.0
+fr	04_res	2	318	0.0	1.0
+fr	05_nuclear	2	318	0.0	1.0
+fr	06_coal	2	318	0.0	1.0
+fr	07_gas	2	318	0.0	1.0
+fr	08_non-res	2	318	0.0	1.0
 fr	09_hydro_pump	2	318	0.0	0.0
-fr	01_solar	2	319	1.0	0.0
-fr	02_wind_on	2	319	1.0	0.0
-fr	03_wind_off	2	319	1.0	0.0
-fr	04_res	2	319	1.0	0.0
-fr	05_nuclear	2	319	1.0	0.0
-fr	06_coal	2	319	1.0	0.0
-fr	07_gas	2	319	1.0	0.0
-fr	08_non-res	2	319	1.0	0.0
+fr	01_solar	2	319	0.0	1.0
+fr	02_wind_on	2	319	0.0	1.0
+fr	03_wind_off	2	319	0.0	1.0
+fr	04_res	2	319	0.0	1.0
+fr	05_nuclear	2	319	0.0	1.0
+fr	06_coal	2	319	0.0	1.0
+fr	07_gas	2	319	0.0	1.0
+fr	08_non-res	2	319	0.0	1.0
 fr	09_hydro_pump	2	319	0.0	0.0
-fr	01_solar	2	320	1.0	0.0
-fr	02_wind_on	2	320	1.0	0.0
-fr	03_wind_off	2	320	1.0	0.0
-fr	04_res	2	320	1.0	0.0
-fr	05_nuclear	2	320	1.0	0.0
-fr	06_coal	2	320	1.0	0.0
-fr	07_gas	2	320	1.0	0.0
-fr	08_non-res	2	320	1.0	0.0
+fr	01_solar	2	320	0.0	1.0
+fr	02_wind_on	2	320	0.0	1.0
+fr	03_wind_off	2	320	0.0	1.0
+fr	04_res	2	320	0.0	1.0
+fr	05_nuclear	2	320	0.0	1.0
+fr	06_coal	2	320	0.0	1.0
+fr	07_gas	2	320	0.0	1.0
+fr	08_non-res	2	320	0.0	1.0
 fr	09_hydro_pump	2	320	0.0	0.0
-fr	01_solar	2	321	1.0	0.0
-fr	02_wind_on	2	321	1.0	0.0
-fr	03_wind_off	2	321	1.0	0.0
-fr	04_res	2	321	1.0	0.0
-fr	05_nuclear	2	321	1.0	0.0
-fr	06_coal	2	321	1.0	0.0
-fr	07_gas	2	321	1.0	0.0
-fr	08_non-res	2	321	1.0	0.0
+fr	01_solar	2	321	0.0	1.0
+fr	02_wind_on	2	321	0.0	1.0
+fr	03_wind_off	2	321	0.0	1.0
+fr	04_res	2	321	0.0	1.0
+fr	05_nuclear	2	321	0.0	1.0
+fr	06_coal	2	321	0.0	1.0
+fr	07_gas	2	321	0.0	1.0
+fr	08_non-res	2	321	0.0	1.0
 fr	09_hydro_pump	2	321	0.0	0.0
-fr	01_solar	2	322	1.0	0.0
-fr	02_wind_on	2	322	1.0	0.0
-fr	03_wind_off	2	322	1.0	0.0
-fr	04_res	2	322	1.0	0.0
-fr	05_nuclear	2	322	1.0	0.0
-fr	06_coal	2	322	1.0	0.0
-fr	07_gas	2	322	1.0	0.0
-fr	08_non-res	2	322	1.0	0.0
+fr	01_solar	2	322	0.0	1.0
+fr	02_wind_on	2	322	0.0	1.0
+fr	03_wind_off	2	322	0.0	1.0
+fr	04_res	2	322	0.0	1.0
+fr	05_nuclear	2	322	0.0	1.0
+fr	06_coal	2	322	0.0	1.0
+fr	07_gas	2	322	0.0	1.0
+fr	08_non-res	2	322	0.0	1.0
 fr	09_hydro_pump	2	322	0.0	0.0
-fr	01_solar	2	323	1.0	0.0
-fr	02_wind_on	2	323	1.0	0.0
-fr	03_wind_off	2	323	1.0	0.0
-fr	04_res	2	323	1.0	0.0
-fr	05_nuclear	2	323	1.0	0.0
-fr	06_coal	2	323	1.0	0.0
-fr	07_gas	2	323	1.0	0.0
-fr	08_non-res	2	323	1.0	0.0
+fr	01_solar	2	323	0.0	1.0
+fr	02_wind_on	2	323	0.0	1.0
+fr	03_wind_off	2	323	0.0	1.0
+fr	04_res	2	323	0.0	1.0
+fr	05_nuclear	2	323	0.0	1.0
+fr	06_coal	2	323	0.0	1.0
+fr	07_gas	2	323	0.0	1.0
+fr	08_non-res	2	323	0.0	1.0
 fr	09_hydro_pump	2	323	0.0	0.0
-fr	01_solar	2	324	1.0	0.0
-fr	02_wind_on	2	324	1.0	0.0
-fr	03_wind_off	2	324	1.0	0.0
-fr	04_res	2	324	1.0	0.0
-fr	05_nuclear	2	324	1.0	0.0
-fr	06_coal	2	324	1.0	0.0
-fr	07_gas	2	324	1.0	0.0
-fr	08_non-res	2	324	1.0	0.0
+fr	01_solar	2	324	0.0	1.0
+fr	02_wind_on	2	324	0.0	1.0
+fr	03_wind_off	2	324	0.0	1.0
+fr	04_res	2	324	0.0	1.0
+fr	05_nuclear	2	324	0.0	1.0
+fr	06_coal	2	324	0.0	1.0
+fr	07_gas	2	324	0.0	1.0
+fr	08_non-res	2	324	0.0	1.0
 fr	09_hydro_pump	2	324	0.0	0.0
-fr	01_solar	2	325	1.0	0.0
-fr	02_wind_on	2	325	1.0	0.0
-fr	03_wind_off	2	325	1.0	0.0
-fr	04_res	2	325	1.0	0.0
-fr	05_nuclear	2	325	1.0	0.0
-fr	06_coal	2	325	1.0	0.0
-fr	07_gas	2	325	1.0	0.0
-fr	08_non-res	2	325	1.0	0.0
+fr	01_solar	2	325	0.0	1.0
+fr	02_wind_on	2	325	0.0	1.0
+fr	03_wind_off	2	325	0.0	1.0
+fr	04_res	2	325	0.0	1.0
+fr	05_nuclear	2	325	0.0	1.0
+fr	06_coal	2	325	0.0	1.0
+fr	07_gas	2	325	0.0	1.0
+fr	08_non-res	2	325	0.0	1.0
 fr	09_hydro_pump	2	325	0.0	0.0
-fr	01_solar	2	326	1.0	0.0
-fr	02_wind_on	2	326	1.0	0.0
-fr	03_wind_off	2	326	1.0	0.0
-fr	04_res	2	326	1.0	0.0
-fr	05_nuclear	2	326	1.0	0.0
-fr	06_coal	2	326	1.0	0.0
-fr	07_gas	2	326	1.0	0.0
-fr	08_non-res	2	326	1.0	0.0
+fr	01_solar	2	326	0.0	1.0
+fr	02_wind_on	2	326	0.0	1.0
+fr	03_wind_off	2	326	0.0	1.0
+fr	04_res	2	326	0.0	1.0
+fr	05_nuclear	2	326	0.0	1.0
+fr	06_coal	2	326	0.0	1.0
+fr	07_gas	2	326	0.0	1.0
+fr	08_non-res	2	326	0.0	1.0
 fr	09_hydro_pump	2	326	0.0	0.0
-fr	01_solar	2	327	1.0	0.0
-fr	02_wind_on	2	327	1.0	0.0
-fr	03_wind_off	2	327	1.0	0.0
-fr	04_res	2	327	1.0	0.0
-fr	05_nuclear	2	327	1.0	0.0
-fr	06_coal	2	327	1.0	0.0
-fr	07_gas	2	327	1.0	0.0
-fr	08_non-res	2	327	1.0	0.0
+fr	01_solar	2	327	0.0	1.0
+fr	02_wind_on	2	327	0.0	1.0
+fr	03_wind_off	2	327	0.0	1.0
+fr	04_res	2	327	0.0	1.0
+fr	05_nuclear	2	327	0.0	1.0
+fr	06_coal	2	327	0.0	1.0
+fr	07_gas	2	327	0.0	1.0
+fr	08_non-res	2	327	0.0	1.0
 fr	09_hydro_pump	2	327	0.0	0.0
-fr	01_solar	2	328	1.0	0.0
-fr	02_wind_on	2	328	1.0	0.0
-fr	03_wind_off	2	328	1.0	0.0
-fr	04_res	2	328	1.0	0.0
-fr	05_nuclear	2	328	1.0	0.0
-fr	06_coal	2	328	1.0	0.0
-fr	07_gas	2	328	1.0	0.0
-fr	08_non-res	2	328	1.0	0.0
+fr	01_solar	2	328	0.0	1.0
+fr	02_wind_on	2	328	0.0	1.0
+fr	03_wind_off	2	328	0.0	1.0
+fr	04_res	2	328	0.0	1.0
+fr	05_nuclear	2	328	0.0	1.0
+fr	06_coal	2	328	0.0	1.0
+fr	07_gas	2	328	0.0	1.0
+fr	08_non-res	2	328	0.0	1.0
 fr	09_hydro_pump	2	328	0.0	0.0
-fr	01_solar	2	329	1.0	0.0
-fr	02_wind_on	2	329	1.0	0.0
-fr	03_wind_off	2	329	1.0	0.0
-fr	04_res	2	329	1.0	0.0
-fr	05_nuclear	2	329	1.0	0.0
-fr	06_coal	2	329	1.0	0.0
-fr	07_gas	2	329	1.0	0.0
-fr	08_non-res	2	329	1.0	0.0
+fr	01_solar	2	329	0.0	1.0
+fr	02_wind_on	2	329	0.0	1.0
+fr	03_wind_off	2	329	0.0	1.0
+fr	04_res	2	329	0.0	1.0
+fr	05_nuclear	2	329	0.0	1.0
+fr	06_coal	2	329	0.0	1.0
+fr	07_gas	2	329	0.0	1.0
+fr	08_non-res	2	329	0.0	1.0
 fr	09_hydro_pump	2	329	0.0	0.0
-fr	01_solar	2	330	1.0	0.0
-fr	02_wind_on	2	330	1.0	0.0
-fr	03_wind_off	2	330	1.0	0.0
-fr	04_res	2	330	1.0	0.0
-fr	05_nuclear	2	330	1.0	0.0
-fr	06_coal	2	330	1.0	0.0
-fr	07_gas	2	330	1.0	0.0
-fr	08_non-res	2	330	1.0	0.0
-fr	09_hydro_pump	2	330	1.0	0.0
-fr	01_solar	2	331	1.0	0.0
-fr	02_wind_on	2	331	1.0	0.0
-fr	03_wind_off	2	331	1.0	0.0
-fr	04_res	2	331	1.0	0.0
-fr	05_nuclear	2	331	1.0	0.0
-fr	06_coal	2	331	1.0	0.0
-fr	07_gas	2	331	1.0	0.0
-fr	08_non-res	2	331	1.0	0.0
-fr	09_hydro_pump	2	331	1.0	0.0
-fr	01_solar	2	332	1.0	0.0
-fr	02_wind_on	2	332	1.0	0.0
-fr	03_wind_off	2	332	1.0	0.0
-fr	04_res	2	332	1.0	0.0
-fr	05_nuclear	2	332	1.0	0.0
-fr	06_coal	2	332	1.0	0.0
-fr	07_gas	2	332	1.0	0.0
-fr	08_non-res	2	332	1.0	0.0
-fr	09_hydro_pump	2	332	1.0	0.0
-fr	01_solar	2	333	1.0	0.0
-fr	02_wind_on	2	333	1.0	0.0
-fr	03_wind_off	2	333	1.0	0.0
-fr	04_res	2	333	1.0	0.0
-fr	05_nuclear	2	333	1.0	0.0
-fr	06_coal	2	333	1.0	0.0
-fr	07_gas	2	333	1.0	0.0
-fr	08_non-res	2	333	1.0	0.0
-fr	09_hydro_pump	2	333	1.0	0.0
-fr	01_solar	2	334	1.0	0.0
-fr	02_wind_on	2	334	1.0	0.0
-fr	03_wind_off	2	334	1.0	0.0
-fr	04_res	2	334	1.0	0.0
-fr	05_nuclear	2	334	1.0	0.0
-fr	06_coal	2	334	1.0	0.0
-fr	07_gas	2	334	1.0	0.0
-fr	08_non-res	2	334	1.0	0.0
-fr	09_hydro_pump	2	334	1.0	0.0
-fr	01_solar	2	335	1.0	0.0
-fr	02_wind_on	2	335	1.0	0.0
-fr	03_wind_off	2	335	1.0	0.0
-fr	04_res	2	335	1.0	0.0
-fr	05_nuclear	2	335	1.0	0.0
-fr	06_coal	2	335	1.0	0.0
-fr	07_gas	2	335	1.0	0.0
-fr	08_non-res	2	335	1.0	0.0
-fr	09_hydro_pump	2	335	1.0	0.0
-fr	01_solar	2	336	1.0	0.0
-fr	02_wind_on	2	336	1.0	0.0
-fr	03_wind_off	2	336	1.0	0.0
-fr	04_res	2	336	1.0	0.0
-fr	05_nuclear	2	336	1.0	0.0
-fr	06_coal	2	336	1.0	0.0
-fr	07_gas	2	336	1.0	0.0
-fr	08_non-res	2	336	1.0	0.0
-fr	09_hydro_pump	2	336	1.0	0.0
+fr	01_solar	2	330	0.0	1.0
+fr	02_wind_on	2	330	0.0	1.0
+fr	03_wind_off	2	330	0.0	1.0
+fr	04_res	2	330	0.0	1.0
+fr	05_nuclear	2	330	0.0	1.0
+fr	06_coal	2	330	0.0	1.0
+fr	07_gas	2	330	0.0	1.0
+fr	08_non-res	2	330	0.0	1.0
+fr	09_hydro_pump	2	330	0.0	1.0
+fr	01_solar	2	331	0.0	1.0
+fr	02_wind_on	2	331	0.0	1.0
+fr	03_wind_off	2	331	0.0	1.0
+fr	04_res	2	331	0.0	1.0
+fr	05_nuclear	2	331	0.0	1.0
+fr	06_coal	2	331	0.0	1.0
+fr	07_gas	2	331	0.0	1.0
+fr	08_non-res	2	331	0.0	1.0
+fr	09_hydro_pump	2	331	0.0	1.0
+fr	01_solar	2	332	0.0	1.0
+fr	02_wind_on	2	332	0.0	1.0
+fr	03_wind_off	2	332	0.0	1.0
+fr	04_res	2	332	0.0	1.0
+fr	05_nuclear	2	332	0.0	1.0
+fr	06_coal	2	332	0.0	1.0
+fr	07_gas	2	332	0.0	1.0
+fr	08_non-res	2	332	0.0	1.0
+fr	09_hydro_pump	2	332	0.0	1.0
+fr	01_solar	2	333	0.0	1.0
+fr	02_wind_on	2	333	0.0	1.0
+fr	03_wind_off	2	333	0.0	1.0
+fr	04_res	2	333	0.0	1.0
+fr	05_nuclear	2	333	0.0	1.0
+fr	06_coal	2	333	0.0	1.0
+fr	07_gas	2	333	0.0	1.0
+fr	08_non-res	2	333	0.0	1.0
+fr	09_hydro_pump	2	333	0.0	1.0
+fr	01_solar	2	334	0.0	1.0
+fr	02_wind_on	2	334	0.0	1.0
+fr	03_wind_off	2	334	0.0	1.0
+fr	04_res	2	334	0.0	1.0
+fr	05_nuclear	2	334	0.0	1.0
+fr	06_coal	2	334	0.0	1.0
+fr	07_gas	2	334	0.0	1.0
+fr	08_non-res	2	334	0.0	1.0
+fr	09_hydro_pump	2	334	0.0	1.0
+fr	01_solar	2	335	0.0	1.0
+fr	02_wind_on	2	335	0.0	1.0
+fr	03_wind_off	2	335	0.0	1.0
+fr	04_res	2	335	0.0	1.0
+fr	05_nuclear	2	335	0.0	1.0
+fr	06_coal	2	335	0.0	1.0
+fr	07_gas	2	335	0.0	1.0
+fr	08_non-res	2	335	0.0	1.0
+fr	09_hydro_pump	2	335	0.0	1.0
+fr	01_solar	2	336	0.0	1.0
+fr	02_wind_on	2	336	0.0	1.0
+fr	03_wind_off	2	336	0.0	1.0
+fr	04_res	2	336	0.0	1.0
+fr	05_nuclear	2	336	0.0	1.0
+fr	06_coal	2	336	0.0	1.0
+fr	07_gas	2	336	0.0	1.0
+fr	08_non-res	2	336	0.0	1.0
+fr	09_hydro_pump	2	336	0.0	1.0
 it	01_solar	2	1	0.0	0.0
 it	02_wind_on	2	1	0.0	0.0
 it	03_wind_off	2	1	0.0	0.0
@@ -21176,7 +21176,7 @@ it	06_coal	2	1	0.0	0.0
 it	07_gas	2	1	0.0	0.0
 it	08_non-res	2	1	0.0	0.0
 it	09_hydro_pump	2	1	0.0	0.0
-it	01_solar	2	2	1.0	0.0
+it	01_solar	2	2	0.0	1.0
 it	02_wind_on	2	2	0.0	0.0
 it	03_wind_off	2	2	0.0	0.0
 it	04_res	2	2	0.0	0.0
@@ -21185,7 +21185,7 @@ it	06_coal	2	2	0.0	0.0
 it	07_gas	2	2	0.0	0.0
 it	08_non-res	2	2	0.0	0.0
 it	09_hydro_pump	2	2	0.0	0.0
-it	01_solar	2	3	1.0	0.0
+it	01_solar	2	3	0.0	1.0
 it	02_wind_on	2	3	0.0	0.0
 it	03_wind_off	2	3	0.0	0.0
 it	04_res	2	3	0.0	0.0
@@ -21194,7 +21194,7 @@ it	06_coal	2	3	0.0	0.0
 it	07_gas	2	3	0.0	0.0
 it	08_non-res	2	3	0.0	0.0
 it	09_hydro_pump	2	3	0.0	0.0
-it	01_solar	2	4	1.0	0.0
+it	01_solar	2	4	0.0	1.0
 it	02_wind_on	2	4	0.0	0.0
 it	03_wind_off	2	4	0.0	0.0
 it	04_res	2	4	0.0	0.0
@@ -21203,7 +21203,7 @@ it	06_coal	2	4	0.0	0.0
 it	07_gas	2	4	0.0	0.0
 it	08_non-res	2	4	0.0	0.0
 it	09_hydro_pump	2	4	0.0	0.0
-it	01_solar	2	5	1.0	0.0
+it	01_solar	2	5	0.0	1.0
 it	02_wind_on	2	5	0.0	0.0
 it	03_wind_off	2	5	0.0	0.0
 it	04_res	2	5	0.0	0.0
@@ -21212,7 +21212,7 @@ it	06_coal	2	5	0.0	0.0
 it	07_gas	2	5	0.0	0.0
 it	08_non-res	2	5	0.0	0.0
 it	09_hydro_pump	2	5	0.0	0.0
-it	01_solar	2	6	1.0	0.0
+it	01_solar	2	6	0.0	1.0
 it	02_wind_on	2	6	0.0	0.0
 it	03_wind_off	2	6	0.0	0.0
 it	04_res	2	6	0.0	0.0
@@ -21221,7 +21221,7 @@ it	06_coal	2	6	0.0	0.0
 it	07_gas	2	6	0.0	0.0
 it	08_non-res	2	6	0.0	0.0
 it	09_hydro_pump	2	6	0.0	0.0
-it	01_solar	2	7	1.0	0.0
+it	01_solar	2	7	0.0	1.0
 it	02_wind_on	2	7	0.0	0.0
 it	03_wind_off	2	7	0.0	0.0
 it	04_res	2	7	0.0	0.0
@@ -21230,7 +21230,7 @@ it	06_coal	2	7	0.0	0.0
 it	07_gas	2	7	0.0	0.0
 it	08_non-res	2	7	0.0	0.0
 it	09_hydro_pump	2	7	0.0	0.0
-it	01_solar	2	8	1.0	0.0
+it	01_solar	2	8	0.0	1.0
 it	02_wind_on	2	8	0.0	0.0
 it	03_wind_off	2	8	0.0	0.0
 it	04_res	2	8	0.0	0.0
@@ -21239,7 +21239,7 @@ it	06_coal	2	8	0.0	0.0
 it	07_gas	2	8	0.0	0.0
 it	08_non-res	2	8	0.0	0.0
 it	09_hydro_pump	2	8	0.0	0.0
-it	01_solar	2	9	1.0	0.0
+it	01_solar	2	9	0.0	1.0
 it	02_wind_on	2	9	0.0	0.0
 it	03_wind_off	2	9	0.0	0.0
 it	04_res	2	9	0.0	0.0
@@ -21248,7 +21248,7 @@ it	06_coal	2	9	0.0	0.0
 it	07_gas	2	9	0.0	0.0
 it	08_non-res	2	9	0.0	0.0
 it	09_hydro_pump	2	9	0.0	0.0
-it	01_solar	2	10	1.0	0.0
+it	01_solar	2	10	0.0	1.0
 it	02_wind_on	2	10	0.0	0.0
 it	03_wind_off	2	10	0.0	0.0
 it	04_res	2	10	0.0	0.0
@@ -21257,7 +21257,7 @@ it	06_coal	2	10	0.0	0.0
 it	07_gas	2	10	0.0	0.0
 it	08_non-res	2	10	0.0	0.0
 it	09_hydro_pump	2	10	0.0	0.0
-it	01_solar	2	11	1.0	0.0
+it	01_solar	2	11	0.0	1.0
 it	02_wind_on	2	11	0.0	0.0
 it	03_wind_off	2	11	0.0	0.0
 it	04_res	2	11	0.0	0.0
@@ -21266,7 +21266,7 @@ it	06_coal	2	11	0.0	0.0
 it	07_gas	2	11	0.0	0.0
 it	08_non-res	2	11	0.0	0.0
 it	09_hydro_pump	2	11	0.0	0.0
-it	01_solar	2	12	1.0	0.0
+it	01_solar	2	12	0.0	1.0
 it	02_wind_on	2	12	0.0	0.0
 it	03_wind_off	2	12	0.0	0.0
 it	04_res	2	12	0.0	0.0
@@ -21275,7 +21275,7 @@ it	06_coal	2	12	0.0	0.0
 it	07_gas	2	12	0.0	0.0
 it	08_non-res	2	12	0.0	0.0
 it	09_hydro_pump	2	12	0.0	0.0
-it	01_solar	2	13	1.0	0.0
+it	01_solar	2	13	0.0	1.0
 it	02_wind_on	2	13	0.0	0.0
 it	03_wind_off	2	13	0.0	0.0
 it	04_res	2	13	0.0	0.0
@@ -21284,7 +21284,7 @@ it	06_coal	2	13	0.0	0.0
 it	07_gas	2	13	0.0	0.0
 it	08_non-res	2	13	0.0	0.0
 it	09_hydro_pump	2	13	0.0	0.0
-it	01_solar	2	14	1.0	0.0
+it	01_solar	2	14	0.0	1.0
 it	02_wind_on	2	14	0.0	0.0
 it	03_wind_off	2	14	0.0	0.0
 it	04_res	2	14	0.0	0.0
@@ -21293,7 +21293,7 @@ it	06_coal	2	14	0.0	0.0
 it	07_gas	2	14	0.0	0.0
 it	08_non-res	2	14	0.0	0.0
 it	09_hydro_pump	2	14	0.0	0.0
-it	01_solar	2	15	1.0	0.0
+it	01_solar	2	15	0.0	1.0
 it	02_wind_on	2	15	0.0	0.0
 it	03_wind_off	2	15	0.0	0.0
 it	04_res	2	15	0.0	0.0
@@ -21302,7 +21302,7 @@ it	06_coal	2	15	0.0	0.0
 it	07_gas	2	15	0.0	0.0
 it	08_non-res	2	15	0.0	0.0
 it	09_hydro_pump	2	15	0.0	0.0
-it	01_solar	2	16	1.0	0.0
+it	01_solar	2	16	0.0	1.0
 it	02_wind_on	2	16	0.0	0.0
 it	03_wind_off	2	16	0.0	0.0
 it	04_res	2	16	0.0	0.0
@@ -21311,7 +21311,7 @@ it	06_coal	2	16	0.0	0.0
 it	07_gas	2	16	0.0	0.0
 it	08_non-res	2	16	0.0	0.0
 it	09_hydro_pump	2	16	0.0	0.0
-it	01_solar	2	17	1.0	0.0
+it	01_solar	2	17	0.0	1.0
 it	02_wind_on	2	17	0.0	0.0
 it	03_wind_off	2	17	0.0	0.0
 it	04_res	2	17	0.0	0.0
@@ -21320,7 +21320,7 @@ it	06_coal	2	17	0.0	0.0
 it	07_gas	2	17	0.0	0.0
 it	08_non-res	2	17	0.0	0.0
 it	09_hydro_pump	2	17	0.0	0.0
-it	01_solar	2	18	1.0	0.0
+it	01_solar	2	18	0.0	1.0
 it	02_wind_on	2	18	0.0	0.0
 it	03_wind_off	2	18	0.0	0.0
 it	04_res	2	18	0.0	0.0
@@ -21329,7 +21329,7 @@ it	06_coal	2	18	0.0	0.0
 it	07_gas	2	18	0.0	0.0
 it	08_non-res	2	18	0.0	0.0
 it	09_hydro_pump	2	18	0.0	0.0
-it	01_solar	2	19	1.0	0.0
+it	01_solar	2	19	0.0	1.0
 it	02_wind_on	2	19	0.0	0.0
 it	03_wind_off	2	19	0.0	0.0
 it	04_res	2	19	0.0	0.0
@@ -21338,7 +21338,7 @@ it	06_coal	2	19	0.0	0.0
 it	07_gas	2	19	0.0	0.0
 it	08_non-res	2	19	0.0	0.0
 it	09_hydro_pump	2	19	0.0	0.0
-it	01_solar	2	20	1.0	0.0
+it	01_solar	2	20	0.0	1.0
 it	02_wind_on	2	20	0.0	0.0
 it	03_wind_off	2	20	0.0	0.0
 it	04_res	2	20	0.0	0.0
@@ -21347,7 +21347,7 @@ it	06_coal	2	20	0.0	0.0
 it	07_gas	2	20	0.0	0.0
 it	08_non-res	2	20	0.0	0.0
 it	09_hydro_pump	2	20	0.0	0.0
-it	01_solar	2	21	1.0	0.0
+it	01_solar	2	21	0.0	1.0
 it	02_wind_on	2	21	0.0	0.0
 it	03_wind_off	2	21	0.0	0.0
 it	04_res	2	21	0.0	0.0
@@ -21356,8 +21356,8 @@ it	06_coal	2	21	0.0	0.0
 it	07_gas	2	21	0.0	0.0
 it	08_non-res	2	21	0.0	0.0
 it	09_hydro_pump	2	21	0.0	0.0
-it	01_solar	2	22	1.0	0.0
-it	02_wind_on	2	22	1.0	0.0
+it	01_solar	2	22	0.0	1.0
+it	02_wind_on	2	22	0.0	1.0
 it	03_wind_off	2	22	0.0	0.0
 it	04_res	2	22	0.0	0.0
 it	05_nuclear	2	22	0.0	0.0
@@ -21365,8 +21365,8 @@ it	06_coal	2	22	0.0	0.0
 it	07_gas	2	22	0.0	0.0
 it	08_non-res	2	22	0.0	0.0
 it	09_hydro_pump	2	22	0.0	0.0
-it	01_solar	2	23	1.0	0.0
-it	02_wind_on	2	23	1.0	0.0
+it	01_solar	2	23	0.0	1.0
+it	02_wind_on	2	23	0.0	1.0
 it	03_wind_off	2	23	0.0	0.0
 it	04_res	2	23	0.0	0.0
 it	05_nuclear	2	23	0.0	0.0
@@ -21374,8 +21374,8 @@ it	06_coal	2	23	0.0	0.0
 it	07_gas	2	23	0.0	0.0
 it	08_non-res	2	23	0.0	0.0
 it	09_hydro_pump	2	23	0.0	0.0
-it	01_solar	2	24	1.0	0.0
-it	02_wind_on	2	24	1.0	0.0
+it	01_solar	2	24	0.0	1.0
+it	02_wind_on	2	24	0.0	1.0
 it	03_wind_off	2	24	0.0	0.0
 it	04_res	2	24	0.0	0.0
 it	05_nuclear	2	24	0.0	0.0
@@ -21383,8 +21383,8 @@ it	06_coal	2	24	0.0	0.0
 it	07_gas	2	24	0.0	0.0
 it	08_non-res	2	24	0.0	0.0
 it	09_hydro_pump	2	24	0.0	0.0
-it	01_solar	2	25	1.0	0.0
-it	02_wind_on	2	25	1.0	0.0
+it	01_solar	2	25	0.0	1.0
+it	02_wind_on	2	25	0.0	1.0
 it	03_wind_off	2	25	0.0	0.0
 it	04_res	2	25	0.0	0.0
 it	05_nuclear	2	25	0.0	0.0
@@ -21392,8 +21392,8 @@ it	06_coal	2	25	0.0	0.0
 it	07_gas	2	25	0.0	0.0
 it	08_non-res	2	25	0.0	0.0
 it	09_hydro_pump	2	25	0.0	0.0
-it	01_solar	2	26	1.0	0.0
-it	02_wind_on	2	26	1.0	0.0
+it	01_solar	2	26	0.0	1.0
+it	02_wind_on	2	26	0.0	1.0
 it	03_wind_off	2	26	0.0	0.0
 it	04_res	2	26	0.0	0.0
 it	05_nuclear	2	26	0.0	0.0
@@ -21401,8 +21401,8 @@ it	06_coal	2	26	0.0	0.0
 it	07_gas	2	26	0.0	0.0
 it	08_non-res	2	26	0.0	0.0
 it	09_hydro_pump	2	26	0.0	0.0
-it	01_solar	2	27	1.0	0.0
-it	02_wind_on	2	27	1.0	0.0
+it	01_solar	2	27	0.0	1.0
+it	02_wind_on	2	27	0.0	1.0
 it	03_wind_off	2	27	0.0	0.0
 it	04_res	2	27	0.0	0.0
 it	05_nuclear	2	27	0.0	0.0
@@ -21410,8 +21410,8 @@ it	06_coal	2	27	0.0	0.0
 it	07_gas	2	27	0.0	0.0
 it	08_non-res	2	27	0.0	0.0
 it	09_hydro_pump	2	27	0.0	0.0
-it	01_solar	2	28	1.0	0.0
-it	02_wind_on	2	28	1.0	0.0
+it	01_solar	2	28	0.0	1.0
+it	02_wind_on	2	28	0.0	1.0
 it	03_wind_off	2	28	0.0	0.0
 it	04_res	2	28	0.0	0.0
 it	05_nuclear	2	28	0.0	0.0
@@ -21419,8 +21419,8 @@ it	06_coal	2	28	0.0	0.0
 it	07_gas	2	28	0.0	0.0
 it	08_non-res	2	28	0.0	0.0
 it	09_hydro_pump	2	28	0.0	0.0
-it	01_solar	2	29	1.0	0.0
-it	02_wind_on	2	29	1.0	0.0
+it	01_solar	2	29	0.0	1.0
+it	02_wind_on	2	29	0.0	1.0
 it	03_wind_off	2	29	0.0	0.0
 it	04_res	2	29	0.0	0.0
 it	05_nuclear	2	29	0.0	0.0
@@ -21428,8 +21428,8 @@ it	06_coal	2	29	0.0	0.0
 it	07_gas	2	29	0.0	0.0
 it	08_non-res	2	29	0.0	0.0
 it	09_hydro_pump	2	29	0.0	0.0
-it	01_solar	2	30	1.0	0.0
-it	02_wind_on	2	30	1.0	0.0
+it	01_solar	2	30	0.0	1.0
+it	02_wind_on	2	30	0.0	1.0
 it	03_wind_off	2	30	0.0	0.0
 it	04_res	2	30	0.0	0.0
 it	05_nuclear	2	30	0.0	0.0
@@ -21437,8 +21437,8 @@ it	06_coal	2	30	0.0	0.0
 it	07_gas	2	30	0.0	0.0
 it	08_non-res	2	30	0.0	0.0
 it	09_hydro_pump	2	30	0.0	0.0
-it	01_solar	2	31	1.0	0.0
-it	02_wind_on	2	31	1.0	0.0
+it	01_solar	2	31	0.0	1.0
+it	02_wind_on	2	31	0.0	1.0
 it	03_wind_off	2	31	0.0	0.0
 it	04_res	2	31	0.0	0.0
 it	05_nuclear	2	31	0.0	0.0
@@ -21446,8 +21446,8 @@ it	06_coal	2	31	0.0	0.0
 it	07_gas	2	31	0.0	0.0
 it	08_non-res	2	31	0.0	0.0
 it	09_hydro_pump	2	31	0.0	0.0
-it	01_solar	2	32	1.0	0.0
-it	02_wind_on	2	32	1.0	0.0
+it	01_solar	2	32	0.0	1.0
+it	02_wind_on	2	32	0.0	1.0
 it	03_wind_off	2	32	0.0	0.0
 it	04_res	2	32	0.0	0.0
 it	05_nuclear	2	32	0.0	0.0
@@ -21455,8 +21455,8 @@ it	06_coal	2	32	0.0	0.0
 it	07_gas	2	32	0.0	0.0
 it	08_non-res	2	32	0.0	0.0
 it	09_hydro_pump	2	32	0.0	0.0
-it	01_solar	2	33	1.0	0.0
-it	02_wind_on	2	33	1.0	0.0
+it	01_solar	2	33	0.0	1.0
+it	02_wind_on	2	33	0.0	1.0
 it	03_wind_off	2	33	0.0	0.0
 it	04_res	2	33	0.0	0.0
 it	05_nuclear	2	33	0.0	0.0
@@ -21464,8 +21464,8 @@ it	06_coal	2	33	0.0	0.0
 it	07_gas	2	33	0.0	0.0
 it	08_non-res	2	33	0.0	0.0
 it	09_hydro_pump	2	33	0.0	0.0
-it	01_solar	2	34	1.0	0.0
-it	02_wind_on	2	34	1.0	0.0
+it	01_solar	2	34	0.0	1.0
+it	02_wind_on	2	34	0.0	1.0
 it	03_wind_off	2	34	0.0	0.0
 it	04_res	2	34	0.0	0.0
 it	05_nuclear	2	34	0.0	0.0
@@ -21473,8 +21473,8 @@ it	06_coal	2	34	0.0	0.0
 it	07_gas	2	34	0.0	0.0
 it	08_non-res	2	34	0.0	0.0
 it	09_hydro_pump	2	34	0.0	0.0
-it	01_solar	2	35	1.0	0.0
-it	02_wind_on	2	35	1.0	0.0
+it	01_solar	2	35	0.0	1.0
+it	02_wind_on	2	35	0.0	1.0
 it	03_wind_off	2	35	0.0	0.0
 it	04_res	2	35	0.0	0.0
 it	05_nuclear	2	35	0.0	0.0
@@ -21482,8 +21482,8 @@ it	06_coal	2	35	0.0	0.0
 it	07_gas	2	35	0.0	0.0
 it	08_non-res	2	35	0.0	0.0
 it	09_hydro_pump	2	35	0.0	0.0
-it	01_solar	2	36	1.0	0.0
-it	02_wind_on	2	36	1.0	0.0
+it	01_solar	2	36	0.0	1.0
+it	02_wind_on	2	36	0.0	1.0
 it	03_wind_off	2	36	0.0	0.0
 it	04_res	2	36	0.0	0.0
 it	05_nuclear	2	36	0.0	0.0
@@ -21491,8 +21491,8 @@ it	06_coal	2	36	0.0	0.0
 it	07_gas	2	36	0.0	0.0
 it	08_non-res	2	36	0.0	0.0
 it	09_hydro_pump	2	36	0.0	0.0
-it	01_solar	2	37	1.0	0.0
-it	02_wind_on	2	37	1.0	0.0
+it	01_solar	2	37	0.0	1.0
+it	02_wind_on	2	37	0.0	1.0
 it	03_wind_off	2	37	0.0	0.0
 it	04_res	2	37	0.0	0.0
 it	05_nuclear	2	37	0.0	0.0
@@ -21500,8 +21500,8 @@ it	06_coal	2	37	0.0	0.0
 it	07_gas	2	37	0.0	0.0
 it	08_non-res	2	37	0.0	0.0
 it	09_hydro_pump	2	37	0.0	0.0
-it	01_solar	2	38	1.0	0.0
-it	02_wind_on	2	38	1.0	0.0
+it	01_solar	2	38	0.0	1.0
+it	02_wind_on	2	38	0.0	1.0
 it	03_wind_off	2	38	0.0	0.0
 it	04_res	2	38	0.0	0.0
 it	05_nuclear	2	38	0.0	0.0
@@ -21509,8 +21509,8 @@ it	06_coal	2	38	0.0	0.0
 it	07_gas	2	38	0.0	0.0
 it	08_non-res	2	38	0.0	0.0
 it	09_hydro_pump	2	38	0.0	0.0
-it	01_solar	2	39	1.0	0.0
-it	02_wind_on	2	39	1.0	0.0
+it	01_solar	2	39	0.0	1.0
+it	02_wind_on	2	39	0.0	1.0
 it	03_wind_off	2	39	0.0	0.0
 it	04_res	2	39	0.0	0.0
 it	05_nuclear	2	39	0.0	0.0
@@ -21518,8 +21518,8 @@ it	06_coal	2	39	0.0	0.0
 it	07_gas	2	39	0.0	0.0
 it	08_non-res	2	39	0.0	0.0
 it	09_hydro_pump	2	39	0.0	0.0
-it	01_solar	2	40	1.0	0.0
-it	02_wind_on	2	40	1.0	0.0
+it	01_solar	2	40	0.0	1.0
+it	02_wind_on	2	40	0.0	1.0
 it	03_wind_off	2	40	0.0	0.0
 it	04_res	2	40	0.0	0.0
 it	05_nuclear	2	40	0.0	0.0
@@ -21527,8 +21527,8 @@ it	06_coal	2	40	0.0	0.0
 it	07_gas	2	40	0.0	0.0
 it	08_non-res	2	40	0.0	0.0
 it	09_hydro_pump	2	40	0.0	0.0
-it	01_solar	2	41	1.0	0.0
-it	02_wind_on	2	41	1.0	0.0
+it	01_solar	2	41	0.0	1.0
+it	02_wind_on	2	41	0.0	1.0
 it	03_wind_off	2	41	0.0	0.0
 it	04_res	2	41	0.0	0.0
 it	05_nuclear	2	41	0.0	0.0
@@ -21536,1149 +21536,1149 @@ it	06_coal	2	41	0.0	0.0
 it	07_gas	2	41	0.0	0.0
 it	08_non-res	2	41	0.0	0.0
 it	09_hydro_pump	2	41	0.0	0.0
-it	01_solar	2	42	1.0	0.0
-it	02_wind_on	2	42	1.0	0.0
-it	03_wind_off	2	42	1.0	0.0
+it	01_solar	2	42	0.0	1.0
+it	02_wind_on	2	42	0.0	1.0
+it	03_wind_off	2	42	0.0	1.0
 it	04_res	2	42	0.0	0.0
 it	05_nuclear	2	42	0.0	0.0
 it	06_coal	2	42	0.0	0.0
 it	07_gas	2	42	0.0	0.0
 it	08_non-res	2	42	0.0	0.0
 it	09_hydro_pump	2	42	0.0	0.0
-it	01_solar	2	43	1.0	0.0
-it	02_wind_on	2	43	1.0	0.0
-it	03_wind_off	2	43	1.0	0.0
+it	01_solar	2	43	0.0	1.0
+it	02_wind_on	2	43	0.0	1.0
+it	03_wind_off	2	43	0.0	1.0
 it	04_res	2	43	0.0	0.0
 it	05_nuclear	2	43	0.0	0.0
 it	06_coal	2	43	0.0	0.0
 it	07_gas	2	43	0.0	0.0
 it	08_non-res	2	43	0.0	0.0
 it	09_hydro_pump	2	43	0.0	0.0
-it	01_solar	2	44	1.0	0.0
-it	02_wind_on	2	44	1.0	0.0
-it	03_wind_off	2	44	1.0	0.0
+it	01_solar	2	44	0.0	1.0
+it	02_wind_on	2	44	0.0	1.0
+it	03_wind_off	2	44	0.0	1.0
 it	04_res	2	44	0.0	0.0
 it	05_nuclear	2	44	0.0	0.0
 it	06_coal	2	44	0.0	0.0
 it	07_gas	2	44	0.0	0.0
 it	08_non-res	2	44	0.0	0.0
 it	09_hydro_pump	2	44	0.0	0.0
-it	01_solar	2	45	1.0	0.0
-it	02_wind_on	2	45	1.0	0.0
-it	03_wind_off	2	45	1.0	0.0
+it	01_solar	2	45	0.0	1.0
+it	02_wind_on	2	45	0.0	1.0
+it	03_wind_off	2	45	0.0	1.0
 it	04_res	2	45	0.0	0.0
 it	05_nuclear	2	45	0.0	0.0
 it	06_coal	2	45	0.0	0.0
 it	07_gas	2	45	0.0	0.0
 it	08_non-res	2	45	0.0	0.0
 it	09_hydro_pump	2	45	0.0	0.0
-it	01_solar	2	46	1.0	0.0
-it	02_wind_on	2	46	1.0	0.0
-it	03_wind_off	2	46	1.0	0.0
+it	01_solar	2	46	0.0	1.0
+it	02_wind_on	2	46	0.0	1.0
+it	03_wind_off	2	46	0.0	1.0
 it	04_res	2	46	0.0	0.0
 it	05_nuclear	2	46	0.0	0.0
 it	06_coal	2	46	0.0	0.0
 it	07_gas	2	46	0.0	0.0
 it	08_non-res	2	46	0.0	0.0
 it	09_hydro_pump	2	46	0.0	0.0
-it	01_solar	2	47	1.0	0.0
-it	02_wind_on	2	47	1.0	0.0
-it	03_wind_off	2	47	1.0	0.0
+it	01_solar	2	47	0.0	1.0
+it	02_wind_on	2	47	0.0	1.0
+it	03_wind_off	2	47	0.0	1.0
 it	04_res	2	47	0.0	0.0
 it	05_nuclear	2	47	0.0	0.0
 it	06_coal	2	47	0.0	0.0
 it	07_gas	2	47	0.0	0.0
 it	08_non-res	2	47	0.0	0.0
 it	09_hydro_pump	2	47	0.0	0.0
-it	01_solar	2	48	1.0	0.0
-it	02_wind_on	2	48	1.0	0.0
-it	03_wind_off	2	48	1.0	0.0
+it	01_solar	2	48	0.0	1.0
+it	02_wind_on	2	48	0.0	1.0
+it	03_wind_off	2	48	0.0	1.0
 it	04_res	2	48	0.0	0.0
 it	05_nuclear	2	48	0.0	0.0
 it	06_coal	2	48	0.0	0.0
 it	07_gas	2	48	0.0	0.0
 it	08_non-res	2	48	0.0	0.0
 it	09_hydro_pump	2	48	0.0	0.0
-it	01_solar	2	49	1.0	0.0
-it	02_wind_on	2	49	1.0	0.0
-it	03_wind_off	2	49	1.0	0.0
+it	01_solar	2	49	0.0	1.0
+it	02_wind_on	2	49	0.0	1.0
+it	03_wind_off	2	49	0.0	1.0
 it	04_res	2	49	0.0	0.0
 it	05_nuclear	2	49	0.0	0.0
 it	06_coal	2	49	0.0	0.0
 it	07_gas	2	49	0.0	0.0
 it	08_non-res	2	49	0.0	0.0
 it	09_hydro_pump	2	49	0.0	0.0
-it	01_solar	2	50	1.0	0.0
-it	02_wind_on	2	50	1.0	0.0
-it	03_wind_off	2	50	1.0	0.0
+it	01_solar	2	50	0.0	1.0
+it	02_wind_on	2	50	0.0	1.0
+it	03_wind_off	2	50	0.0	1.0
 it	04_res	2	50	0.0	0.0
 it	05_nuclear	2	50	0.0	0.0
 it	06_coal	2	50	0.0	0.0
 it	07_gas	2	50	0.0	0.0
 it	08_non-res	2	50	0.0	0.0
 it	09_hydro_pump	2	50	0.0	0.0
-it	01_solar	2	51	1.0	0.0
-it	02_wind_on	2	51	1.0	0.0
-it	03_wind_off	2	51	1.0	0.0
+it	01_solar	2	51	0.0	1.0
+it	02_wind_on	2	51	0.0	1.0
+it	03_wind_off	2	51	0.0	1.0
 it	04_res	2	51	0.0	0.0
 it	05_nuclear	2	51	0.0	0.0
 it	06_coal	2	51	0.0	0.0
 it	07_gas	2	51	0.0	0.0
 it	08_non-res	2	51	0.0	0.0
 it	09_hydro_pump	2	51	0.0	0.0
-it	01_solar	2	52	1.0	0.0
-it	02_wind_on	2	52	1.0	0.0
-it	03_wind_off	2	52	1.0	0.0
+it	01_solar	2	52	0.0	1.0
+it	02_wind_on	2	52	0.0	1.0
+it	03_wind_off	2	52	0.0	1.0
 it	04_res	2	52	0.0	0.0
 it	05_nuclear	2	52	0.0	0.0
 it	06_coal	2	52	0.0	0.0
 it	07_gas	2	52	0.0	0.0
 it	08_non-res	2	52	0.0	0.0
 it	09_hydro_pump	2	52	0.0	0.0
-it	01_solar	2	53	1.0	0.0
-it	02_wind_on	2	53	1.0	0.0
-it	03_wind_off	2	53	1.0	0.0
+it	01_solar	2	53	0.0	1.0
+it	02_wind_on	2	53	0.0	1.0
+it	03_wind_off	2	53	0.0	1.0
 it	04_res	2	53	0.0	0.0
 it	05_nuclear	2	53	0.0	0.0
 it	06_coal	2	53	0.0	0.0
 it	07_gas	2	53	0.0	0.0
 it	08_non-res	2	53	0.0	0.0
 it	09_hydro_pump	2	53	0.0	0.0
-it	01_solar	2	54	1.0	0.0
-it	02_wind_on	2	54	1.0	0.0
-it	03_wind_off	2	54	1.0	0.0
+it	01_solar	2	54	0.0	1.0
+it	02_wind_on	2	54	0.0	1.0
+it	03_wind_off	2	54	0.0	1.0
 it	04_res	2	54	0.0	0.0
 it	05_nuclear	2	54	0.0	0.0
 it	06_coal	2	54	0.0	0.0
 it	07_gas	2	54	0.0	0.0
 it	08_non-res	2	54	0.0	0.0
 it	09_hydro_pump	2	54	0.0	0.0
-it	01_solar	2	55	1.0	0.0
-it	02_wind_on	2	55	1.0	0.0
-it	03_wind_off	2	55	1.0	0.0
+it	01_solar	2	55	0.0	1.0
+it	02_wind_on	2	55	0.0	1.0
+it	03_wind_off	2	55	0.0	1.0
 it	04_res	2	55	0.0	0.0
 it	05_nuclear	2	55	0.0	0.0
 it	06_coal	2	55	0.0	0.0
 it	07_gas	2	55	0.0	0.0
 it	08_non-res	2	55	0.0	0.0
 it	09_hydro_pump	2	55	0.0	0.0
-it	01_solar	2	56	1.0	0.0
-it	02_wind_on	2	56	1.0	0.0
-it	03_wind_off	2	56	1.0	0.0
+it	01_solar	2	56	0.0	1.0
+it	02_wind_on	2	56	0.0	1.0
+it	03_wind_off	2	56	0.0	1.0
 it	04_res	2	56	0.0	0.0
 it	05_nuclear	2	56	0.0	0.0
 it	06_coal	2	56	0.0	0.0
 it	07_gas	2	56	0.0	0.0
 it	08_non-res	2	56	0.0	0.0
 it	09_hydro_pump	2	56	0.0	0.0
-it	01_solar	2	57	1.0	0.0
-it	02_wind_on	2	57	1.0	0.0
-it	03_wind_off	2	57	1.0	0.0
+it	01_solar	2	57	0.0	1.0
+it	02_wind_on	2	57	0.0	1.0
+it	03_wind_off	2	57	0.0	1.0
 it	04_res	2	57	0.0	0.0
 it	05_nuclear	2	57	0.0	0.0
 it	06_coal	2	57	0.0	0.0
 it	07_gas	2	57	0.0	0.0
 it	08_non-res	2	57	0.0	0.0
 it	09_hydro_pump	2	57	0.0	0.0
-it	01_solar	2	58	1.0	0.0
-it	02_wind_on	2	58	1.0	0.0
-it	03_wind_off	2	58	1.0	0.0
+it	01_solar	2	58	0.0	1.0
+it	02_wind_on	2	58	0.0	1.0
+it	03_wind_off	2	58	0.0	1.0
 it	04_res	2	58	0.0	0.0
 it	05_nuclear	2	58	0.0	0.0
 it	06_coal	2	58	0.0	0.0
 it	07_gas	2	58	0.0	0.0
 it	08_non-res	2	58	0.0	0.0
 it	09_hydro_pump	2	58	0.0	0.0
-it	01_solar	2	59	1.0	0.0
-it	02_wind_on	2	59	1.0	0.0
-it	03_wind_off	2	59	1.0	0.0
+it	01_solar	2	59	0.0	1.0
+it	02_wind_on	2	59	0.0	1.0
+it	03_wind_off	2	59	0.0	1.0
 it	04_res	2	59	0.0	0.0
 it	05_nuclear	2	59	0.0	0.0
 it	06_coal	2	59	0.0	0.0
 it	07_gas	2	59	0.0	0.0
 it	08_non-res	2	59	0.0	0.0
 it	09_hydro_pump	2	59	0.0	0.0
-it	01_solar	2	60	1.0	0.0
-it	02_wind_on	2	60	1.0	0.0
-it	03_wind_off	2	60	1.0	0.0
+it	01_solar	2	60	0.0	1.0
+it	02_wind_on	2	60	0.0	1.0
+it	03_wind_off	2	60	0.0	1.0
 it	04_res	2	60	0.0	0.0
 it	05_nuclear	2	60	0.0	0.0
 it	06_coal	2	60	0.0	0.0
 it	07_gas	2	60	0.0	0.0
 it	08_non-res	2	60	0.0	0.0
 it	09_hydro_pump	2	60	0.0	0.0
-it	01_solar	2	61	1.0	0.0
-it	02_wind_on	2	61	1.0	0.0
-it	03_wind_off	2	61	1.0	0.0
+it	01_solar	2	61	0.0	1.0
+it	02_wind_on	2	61	0.0	1.0
+it	03_wind_off	2	61	0.0	1.0
 it	04_res	2	61	0.0	0.0
 it	05_nuclear	2	61	0.0	0.0
 it	06_coal	2	61	0.0	0.0
 it	07_gas	2	61	0.0	0.0
 it	08_non-res	2	61	0.0	0.0
 it	09_hydro_pump	2	61	0.0	0.0
-it	01_solar	2	62	1.0	0.0
-it	02_wind_on	2	62	1.0	0.0
-it	03_wind_off	2	62	1.0	0.0
-it	04_res	2	62	1.0	0.0
+it	01_solar	2	62	0.0	1.0
+it	02_wind_on	2	62	0.0	1.0
+it	03_wind_off	2	62	0.0	1.0
+it	04_res	2	62	0.0	1.0
 it	05_nuclear	2	62	0.0	0.0
 it	06_coal	2	62	0.0	0.0
 it	07_gas	2	62	0.0	0.0
 it	08_non-res	2	62	0.0	0.0
 it	09_hydro_pump	2	62	0.0	0.0
-it	01_solar	2	63	1.0	0.0
-it	02_wind_on	2	63	1.0	0.0
-it	03_wind_off	2	63	1.0	0.0
-it	04_res	2	63	1.0	0.0
+it	01_solar	2	63	0.0	1.0
+it	02_wind_on	2	63	0.0	1.0
+it	03_wind_off	2	63	0.0	1.0
+it	04_res	2	63	0.0	1.0
 it	05_nuclear	2	63	0.0	0.0
 it	06_coal	2	63	0.0	0.0
 it	07_gas	2	63	0.0	0.0
 it	08_non-res	2	63	0.0	0.0
 it	09_hydro_pump	2	63	0.0	0.0
-it	01_solar	2	64	1.0	0.0
-it	02_wind_on	2	64	1.0	0.0
-it	03_wind_off	2	64	1.0	0.0
-it	04_res	2	64	1.0	0.0
+it	01_solar	2	64	0.0	1.0
+it	02_wind_on	2	64	0.0	1.0
+it	03_wind_off	2	64	0.0	1.0
+it	04_res	2	64	0.0	1.0
 it	05_nuclear	2	64	0.0	0.0
 it	06_coal	2	64	0.0	0.0
 it	07_gas	2	64	0.0	0.0
 it	08_non-res	2	64	0.0	0.0
 it	09_hydro_pump	2	64	0.0	0.0
-it	01_solar	2	65	1.0	0.0
-it	02_wind_on	2	65	1.0	0.0
-it	03_wind_off	2	65	1.0	0.0
-it	04_res	2	65	1.0	0.0
+it	01_solar	2	65	0.0	1.0
+it	02_wind_on	2	65	0.0	1.0
+it	03_wind_off	2	65	0.0	1.0
+it	04_res	2	65	0.0	1.0
 it	05_nuclear	2	65	0.0	0.0
 it	06_coal	2	65	0.0	0.0
 it	07_gas	2	65	0.0	0.0
 it	08_non-res	2	65	0.0	0.0
 it	09_hydro_pump	2	65	0.0	0.0
-it	01_solar	2	66	1.0	0.0
-it	02_wind_on	2	66	1.0	0.0
-it	03_wind_off	2	66	1.0	0.0
-it	04_res	2	66	1.0	0.0
+it	01_solar	2	66	0.0	1.0
+it	02_wind_on	2	66	0.0	1.0
+it	03_wind_off	2	66	0.0	1.0
+it	04_res	2	66	0.0	1.0
 it	05_nuclear	2	66	0.0	0.0
 it	06_coal	2	66	0.0	0.0
 it	07_gas	2	66	0.0	0.0
 it	08_non-res	2	66	0.0	0.0
 it	09_hydro_pump	2	66	0.0	0.0
-it	01_solar	2	67	1.0	0.0
-it	02_wind_on	2	67	1.0	0.0
-it	03_wind_off	2	67	1.0	0.0
-it	04_res	2	67	1.0	0.0
+it	01_solar	2	67	0.0	1.0
+it	02_wind_on	2	67	0.0	1.0
+it	03_wind_off	2	67	0.0	1.0
+it	04_res	2	67	0.0	1.0
 it	05_nuclear	2	67	0.0	0.0
 it	06_coal	2	67	0.0	0.0
 it	07_gas	2	67	0.0	0.0
 it	08_non-res	2	67	0.0	0.0
 it	09_hydro_pump	2	67	0.0	0.0
-it	01_solar	2	68	1.0	0.0
-it	02_wind_on	2	68	1.0	0.0
-it	03_wind_off	2	68	1.0	0.0
-it	04_res	2	68	1.0	0.0
+it	01_solar	2	68	0.0	1.0
+it	02_wind_on	2	68	0.0	1.0
+it	03_wind_off	2	68	0.0	1.0
+it	04_res	2	68	0.0	1.0
 it	05_nuclear	2	68	0.0	0.0
 it	06_coal	2	68	0.0	0.0
 it	07_gas	2	68	0.0	0.0
 it	08_non-res	2	68	0.0	0.0
 it	09_hydro_pump	2	68	0.0	0.0
-it	01_solar	2	69	1.0	0.0
-it	02_wind_on	2	69	1.0	0.0
-it	03_wind_off	2	69	1.0	0.0
-it	04_res	2	69	1.0	0.0
+it	01_solar	2	69	0.0	1.0
+it	02_wind_on	2	69	0.0	1.0
+it	03_wind_off	2	69	0.0	1.0
+it	04_res	2	69	0.0	1.0
 it	05_nuclear	2	69	0.0	0.0
 it	06_coal	2	69	0.0	0.0
 it	07_gas	2	69	0.0	0.0
 it	08_non-res	2	69	0.0	0.0
 it	09_hydro_pump	2	69	0.0	0.0
-it	01_solar	2	70	1.0	0.0
-it	02_wind_on	2	70	1.0	0.0
-it	03_wind_off	2	70	1.0	0.0
-it	04_res	2	70	1.0	0.0
+it	01_solar	2	70	0.0	1.0
+it	02_wind_on	2	70	0.0	1.0
+it	03_wind_off	2	70	0.0	1.0
+it	04_res	2	70	0.0	1.0
 it	05_nuclear	2	70	0.0	0.0
 it	06_coal	2	70	0.0	0.0
 it	07_gas	2	70	0.0	0.0
 it	08_non-res	2	70	0.0	0.0
 it	09_hydro_pump	2	70	0.0	0.0
-it	01_solar	2	71	1.0	0.0
-it	02_wind_on	2	71	1.0	0.0
-it	03_wind_off	2	71	1.0	0.0
-it	04_res	2	71	1.0	0.0
+it	01_solar	2	71	0.0	1.0
+it	02_wind_on	2	71	0.0	1.0
+it	03_wind_off	2	71	0.0	1.0
+it	04_res	2	71	0.0	1.0
 it	05_nuclear	2	71	0.0	0.0
 it	06_coal	2	71	0.0	0.0
 it	07_gas	2	71	0.0	0.0
 it	08_non-res	2	71	0.0	0.0
 it	09_hydro_pump	2	71	0.0	0.0
-it	01_solar	2	72	1.0	0.0
-it	02_wind_on	2	72	1.0	0.0
-it	03_wind_off	2	72	1.0	0.0
-it	04_res	2	72	1.0	0.0
+it	01_solar	2	72	0.0	1.0
+it	02_wind_on	2	72	0.0	1.0
+it	03_wind_off	2	72	0.0	1.0
+it	04_res	2	72	0.0	1.0
 it	05_nuclear	2	72	0.0	0.0
 it	06_coal	2	72	0.0	0.0
 it	07_gas	2	72	0.0	0.0
 it	08_non-res	2	72	0.0	0.0
 it	09_hydro_pump	2	72	0.0	0.0
-it	01_solar	2	73	1.0	0.0
-it	02_wind_on	2	73	1.0	0.0
-it	03_wind_off	2	73	1.0	0.0
-it	04_res	2	73	1.0	0.0
+it	01_solar	2	73	0.0	1.0
+it	02_wind_on	2	73	0.0	1.0
+it	03_wind_off	2	73	0.0	1.0
+it	04_res	2	73	0.0	1.0
 it	05_nuclear	2	73	0.0	0.0
 it	06_coal	2	73	0.0	0.0
 it	07_gas	2	73	0.0	0.0
 it	08_non-res	2	73	0.0	0.0
 it	09_hydro_pump	2	73	0.0	0.0
-it	01_solar	2	74	1.0	0.0
-it	02_wind_on	2	74	1.0	0.0
-it	03_wind_off	2	74	1.0	0.0
-it	04_res	2	74	1.0	0.0
+it	01_solar	2	74	0.0	1.0
+it	02_wind_on	2	74	0.0	1.0
+it	03_wind_off	2	74	0.0	1.0
+it	04_res	2	74	0.0	1.0
 it	05_nuclear	2	74	0.0	0.0
 it	06_coal	2	74	0.0	0.0
 it	07_gas	2	74	0.0	0.0
 it	08_non-res	2	74	0.0	0.0
 it	09_hydro_pump	2	74	0.0	0.0
-it	01_solar	2	75	1.0	0.0
-it	02_wind_on	2	75	1.0	0.0
-it	03_wind_off	2	75	1.0	0.0
-it	04_res	2	75	1.0	0.0
+it	01_solar	2	75	0.0	1.0
+it	02_wind_on	2	75	0.0	1.0
+it	03_wind_off	2	75	0.0	1.0
+it	04_res	2	75	0.0	1.0
 it	05_nuclear	2	75	0.0	0.0
 it	06_coal	2	75	0.0	0.0
 it	07_gas	2	75	0.0	0.0
 it	08_non-res	2	75	0.0	0.0
 it	09_hydro_pump	2	75	0.0	0.0
-it	01_solar	2	76	1.0	0.0
-it	02_wind_on	2	76	1.0	0.0
-it	03_wind_off	2	76	1.0	0.0
-it	04_res	2	76	1.0	0.0
+it	01_solar	2	76	0.0	1.0
+it	02_wind_on	2	76	0.0	1.0
+it	03_wind_off	2	76	0.0	1.0
+it	04_res	2	76	0.0	1.0
 it	05_nuclear	2	76	0.0	0.0
 it	06_coal	2	76	0.0	0.0
 it	07_gas	2	76	0.0	0.0
 it	08_non-res	2	76	0.0	0.0
 it	09_hydro_pump	2	76	0.0	0.0
-it	01_solar	2	77	1.0	0.0
-it	02_wind_on	2	77	1.0	0.0
-it	03_wind_off	2	77	1.0	0.0
-it	04_res	2	77	1.0	0.0
+it	01_solar	2	77	0.0	1.0
+it	02_wind_on	2	77	0.0	1.0
+it	03_wind_off	2	77	0.0	1.0
+it	04_res	2	77	0.0	1.0
 it	05_nuclear	2	77	0.0	0.0
 it	06_coal	2	77	0.0	0.0
 it	07_gas	2	77	0.0	0.0
 it	08_non-res	2	77	0.0	0.0
 it	09_hydro_pump	2	77	0.0	0.0
-it	01_solar	2	78	1.0	0.0
-it	02_wind_on	2	78	1.0	0.0
-it	03_wind_off	2	78	1.0	0.0
-it	04_res	2	78	1.0	0.0
+it	01_solar	2	78	0.0	1.0
+it	02_wind_on	2	78	0.0	1.0
+it	03_wind_off	2	78	0.0	1.0
+it	04_res	2	78	0.0	1.0
 it	05_nuclear	2	78	0.0	0.0
 it	06_coal	2	78	0.0	0.0
 it	07_gas	2	78	0.0	0.0
 it	08_non-res	2	78	0.0	0.0
 it	09_hydro_pump	2	78	0.0	0.0
-it	01_solar	2	79	1.0	0.0
-it	02_wind_on	2	79	1.0	0.0
-it	03_wind_off	2	79	1.0	0.0
-it	04_res	2	79	1.0	0.0
+it	01_solar	2	79	0.0	1.0
+it	02_wind_on	2	79	0.0	1.0
+it	03_wind_off	2	79	0.0	1.0
+it	04_res	2	79	0.0	1.0
 it	05_nuclear	2	79	0.0	0.0
 it	06_coal	2	79	0.0	0.0
 it	07_gas	2	79	0.0	0.0
 it	08_non-res	2	79	0.0	0.0
 it	09_hydro_pump	2	79	0.0	0.0
-it	01_solar	2	80	1.0	0.0
-it	02_wind_on	2	80	1.0	0.0
-it	03_wind_off	2	80	1.0	0.0
-it	04_res	2	80	1.0	0.0
+it	01_solar	2	80	0.0	1.0
+it	02_wind_on	2	80	0.0	1.0
+it	03_wind_off	2	80	0.0	1.0
+it	04_res	2	80	0.0	1.0
 it	05_nuclear	2	80	0.0	0.0
 it	06_coal	2	80	0.0	0.0
 it	07_gas	2	80	0.0	0.0
 it	08_non-res	2	80	0.0	0.0
 it	09_hydro_pump	2	80	0.0	0.0
-it	01_solar	2	81	1.0	0.0
-it	02_wind_on	2	81	1.0	0.0
-it	03_wind_off	2	81	1.0	0.0
-it	04_res	2	81	1.0	0.0
+it	01_solar	2	81	0.0	1.0
+it	02_wind_on	2	81	0.0	1.0
+it	03_wind_off	2	81	0.0	1.0
+it	04_res	2	81	0.0	1.0
 it	05_nuclear	2	81	0.0	0.0
 it	06_coal	2	81	0.0	0.0
 it	07_gas	2	81	0.0	0.0
 it	08_non-res	2	81	0.0	0.0
 it	09_hydro_pump	2	81	0.0	0.0
-it	01_solar	2	82	1.0	0.0
-it	02_wind_on	2	82	1.0	0.0
-it	03_wind_off	2	82	1.0	0.0
-it	04_res	2	82	1.0	0.0
-it	05_nuclear	2	82	1.0	0.0
+it	01_solar	2	82	0.0	1.0
+it	02_wind_on	2	82	0.0	1.0
+it	03_wind_off	2	82	0.0	1.0
+it	04_res	2	82	0.0	1.0
+it	05_nuclear	2	82	0.0	1.0
 it	06_coal	2	82	0.0	0.0
 it	07_gas	2	82	0.0	0.0
 it	08_non-res	2	82	0.0	0.0
 it	09_hydro_pump	2	82	0.0	0.0
-it	01_solar	2	83	1.0	0.0
-it	02_wind_on	2	83	1.0	0.0
-it	03_wind_off	2	83	1.0	0.0
-it	04_res	2	83	1.0	0.0
-it	05_nuclear	2	83	1.0	0.0
+it	01_solar	2	83	0.0	1.0
+it	02_wind_on	2	83	0.0	1.0
+it	03_wind_off	2	83	0.0	1.0
+it	04_res	2	83	0.0	1.0
+it	05_nuclear	2	83	0.0	1.0
 it	06_coal	2	83	0.0	0.0
 it	07_gas	2	83	0.0	0.0
 it	08_non-res	2	83	0.0	0.0
 it	09_hydro_pump	2	83	0.0	0.0
-it	01_solar	2	84	1.0	0.0
-it	02_wind_on	2	84	1.0	0.0
-it	03_wind_off	2	84	1.0	0.0
-it	04_res	2	84	1.0	0.0
-it	05_nuclear	2	84	1.0	0.0
+it	01_solar	2	84	0.0	1.0
+it	02_wind_on	2	84	0.0	1.0
+it	03_wind_off	2	84	0.0	1.0
+it	04_res	2	84	0.0	1.0
+it	05_nuclear	2	84	0.0	1.0
 it	06_coal	2	84	0.0	0.0
 it	07_gas	2	84	0.0	0.0
 it	08_non-res	2	84	0.0	0.0
 it	09_hydro_pump	2	84	0.0	0.0
-it	01_solar	2	85	1.0	0.0
-it	02_wind_on	2	85	1.0	0.0
-it	03_wind_off	2	85	1.0	0.0
-it	04_res	2	85	1.0	0.0
-it	05_nuclear	2	85	1.0	0.0
+it	01_solar	2	85	0.0	1.0
+it	02_wind_on	2	85	0.0	1.0
+it	03_wind_off	2	85	0.0	1.0
+it	04_res	2	85	0.0	1.0
+it	05_nuclear	2	85	0.0	1.0
 it	06_coal	2	85	0.0	0.0
 it	07_gas	2	85	0.0	0.0
 it	08_non-res	2	85	0.0	0.0
 it	09_hydro_pump	2	85	0.0	0.0
-it	01_solar	2	86	1.0	0.0
-it	02_wind_on	2	86	1.0	0.0
-it	03_wind_off	2	86	1.0	0.0
-it	04_res	2	86	1.0	0.0
-it	05_nuclear	2	86	1.0	0.0
+it	01_solar	2	86	0.0	1.0
+it	02_wind_on	2	86	0.0	1.0
+it	03_wind_off	2	86	0.0	1.0
+it	04_res	2	86	0.0	1.0
+it	05_nuclear	2	86	0.0	1.0
 it	06_coal	2	86	0.0	0.0
 it	07_gas	2	86	0.0	0.0
 it	08_non-res	2	86	0.0	0.0
 it	09_hydro_pump	2	86	0.0	0.0
-it	01_solar	2	87	1.0	0.0
-it	02_wind_on	2	87	1.0	0.0
-it	03_wind_off	2	87	1.0	0.0
-it	04_res	2	87	1.0	0.0
-it	05_nuclear	2	87	1.0	0.0
+it	01_solar	2	87	0.0	1.0
+it	02_wind_on	2	87	0.0	1.0
+it	03_wind_off	2	87	0.0	1.0
+it	04_res	2	87	0.0	1.0
+it	05_nuclear	2	87	0.0	1.0
 it	06_coal	2	87	0.0	0.0
 it	07_gas	2	87	0.0	0.0
 it	08_non-res	2	87	0.0	0.0
 it	09_hydro_pump	2	87	0.0	0.0
-it	01_solar	2	88	1.0	0.0
-it	02_wind_on	2	88	1.0	0.0
-it	03_wind_off	2	88	1.0	0.0
-it	04_res	2	88	1.0	0.0
-it	05_nuclear	2	88	1.0	0.0
+it	01_solar	2	88	0.0	1.0
+it	02_wind_on	2	88	0.0	1.0
+it	03_wind_off	2	88	0.0	1.0
+it	04_res	2	88	0.0	1.0
+it	05_nuclear	2	88	0.0	1.0
 it	06_coal	2	88	0.0	0.0
 it	07_gas	2	88	0.0	0.0
 it	08_non-res	2	88	0.0	0.0
 it	09_hydro_pump	2	88	0.0	0.0
-it	01_solar	2	89	1.0	0.0
-it	02_wind_on	2	89	1.0	0.0
-it	03_wind_off	2	89	1.0	0.0
-it	04_res	2	89	1.0	0.0
-it	05_nuclear	2	89	1.0	0.0
+it	01_solar	2	89	0.0	1.0
+it	02_wind_on	2	89	0.0	1.0
+it	03_wind_off	2	89	0.0	1.0
+it	04_res	2	89	0.0	1.0
+it	05_nuclear	2	89	0.0	1.0
 it	06_coal	2	89	0.0	0.0
 it	07_gas	2	89	0.0	0.0
 it	08_non-res	2	89	0.0	0.0
 it	09_hydro_pump	2	89	0.0	0.0
-it	01_solar	2	90	1.0	0.0
-it	02_wind_on	2	90	1.0	0.0
-it	03_wind_off	2	90	1.0	0.0
-it	04_res	2	90	1.0	0.0
-it	05_nuclear	2	90	1.0	0.0
+it	01_solar	2	90	0.0	1.0
+it	02_wind_on	2	90	0.0	1.0
+it	03_wind_off	2	90	0.0	1.0
+it	04_res	2	90	0.0	1.0
+it	05_nuclear	2	90	0.0	1.0
 it	06_coal	2	90	0.0	0.0
 it	07_gas	2	90	0.0	0.0
 it	08_non-res	2	90	0.0	0.0
 it	09_hydro_pump	2	90	0.0	0.0
-it	01_solar	2	91	1.0	0.0
-it	02_wind_on	2	91	1.0	0.0
-it	03_wind_off	2	91	1.0	0.0
-it	04_res	2	91	1.0	0.0
-it	05_nuclear	2	91	1.0	0.0
+it	01_solar	2	91	0.0	1.0
+it	02_wind_on	2	91	0.0	1.0
+it	03_wind_off	2	91	0.0	1.0
+it	04_res	2	91	0.0	1.0
+it	05_nuclear	2	91	0.0	1.0
 it	06_coal	2	91	0.0	0.0
 it	07_gas	2	91	0.0	0.0
 it	08_non-res	2	91	0.0	0.0
 it	09_hydro_pump	2	91	0.0	0.0
-it	01_solar	2	92	1.0	0.0
-it	02_wind_on	2	92	1.0	0.0
-it	03_wind_off	2	92	1.0	0.0
-it	04_res	2	92	1.0	0.0
-it	05_nuclear	2	92	1.0	0.0
+it	01_solar	2	92	0.0	1.0
+it	02_wind_on	2	92	0.0	1.0
+it	03_wind_off	2	92	0.0	1.0
+it	04_res	2	92	0.0	1.0
+it	05_nuclear	2	92	0.0	1.0
 it	06_coal	2	92	0.0	0.0
 it	07_gas	2	92	0.0	0.0
 it	08_non-res	2	92	0.0	0.0
 it	09_hydro_pump	2	92	0.0	0.0
-it	01_solar	2	93	1.0	0.0
-it	02_wind_on	2	93	1.0	0.0
-it	03_wind_off	2	93	1.0	0.0
-it	04_res	2	93	1.0	0.0
-it	05_nuclear	2	93	1.0	0.0
+it	01_solar	2	93	0.0	1.0
+it	02_wind_on	2	93	0.0	1.0
+it	03_wind_off	2	93	0.0	1.0
+it	04_res	2	93	0.0	1.0
+it	05_nuclear	2	93	0.0	1.0
 it	06_coal	2	93	0.0	0.0
 it	07_gas	2	93	0.0	0.0
 it	08_non-res	2	93	0.0	0.0
 it	09_hydro_pump	2	93	0.0	0.0
-it	01_solar	2	94	1.0	0.0
-it	02_wind_on	2	94	1.0	0.0
-it	03_wind_off	2	94	1.0	0.0
-it	04_res	2	94	1.0	0.0
-it	05_nuclear	2	94	1.0	0.0
+it	01_solar	2	94	0.0	1.0
+it	02_wind_on	2	94	0.0	1.0
+it	03_wind_off	2	94	0.0	1.0
+it	04_res	2	94	0.0	1.0
+it	05_nuclear	2	94	0.0	1.0
 it	06_coal	2	94	0.0	0.0
 it	07_gas	2	94	0.0	0.0
 it	08_non-res	2	94	0.0	0.0
 it	09_hydro_pump	2	94	0.0	0.0
-it	01_solar	2	95	1.0	0.0
-it	02_wind_on	2	95	1.0	0.0
-it	03_wind_off	2	95	1.0	0.0
-it	04_res	2	95	1.0	0.0
-it	05_nuclear	2	95	1.0	0.0
+it	01_solar	2	95	0.0	1.0
+it	02_wind_on	2	95	0.0	1.0
+it	03_wind_off	2	95	0.0	1.0
+it	04_res	2	95	0.0	1.0
+it	05_nuclear	2	95	0.0	1.0
 it	06_coal	2	95	0.0	0.0
 it	07_gas	2	95	0.0	0.0
 it	08_non-res	2	95	0.0	0.0
 it	09_hydro_pump	2	95	0.0	0.0
-it	01_solar	2	96	1.0	0.0
-it	02_wind_on	2	96	1.0	0.0
-it	03_wind_off	2	96	1.0	0.0
-it	04_res	2	96	1.0	0.0
-it	05_nuclear	2	96	1.0	0.0
+it	01_solar	2	96	0.0	1.0
+it	02_wind_on	2	96	0.0	1.0
+it	03_wind_off	2	96	0.0	1.0
+it	04_res	2	96	0.0	1.0
+it	05_nuclear	2	96	0.0	1.0
 it	06_coal	2	96	0.0	0.0
 it	07_gas	2	96	0.0	0.0
 it	08_non-res	2	96	0.0	0.0
 it	09_hydro_pump	2	96	0.0	0.0
-it	01_solar	2	97	1.0	0.0
-it	02_wind_on	2	97	1.0	0.0
-it	03_wind_off	2	97	1.0	0.0
-it	04_res	2	97	1.0	0.0
-it	05_nuclear	2	97	1.0	0.0
+it	01_solar	2	97	0.0	1.0
+it	02_wind_on	2	97	0.0	1.0
+it	03_wind_off	2	97	0.0	1.0
+it	04_res	2	97	0.0	1.0
+it	05_nuclear	2	97	0.0	1.0
 it	06_coal	2	97	0.0	0.0
 it	07_gas	2	97	0.0	0.0
 it	08_non-res	2	97	0.0	0.0
 it	09_hydro_pump	2	97	0.0	0.0
-it	01_solar	2	98	1.0	0.0
-it	02_wind_on	2	98	1.0	0.0
-it	03_wind_off	2	98	1.0	0.0
-it	04_res	2	98	1.0	0.0
-it	05_nuclear	2	98	1.0	0.0
+it	01_solar	2	98	0.0	1.0
+it	02_wind_on	2	98	0.0	1.0
+it	03_wind_off	2	98	0.0	1.0
+it	04_res	2	98	0.0	1.0
+it	05_nuclear	2	98	0.0	1.0
 it	06_coal	2	98	0.0	0.0
 it	07_gas	2	98	0.0	0.0
 it	08_non-res	2	98	0.0	0.0
 it	09_hydro_pump	2	98	0.0	0.0
-it	01_solar	2	99	1.0	0.0
-it	02_wind_on	2	99	1.0	0.0
-it	03_wind_off	2	99	1.0	0.0
-it	04_res	2	99	1.0	0.0
-it	05_nuclear	2	99	1.0	0.0
+it	01_solar	2	99	0.0	1.0
+it	02_wind_on	2	99	0.0	1.0
+it	03_wind_off	2	99	0.0	1.0
+it	04_res	2	99	0.0	1.0
+it	05_nuclear	2	99	0.0	1.0
 it	06_coal	2	99	0.0	0.0
 it	07_gas	2	99	0.0	0.0
 it	08_non-res	2	99	0.0	0.0
 it	09_hydro_pump	2	99	0.0	0.0
-it	01_solar	2	100	1.0	0.0
-it	02_wind_on	2	100	1.0	0.0
-it	03_wind_off	2	100	1.0	0.0
-it	04_res	2	100	1.0	0.0
-it	05_nuclear	2	100	1.0	0.0
+it	01_solar	2	100	0.0	1.0
+it	02_wind_on	2	100	0.0	1.0
+it	03_wind_off	2	100	0.0	1.0
+it	04_res	2	100	0.0	1.0
+it	05_nuclear	2	100	0.0	1.0
 it	06_coal	2	100	0.0	0.0
 it	07_gas	2	100	0.0	0.0
 it	08_non-res	2	100	0.0	0.0
 it	09_hydro_pump	2	100	0.0	0.0
-it	01_solar	2	101	1.0	0.0
-it	02_wind_on	2	101	1.0	0.0
-it	03_wind_off	2	101	1.0	0.0
-it	04_res	2	101	1.0	0.0
-it	05_nuclear	2	101	1.0	0.0
+it	01_solar	2	101	0.0	1.0
+it	02_wind_on	2	101	0.0	1.0
+it	03_wind_off	2	101	0.0	1.0
+it	04_res	2	101	0.0	1.0
+it	05_nuclear	2	101	0.0	1.0
 it	06_coal	2	101	0.0	0.0
 it	07_gas	2	101	0.0	0.0
 it	08_non-res	2	101	0.0	0.0
 it	09_hydro_pump	2	101	0.0	0.0
-it	01_solar	2	102	1.0	0.0
-it	02_wind_on	2	102	1.0	0.0
-it	03_wind_off	2	102	1.0	0.0
-it	04_res	2	102	1.0	0.0
-it	05_nuclear	2	102	1.0	0.0
-it	06_coal	2	102	1.0	0.0
+it	01_solar	2	102	0.0	1.0
+it	02_wind_on	2	102	0.0	1.0
+it	03_wind_off	2	102	0.0	1.0
+it	04_res	2	102	0.0	1.0
+it	05_nuclear	2	102	0.0	1.0
+it	06_coal	2	102	0.0	1.0
 it	07_gas	2	102	0.0	0.0
 it	08_non-res	2	102	0.0	0.0
 it	09_hydro_pump	2	102	0.0	0.0
-it	01_solar	2	103	1.0	0.0
-it	02_wind_on	2	103	1.0	0.0
-it	03_wind_off	2	103	1.0	0.0
-it	04_res	2	103	1.0	0.0
-it	05_nuclear	2	103	1.0	0.0
-it	06_coal	2	103	1.0	0.0
+it	01_solar	2	103	0.0	1.0
+it	02_wind_on	2	103	0.0	1.0
+it	03_wind_off	2	103	0.0	1.0
+it	04_res	2	103	0.0	1.0
+it	05_nuclear	2	103	0.0	1.0
+it	06_coal	2	103	0.0	1.0
 it	07_gas	2	103	0.0	0.0
 it	08_non-res	2	103	0.0	0.0
 it	09_hydro_pump	2	103	0.0	0.0
-it	01_solar	2	104	1.0	0.0
-it	02_wind_on	2	104	1.0	0.0
-it	03_wind_off	2	104	1.0	0.0
-it	04_res	2	104	1.0	0.0
-it	05_nuclear	2	104	1.0	0.0
-it	06_coal	2	104	1.0	0.0
+it	01_solar	2	104	0.0	1.0
+it	02_wind_on	2	104	0.0	1.0
+it	03_wind_off	2	104	0.0	1.0
+it	04_res	2	104	0.0	1.0
+it	05_nuclear	2	104	0.0	1.0
+it	06_coal	2	104	0.0	1.0
 it	07_gas	2	104	0.0	0.0
 it	08_non-res	2	104	0.0	0.0
 it	09_hydro_pump	2	104	0.0	0.0
-it	01_solar	2	105	1.0	0.0
-it	02_wind_on	2	105	1.0	0.0
-it	03_wind_off	2	105	1.0	0.0
-it	04_res	2	105	1.0	0.0
-it	05_nuclear	2	105	1.0	0.0
-it	06_coal	2	105	1.0	0.0
+it	01_solar	2	105	0.0	1.0
+it	02_wind_on	2	105	0.0	1.0
+it	03_wind_off	2	105	0.0	1.0
+it	04_res	2	105	0.0	1.0
+it	05_nuclear	2	105	0.0	1.0
+it	06_coal	2	105	0.0	1.0
 it	07_gas	2	105	0.0	0.0
 it	08_non-res	2	105	0.0	0.0
 it	09_hydro_pump	2	105	0.0	0.0
-it	01_solar	2	106	1.0	0.0
-it	02_wind_on	2	106	1.0	0.0
-it	03_wind_off	2	106	1.0	0.0
-it	04_res	2	106	1.0	0.0
-it	05_nuclear	2	106	1.0	0.0
-it	06_coal	2	106	1.0	0.0
+it	01_solar	2	106	0.0	1.0
+it	02_wind_on	2	106	0.0	1.0
+it	03_wind_off	2	106	0.0	1.0
+it	04_res	2	106	0.0	1.0
+it	05_nuclear	2	106	0.0	1.0
+it	06_coal	2	106	0.0	1.0
 it	07_gas	2	106	0.0	0.0
 it	08_non-res	2	106	0.0	0.0
 it	09_hydro_pump	2	106	0.0	0.0
-it	01_solar	2	107	1.0	0.0
-it	02_wind_on	2	107	1.0	0.0
-it	03_wind_off	2	107	1.0	0.0
-it	04_res	2	107	1.0	0.0
-it	05_nuclear	2	107	1.0	0.0
-it	06_coal	2	107	1.0	0.0
+it	01_solar	2	107	0.0	1.0
+it	02_wind_on	2	107	0.0	1.0
+it	03_wind_off	2	107	0.0	1.0
+it	04_res	2	107	0.0	1.0
+it	05_nuclear	2	107	0.0	1.0
+it	06_coal	2	107	0.0	1.0
 it	07_gas	2	107	0.0	0.0
 it	08_non-res	2	107	0.0	0.0
 it	09_hydro_pump	2	107	0.0	0.0
-it	01_solar	2	108	1.0	0.0
-it	02_wind_on	2	108	1.0	0.0
-it	03_wind_off	2	108	1.0	0.0
-it	04_res	2	108	1.0	0.0
-it	05_nuclear	2	108	1.0	0.0
-it	06_coal	2	108	1.0	0.0
+it	01_solar	2	108	0.0	1.0
+it	02_wind_on	2	108	0.0	1.0
+it	03_wind_off	2	108	0.0	1.0
+it	04_res	2	108	0.0	1.0
+it	05_nuclear	2	108	0.0	1.0
+it	06_coal	2	108	0.0	1.0
 it	07_gas	2	108	0.0	0.0
 it	08_non-res	2	108	0.0	0.0
 it	09_hydro_pump	2	108	0.0	0.0
-it	01_solar	2	109	1.0	0.0
-it	02_wind_on	2	109	1.0	0.0
-it	03_wind_off	2	109	1.0	0.0
-it	04_res	2	109	1.0	0.0
-it	05_nuclear	2	109	1.0	0.0
-it	06_coal	2	109	1.0	0.0
+it	01_solar	2	109	0.0	1.0
+it	02_wind_on	2	109	0.0	1.0
+it	03_wind_off	2	109	0.0	1.0
+it	04_res	2	109	0.0	1.0
+it	05_nuclear	2	109	0.0	1.0
+it	06_coal	2	109	0.0	1.0
 it	07_gas	2	109	0.0	0.0
 it	08_non-res	2	109	0.0	0.0
 it	09_hydro_pump	2	109	0.0	0.0
-it	01_solar	2	110	1.0	0.0
-it	02_wind_on	2	110	1.0	0.0
-it	03_wind_off	2	110	1.0	0.0
-it	04_res	2	110	1.0	0.0
-it	05_nuclear	2	110	1.0	0.0
-it	06_coal	2	110	1.0	0.0
+it	01_solar	2	110	0.0	1.0
+it	02_wind_on	2	110	0.0	1.0
+it	03_wind_off	2	110	0.0	1.0
+it	04_res	2	110	0.0	1.0
+it	05_nuclear	2	110	0.0	1.0
+it	06_coal	2	110	0.0	1.0
 it	07_gas	2	110	0.0	0.0
 it	08_non-res	2	110	0.0	0.0
 it	09_hydro_pump	2	110	0.0	0.0
-it	01_solar	2	111	1.0	0.0
-it	02_wind_on	2	111	1.0	0.0
-it	03_wind_off	2	111	1.0	0.0
-it	04_res	2	111	1.0	0.0
-it	05_nuclear	2	111	1.0	0.0
-it	06_coal	2	111	1.0	0.0
+it	01_solar	2	111	0.0	1.0
+it	02_wind_on	2	111	0.0	1.0
+it	03_wind_off	2	111	0.0	1.0
+it	04_res	2	111	0.0	1.0
+it	05_nuclear	2	111	0.0	1.0
+it	06_coal	2	111	0.0	1.0
 it	07_gas	2	111	0.0	0.0
 it	08_non-res	2	111	0.0	0.0
 it	09_hydro_pump	2	111	0.0	0.0
-it	01_solar	2	112	1.0	0.0
-it	02_wind_on	2	112	1.0	0.0
-it	03_wind_off	2	112	1.0	0.0
-it	04_res	2	112	1.0	0.0
-it	05_nuclear	2	112	1.0	0.0
-it	06_coal	2	112	1.0	0.0
+it	01_solar	2	112	0.0	1.0
+it	02_wind_on	2	112	0.0	1.0
+it	03_wind_off	2	112	0.0	1.0
+it	04_res	2	112	0.0	1.0
+it	05_nuclear	2	112	0.0	1.0
+it	06_coal	2	112	0.0	1.0
 it	07_gas	2	112	0.0	0.0
 it	08_non-res	2	112	0.0	0.0
 it	09_hydro_pump	2	112	0.0	0.0
-it	01_solar	2	113	1.0	0.0
-it	02_wind_on	2	113	1.0	0.0
-it	03_wind_off	2	113	1.0	0.0
-it	04_res	2	113	1.0	0.0
-it	05_nuclear	2	113	1.0	0.0
-it	06_coal	2	113	1.0	0.0
+it	01_solar	2	113	0.0	1.0
+it	02_wind_on	2	113	0.0	1.0
+it	03_wind_off	2	113	0.0	1.0
+it	04_res	2	113	0.0	1.0
+it	05_nuclear	2	113	0.0	1.0
+it	06_coal	2	113	0.0	1.0
 it	07_gas	2	113	0.0	0.0
 it	08_non-res	2	113	0.0	0.0
 it	09_hydro_pump	2	113	0.0	0.0
-it	01_solar	2	114	1.0	0.0
-it	02_wind_on	2	114	1.0	0.0
-it	03_wind_off	2	114	1.0	0.0
-it	04_res	2	114	1.0	0.0
-it	05_nuclear	2	114	1.0	0.0
-it	06_coal	2	114	1.0	0.0
+it	01_solar	2	114	0.0	1.0
+it	02_wind_on	2	114	0.0	1.0
+it	03_wind_off	2	114	0.0	1.0
+it	04_res	2	114	0.0	1.0
+it	05_nuclear	2	114	0.0	1.0
+it	06_coal	2	114	0.0	1.0
 it	07_gas	2	114	0.0	0.0
 it	08_non-res	2	114	0.0	0.0
 it	09_hydro_pump	2	114	0.0	0.0
-it	01_solar	2	115	1.0	0.0
-it	02_wind_on	2	115	1.0	0.0
-it	03_wind_off	2	115	1.0	0.0
-it	04_res	2	115	1.0	0.0
-it	05_nuclear	2	115	1.0	0.0
-it	06_coal	2	115	1.0	0.0
+it	01_solar	2	115	0.0	1.0
+it	02_wind_on	2	115	0.0	1.0
+it	03_wind_off	2	115	0.0	1.0
+it	04_res	2	115	0.0	1.0
+it	05_nuclear	2	115	0.0	1.0
+it	06_coal	2	115	0.0	1.0
 it	07_gas	2	115	0.0	0.0
 it	08_non-res	2	115	0.0	0.0
 it	09_hydro_pump	2	115	0.0	0.0
-it	01_solar	2	116	1.0	0.0
-it	02_wind_on	2	116	1.0	0.0
-it	03_wind_off	2	116	1.0	0.0
-it	04_res	2	116	1.0	0.0
-it	05_nuclear	2	116	1.0	0.0
-it	06_coal	2	116	1.0	0.0
+it	01_solar	2	116	0.0	1.0
+it	02_wind_on	2	116	0.0	1.0
+it	03_wind_off	2	116	0.0	1.0
+it	04_res	2	116	0.0	1.0
+it	05_nuclear	2	116	0.0	1.0
+it	06_coal	2	116	0.0	1.0
 it	07_gas	2	116	0.0	0.0
 it	08_non-res	2	116	0.0	0.0
 it	09_hydro_pump	2	116	0.0	0.0
-it	01_solar	2	117	1.0	0.0
-it	02_wind_on	2	117	1.0	0.0
-it	03_wind_off	2	117	1.0	0.0
-it	04_res	2	117	1.0	0.0
-it	05_nuclear	2	117	1.0	0.0
-it	06_coal	2	117	1.0	0.0
+it	01_solar	2	117	0.0	1.0
+it	02_wind_on	2	117	0.0	1.0
+it	03_wind_off	2	117	0.0	1.0
+it	04_res	2	117	0.0	1.0
+it	05_nuclear	2	117	0.0	1.0
+it	06_coal	2	117	0.0	1.0
 it	07_gas	2	117	0.0	0.0
 it	08_non-res	2	117	0.0	0.0
 it	09_hydro_pump	2	117	0.0	0.0
-it	01_solar	2	118	1.0	0.0
-it	02_wind_on	2	118	1.0	0.0
-it	03_wind_off	2	118	1.0	0.0
-it	04_res	2	118	1.0	0.0
-it	05_nuclear	2	118	1.0	0.0
-it	06_coal	2	118	1.0	0.0
+it	01_solar	2	118	0.0	1.0
+it	02_wind_on	2	118	0.0	1.0
+it	03_wind_off	2	118	0.0	1.0
+it	04_res	2	118	0.0	1.0
+it	05_nuclear	2	118	0.0	1.0
+it	06_coal	2	118	0.0	1.0
 it	07_gas	2	118	0.0	0.0
 it	08_non-res	2	118	0.0	0.0
 it	09_hydro_pump	2	118	0.0	0.0
-it	01_solar	2	119	1.0	0.0
-it	02_wind_on	2	119	1.0	0.0
-it	03_wind_off	2	119	1.0	0.0
-it	04_res	2	119	1.0	0.0
-it	05_nuclear	2	119	1.0	0.0
-it	06_coal	2	119	1.0	0.0
+it	01_solar	2	119	0.0	1.0
+it	02_wind_on	2	119	0.0	1.0
+it	03_wind_off	2	119	0.0	1.0
+it	04_res	2	119	0.0	1.0
+it	05_nuclear	2	119	0.0	1.0
+it	06_coal	2	119	0.0	1.0
 it	07_gas	2	119	0.0	0.0
 it	08_non-res	2	119	0.0	0.0
 it	09_hydro_pump	2	119	0.0	0.0
-it	01_solar	2	120	1.0	0.0
-it	02_wind_on	2	120	1.0	0.0
-it	03_wind_off	2	120	1.0	0.0
-it	04_res	2	120	1.0	0.0
-it	05_nuclear	2	120	1.0	0.0
-it	06_coal	2	120	1.0	0.0
+it	01_solar	2	120	0.0	1.0
+it	02_wind_on	2	120	0.0	1.0
+it	03_wind_off	2	120	0.0	1.0
+it	04_res	2	120	0.0	1.0
+it	05_nuclear	2	120	0.0	1.0
+it	06_coal	2	120	0.0	1.0
 it	07_gas	2	120	0.0	0.0
 it	08_non-res	2	120	0.0	0.0
 it	09_hydro_pump	2	120	0.0	0.0
-it	01_solar	2	121	1.0	0.0
-it	02_wind_on	2	121	1.0	0.0
-it	03_wind_off	2	121	1.0	0.0
-it	04_res	2	121	1.0	0.0
-it	05_nuclear	2	121	1.0	0.0
-it	06_coal	2	121	1.0	0.0
+it	01_solar	2	121	0.0	1.0
+it	02_wind_on	2	121	0.0	1.0
+it	03_wind_off	2	121	0.0	1.0
+it	04_res	2	121	0.0	1.0
+it	05_nuclear	2	121	0.0	1.0
+it	06_coal	2	121	0.0	1.0
 it	07_gas	2	121	0.0	0.0
 it	08_non-res	2	121	0.0	0.0
 it	09_hydro_pump	2	121	0.0	0.0
-it	01_solar	2	122	1.0	0.0
-it	02_wind_on	2	122	1.0	0.0
-it	03_wind_off	2	122	1.0	0.0
-it	04_res	2	122	1.0	0.0
-it	05_nuclear	2	122	1.0	0.0
-it	06_coal	2	122	1.0	0.0
-it	07_gas	2	122	1.0	0.0
+it	01_solar	2	122	0.0	1.0
+it	02_wind_on	2	122	0.0	1.0
+it	03_wind_off	2	122	0.0	1.0
+it	04_res	2	122	0.0	1.0
+it	05_nuclear	2	122	0.0	1.0
+it	06_coal	2	122	0.0	1.0
+it	07_gas	2	122	0.0	1.0
 it	08_non-res	2	122	0.0	0.0
 it	09_hydro_pump	2	122	0.0	0.0
-it	01_solar	2	123	1.0	0.0
-it	02_wind_on	2	123	1.0	0.0
-it	03_wind_off	2	123	1.0	0.0
-it	04_res	2	123	1.0	0.0
-it	05_nuclear	2	123	1.0	0.0
-it	06_coal	2	123	1.0	0.0
-it	07_gas	2	123	1.0	0.0
+it	01_solar	2	123	0.0	1.0
+it	02_wind_on	2	123	0.0	1.0
+it	03_wind_off	2	123	0.0	1.0
+it	04_res	2	123	0.0	1.0
+it	05_nuclear	2	123	0.0	1.0
+it	06_coal	2	123	0.0	1.0
+it	07_gas	2	123	0.0	1.0
 it	08_non-res	2	123	0.0	0.0
 it	09_hydro_pump	2	123	0.0	0.0
-it	01_solar	2	124	1.0	0.0
-it	02_wind_on	2	124	1.0	0.0
-it	03_wind_off	2	124	1.0	0.0
-it	04_res	2	124	1.0	0.0
-it	05_nuclear	2	124	1.0	0.0
-it	06_coal	2	124	1.0	0.0
-it	07_gas	2	124	1.0	0.0
+it	01_solar	2	124	0.0	1.0
+it	02_wind_on	2	124	0.0	1.0
+it	03_wind_off	2	124	0.0	1.0
+it	04_res	2	124	0.0	1.0
+it	05_nuclear	2	124	0.0	1.0
+it	06_coal	2	124	0.0	1.0
+it	07_gas	2	124	0.0	1.0
 it	08_non-res	2	124	0.0	0.0
 it	09_hydro_pump	2	124	0.0	0.0
-it	01_solar	2	125	1.0	0.0
-it	02_wind_on	2	125	1.0	0.0
-it	03_wind_off	2	125	1.0	0.0
-it	04_res	2	125	1.0	0.0
-it	05_nuclear	2	125	1.0	0.0
-it	06_coal	2	125	1.0	0.0
-it	07_gas	2	125	1.0	0.0
+it	01_solar	2	125	0.0	1.0
+it	02_wind_on	2	125	0.0	1.0
+it	03_wind_off	2	125	0.0	1.0
+it	04_res	2	125	0.0	1.0
+it	05_nuclear	2	125	0.0	1.0
+it	06_coal	2	125	0.0	1.0
+it	07_gas	2	125	0.0	1.0
 it	08_non-res	2	125	0.0	0.0
 it	09_hydro_pump	2	125	0.0	0.0
-it	01_solar	2	126	1.0	0.0
-it	02_wind_on	2	126	1.0	0.0
-it	03_wind_off	2	126	1.0	0.0
-it	04_res	2	126	1.0	0.0
-it	05_nuclear	2	126	1.0	0.0
-it	06_coal	2	126	1.0	0.0
-it	07_gas	2	126	1.0	0.0
+it	01_solar	2	126	0.0	1.0
+it	02_wind_on	2	126	0.0	1.0
+it	03_wind_off	2	126	0.0	1.0
+it	04_res	2	126	0.0	1.0
+it	05_nuclear	2	126	0.0	1.0
+it	06_coal	2	126	0.0	1.0
+it	07_gas	2	126	0.0	1.0
 it	08_non-res	2	126	0.0	0.0
 it	09_hydro_pump	2	126	0.0	0.0
-it	01_solar	2	127	1.0	0.0
-it	02_wind_on	2	127	1.0	0.0
-it	03_wind_off	2	127	1.0	0.0
-it	04_res	2	127	1.0	0.0
-it	05_nuclear	2	127	1.0	0.0
-it	06_coal	2	127	1.0	0.0
-it	07_gas	2	127	1.0	0.0
+it	01_solar	2	127	0.0	1.0
+it	02_wind_on	2	127	0.0	1.0
+it	03_wind_off	2	127	0.0	1.0
+it	04_res	2	127	0.0	1.0
+it	05_nuclear	2	127	0.0	1.0
+it	06_coal	2	127	0.0	1.0
+it	07_gas	2	127	0.0	1.0
 it	08_non-res	2	127	0.0	0.0
 it	09_hydro_pump	2	127	0.0	0.0
-it	01_solar	2	128	1.0	0.0
-it	02_wind_on	2	128	1.0	0.0
-it	03_wind_off	2	128	1.0	0.0
-it	04_res	2	128	1.0	0.0
-it	05_nuclear	2	128	1.0	0.0
-it	06_coal	2	128	1.0	0.0
-it	07_gas	2	128	1.0	0.0
+it	01_solar	2	128	0.0	1.0
+it	02_wind_on	2	128	0.0	1.0
+it	03_wind_off	2	128	0.0	1.0
+it	04_res	2	128	0.0	1.0
+it	05_nuclear	2	128	0.0	1.0
+it	06_coal	2	128	0.0	1.0
+it	07_gas	2	128	0.0	1.0
 it	08_non-res	2	128	0.0	0.0
 it	09_hydro_pump	2	128	0.0	0.0
-it	01_solar	2	129	1.0	0.0
-it	02_wind_on	2	129	1.0	0.0
-it	03_wind_off	2	129	1.0	0.0
-it	04_res	2	129	1.0	0.0
-it	05_nuclear	2	129	1.0	0.0
-it	06_coal	2	129	1.0	0.0
-it	07_gas	2	129	1.0	0.0
+it	01_solar	2	129	0.0	1.0
+it	02_wind_on	2	129	0.0	1.0
+it	03_wind_off	2	129	0.0	1.0
+it	04_res	2	129	0.0	1.0
+it	05_nuclear	2	129	0.0	1.0
+it	06_coal	2	129	0.0	1.0
+it	07_gas	2	129	0.0	1.0
 it	08_non-res	2	129	0.0	0.0
 it	09_hydro_pump	2	129	0.0	0.0
-it	01_solar	2	130	1.0	0.0
-it	02_wind_on	2	130	1.0	0.0
-it	03_wind_off	2	130	1.0	0.0
-it	04_res	2	130	1.0	0.0
-it	05_nuclear	2	130	1.0	0.0
-it	06_coal	2	130	1.0	0.0
-it	07_gas	2	130	1.0	0.0
+it	01_solar	2	130	0.0	1.0
+it	02_wind_on	2	130	0.0	1.0
+it	03_wind_off	2	130	0.0	1.0
+it	04_res	2	130	0.0	1.0
+it	05_nuclear	2	130	0.0	1.0
+it	06_coal	2	130	0.0	1.0
+it	07_gas	2	130	0.0	1.0
 it	08_non-res	2	130	0.0	0.0
 it	09_hydro_pump	2	130	0.0	0.0
-it	01_solar	2	131	1.0	0.0
-it	02_wind_on	2	131	1.0	0.0
-it	03_wind_off	2	131	1.0	0.0
-it	04_res	2	131	1.0	0.0
-it	05_nuclear	2	131	1.0	0.0
-it	06_coal	2	131	1.0	0.0
-it	07_gas	2	131	1.0	0.0
+it	01_solar	2	131	0.0	1.0
+it	02_wind_on	2	131	0.0	1.0
+it	03_wind_off	2	131	0.0	1.0
+it	04_res	2	131	0.0	1.0
+it	05_nuclear	2	131	0.0	1.0
+it	06_coal	2	131	0.0	1.0
+it	07_gas	2	131	0.0	1.0
 it	08_non-res	2	131	0.0	0.0
 it	09_hydro_pump	2	131	0.0	0.0
-it	01_solar	2	132	1.0	0.0
-it	02_wind_on	2	132	1.0	0.0
-it	03_wind_off	2	132	1.0	0.0
-it	04_res	2	132	1.0	0.0
-it	05_nuclear	2	132	1.0	0.0
-it	06_coal	2	132	1.0	0.0
-it	07_gas	2	132	1.0	0.0
+it	01_solar	2	132	0.0	1.0
+it	02_wind_on	2	132	0.0	1.0
+it	03_wind_off	2	132	0.0	1.0
+it	04_res	2	132	0.0	1.0
+it	05_nuclear	2	132	0.0	1.0
+it	06_coal	2	132	0.0	1.0
+it	07_gas	2	132	0.0	1.0
 it	08_non-res	2	132	0.0	0.0
 it	09_hydro_pump	2	132	0.0	0.0
-it	01_solar	2	133	1.0	0.0
-it	02_wind_on	2	133	1.0	0.0
-it	03_wind_off	2	133	1.0	0.0
-it	04_res	2	133	1.0	0.0
-it	05_nuclear	2	133	1.0	0.0
-it	06_coal	2	133	1.0	0.0
-it	07_gas	2	133	1.0	0.0
+it	01_solar	2	133	0.0	1.0
+it	02_wind_on	2	133	0.0	1.0
+it	03_wind_off	2	133	0.0	1.0
+it	04_res	2	133	0.0	1.0
+it	05_nuclear	2	133	0.0	1.0
+it	06_coal	2	133	0.0	1.0
+it	07_gas	2	133	0.0	1.0
 it	08_non-res	2	133	0.0	0.0
 it	09_hydro_pump	2	133	0.0	0.0
-it	01_solar	2	134	1.0	0.0
-it	02_wind_on	2	134	1.0	0.0
-it	03_wind_off	2	134	1.0	0.0
-it	04_res	2	134	1.0	0.0
-it	05_nuclear	2	134	1.0	0.0
-it	06_coal	2	134	1.0	0.0
-it	07_gas	2	134	1.0	0.0
+it	01_solar	2	134	0.0	1.0
+it	02_wind_on	2	134	0.0	1.0
+it	03_wind_off	2	134	0.0	1.0
+it	04_res	2	134	0.0	1.0
+it	05_nuclear	2	134	0.0	1.0
+it	06_coal	2	134	0.0	1.0
+it	07_gas	2	134	0.0	1.0
 it	08_non-res	2	134	0.0	0.0
 it	09_hydro_pump	2	134	0.0	0.0
-it	01_solar	2	135	1.0	0.0
-it	02_wind_on	2	135	1.0	0.0
-it	03_wind_off	2	135	1.0	0.0
-it	04_res	2	135	1.0	0.0
-it	05_nuclear	2	135	1.0	0.0
-it	06_coal	2	135	1.0	0.0
-it	07_gas	2	135	1.0	0.0
+it	01_solar	2	135	0.0	1.0
+it	02_wind_on	2	135	0.0	1.0
+it	03_wind_off	2	135	0.0	1.0
+it	04_res	2	135	0.0	1.0
+it	05_nuclear	2	135	0.0	1.0
+it	06_coal	2	135	0.0	1.0
+it	07_gas	2	135	0.0	1.0
 it	08_non-res	2	135	0.0	0.0
 it	09_hydro_pump	2	135	0.0	0.0
-it	01_solar	2	136	1.0	0.0
-it	02_wind_on	2	136	1.0	0.0
-it	03_wind_off	2	136	1.0	0.0
-it	04_res	2	136	1.0	0.0
-it	05_nuclear	2	136	1.0	0.0
-it	06_coal	2	136	1.0	0.0
-it	07_gas	2	136	1.0	0.0
+it	01_solar	2	136	0.0	1.0
+it	02_wind_on	2	136	0.0	1.0
+it	03_wind_off	2	136	0.0	1.0
+it	04_res	2	136	0.0	1.0
+it	05_nuclear	2	136	0.0	1.0
+it	06_coal	2	136	0.0	1.0
+it	07_gas	2	136	0.0	1.0
 it	08_non-res	2	136	0.0	0.0
 it	09_hydro_pump	2	136	0.0	0.0
-it	01_solar	2	137	1.0	0.0
-it	02_wind_on	2	137	1.0	0.0
-it	03_wind_off	2	137	1.0	0.0
-it	04_res	2	137	1.0	0.0
-it	05_nuclear	2	137	1.0	0.0
-it	06_coal	2	137	1.0	0.0
-it	07_gas	2	137	1.0	0.0
+it	01_solar	2	137	0.0	1.0
+it	02_wind_on	2	137	0.0	1.0
+it	03_wind_off	2	137	0.0	1.0
+it	04_res	2	137	0.0	1.0
+it	05_nuclear	2	137	0.0	1.0
+it	06_coal	2	137	0.0	1.0
+it	07_gas	2	137	0.0	1.0
 it	08_non-res	2	137	0.0	0.0
 it	09_hydro_pump	2	137	0.0	0.0
-it	01_solar	2	138	1.0	0.0
-it	02_wind_on	2	138	1.0	0.0
-it	03_wind_off	2	138	1.0	0.0
-it	04_res	2	138	1.0	0.0
-it	05_nuclear	2	138	1.0	0.0
-it	06_coal	2	138	1.0	0.0
-it	07_gas	2	138	1.0	0.0
+it	01_solar	2	138	0.0	1.0
+it	02_wind_on	2	138	0.0	1.0
+it	03_wind_off	2	138	0.0	1.0
+it	04_res	2	138	0.0	1.0
+it	05_nuclear	2	138	0.0	1.0
+it	06_coal	2	138	0.0	1.0
+it	07_gas	2	138	0.0	1.0
 it	08_non-res	2	138	0.0	0.0
 it	09_hydro_pump	2	138	0.0	0.0
-it	01_solar	2	139	1.0	0.0
-it	02_wind_on	2	139	1.0	0.0
-it	03_wind_off	2	139	1.0	0.0
-it	04_res	2	139	1.0	0.0
-it	05_nuclear	2	139	1.0	0.0
-it	06_coal	2	139	1.0	0.0
-it	07_gas	2	139	1.0	0.0
+it	01_solar	2	139	0.0	1.0
+it	02_wind_on	2	139	0.0	1.0
+it	03_wind_off	2	139	0.0	1.0
+it	04_res	2	139	0.0	1.0
+it	05_nuclear	2	139	0.0	1.0
+it	06_coal	2	139	0.0	1.0
+it	07_gas	2	139	0.0	1.0
 it	08_non-res	2	139	0.0	0.0
 it	09_hydro_pump	2	139	0.0	0.0
-it	01_solar	2	140	1.0	0.0
-it	02_wind_on	2	140	1.0	0.0
-it	03_wind_off	2	140	1.0	0.0
-it	04_res	2	140	1.0	0.0
-it	05_nuclear	2	140	1.0	0.0
-it	06_coal	2	140	1.0	0.0
-it	07_gas	2	140	1.0	0.0
+it	01_solar	2	140	0.0	1.0
+it	02_wind_on	2	140	0.0	1.0
+it	03_wind_off	2	140	0.0	1.0
+it	04_res	2	140	0.0	1.0
+it	05_nuclear	2	140	0.0	1.0
+it	06_coal	2	140	0.0	1.0
+it	07_gas	2	140	0.0	1.0
 it	08_non-res	2	140	0.0	0.0
 it	09_hydro_pump	2	140	0.0	0.0
-it	01_solar	2	141	1.0	0.0
-it	02_wind_on	2	141	1.0	0.0
-it	03_wind_off	2	141	1.0	0.0
-it	04_res	2	141	1.0	0.0
-it	05_nuclear	2	141	1.0	0.0
-it	06_coal	2	141	1.0	0.0
-it	07_gas	2	141	1.0	0.0
+it	01_solar	2	141	0.0	1.0
+it	02_wind_on	2	141	0.0	1.0
+it	03_wind_off	2	141	0.0	1.0
+it	04_res	2	141	0.0	1.0
+it	05_nuclear	2	141	0.0	1.0
+it	06_coal	2	141	0.0	1.0
+it	07_gas	2	141	0.0	1.0
 it	08_non-res	2	141	0.0	0.0
 it	09_hydro_pump	2	141	0.0	0.0
-it	01_solar	2	142	1.0	0.0
-it	02_wind_on	2	142	1.0	0.0
-it	03_wind_off	2	142	1.0	0.0
-it	04_res	2	142	1.0	0.0
-it	05_nuclear	2	142	1.0	0.0
-it	06_coal	2	142	1.0	0.0
-it	07_gas	2	142	1.0	0.0
-it	08_non-res	2	142	1.0	0.0
+it	01_solar	2	142	0.0	1.0
+it	02_wind_on	2	142	0.0	1.0
+it	03_wind_off	2	142	0.0	1.0
+it	04_res	2	142	0.0	1.0
+it	05_nuclear	2	142	0.0	1.0
+it	06_coal	2	142	0.0	1.0
+it	07_gas	2	142	0.0	1.0
+it	08_non-res	2	142	0.0	1.0
 it	09_hydro_pump	2	142	0.0	0.0
-it	01_solar	2	143	1.0	0.0
-it	02_wind_on	2	143	1.0	0.0
-it	03_wind_off	2	143	1.0	0.0
-it	04_res	2	143	1.0	0.0
-it	05_nuclear	2	143	1.0	0.0
-it	06_coal	2	143	1.0	0.0
-it	07_gas	2	143	1.0	0.0
-it	08_non-res	2	143	1.0	0.0
+it	01_solar	2	143	0.0	1.0
+it	02_wind_on	2	143	0.0	1.0
+it	03_wind_off	2	143	0.0	1.0
+it	04_res	2	143	0.0	1.0
+it	05_nuclear	2	143	0.0	1.0
+it	06_coal	2	143	0.0	1.0
+it	07_gas	2	143	0.0	1.0
+it	08_non-res	2	143	0.0	1.0
 it	09_hydro_pump	2	143	0.0	0.0
-it	01_solar	2	144	1.0	0.0
-it	02_wind_on	2	144	1.0	0.0
-it	03_wind_off	2	144	1.0	0.0
-it	04_res	2	144	1.0	0.0
-it	05_nuclear	2	144	1.0	0.0
-it	06_coal	2	144	1.0	0.0
-it	07_gas	2	144	1.0	0.0
-it	08_non-res	2	144	1.0	0.0
+it	01_solar	2	144	0.0	1.0
+it	02_wind_on	2	144	0.0	1.0
+it	03_wind_off	2	144	0.0	1.0
+it	04_res	2	144	0.0	1.0
+it	05_nuclear	2	144	0.0	1.0
+it	06_coal	2	144	0.0	1.0
+it	07_gas	2	144	0.0	1.0
+it	08_non-res	2	144	0.0	1.0
 it	09_hydro_pump	2	144	0.0	0.0
-it	01_solar	2	145	1.0	0.0
-it	02_wind_on	2	145	1.0	0.0
-it	03_wind_off	2	145	1.0	0.0
-it	04_res	2	145	1.0	0.0
-it	05_nuclear	2	145	1.0	0.0
-it	06_coal	2	145	1.0	0.0
-it	07_gas	2	145	1.0	0.0
-it	08_non-res	2	145	1.0	0.0
+it	01_solar	2	145	0.0	1.0
+it	02_wind_on	2	145	0.0	1.0
+it	03_wind_off	2	145	0.0	1.0
+it	04_res	2	145	0.0	1.0
+it	05_nuclear	2	145	0.0	1.0
+it	06_coal	2	145	0.0	1.0
+it	07_gas	2	145	0.0	1.0
+it	08_non-res	2	145	0.0	1.0
 it	09_hydro_pump	2	145	0.0	0.0
-it	01_solar	2	146	1.0	0.0
-it	02_wind_on	2	146	1.0	0.0
-it	03_wind_off	2	146	1.0	0.0
-it	04_res	2	146	1.0	0.0
-it	05_nuclear	2	146	1.0	0.0
-it	06_coal	2	146	1.0	0.0
-it	07_gas	2	146	1.0	0.0
-it	08_non-res	2	146	1.0	0.0
+it	01_solar	2	146	0.0	1.0
+it	02_wind_on	2	146	0.0	1.0
+it	03_wind_off	2	146	0.0	1.0
+it	04_res	2	146	0.0	1.0
+it	05_nuclear	2	146	0.0	1.0
+it	06_coal	2	146	0.0	1.0
+it	07_gas	2	146	0.0	1.0
+it	08_non-res	2	146	0.0	1.0
 it	09_hydro_pump	2	146	0.0	0.0
-it	01_solar	2	147	1.0	0.0
-it	02_wind_on	2	147	1.0	0.0
-it	03_wind_off	2	147	1.0	0.0
-it	04_res	2	147	1.0	0.0
-it	05_nuclear	2	147	1.0	0.0
-it	06_coal	2	147	1.0	0.0
-it	07_gas	2	147	1.0	0.0
-it	08_non-res	2	147	1.0	0.0
+it	01_solar	2	147	0.0	1.0
+it	02_wind_on	2	147	0.0	1.0
+it	03_wind_off	2	147	0.0	1.0
+it	04_res	2	147	0.0	1.0
+it	05_nuclear	2	147	0.0	1.0
+it	06_coal	2	147	0.0	1.0
+it	07_gas	2	147	0.0	1.0
+it	08_non-res	2	147	0.0	1.0
 it	09_hydro_pump	2	147	0.0	0.0
-it	01_solar	2	148	1.0	0.0
-it	02_wind_on	2	148	1.0	0.0
-it	03_wind_off	2	148	1.0	0.0
-it	04_res	2	148	1.0	0.0
-it	05_nuclear	2	148	1.0	0.0
-it	06_coal	2	148	1.0	0.0
-it	07_gas	2	148	1.0	0.0
-it	08_non-res	2	148	1.0	0.0
+it	01_solar	2	148	0.0	1.0
+it	02_wind_on	2	148	0.0	1.0
+it	03_wind_off	2	148	0.0	1.0
+it	04_res	2	148	0.0	1.0
+it	05_nuclear	2	148	0.0	1.0
+it	06_coal	2	148	0.0	1.0
+it	07_gas	2	148	0.0	1.0
+it	08_non-res	2	148	0.0	1.0
 it	09_hydro_pump	2	148	0.0	0.0
-it	01_solar	2	149	1.0	0.0
-it	02_wind_on	2	149	1.0	0.0
-it	03_wind_off	2	149	1.0	0.0
-it	04_res	2	149	1.0	0.0
-it	05_nuclear	2	149	1.0	0.0
-it	06_coal	2	149	1.0	0.0
-it	07_gas	2	149	1.0	0.0
-it	08_non-res	2	149	1.0	0.0
+it	01_solar	2	149	0.0	1.0
+it	02_wind_on	2	149	0.0	1.0
+it	03_wind_off	2	149	0.0	1.0
+it	04_res	2	149	0.0	1.0
+it	05_nuclear	2	149	0.0	1.0
+it	06_coal	2	149	0.0	1.0
+it	07_gas	2	149	0.0	1.0
+it	08_non-res	2	149	0.0	1.0
 it	09_hydro_pump	2	149	0.0	0.0
-it	01_solar	2	150	1.0	0.0
-it	02_wind_on	2	150	1.0	0.0
-it	03_wind_off	2	150	1.0	0.0
-it	04_res	2	150	1.0	0.0
-it	05_nuclear	2	150	1.0	0.0
-it	06_coal	2	150	1.0	0.0
-it	07_gas	2	150	1.0	0.0
-it	08_non-res	2	150	1.0	0.0
+it	01_solar	2	150	0.0	1.0
+it	02_wind_on	2	150	0.0	1.0
+it	03_wind_off	2	150	0.0	1.0
+it	04_res	2	150	0.0	1.0
+it	05_nuclear	2	150	0.0	1.0
+it	06_coal	2	150	0.0	1.0
+it	07_gas	2	150	0.0	1.0
+it	08_non-res	2	150	0.0	1.0
 it	09_hydro_pump	2	150	0.0	0.0
-it	01_solar	2	151	1.0	0.0
-it	02_wind_on	2	151	1.0	0.0
-it	03_wind_off	2	151	1.0	0.0
-it	04_res	2	151	1.0	0.0
-it	05_nuclear	2	151	1.0	0.0
-it	06_coal	2	151	1.0	0.0
-it	07_gas	2	151	1.0	0.0
-it	08_non-res	2	151	1.0	0.0
+it	01_solar	2	151	0.0	1.0
+it	02_wind_on	2	151	0.0	1.0
+it	03_wind_off	2	151	0.0	1.0
+it	04_res	2	151	0.0	1.0
+it	05_nuclear	2	151	0.0	1.0
+it	06_coal	2	151	0.0	1.0
+it	07_gas	2	151	0.0	1.0
+it	08_non-res	2	151	0.0	1.0
 it	09_hydro_pump	2	151	0.0	0.0
-it	01_solar	2	152	1.0	0.0
-it	02_wind_on	2	152	1.0	0.0
-it	03_wind_off	2	152	1.0	0.0
-it	04_res	2	152	1.0	0.0
-it	05_nuclear	2	152	1.0	0.0
-it	06_coal	2	152	1.0	0.0
-it	07_gas	2	152	1.0	0.0
-it	08_non-res	2	152	1.0	0.0
+it	01_solar	2	152	0.0	1.0
+it	02_wind_on	2	152	0.0	1.0
+it	03_wind_off	2	152	0.0	1.0
+it	04_res	2	152	0.0	1.0
+it	05_nuclear	2	152	0.0	1.0
+it	06_coal	2	152	0.0	1.0
+it	07_gas	2	152	0.0	1.0
+it	08_non-res	2	152	0.0	1.0
 it	09_hydro_pump	2	152	0.0	0.0
-it	01_solar	2	153	1.0	0.0
-it	02_wind_on	2	153	1.0	0.0
-it	03_wind_off	2	153	1.0	0.0
-it	04_res	2	153	1.0	0.0
-it	05_nuclear	2	153	1.0	0.0
-it	06_coal	2	153	1.0	0.0
-it	07_gas	2	153	1.0	0.0
-it	08_non-res	2	153	1.0	0.0
+it	01_solar	2	153	0.0	1.0
+it	02_wind_on	2	153	0.0	1.0
+it	03_wind_off	2	153	0.0	1.0
+it	04_res	2	153	0.0	1.0
+it	05_nuclear	2	153	0.0	1.0
+it	06_coal	2	153	0.0	1.0
+it	07_gas	2	153	0.0	1.0
+it	08_non-res	2	153	0.0	1.0
 it	09_hydro_pump	2	153	0.0	0.0
-it	01_solar	2	154	1.0	0.0
-it	02_wind_on	2	154	1.0	0.0
-it	03_wind_off	2	154	1.0	0.0
-it	04_res	2	154	1.0	0.0
-it	05_nuclear	2	154	1.0	0.0
-it	06_coal	2	154	1.0	0.0
-it	07_gas	2	154	1.0	0.0
-it	08_non-res	2	154	1.0	0.0
+it	01_solar	2	154	0.0	1.0
+it	02_wind_on	2	154	0.0	1.0
+it	03_wind_off	2	154	0.0	1.0
+it	04_res	2	154	0.0	1.0
+it	05_nuclear	2	154	0.0	1.0
+it	06_coal	2	154	0.0	1.0
+it	07_gas	2	154	0.0	1.0
+it	08_non-res	2	154	0.0	1.0
 it	09_hydro_pump	2	154	0.0	0.0
-it	01_solar	2	155	1.0	0.0
-it	02_wind_on	2	155	1.0	0.0
-it	03_wind_off	2	155	1.0	0.0
-it	04_res	2	155	1.0	0.0
-it	05_nuclear	2	155	1.0	0.0
-it	06_coal	2	155	1.0	0.0
-it	07_gas	2	155	1.0	0.0
-it	08_non-res	2	155	1.0	0.0
+it	01_solar	2	155	0.0	1.0
+it	02_wind_on	2	155	0.0	1.0
+it	03_wind_off	2	155	0.0	1.0
+it	04_res	2	155	0.0	1.0
+it	05_nuclear	2	155	0.0	1.0
+it	06_coal	2	155	0.0	1.0
+it	07_gas	2	155	0.0	1.0
+it	08_non-res	2	155	0.0	1.0
 it	09_hydro_pump	2	155	0.0	0.0
-it	01_solar	2	156	1.0	0.0
-it	02_wind_on	2	156	1.0	0.0
-it	03_wind_off	2	156	1.0	0.0
-it	04_res	2	156	1.0	0.0
-it	05_nuclear	2	156	1.0	0.0
-it	06_coal	2	156	1.0	0.0
-it	07_gas	2	156	1.0	0.0
-it	08_non-res	2	156	1.0	0.0
+it	01_solar	2	156	0.0	1.0
+it	02_wind_on	2	156	0.0	1.0
+it	03_wind_off	2	156	0.0	1.0
+it	04_res	2	156	0.0	1.0
+it	05_nuclear	2	156	0.0	1.0
+it	06_coal	2	156	0.0	1.0
+it	07_gas	2	156	0.0	1.0
+it	08_non-res	2	156	0.0	1.0
 it	09_hydro_pump	2	156	0.0	0.0
-it	01_solar	2	157	1.0	0.0
-it	02_wind_on	2	157	1.0	0.0
-it	03_wind_off	2	157	1.0	0.0
-it	04_res	2	157	1.0	0.0
-it	05_nuclear	2	157	1.0	0.0
-it	06_coal	2	157	1.0	0.0
-it	07_gas	2	157	1.0	0.0
-it	08_non-res	2	157	1.0	0.0
+it	01_solar	2	157	0.0	1.0
+it	02_wind_on	2	157	0.0	1.0
+it	03_wind_off	2	157	0.0	1.0
+it	04_res	2	157	0.0	1.0
+it	05_nuclear	2	157	0.0	1.0
+it	06_coal	2	157	0.0	1.0
+it	07_gas	2	157	0.0	1.0
+it	08_non-res	2	157	0.0	1.0
 it	09_hydro_pump	2	157	0.0	0.0
-it	01_solar	2	158	1.0	0.0
-it	02_wind_on	2	158	1.0	0.0
-it	03_wind_off	2	158	1.0	0.0
-it	04_res	2	158	1.0	0.0
-it	05_nuclear	2	158	1.0	0.0
-it	06_coal	2	158	1.0	0.0
-it	07_gas	2	158	1.0	0.0
-it	08_non-res	2	158	1.0	0.0
+it	01_solar	2	158	0.0	1.0
+it	02_wind_on	2	158	0.0	1.0
+it	03_wind_off	2	158	0.0	1.0
+it	04_res	2	158	0.0	1.0
+it	05_nuclear	2	158	0.0	1.0
+it	06_coal	2	158	0.0	1.0
+it	07_gas	2	158	0.0	1.0
+it	08_non-res	2	158	0.0	1.0
 it	09_hydro_pump	2	158	0.0	0.0
-it	01_solar	2	159	1.0	0.0
-it	02_wind_on	2	159	1.0	0.0
-it	03_wind_off	2	159	1.0	0.0
-it	04_res	2	159	1.0	0.0
-it	05_nuclear	2	159	1.0	0.0
-it	06_coal	2	159	1.0	0.0
-it	07_gas	2	159	1.0	0.0
-it	08_non-res	2	159	1.0	0.0
+it	01_solar	2	159	0.0	1.0
+it	02_wind_on	2	159	0.0	1.0
+it	03_wind_off	2	159	0.0	1.0
+it	04_res	2	159	0.0	1.0
+it	05_nuclear	2	159	0.0	1.0
+it	06_coal	2	159	0.0	1.0
+it	07_gas	2	159	0.0	1.0
+it	08_non-res	2	159	0.0	1.0
 it	09_hydro_pump	2	159	0.0	0.0
-it	01_solar	2	160	1.0	0.0
-it	02_wind_on	2	160	1.0	0.0
-it	03_wind_off	2	160	1.0	0.0
-it	04_res	2	160	1.0	0.0
-it	05_nuclear	2	160	1.0	0.0
-it	06_coal	2	160	1.0	0.0
-it	07_gas	2	160	1.0	0.0
-it	08_non-res	2	160	1.0	0.0
+it	01_solar	2	160	0.0	1.0
+it	02_wind_on	2	160	0.0	1.0
+it	03_wind_off	2	160	0.0	1.0
+it	04_res	2	160	0.0	1.0
+it	05_nuclear	2	160	0.0	1.0
+it	06_coal	2	160	0.0	1.0
+it	07_gas	2	160	0.0	1.0
+it	08_non-res	2	160	0.0	1.0
 it	09_hydro_pump	2	160	0.0	0.0
-it	01_solar	2	161	1.0	0.0
-it	02_wind_on	2	161	1.0	0.0
-it	03_wind_off	2	161	1.0	0.0
-it	04_res	2	161	1.0	0.0
-it	05_nuclear	2	161	1.0	0.0
-it	06_coal	2	161	1.0	0.0
-it	07_gas	2	161	1.0	0.0
-it	08_non-res	2	161	1.0	0.0
+it	01_solar	2	161	0.0	1.0
+it	02_wind_on	2	161	0.0	1.0
+it	03_wind_off	2	161	0.0	1.0
+it	04_res	2	161	0.0	1.0
+it	05_nuclear	2	161	0.0	1.0
+it	06_coal	2	161	0.0	1.0
+it	07_gas	2	161	0.0	1.0
+it	08_non-res	2	161	0.0	1.0
 it	09_hydro_pump	2	161	0.0	0.0
-it	01_solar	2	162	1.0	0.0
-it	02_wind_on	2	162	1.0	0.0
-it	03_wind_off	2	162	1.0	0.0
-it	04_res	2	162	1.0	0.0
-it	05_nuclear	2	162	1.0	0.0
-it	06_coal	2	162	1.0	0.0
-it	07_gas	2	162	1.0	0.0
-it	08_non-res	2	162	1.0	0.0
-it	09_hydro_pump	2	162	1.0	0.0
-it	01_solar	2	163	1.0	0.0
-it	02_wind_on	2	163	1.0	0.0
-it	03_wind_off	2	163	1.0	0.0
-it	04_res	2	163	1.0	0.0
-it	05_nuclear	2	163	1.0	0.0
-it	06_coal	2	163	1.0	0.0
-it	07_gas	2	163	1.0	0.0
-it	08_non-res	2	163	1.0	0.0
-it	09_hydro_pump	2	163	1.0	0.0
-it	01_solar	2	164	1.0	0.0
-it	02_wind_on	2	164	1.0	0.0
-it	03_wind_off	2	164	1.0	0.0
-it	04_res	2	164	1.0	0.0
-it	05_nuclear	2	164	1.0	0.0
-it	06_coal	2	164	1.0	0.0
-it	07_gas	2	164	1.0	0.0
-it	08_non-res	2	164	1.0	0.0
-it	09_hydro_pump	2	164	1.0	0.0
-it	01_solar	2	165	1.0	0.0
-it	02_wind_on	2	165	1.0	0.0
-it	03_wind_off	2	165	1.0	0.0
-it	04_res	2	165	1.0	0.0
-it	05_nuclear	2	165	1.0	0.0
-it	06_coal	2	165	1.0	0.0
-it	07_gas	2	165	1.0	0.0
-it	08_non-res	2	165	1.0	0.0
-it	09_hydro_pump	2	165	1.0	0.0
-it	01_solar	2	166	1.0	0.0
-it	02_wind_on	2	166	1.0	0.0
-it	03_wind_off	2	166	1.0	0.0
-it	04_res	2	166	1.0	0.0
-it	05_nuclear	2	166	1.0	0.0
-it	06_coal	2	166	1.0	0.0
-it	07_gas	2	166	1.0	0.0
-it	08_non-res	2	166	1.0	0.0
-it	09_hydro_pump	2	166	1.0	0.0
-it	01_solar	2	167	1.0	0.0
-it	02_wind_on	2	167	1.0	0.0
-it	03_wind_off	2	167	1.0	0.0
-it	04_res	2	167	1.0	0.0
-it	05_nuclear	2	167	1.0	0.0
-it	06_coal	2	167	1.0	0.0
-it	07_gas	2	167	1.0	0.0
-it	08_non-res	2	167	1.0	0.0
-it	09_hydro_pump	2	167	1.0	0.0
-it	01_solar	2	168	1.0	0.0
-it	02_wind_on	2	168	1.0	0.0
-it	03_wind_off	2	168	1.0	0.0
-it	04_res	2	168	1.0	0.0
-it	05_nuclear	2	168	1.0	0.0
-it	06_coal	2	168	1.0	0.0
-it	07_gas	2	168	1.0	0.0
-it	08_non-res	2	168	1.0	0.0
-it	09_hydro_pump	2	168	1.0	0.0
+it	01_solar	2	162	0.0	1.0
+it	02_wind_on	2	162	0.0	1.0
+it	03_wind_off	2	162	0.0	1.0
+it	04_res	2	162	0.0	1.0
+it	05_nuclear	2	162	0.0	1.0
+it	06_coal	2	162	0.0	1.0
+it	07_gas	2	162	0.0	1.0
+it	08_non-res	2	162	0.0	1.0
+it	09_hydro_pump	2	162	0.0	1.0
+it	01_solar	2	163	0.0	1.0
+it	02_wind_on	2	163	0.0	1.0
+it	03_wind_off	2	163	0.0	1.0
+it	04_res	2	163	0.0	1.0
+it	05_nuclear	2	163	0.0	1.0
+it	06_coal	2	163	0.0	1.0
+it	07_gas	2	163	0.0	1.0
+it	08_non-res	2	163	0.0	1.0
+it	09_hydro_pump	2	163	0.0	1.0
+it	01_solar	2	164	0.0	1.0
+it	02_wind_on	2	164	0.0	1.0
+it	03_wind_off	2	164	0.0	1.0
+it	04_res	2	164	0.0	1.0
+it	05_nuclear	2	164	0.0	1.0
+it	06_coal	2	164	0.0	1.0
+it	07_gas	2	164	0.0	1.0
+it	08_non-res	2	164	0.0	1.0
+it	09_hydro_pump	2	164	0.0	1.0
+it	01_solar	2	165	0.0	1.0
+it	02_wind_on	2	165	0.0	1.0
+it	03_wind_off	2	165	0.0	1.0
+it	04_res	2	165	0.0	1.0
+it	05_nuclear	2	165	0.0	1.0
+it	06_coal	2	165	0.0	1.0
+it	07_gas	2	165	0.0	1.0
+it	08_non-res	2	165	0.0	1.0
+it	09_hydro_pump	2	165	0.0	1.0
+it	01_solar	2	166	0.0	1.0
+it	02_wind_on	2	166	0.0	1.0
+it	03_wind_off	2	166	0.0	1.0
+it	04_res	2	166	0.0	1.0
+it	05_nuclear	2	166	0.0	1.0
+it	06_coal	2	166	0.0	1.0
+it	07_gas	2	166	0.0	1.0
+it	08_non-res	2	166	0.0	1.0
+it	09_hydro_pump	2	166	0.0	1.0
+it	01_solar	2	167	0.0	1.0
+it	02_wind_on	2	167	0.0	1.0
+it	03_wind_off	2	167	0.0	1.0
+it	04_res	2	167	0.0	1.0
+it	05_nuclear	2	167	0.0	1.0
+it	06_coal	2	167	0.0	1.0
+it	07_gas	2	167	0.0	1.0
+it	08_non-res	2	167	0.0	1.0
+it	09_hydro_pump	2	167	0.0	1.0
+it	01_solar	2	168	0.0	1.0
+it	02_wind_on	2	168	0.0	1.0
+it	03_wind_off	2	168	0.0	1.0
+it	04_res	2	168	0.0	1.0
+it	05_nuclear	2	168	0.0	1.0
+it	06_coal	2	168	0.0	1.0
+it	07_gas	2	168	0.0	1.0
+it	08_non-res	2	168	0.0	1.0
+it	09_hydro_pump	2	168	0.0	1.0
 it	01_solar	2	169	0.0	0.0
 it	02_wind_on	2	169	0.0	0.0
 it	03_wind_off	2	169	0.0	0.0
@@ -22688,7 +22688,7 @@ it	06_coal	2	169	0.0	0.0
 it	07_gas	2	169	0.0	0.0
 it	08_non-res	2	169	0.0	0.0
 it	09_hydro_pump	2	169	0.0	0.0
-it	01_solar	2	170	1.0	0.0
+it	01_solar	2	170	0.0	1.0
 it	02_wind_on	2	170	0.0	0.0
 it	03_wind_off	2	170	0.0	0.0
 it	04_res	2	170	0.0	0.0
@@ -22697,7 +22697,7 @@ it	06_coal	2	170	0.0	0.0
 it	07_gas	2	170	0.0	0.0
 it	08_non-res	2	170	0.0	0.0
 it	09_hydro_pump	2	170	0.0	0.0
-it	01_solar	2	171	1.0	0.0
+it	01_solar	2	171	0.0	1.0
 it	02_wind_on	2	171	0.0	0.0
 it	03_wind_off	2	171	0.0	0.0
 it	04_res	2	171	0.0	0.0
@@ -22706,7 +22706,7 @@ it	06_coal	2	171	0.0	0.0
 it	07_gas	2	171	0.0	0.0
 it	08_non-res	2	171	0.0	0.0
 it	09_hydro_pump	2	171	0.0	0.0
-it	01_solar	2	172	1.0	0.0
+it	01_solar	2	172	0.0	1.0
 it	02_wind_on	2	172	0.0	0.0
 it	03_wind_off	2	172	0.0	0.0
 it	04_res	2	172	0.0	0.0
@@ -22715,7 +22715,7 @@ it	06_coal	2	172	0.0	0.0
 it	07_gas	2	172	0.0	0.0
 it	08_non-res	2	172	0.0	0.0
 it	09_hydro_pump	2	172	0.0	0.0
-it	01_solar	2	173	1.0	0.0
+it	01_solar	2	173	0.0	1.0
 it	02_wind_on	2	173	0.0	0.0
 it	03_wind_off	2	173	0.0	0.0
 it	04_res	2	173	0.0	0.0
@@ -22724,7 +22724,7 @@ it	06_coal	2	173	0.0	0.0
 it	07_gas	2	173	0.0	0.0
 it	08_non-res	2	173	0.0	0.0
 it	09_hydro_pump	2	173	0.0	0.0
-it	01_solar	2	174	1.0	0.0
+it	01_solar	2	174	0.0	1.0
 it	02_wind_on	2	174	0.0	0.0
 it	03_wind_off	2	174	0.0	0.0
 it	04_res	2	174	0.0	0.0
@@ -22733,7 +22733,7 @@ it	06_coal	2	174	0.0	0.0
 it	07_gas	2	174	0.0	0.0
 it	08_non-res	2	174	0.0	0.0
 it	09_hydro_pump	2	174	0.0	0.0
-it	01_solar	2	175	1.0	0.0
+it	01_solar	2	175	0.0	1.0
 it	02_wind_on	2	175	0.0	0.0
 it	03_wind_off	2	175	0.0	0.0
 it	04_res	2	175	0.0	0.0
@@ -22742,7 +22742,7 @@ it	06_coal	2	175	0.0	0.0
 it	07_gas	2	175	0.0	0.0
 it	08_non-res	2	175	0.0	0.0
 it	09_hydro_pump	2	175	0.0	0.0
-it	01_solar	2	176	1.0	0.0
+it	01_solar	2	176	0.0	1.0
 it	02_wind_on	2	176	0.0	0.0
 it	03_wind_off	2	176	0.0	0.0
 it	04_res	2	176	0.0	0.0
@@ -22751,7 +22751,7 @@ it	06_coal	2	176	0.0	0.0
 it	07_gas	2	176	0.0	0.0
 it	08_non-res	2	176	0.0	0.0
 it	09_hydro_pump	2	176	0.0	0.0
-it	01_solar	2	177	1.0	0.0
+it	01_solar	2	177	0.0	1.0
 it	02_wind_on	2	177	0.0	0.0
 it	03_wind_off	2	177	0.0	0.0
 it	04_res	2	177	0.0	0.0
@@ -22760,7 +22760,7 @@ it	06_coal	2	177	0.0	0.0
 it	07_gas	2	177	0.0	0.0
 it	08_non-res	2	177	0.0	0.0
 it	09_hydro_pump	2	177	0.0	0.0
-it	01_solar	2	178	1.0	0.0
+it	01_solar	2	178	0.0	1.0
 it	02_wind_on	2	178	0.0	0.0
 it	03_wind_off	2	178	0.0	0.0
 it	04_res	2	178	0.0	0.0
@@ -22769,7 +22769,7 @@ it	06_coal	2	178	0.0	0.0
 it	07_gas	2	178	0.0	0.0
 it	08_non-res	2	178	0.0	0.0
 it	09_hydro_pump	2	178	0.0	0.0
-it	01_solar	2	179	1.0	0.0
+it	01_solar	2	179	0.0	1.0
 it	02_wind_on	2	179	0.0	0.0
 it	03_wind_off	2	179	0.0	0.0
 it	04_res	2	179	0.0	0.0
@@ -22778,7 +22778,7 @@ it	06_coal	2	179	0.0	0.0
 it	07_gas	2	179	0.0	0.0
 it	08_non-res	2	179	0.0	0.0
 it	09_hydro_pump	2	179	0.0	0.0
-it	01_solar	2	180	1.0	0.0
+it	01_solar	2	180	0.0	1.0
 it	02_wind_on	2	180	0.0	0.0
 it	03_wind_off	2	180	0.0	0.0
 it	04_res	2	180	0.0	0.0
@@ -22787,7 +22787,7 @@ it	06_coal	2	180	0.0	0.0
 it	07_gas	2	180	0.0	0.0
 it	08_non-res	2	180	0.0	0.0
 it	09_hydro_pump	2	180	0.0	0.0
-it	01_solar	2	181	1.0	0.0
+it	01_solar	2	181	0.0	1.0
 it	02_wind_on	2	181	0.0	0.0
 it	03_wind_off	2	181	0.0	0.0
 it	04_res	2	181	0.0	0.0
@@ -22796,7 +22796,7 @@ it	06_coal	2	181	0.0	0.0
 it	07_gas	2	181	0.0	0.0
 it	08_non-res	2	181	0.0	0.0
 it	09_hydro_pump	2	181	0.0	0.0
-it	01_solar	2	182	1.0	0.0
+it	01_solar	2	182	0.0	1.0
 it	02_wind_on	2	182	0.0	0.0
 it	03_wind_off	2	182	0.0	0.0
 it	04_res	2	182	0.0	0.0
@@ -22805,7 +22805,7 @@ it	06_coal	2	182	0.0	0.0
 it	07_gas	2	182	0.0	0.0
 it	08_non-res	2	182	0.0	0.0
 it	09_hydro_pump	2	182	0.0	0.0
-it	01_solar	2	183	1.0	0.0
+it	01_solar	2	183	0.0	1.0
 it	02_wind_on	2	183	0.0	0.0
 it	03_wind_off	2	183	0.0	0.0
 it	04_res	2	183	0.0	0.0
@@ -22814,7 +22814,7 @@ it	06_coal	2	183	0.0	0.0
 it	07_gas	2	183	0.0	0.0
 it	08_non-res	2	183	0.0	0.0
 it	09_hydro_pump	2	183	0.0	0.0
-it	01_solar	2	184	1.0	0.0
+it	01_solar	2	184	0.0	1.0
 it	02_wind_on	2	184	0.0	0.0
 it	03_wind_off	2	184	0.0	0.0
 it	04_res	2	184	0.0	0.0
@@ -22823,7 +22823,7 @@ it	06_coal	2	184	0.0	0.0
 it	07_gas	2	184	0.0	0.0
 it	08_non-res	2	184	0.0	0.0
 it	09_hydro_pump	2	184	0.0	0.0
-it	01_solar	2	185	1.0	0.0
+it	01_solar	2	185	0.0	1.0
 it	02_wind_on	2	185	0.0	0.0
 it	03_wind_off	2	185	0.0	0.0
 it	04_res	2	185	0.0	0.0
@@ -22832,7 +22832,7 @@ it	06_coal	2	185	0.0	0.0
 it	07_gas	2	185	0.0	0.0
 it	08_non-res	2	185	0.0	0.0
 it	09_hydro_pump	2	185	0.0	0.0
-it	01_solar	2	186	1.0	0.0
+it	01_solar	2	186	0.0	1.0
 it	02_wind_on	2	186	0.0	0.0
 it	03_wind_off	2	186	0.0	0.0
 it	04_res	2	186	0.0	0.0
@@ -22841,7 +22841,7 @@ it	06_coal	2	186	0.0	0.0
 it	07_gas	2	186	0.0	0.0
 it	08_non-res	2	186	0.0	0.0
 it	09_hydro_pump	2	186	0.0	0.0
-it	01_solar	2	187	1.0	0.0
+it	01_solar	2	187	0.0	1.0
 it	02_wind_on	2	187	0.0	0.0
 it	03_wind_off	2	187	0.0	0.0
 it	04_res	2	187	0.0	0.0
@@ -22850,7 +22850,7 @@ it	06_coal	2	187	0.0	0.0
 it	07_gas	2	187	0.0	0.0
 it	08_non-res	2	187	0.0	0.0
 it	09_hydro_pump	2	187	0.0	0.0
-it	01_solar	2	188	1.0	0.0
+it	01_solar	2	188	0.0	1.0
 it	02_wind_on	2	188	0.0	0.0
 it	03_wind_off	2	188	0.0	0.0
 it	04_res	2	188	0.0	0.0
@@ -22859,7 +22859,7 @@ it	06_coal	2	188	0.0	0.0
 it	07_gas	2	188	0.0	0.0
 it	08_non-res	2	188	0.0	0.0
 it	09_hydro_pump	2	188	0.0	0.0
-it	01_solar	2	189	1.0	0.0
+it	01_solar	2	189	0.0	1.0
 it	02_wind_on	2	189	0.0	0.0
 it	03_wind_off	2	189	0.0	0.0
 it	04_res	2	189	0.0	0.0
@@ -22868,8 +22868,8 @@ it	06_coal	2	189	0.0	0.0
 it	07_gas	2	189	0.0	0.0
 it	08_non-res	2	189	0.0	0.0
 it	09_hydro_pump	2	189	0.0	0.0
-it	01_solar	2	190	1.0	0.0
-it	02_wind_on	2	190	1.0	0.0
+it	01_solar	2	190	0.0	1.0
+it	02_wind_on	2	190	0.0	1.0
 it	03_wind_off	2	190	0.0	0.0
 it	04_res	2	190	0.0	0.0
 it	05_nuclear	2	190	0.0	0.0
@@ -22877,8 +22877,8 @@ it	06_coal	2	190	0.0	0.0
 it	07_gas	2	190	0.0	0.0
 it	08_non-res	2	190	0.0	0.0
 it	09_hydro_pump	2	190	0.0	0.0
-it	01_solar	2	191	1.0	0.0
-it	02_wind_on	2	191	1.0	0.0
+it	01_solar	2	191	0.0	1.0
+it	02_wind_on	2	191	0.0	1.0
 it	03_wind_off	2	191	0.0	0.0
 it	04_res	2	191	0.0	0.0
 it	05_nuclear	2	191	0.0	0.0
@@ -22886,8 +22886,8 @@ it	06_coal	2	191	0.0	0.0
 it	07_gas	2	191	0.0	0.0
 it	08_non-res	2	191	0.0	0.0
 it	09_hydro_pump	2	191	0.0	0.0
-it	01_solar	2	192	1.0	0.0
-it	02_wind_on	2	192	1.0	0.0
+it	01_solar	2	192	0.0	1.0
+it	02_wind_on	2	192	0.0	1.0
 it	03_wind_off	2	192	0.0	0.0
 it	04_res	2	192	0.0	0.0
 it	05_nuclear	2	192	0.0	0.0
@@ -22895,8 +22895,8 @@ it	06_coal	2	192	0.0	0.0
 it	07_gas	2	192	0.0	0.0
 it	08_non-res	2	192	0.0	0.0
 it	09_hydro_pump	2	192	0.0	0.0
-it	01_solar	2	193	1.0	0.0
-it	02_wind_on	2	193	1.0	0.0
+it	01_solar	2	193	0.0	1.0
+it	02_wind_on	2	193	0.0	1.0
 it	03_wind_off	2	193	0.0	0.0
 it	04_res	2	193	0.0	0.0
 it	05_nuclear	2	193	0.0	0.0
@@ -22904,8 +22904,8 @@ it	06_coal	2	193	0.0	0.0
 it	07_gas	2	193	0.0	0.0
 it	08_non-res	2	193	0.0	0.0
 it	09_hydro_pump	2	193	0.0	0.0
-it	01_solar	2	194	1.0	0.0
-it	02_wind_on	2	194	1.0	0.0
+it	01_solar	2	194	0.0	1.0
+it	02_wind_on	2	194	0.0	1.0
 it	03_wind_off	2	194	0.0	0.0
 it	04_res	2	194	0.0	0.0
 it	05_nuclear	2	194	0.0	0.0
@@ -22913,8 +22913,8 @@ it	06_coal	2	194	0.0	0.0
 it	07_gas	2	194	0.0	0.0
 it	08_non-res	2	194	0.0	0.0
 it	09_hydro_pump	2	194	0.0	0.0
-it	01_solar	2	195	1.0	0.0
-it	02_wind_on	2	195	1.0	0.0
+it	01_solar	2	195	0.0	1.0
+it	02_wind_on	2	195	0.0	1.0
 it	03_wind_off	2	195	0.0	0.0
 it	04_res	2	195	0.0	0.0
 it	05_nuclear	2	195	0.0	0.0
@@ -22922,8 +22922,8 @@ it	06_coal	2	195	0.0	0.0
 it	07_gas	2	195	0.0	0.0
 it	08_non-res	2	195	0.0	0.0
 it	09_hydro_pump	2	195	0.0	0.0
-it	01_solar	2	196	1.0	0.0
-it	02_wind_on	2	196	1.0	0.0
+it	01_solar	2	196	0.0	1.0
+it	02_wind_on	2	196	0.0	1.0
 it	03_wind_off	2	196	0.0	0.0
 it	04_res	2	196	0.0	0.0
 it	05_nuclear	2	196	0.0	0.0
@@ -22931,8 +22931,8 @@ it	06_coal	2	196	0.0	0.0
 it	07_gas	2	196	0.0	0.0
 it	08_non-res	2	196	0.0	0.0
 it	09_hydro_pump	2	196	0.0	0.0
-it	01_solar	2	197	1.0	0.0
-it	02_wind_on	2	197	1.0	0.0
+it	01_solar	2	197	0.0	1.0
+it	02_wind_on	2	197	0.0	1.0
 it	03_wind_off	2	197	0.0	0.0
 it	04_res	2	197	0.0	0.0
 it	05_nuclear	2	197	0.0	0.0
@@ -22940,8 +22940,8 @@ it	06_coal	2	197	0.0	0.0
 it	07_gas	2	197	0.0	0.0
 it	08_non-res	2	197	0.0	0.0
 it	09_hydro_pump	2	197	0.0	0.0
-it	01_solar	2	198	1.0	0.0
-it	02_wind_on	2	198	1.0	0.0
+it	01_solar	2	198	0.0	1.0
+it	02_wind_on	2	198	0.0	1.0
 it	03_wind_off	2	198	0.0	0.0
 it	04_res	2	198	0.0	0.0
 it	05_nuclear	2	198	0.0	0.0
@@ -22949,8 +22949,8 @@ it	06_coal	2	198	0.0	0.0
 it	07_gas	2	198	0.0	0.0
 it	08_non-res	2	198	0.0	0.0
 it	09_hydro_pump	2	198	0.0	0.0
-it	01_solar	2	199	1.0	0.0
-it	02_wind_on	2	199	1.0	0.0
+it	01_solar	2	199	0.0	1.0
+it	02_wind_on	2	199	0.0	1.0
 it	03_wind_off	2	199	0.0	0.0
 it	04_res	2	199	0.0	0.0
 it	05_nuclear	2	199	0.0	0.0
@@ -22958,8 +22958,8 @@ it	06_coal	2	199	0.0	0.0
 it	07_gas	2	199	0.0	0.0
 it	08_non-res	2	199	0.0	0.0
 it	09_hydro_pump	2	199	0.0	0.0
-it	01_solar	2	200	1.0	0.0
-it	02_wind_on	2	200	1.0	0.0
+it	01_solar	2	200	0.0	1.0
+it	02_wind_on	2	200	0.0	1.0
 it	03_wind_off	2	200	0.0	0.0
 it	04_res	2	200	0.0	0.0
 it	05_nuclear	2	200	0.0	0.0
@@ -22967,8 +22967,8 @@ it	06_coal	2	200	0.0	0.0
 it	07_gas	2	200	0.0	0.0
 it	08_non-res	2	200	0.0	0.0
 it	09_hydro_pump	2	200	0.0	0.0
-it	01_solar	2	201	1.0	0.0
-it	02_wind_on	2	201	1.0	0.0
+it	01_solar	2	201	0.0	1.0
+it	02_wind_on	2	201	0.0	1.0
 it	03_wind_off	2	201	0.0	0.0
 it	04_res	2	201	0.0	0.0
 it	05_nuclear	2	201	0.0	0.0
@@ -22976,8 +22976,8 @@ it	06_coal	2	201	0.0	0.0
 it	07_gas	2	201	0.0	0.0
 it	08_non-res	2	201	0.0	0.0
 it	09_hydro_pump	2	201	0.0	0.0
-it	01_solar	2	202	1.0	0.0
-it	02_wind_on	2	202	1.0	0.0
+it	01_solar	2	202	0.0	1.0
+it	02_wind_on	2	202	0.0	1.0
 it	03_wind_off	2	202	0.0	0.0
 it	04_res	2	202	0.0	0.0
 it	05_nuclear	2	202	0.0	0.0
@@ -22985,8 +22985,8 @@ it	06_coal	2	202	0.0	0.0
 it	07_gas	2	202	0.0	0.0
 it	08_non-res	2	202	0.0	0.0
 it	09_hydro_pump	2	202	0.0	0.0
-it	01_solar	2	203	1.0	0.0
-it	02_wind_on	2	203	1.0	0.0
+it	01_solar	2	203	0.0	1.0
+it	02_wind_on	2	203	0.0	1.0
 it	03_wind_off	2	203	0.0	0.0
 it	04_res	2	203	0.0	0.0
 it	05_nuclear	2	203	0.0	0.0
@@ -22994,8 +22994,8 @@ it	06_coal	2	203	0.0	0.0
 it	07_gas	2	203	0.0	0.0
 it	08_non-res	2	203	0.0	0.0
 it	09_hydro_pump	2	203	0.0	0.0
-it	01_solar	2	204	1.0	0.0
-it	02_wind_on	2	204	1.0	0.0
+it	01_solar	2	204	0.0	1.0
+it	02_wind_on	2	204	0.0	1.0
 it	03_wind_off	2	204	0.0	0.0
 it	04_res	2	204	0.0	0.0
 it	05_nuclear	2	204	0.0	0.0
@@ -23003,8 +23003,8 @@ it	06_coal	2	204	0.0	0.0
 it	07_gas	2	204	0.0	0.0
 it	08_non-res	2	204	0.0	0.0
 it	09_hydro_pump	2	204	0.0	0.0
-it	01_solar	2	205	1.0	0.0
-it	02_wind_on	2	205	1.0	0.0
+it	01_solar	2	205	0.0	1.0
+it	02_wind_on	2	205	0.0	1.0
 it	03_wind_off	2	205	0.0	0.0
 it	04_res	2	205	0.0	0.0
 it	05_nuclear	2	205	0.0	0.0
@@ -23012,8 +23012,8 @@ it	06_coal	2	205	0.0	0.0
 it	07_gas	2	205	0.0	0.0
 it	08_non-res	2	205	0.0	0.0
 it	09_hydro_pump	2	205	0.0	0.0
-it	01_solar	2	206	1.0	0.0
-it	02_wind_on	2	206	1.0	0.0
+it	01_solar	2	206	0.0	1.0
+it	02_wind_on	2	206	0.0	1.0
 it	03_wind_off	2	206	0.0	0.0
 it	04_res	2	206	0.0	0.0
 it	05_nuclear	2	206	0.0	0.0
@@ -23021,8 +23021,8 @@ it	06_coal	2	206	0.0	0.0
 it	07_gas	2	206	0.0	0.0
 it	08_non-res	2	206	0.0	0.0
 it	09_hydro_pump	2	206	0.0	0.0
-it	01_solar	2	207	1.0	0.0
-it	02_wind_on	2	207	1.0	0.0
+it	01_solar	2	207	0.0	1.0
+it	02_wind_on	2	207	0.0	1.0
 it	03_wind_off	2	207	0.0	0.0
 it	04_res	2	207	0.0	0.0
 it	05_nuclear	2	207	0.0	0.0
@@ -23030,8 +23030,8 @@ it	06_coal	2	207	0.0	0.0
 it	07_gas	2	207	0.0	0.0
 it	08_non-res	2	207	0.0	0.0
 it	09_hydro_pump	2	207	0.0	0.0
-it	01_solar	2	208	1.0	0.0
-it	02_wind_on	2	208	1.0	0.0
+it	01_solar	2	208	0.0	1.0
+it	02_wind_on	2	208	0.0	1.0
 it	03_wind_off	2	208	0.0	0.0
 it	04_res	2	208	0.0	0.0
 it	05_nuclear	2	208	0.0	0.0
@@ -23039,8 +23039,8 @@ it	06_coal	2	208	0.0	0.0
 it	07_gas	2	208	0.0	0.0
 it	08_non-res	2	208	0.0	0.0
 it	09_hydro_pump	2	208	0.0	0.0
-it	01_solar	2	209	1.0	0.0
-it	02_wind_on	2	209	1.0	0.0
+it	01_solar	2	209	0.0	1.0
+it	02_wind_on	2	209	0.0	1.0
 it	03_wind_off	2	209	0.0	0.0
 it	04_res	2	209	0.0	0.0
 it	05_nuclear	2	209	0.0	0.0
@@ -23048,1146 +23048,1146 @@ it	06_coal	2	209	0.0	0.0
 it	07_gas	2	209	0.0	0.0
 it	08_non-res	2	209	0.0	0.0
 it	09_hydro_pump	2	209	0.0	0.0
-it	01_solar	2	210	1.0	0.0
-it	02_wind_on	2	210	1.0	0.0
-it	03_wind_off	2	210	1.0	0.0
+it	01_solar	2	210	0.0	1.0
+it	02_wind_on	2	210	0.0	1.0
+it	03_wind_off	2	210	0.0	1.0
 it	04_res	2	210	0.0	0.0
 it	05_nuclear	2	210	0.0	0.0
 it	06_coal	2	210	0.0	0.0
 it	07_gas	2	210	0.0	0.0
 it	08_non-res	2	210	0.0	0.0
 it	09_hydro_pump	2	210	0.0	0.0
-it	01_solar	2	211	1.0	0.0
-it	02_wind_on	2	211	1.0	0.0
-it	03_wind_off	2	211	1.0	0.0
+it	01_solar	2	211	0.0	1.0
+it	02_wind_on	2	211	0.0	1.0
+it	03_wind_off	2	211	0.0	1.0
 it	04_res	2	211	0.0	0.0
 it	05_nuclear	2	211	0.0	0.0
 it	06_coal	2	211	0.0	0.0
 it	07_gas	2	211	0.0	0.0
 it	08_non-res	2	211	0.0	0.0
 it	09_hydro_pump	2	211	0.0	0.0
-it	01_solar	2	212	1.0	0.0
-it	02_wind_on	2	212	1.0	0.0
-it	03_wind_off	2	212	1.0	0.0
+it	01_solar	2	212	0.0	1.0
+it	02_wind_on	2	212	0.0	1.0
+it	03_wind_off	2	212	0.0	1.0
 it	04_res	2	212	0.0	0.0
 it	05_nuclear	2	212	0.0	0.0
 it	06_coal	2	212	0.0	0.0
 it	07_gas	2	212	0.0	0.0
 it	08_non-res	2	212	0.0	0.0
 it	09_hydro_pump	2	212	0.0	0.0
-it	01_solar	2	213	1.0	0.0
-it	02_wind_on	2	213	1.0	0.0
-it	03_wind_off	2	213	1.0	0.0
+it	01_solar	2	213	0.0	1.0
+it	02_wind_on	2	213	0.0	1.0
+it	03_wind_off	2	213	0.0	1.0
 it	04_res	2	213	0.0	0.0
 it	05_nuclear	2	213	0.0	0.0
 it	06_coal	2	213	0.0	0.0
 it	07_gas	2	213	0.0	0.0
 it	08_non-res	2	213	0.0	0.0
 it	09_hydro_pump	2	213	0.0	0.0
-it	01_solar	2	214	1.0	0.0
-it	02_wind_on	2	214	1.0	0.0
-it	03_wind_off	2	214	1.0	0.0
+it	01_solar	2	214	0.0	1.0
+it	02_wind_on	2	214	0.0	1.0
+it	03_wind_off	2	214	0.0	1.0
 it	04_res	2	214	0.0	0.0
 it	05_nuclear	2	214	0.0	0.0
 it	06_coal	2	214	0.0	0.0
 it	07_gas	2	214	0.0	0.0
 it	08_non-res	2	214	0.0	0.0
 it	09_hydro_pump	2	214	0.0	0.0
-it	01_solar	2	215	1.0	0.0
-it	02_wind_on	2	215	1.0	0.0
-it	03_wind_off	2	215	1.0	0.0
+it	01_solar	2	215	0.0	1.0
+it	02_wind_on	2	215	0.0	1.0
+it	03_wind_off	2	215	0.0	1.0
 it	04_res	2	215	0.0	0.0
 it	05_nuclear	2	215	0.0	0.0
 it	06_coal	2	215	0.0	0.0
 it	07_gas	2	215	0.0	0.0
 it	08_non-res	2	215	0.0	0.0
 it	09_hydro_pump	2	215	0.0	0.0
-it	01_solar	2	216	1.0	0.0
-it	02_wind_on	2	216	1.0	0.0
-it	03_wind_off	2	216	1.0	0.0
+it	01_solar	2	216	0.0	1.0
+it	02_wind_on	2	216	0.0	1.0
+it	03_wind_off	2	216	0.0	1.0
 it	04_res	2	216	0.0	0.0
 it	05_nuclear	2	216	0.0	0.0
 it	06_coal	2	216	0.0	0.0
 it	07_gas	2	216	0.0	0.0
 it	08_non-res	2	216	0.0	0.0
 it	09_hydro_pump	2	216	0.0	0.0
-it	01_solar	2	217	1.0	0.0
-it	02_wind_on	2	217	1.0	0.0
-it	03_wind_off	2	217	1.0	0.0
+it	01_solar	2	217	0.0	1.0
+it	02_wind_on	2	217	0.0	1.0
+it	03_wind_off	2	217	0.0	1.0
 it	04_res	2	217	0.0	0.0
 it	05_nuclear	2	217	0.0	0.0
 it	06_coal	2	217	0.0	0.0
 it	07_gas	2	217	0.0	0.0
 it	08_non-res	2	217	0.0	0.0
 it	09_hydro_pump	2	217	0.0	0.0
-it	01_solar	2	218	1.0	0.0
-it	02_wind_on	2	218	1.0	0.0
-it	03_wind_off	2	218	1.0	0.0
+it	01_solar	2	218	0.0	1.0
+it	02_wind_on	2	218	0.0	1.0
+it	03_wind_off	2	218	0.0	1.0
 it	04_res	2	218	0.0	0.0
 it	05_nuclear	2	218	0.0	0.0
 it	06_coal	2	218	0.0	0.0
 it	07_gas	2	218	0.0	0.0
 it	08_non-res	2	218	0.0	0.0
 it	09_hydro_pump	2	218	0.0	0.0
-it	01_solar	2	219	1.0	0.0
-it	02_wind_on	2	219	1.0	0.0
-it	03_wind_off	2	219	1.0	0.0
+it	01_solar	2	219	0.0	1.0
+it	02_wind_on	2	219	0.0	1.0
+it	03_wind_off	2	219	0.0	1.0
 it	04_res	2	219	0.0	0.0
 it	05_nuclear	2	219	0.0	0.0
 it	06_coal	2	219	0.0	0.0
 it	07_gas	2	219	0.0	0.0
 it	08_non-res	2	219	0.0	0.0
 it	09_hydro_pump	2	219	0.0	0.0
-it	01_solar	2	220	1.0	0.0
-it	02_wind_on	2	220	1.0	0.0
-it	03_wind_off	2	220	1.0	0.0
+it	01_solar	2	220	0.0	1.0
+it	02_wind_on	2	220	0.0	1.0
+it	03_wind_off	2	220	0.0	1.0
 it	04_res	2	220	0.0	0.0
 it	05_nuclear	2	220	0.0	0.0
 it	06_coal	2	220	0.0	0.0
 it	07_gas	2	220	0.0	0.0
 it	08_non-res	2	220	0.0	0.0
 it	09_hydro_pump	2	220	0.0	0.0
-it	01_solar	2	221	1.0	0.0
-it	02_wind_on	2	221	1.0	0.0
-it	03_wind_off	2	221	1.0	0.0
+it	01_solar	2	221	0.0	1.0
+it	02_wind_on	2	221	0.0	1.0
+it	03_wind_off	2	221	0.0	1.0
 it	04_res	2	221	0.0	0.0
 it	05_nuclear	2	221	0.0	0.0
 it	06_coal	2	221	0.0	0.0
 it	07_gas	2	221	0.0	0.0
 it	08_non-res	2	221	0.0	0.0
 it	09_hydro_pump	2	221	0.0	0.0
-it	01_solar	2	222	1.0	0.0
-it	02_wind_on	2	222	1.0	0.0
-it	03_wind_off	2	222	1.0	0.0
+it	01_solar	2	222	0.0	1.0
+it	02_wind_on	2	222	0.0	1.0
+it	03_wind_off	2	222	0.0	1.0
 it	04_res	2	222	0.0	0.0
 it	05_nuclear	2	222	0.0	0.0
 it	06_coal	2	222	0.0	0.0
 it	07_gas	2	222	0.0	0.0
 it	08_non-res	2	222	0.0	0.0
 it	09_hydro_pump	2	222	0.0	0.0
-it	01_solar	2	223	1.0	0.0
-it	02_wind_on	2	223	1.0	0.0
-it	03_wind_off	2	223	1.0	0.0
+it	01_solar	2	223	0.0	1.0
+it	02_wind_on	2	223	0.0	1.0
+it	03_wind_off	2	223	0.0	1.0
 it	04_res	2	223	0.0	0.0
 it	05_nuclear	2	223	0.0	0.0
 it	06_coal	2	223	0.0	0.0
 it	07_gas	2	223	0.0	0.0
 it	08_non-res	2	223	0.0	0.0
 it	09_hydro_pump	2	223	0.0	0.0
-it	01_solar	2	224	1.0	0.0
-it	02_wind_on	2	224	1.0	0.0
-it	03_wind_off	2	224	1.0	0.0
+it	01_solar	2	224	0.0	1.0
+it	02_wind_on	2	224	0.0	1.0
+it	03_wind_off	2	224	0.0	1.0
 it	04_res	2	224	0.0	0.0
 it	05_nuclear	2	224	0.0	0.0
 it	06_coal	2	224	0.0	0.0
 it	07_gas	2	224	0.0	0.0
 it	08_non-res	2	224	0.0	0.0
 it	09_hydro_pump	2	224	0.0	0.0
-it	01_solar	2	225	1.0	0.0
-it	02_wind_on	2	225	1.0	0.0
-it	03_wind_off	2	225	1.0	0.0
+it	01_solar	2	225	0.0	1.0
+it	02_wind_on	2	225	0.0	1.0
+it	03_wind_off	2	225	0.0	1.0
 it	04_res	2	225	0.0	0.0
 it	05_nuclear	2	225	0.0	0.0
 it	06_coal	2	225	0.0	0.0
 it	07_gas	2	225	0.0	0.0
 it	08_non-res	2	225	0.0	0.0
 it	09_hydro_pump	2	225	0.0	0.0
-it	01_solar	2	226	1.0	0.0
-it	02_wind_on	2	226	1.0	0.0
-it	03_wind_off	2	226	1.0	0.0
+it	01_solar	2	226	0.0	1.0
+it	02_wind_on	2	226	0.0	1.0
+it	03_wind_off	2	226	0.0	1.0
 it	04_res	2	226	0.0	0.0
 it	05_nuclear	2	226	0.0	0.0
 it	06_coal	2	226	0.0	0.0
 it	07_gas	2	226	0.0	0.0
 it	08_non-res	2	226	0.0	0.0
 it	09_hydro_pump	2	226	0.0	0.0
-it	01_solar	2	227	1.0	0.0
-it	02_wind_on	2	227	1.0	0.0
-it	03_wind_off	2	227	1.0	0.0
+it	01_solar	2	227	0.0	1.0
+it	02_wind_on	2	227	0.0	1.0
+it	03_wind_off	2	227	0.0	1.0
 it	04_res	2	227	0.0	0.0
 it	05_nuclear	2	227	0.0	0.0
 it	06_coal	2	227	0.0	0.0
 it	07_gas	2	227	0.0	0.0
 it	08_non-res	2	227	0.0	0.0
 it	09_hydro_pump	2	227	0.0	0.0
-it	01_solar	2	228	1.0	0.0
-it	02_wind_on	2	228	1.0	0.0
-it	03_wind_off	2	228	1.0	0.0
+it	01_solar	2	228	0.0	1.0
+it	02_wind_on	2	228	0.0	1.0
+it	03_wind_off	2	228	0.0	1.0
 it	04_res	2	228	0.0	0.0
 it	05_nuclear	2	228	0.0	0.0
 it	06_coal	2	228	0.0	0.0
 it	07_gas	2	228	0.0	0.0
 it	08_non-res	2	228	0.0	0.0
 it	09_hydro_pump	2	228	0.0	0.0
-it	01_solar	2	229	1.0	0.0
-it	02_wind_on	2	229	1.0	0.0
-it	03_wind_off	2	229	1.0	0.0
+it	01_solar	2	229	0.0	1.0
+it	02_wind_on	2	229	0.0	1.0
+it	03_wind_off	2	229	0.0	1.0
 it	04_res	2	229	0.0	0.0
 it	05_nuclear	2	229	0.0	0.0
 it	06_coal	2	229	0.0	0.0
 it	07_gas	2	229	0.0	0.0
 it	08_non-res	2	229	0.0	0.0
 it	09_hydro_pump	2	229	0.0	0.0
-it	01_solar	2	230	1.0	0.0
-it	02_wind_on	2	230	1.0	0.0
-it	03_wind_off	2	230	1.0	0.0
-it	04_res	2	230	1.0	0.0
+it	01_solar	2	230	0.0	1.0
+it	02_wind_on	2	230	0.0	1.0
+it	03_wind_off	2	230	0.0	1.0
+it	04_res	2	230	0.0	1.0
 it	05_nuclear	2	230	0.0	0.0
 it	06_coal	2	230	0.0	0.0
 it	07_gas	2	230	0.0	0.0
 it	08_non-res	2	230	0.0	0.0
 it	09_hydro_pump	2	230	0.0	0.0
-it	01_solar	2	231	1.0	0.0
-it	02_wind_on	2	231	1.0	0.0
-it	03_wind_off	2	231	1.0	0.0
-it	04_res	2	231	1.0	0.0
+it	01_solar	2	231	0.0	1.0
+it	02_wind_on	2	231	0.0	1.0
+it	03_wind_off	2	231	0.0	1.0
+it	04_res	2	231	0.0	1.0
 it	05_nuclear	2	231	0.0	0.0
 it	06_coal	2	231	0.0	0.0
 it	07_gas	2	231	0.0	0.0
 it	08_non-res	2	231	0.0	0.0
 it	09_hydro_pump	2	231	0.0	0.0
-it	01_solar	2	232	1.0	0.0
-it	02_wind_on	2	232	1.0	0.0
-it	03_wind_off	2	232	1.0	0.0
-it	04_res	2	232	1.0	0.0
+it	01_solar	2	232	0.0	1.0
+it	02_wind_on	2	232	0.0	1.0
+it	03_wind_off	2	232	0.0	1.0
+it	04_res	2	232	0.0	1.0
 it	05_nuclear	2	232	0.0	0.0
 it	06_coal	2	232	0.0	0.0
 it	07_gas	2	232	0.0	0.0
 it	08_non-res	2	232	0.0	0.0
 it	09_hydro_pump	2	232	0.0	0.0
-it	01_solar	2	233	1.0	0.0
-it	02_wind_on	2	233	1.0	0.0
-it	03_wind_off	2	233	1.0	0.0
-it	04_res	2	233	1.0	0.0
+it	01_solar	2	233	0.0	1.0
+it	02_wind_on	2	233	0.0	1.0
+it	03_wind_off	2	233	0.0	1.0
+it	04_res	2	233	0.0	1.0
 it	05_nuclear	2	233	0.0	0.0
 it	06_coal	2	233	0.0	0.0
 it	07_gas	2	233	0.0	0.0
 it	08_non-res	2	233	0.0	0.0
 it	09_hydro_pump	2	233	0.0	0.0
-it	01_solar	2	234	1.0	0.0
-it	02_wind_on	2	234	1.0	0.0
-it	03_wind_off	2	234	1.0	0.0
-it	04_res	2	234	1.0	0.0
+it	01_solar	2	234	0.0	1.0
+it	02_wind_on	2	234	0.0	1.0
+it	03_wind_off	2	234	0.0	1.0
+it	04_res	2	234	0.0	1.0
 it	05_nuclear	2	234	0.0	0.0
 it	06_coal	2	234	0.0	0.0
 it	07_gas	2	234	0.0	0.0
 it	08_non-res	2	234	0.0	0.0
 it	09_hydro_pump	2	234	0.0	0.0
-it	01_solar	2	235	1.0	0.0
-it	02_wind_on	2	235	1.0	0.0
-it	03_wind_off	2	235	1.0	0.0
-it	04_res	2	235	1.0	0.0
+it	01_solar	2	235	0.0	1.0
+it	02_wind_on	2	235	0.0	1.0
+it	03_wind_off	2	235	0.0	1.0
+it	04_res	2	235	0.0	1.0
 it	05_nuclear	2	235	0.0	0.0
 it	06_coal	2	235	0.0	0.0
 it	07_gas	2	235	0.0	0.0
 it	08_non-res	2	235	0.0	0.0
 it	09_hydro_pump	2	235	0.0	0.0
-it	01_solar	2	236	1.0	0.0
-it	02_wind_on	2	236	1.0	0.0
-it	03_wind_off	2	236	1.0	0.0
-it	04_res	2	236	1.0	0.0
+it	01_solar	2	236	0.0	1.0
+it	02_wind_on	2	236	0.0	1.0
+it	03_wind_off	2	236	0.0	1.0
+it	04_res	2	236	0.0	1.0
 it	05_nuclear	2	236	0.0	0.0
 it	06_coal	2	236	0.0	0.0
 it	07_gas	2	236	0.0	0.0
 it	08_non-res	2	236	0.0	0.0
 it	09_hydro_pump	2	236	0.0	0.0
-it	01_solar	2	237	1.0	0.0
-it	02_wind_on	2	237	1.0	0.0
-it	03_wind_off	2	237	1.0	0.0
-it	04_res	2	237	1.0	0.0
+it	01_solar	2	237	0.0	1.0
+it	02_wind_on	2	237	0.0	1.0
+it	03_wind_off	2	237	0.0	1.0
+it	04_res	2	237	0.0	1.0
 it	05_nuclear	2	237	0.0	0.0
 it	06_coal	2	237	0.0	0.0
 it	07_gas	2	237	0.0	0.0
 it	08_non-res	2	237	0.0	0.0
 it	09_hydro_pump	2	237	0.0	0.0
-it	01_solar	2	238	1.0	0.0
-it	02_wind_on	2	238	1.0	0.0
-it	03_wind_off	2	238	1.0	0.0
-it	04_res	2	238	1.0	0.0
+it	01_solar	2	238	0.0	1.0
+it	02_wind_on	2	238	0.0	1.0
+it	03_wind_off	2	238	0.0	1.0
+it	04_res	2	238	0.0	1.0
 it	05_nuclear	2	238	0.0	0.0
 it	06_coal	2	238	0.0	0.0
 it	07_gas	2	238	0.0	0.0
 it	08_non-res	2	238	0.0	0.0
 it	09_hydro_pump	2	238	0.0	0.0
-it	01_solar	2	239	1.0	0.0
-it	02_wind_on	2	239	1.0	0.0
-it	03_wind_off	2	239	1.0	0.0
-it	04_res	2	239	1.0	0.0
+it	01_solar	2	239	0.0	1.0
+it	02_wind_on	2	239	0.0	1.0
+it	03_wind_off	2	239	0.0	1.0
+it	04_res	2	239	0.0	1.0
 it	05_nuclear	2	239	0.0	0.0
 it	06_coal	2	239	0.0	0.0
 it	07_gas	2	239	0.0	0.0
 it	08_non-res	2	239	0.0	0.0
 it	09_hydro_pump	2	239	0.0	0.0
-it	01_solar	2	240	1.0	0.0
-it	02_wind_on	2	240	1.0	0.0
-it	03_wind_off	2	240	1.0	0.0
-it	04_res	2	240	1.0	0.0
+it	01_solar	2	240	0.0	1.0
+it	02_wind_on	2	240	0.0	1.0
+it	03_wind_off	2	240	0.0	1.0
+it	04_res	2	240	0.0	1.0
 it	05_nuclear	2	240	0.0	0.0
 it	06_coal	2	240	0.0	0.0
 it	07_gas	2	240	0.0	0.0
 it	08_non-res	2	240	0.0	0.0
 it	09_hydro_pump	2	240	0.0	0.0
-it	01_solar	2	241	1.0	0.0
-it	02_wind_on	2	241	1.0	0.0
-it	03_wind_off	2	241	1.0	0.0
-it	04_res	2	241	1.0	0.0
+it	01_solar	2	241	0.0	1.0
+it	02_wind_on	2	241	0.0	1.0
+it	03_wind_off	2	241	0.0	1.0
+it	04_res	2	241	0.0	1.0
 it	05_nuclear	2	241	0.0	0.0
 it	06_coal	2	241	0.0	0.0
 it	07_gas	2	241	0.0	0.0
 it	08_non-res	2	241	0.0	0.0
 it	09_hydro_pump	2	241	0.0	0.0
-it	01_solar	2	242	1.0	0.0
-it	02_wind_on	2	242	1.0	0.0
-it	03_wind_off	2	242	1.0	0.0
-it	04_res	2	242	1.0	0.0
+it	01_solar	2	242	0.0	1.0
+it	02_wind_on	2	242	0.0	1.0
+it	03_wind_off	2	242	0.0	1.0
+it	04_res	2	242	0.0	1.0
 it	05_nuclear	2	242	0.0	0.0
 it	06_coal	2	242	0.0	0.0
 it	07_gas	2	242	0.0	0.0
 it	08_non-res	2	242	0.0	0.0
 it	09_hydro_pump	2	242	0.0	0.0
-it	01_solar	2	243	1.0	0.0
-it	02_wind_on	2	243	1.0	0.0
-it	03_wind_off	2	243	1.0	0.0
-it	04_res	2	243	1.0	0.0
+it	01_solar	2	243	0.0	1.0
+it	02_wind_on	2	243	0.0	1.0
+it	03_wind_off	2	243	0.0	1.0
+it	04_res	2	243	0.0	1.0
 it	05_nuclear	2	243	0.0	0.0
 it	06_coal	2	243	0.0	0.0
 it	07_gas	2	243	0.0	0.0
 it	08_non-res	2	243	0.0	0.0
 it	09_hydro_pump	2	243	0.0	0.0
-it	01_solar	2	244	1.0	0.0
-it	02_wind_on	2	244	1.0	0.0
-it	03_wind_off	2	244	1.0	0.0
-it	04_res	2	244	1.0	0.0
+it	01_solar	2	244	0.0	1.0
+it	02_wind_on	2	244	0.0	1.0
+it	03_wind_off	2	244	0.0	1.0
+it	04_res	2	244	0.0	1.0
 it	05_nuclear	2	244	0.0	0.0
 it	06_coal	2	244	0.0	0.0
 it	07_gas	2	244	0.0	0.0
 it	08_non-res	2	244	0.0	0.0
 it	09_hydro_pump	2	244	0.0	0.0
-it	01_solar	2	245	1.0	0.0
-it	02_wind_on	2	245	1.0	0.0
-it	03_wind_off	2	245	1.0	0.0
-it	04_res	2	245	1.0	0.0
+it	01_solar	2	245	0.0	1.0
+it	02_wind_on	2	245	0.0	1.0
+it	03_wind_off	2	245	0.0	1.0
+it	04_res	2	245	0.0	1.0
 it	05_nuclear	2	245	0.0	0.0
 it	06_coal	2	245	0.0	0.0
 it	07_gas	2	245	0.0	0.0
 it	08_non-res	2	245	0.0	0.0
 it	09_hydro_pump	2	245	0.0	0.0
-it	01_solar	2	246	1.0	0.0
-it	02_wind_on	2	246	1.0	0.0
-it	03_wind_off	2	246	1.0	0.0
-it	04_res	2	246	1.0	0.0
+it	01_solar	2	246	0.0	1.0
+it	02_wind_on	2	246	0.0	1.0
+it	03_wind_off	2	246	0.0	1.0
+it	04_res	2	246	0.0	1.0
 it	05_nuclear	2	246	0.0	0.0
 it	06_coal	2	246	0.0	0.0
 it	07_gas	2	246	0.0	0.0
 it	08_non-res	2	246	0.0	0.0
 it	09_hydro_pump	2	246	0.0	0.0
-it	01_solar	2	247	1.0	0.0
-it	02_wind_on	2	247	1.0	0.0
-it	03_wind_off	2	247	1.0	0.0
-it	04_res	2	247	1.0	0.0
+it	01_solar	2	247	0.0	1.0
+it	02_wind_on	2	247	0.0	1.0
+it	03_wind_off	2	247	0.0	1.0
+it	04_res	2	247	0.0	1.0
 it	05_nuclear	2	247	0.0	0.0
 it	06_coal	2	247	0.0	0.0
 it	07_gas	2	247	0.0	0.0
 it	08_non-res	2	247	0.0	0.0
 it	09_hydro_pump	2	247	0.0	0.0
-it	01_solar	2	248	1.0	0.0
-it	02_wind_on	2	248	1.0	0.0
-it	03_wind_off	2	248	1.0	0.0
-it	04_res	2	248	1.0	0.0
+it	01_solar	2	248	0.0	1.0
+it	02_wind_on	2	248	0.0	1.0
+it	03_wind_off	2	248	0.0	1.0
+it	04_res	2	248	0.0	1.0
 it	05_nuclear	2	248	0.0	0.0
 it	06_coal	2	248	0.0	0.0
 it	07_gas	2	248	0.0	0.0
 it	08_non-res	2	248	0.0	0.0
 it	09_hydro_pump	2	248	0.0	0.0
-it	01_solar	2	249	1.0	0.0
-it	02_wind_on	2	249	1.0	0.0
-it	03_wind_off	2	249	1.0	0.0
-it	04_res	2	249	1.0	0.0
+it	01_solar	2	249	0.0	1.0
+it	02_wind_on	2	249	0.0	1.0
+it	03_wind_off	2	249	0.0	1.0
+it	04_res	2	249	0.0	1.0
 it	05_nuclear	2	249	0.0	0.0
 it	06_coal	2	249	0.0	0.0
 it	07_gas	2	249	0.0	0.0
 it	08_non-res	2	249	0.0	0.0
 it	09_hydro_pump	2	249	0.0	0.0
-it	01_solar	2	250	1.0	0.0
-it	02_wind_on	2	250	1.0	0.0
-it	03_wind_off	2	250	1.0	0.0
-it	04_res	2	250	1.0	0.0
-it	05_nuclear	2	250	1.0	0.0
+it	01_solar	2	250	0.0	1.0
+it	02_wind_on	2	250	0.0	1.0
+it	03_wind_off	2	250	0.0	1.0
+it	04_res	2	250	0.0	1.0
+it	05_nuclear	2	250	0.0	1.0
 it	06_coal	2	250	0.0	0.0
 it	07_gas	2	250	0.0	0.0
 it	08_non-res	2	250	0.0	0.0
 it	09_hydro_pump	2	250	0.0	0.0
-it	01_solar	2	251	1.0	0.0
-it	02_wind_on	2	251	1.0	0.0
-it	03_wind_off	2	251	1.0	0.0
-it	04_res	2	251	1.0	0.0
-it	05_nuclear	2	251	1.0	0.0
+it	01_solar	2	251	0.0	1.0
+it	02_wind_on	2	251	0.0	1.0
+it	03_wind_off	2	251	0.0	1.0
+it	04_res	2	251	0.0	1.0
+it	05_nuclear	2	251	0.0	1.0
 it	06_coal	2	251	0.0	0.0
 it	07_gas	2	251	0.0	0.0
 it	08_non-res	2	251	0.0	0.0
 it	09_hydro_pump	2	251	0.0	0.0
-it	01_solar	2	252	1.0	0.0
-it	02_wind_on	2	252	1.0	0.0
-it	03_wind_off	2	252	1.0	0.0
-it	04_res	2	252	1.0	0.0
-it	05_nuclear	2	252	1.0	0.0
+it	01_solar	2	252	0.0	1.0
+it	02_wind_on	2	252	0.0	1.0
+it	03_wind_off	2	252	0.0	1.0
+it	04_res	2	252	0.0	1.0
+it	05_nuclear	2	252	0.0	1.0
 it	06_coal	2	252	0.0	0.0
 it	07_gas	2	252	0.0	0.0
 it	08_non-res	2	252	0.0	0.0
 it	09_hydro_pump	2	252	0.0	0.0
-it	01_solar	2	253	1.0	0.0
-it	02_wind_on	2	253	1.0	0.0
-it	03_wind_off	2	253	1.0	0.0
-it	04_res	2	253	1.0	0.0
-it	05_nuclear	2	253	1.0	0.0
+it	01_solar	2	253	0.0	1.0
+it	02_wind_on	2	253	0.0	1.0
+it	03_wind_off	2	253	0.0	1.0
+it	04_res	2	253	0.0	1.0
+it	05_nuclear	2	253	0.0	1.0
 it	06_coal	2	253	0.0	0.0
 it	07_gas	2	253	0.0	0.0
 it	08_non-res	2	253	0.0	0.0
 it	09_hydro_pump	2	253	0.0	0.0
-it	01_solar	2	254	1.0	0.0
-it	02_wind_on	2	254	1.0	0.0
-it	03_wind_off	2	254	1.0	0.0
-it	04_res	2	254	1.0	0.0
-it	05_nuclear	2	254	1.0	0.0
+it	01_solar	2	254	0.0	1.0
+it	02_wind_on	2	254	0.0	1.0
+it	03_wind_off	2	254	0.0	1.0
+it	04_res	2	254	0.0	1.0
+it	05_nuclear	2	254	0.0	1.0
 it	06_coal	2	254	0.0	0.0
 it	07_gas	2	254	0.0	0.0
 it	08_non-res	2	254	0.0	0.0
 it	09_hydro_pump	2	254	0.0	0.0
-it	01_solar	2	255	1.0	0.0
-it	02_wind_on	2	255	1.0	0.0
-it	03_wind_off	2	255	1.0	0.0
-it	04_res	2	255	1.0	0.0
-it	05_nuclear	2	255	1.0	0.0
+it	01_solar	2	255	0.0	1.0
+it	02_wind_on	2	255	0.0	1.0
+it	03_wind_off	2	255	0.0	1.0
+it	04_res	2	255	0.0	1.0
+it	05_nuclear	2	255	0.0	1.0
 it	06_coal	2	255	0.0	0.0
 it	07_gas	2	255	0.0	0.0
 it	08_non-res	2	255	0.0	0.0
 it	09_hydro_pump	2	255	0.0	0.0
-it	01_solar	2	256	1.0	0.0
-it	02_wind_on	2	256	1.0	0.0
-it	03_wind_off	2	256	1.0	0.0
-it	04_res	2	256	1.0	0.0
-it	05_nuclear	2	256	1.0	0.0
+it	01_solar	2	256	0.0	1.0
+it	02_wind_on	2	256	0.0	1.0
+it	03_wind_off	2	256	0.0	1.0
+it	04_res	2	256	0.0	1.0
+it	05_nuclear	2	256	0.0	1.0
 it	06_coal	2	256	0.0	0.0
 it	07_gas	2	256	0.0	0.0
 it	08_non-res	2	256	0.0	0.0
 it	09_hydro_pump	2	256	0.0	0.0
-it	01_solar	2	257	1.0	0.0
-it	02_wind_on	2	257	1.0	0.0
-it	03_wind_off	2	257	1.0	0.0
-it	04_res	2	257	1.0	0.0
-it	05_nuclear	2	257	1.0	0.0
+it	01_solar	2	257	0.0	1.0
+it	02_wind_on	2	257	0.0	1.0
+it	03_wind_off	2	257	0.0	1.0
+it	04_res	2	257	0.0	1.0
+it	05_nuclear	2	257	0.0	1.0
 it	06_coal	2	257	0.0	0.0
 it	07_gas	2	257	0.0	0.0
 it	08_non-res	2	257	0.0	0.0
 it	09_hydro_pump	2	257	0.0	0.0
-it	01_solar	2	258	1.0	0.0
-it	02_wind_on	2	258	1.0	0.0
-it	03_wind_off	2	258	1.0	0.0
-it	04_res	2	258	1.0	0.0
-it	05_nuclear	2	258	1.0	0.0
+it	01_solar	2	258	0.0	1.0
+it	02_wind_on	2	258	0.0	1.0
+it	03_wind_off	2	258	0.0	1.0
+it	04_res	2	258	0.0	1.0
+it	05_nuclear	2	258	0.0	1.0
 it	06_coal	2	258	0.0	0.0
 it	07_gas	2	258	0.0	0.0
 it	08_non-res	2	258	0.0	0.0
 it	09_hydro_pump	2	258	0.0	0.0
-it	01_solar	2	259	1.0	0.0
-it	02_wind_on	2	259	1.0	0.0
-it	03_wind_off	2	259	1.0	0.0
-it	04_res	2	259	1.0	0.0
-it	05_nuclear	2	259	1.0	0.0
+it	01_solar	2	259	0.0	1.0
+it	02_wind_on	2	259	0.0	1.0
+it	03_wind_off	2	259	0.0	1.0
+it	04_res	2	259	0.0	1.0
+it	05_nuclear	2	259	0.0	1.0
 it	06_coal	2	259	0.0	0.0
 it	07_gas	2	259	0.0	0.0
 it	08_non-res	2	259	0.0	0.0
 it	09_hydro_pump	2	259	0.0	0.0
-it	01_solar	2	260	1.0	0.0
-it	02_wind_on	2	260	1.0	0.0
-it	03_wind_off	2	260	1.0	0.0
-it	04_res	2	260	1.0	0.0
-it	05_nuclear	2	260	1.0	0.0
+it	01_solar	2	260	0.0	1.0
+it	02_wind_on	2	260	0.0	1.0
+it	03_wind_off	2	260	0.0	1.0
+it	04_res	2	260	0.0	1.0
+it	05_nuclear	2	260	0.0	1.0
 it	06_coal	2	260	0.0	0.0
 it	07_gas	2	260	0.0	0.0
 it	08_non-res	2	260	0.0	0.0
 it	09_hydro_pump	2	260	0.0	0.0
-it	01_solar	2	261	1.0	0.0
-it	02_wind_on	2	261	1.0	0.0
-it	03_wind_off	2	261	1.0	0.0
-it	04_res	2	261	1.0	0.0
-it	05_nuclear	2	261	1.0	0.0
+it	01_solar	2	261	0.0	1.0
+it	02_wind_on	2	261	0.0	1.0
+it	03_wind_off	2	261	0.0	1.0
+it	04_res	2	261	0.0	1.0
+it	05_nuclear	2	261	0.0	1.0
 it	06_coal	2	261	0.0	0.0
 it	07_gas	2	261	0.0	0.0
 it	08_non-res	2	261	0.0	0.0
 it	09_hydro_pump	2	261	0.0	0.0
-it	01_solar	2	262	1.0	0.0
-it	02_wind_on	2	262	1.0	0.0
-it	03_wind_off	2	262	1.0	0.0
-it	04_res	2	262	1.0	0.0
-it	05_nuclear	2	262	1.0	0.0
+it	01_solar	2	262	0.0	1.0
+it	02_wind_on	2	262	0.0	1.0
+it	03_wind_off	2	262	0.0	1.0
+it	04_res	2	262	0.0	1.0
+it	05_nuclear	2	262	0.0	1.0
 it	06_coal	2	262	0.0	0.0
 it	07_gas	2	262	0.0	0.0
 it	08_non-res	2	262	0.0	0.0
 it	09_hydro_pump	2	262	0.0	0.0
-it	01_solar	2	263	1.0	0.0
-it	02_wind_on	2	263	1.0	0.0
-it	03_wind_off	2	263	1.0	0.0
-it	04_res	2	263	1.0	0.0
-it	05_nuclear	2	263	1.0	0.0
+it	01_solar	2	263	0.0	1.0
+it	02_wind_on	2	263	0.0	1.0
+it	03_wind_off	2	263	0.0	1.0
+it	04_res	2	263	0.0	1.0
+it	05_nuclear	2	263	0.0	1.0
 it	06_coal	2	263	0.0	0.0
 it	07_gas	2	263	0.0	0.0
 it	08_non-res	2	263	0.0	0.0
 it	09_hydro_pump	2	263	0.0	0.0
-it	01_solar	2	264	1.0	0.0
-it	02_wind_on	2	264	1.0	0.0
-it	03_wind_off	2	264	1.0	0.0
-it	04_res	2	264	1.0	0.0
-it	05_nuclear	2	264	1.0	0.0
+it	01_solar	2	264	0.0	1.0
+it	02_wind_on	2	264	0.0	1.0
+it	03_wind_off	2	264	0.0	1.0
+it	04_res	2	264	0.0	1.0
+it	05_nuclear	2	264	0.0	1.0
 it	06_coal	2	264	0.0	0.0
 it	07_gas	2	264	0.0	0.0
 it	08_non-res	2	264	0.0	0.0
 it	09_hydro_pump	2	264	0.0	0.0
-it	01_solar	2	265	1.0	0.0
-it	02_wind_on	2	265	1.0	0.0
-it	03_wind_off	2	265	1.0	0.0
-it	04_res	2	265	1.0	0.0
-it	05_nuclear	2	265	1.0	0.0
+it	01_solar	2	265	0.0	1.0
+it	02_wind_on	2	265	0.0	1.0
+it	03_wind_off	2	265	0.0	1.0
+it	04_res	2	265	0.0	1.0
+it	05_nuclear	2	265	0.0	1.0
 it	06_coal	2	265	0.0	0.0
 it	07_gas	2	265	0.0	0.0
 it	08_non-res	2	265	0.0	0.0
 it	09_hydro_pump	2	265	0.0	0.0
-it	01_solar	2	266	1.0	0.0
-it	02_wind_on	2	266	1.0	0.0
-it	03_wind_off	2	266	1.0	0.0
-it	04_res	2	266	1.0	0.0
-it	05_nuclear	2	266	1.0	0.0
+it	01_solar	2	266	0.0	1.0
+it	02_wind_on	2	266	0.0	1.0
+it	03_wind_off	2	266	0.0	1.0
+it	04_res	2	266	0.0	1.0
+it	05_nuclear	2	266	0.0	1.0
 it	06_coal	2	266	0.0	0.0
 it	07_gas	2	266	0.0	0.0
 it	08_non-res	2	266	0.0	0.0
 it	09_hydro_pump	2	266	0.0	0.0
-it	01_solar	2	267	1.0	0.0
-it	02_wind_on	2	267	1.0	0.0
-it	03_wind_off	2	267	1.0	0.0
-it	04_res	2	267	1.0	0.0
-it	05_nuclear	2	267	1.0	0.0
+it	01_solar	2	267	0.0	1.0
+it	02_wind_on	2	267	0.0	1.0
+it	03_wind_off	2	267	0.0	1.0
+it	04_res	2	267	0.0	1.0
+it	05_nuclear	2	267	0.0	1.0
 it	06_coal	2	267	0.0	0.0
 it	07_gas	2	267	0.0	0.0
 it	08_non-res	2	267	0.0	0.0
 it	09_hydro_pump	2	267	0.0	0.0
-it	01_solar	2	268	1.0	0.0
-it	02_wind_on	2	268	1.0	0.0
-it	03_wind_off	2	268	1.0	0.0
-it	04_res	2	268	1.0	0.0
-it	05_nuclear	2	268	1.0	0.0
+it	01_solar	2	268	0.0	1.0
+it	02_wind_on	2	268	0.0	1.0
+it	03_wind_off	2	268	0.0	1.0
+it	04_res	2	268	0.0	1.0
+it	05_nuclear	2	268	0.0	1.0
 it	06_coal	2	268	0.0	0.0
 it	07_gas	2	268	0.0	0.0
 it	08_non-res	2	268	0.0	0.0
 it	09_hydro_pump	2	268	0.0	0.0
-it	01_solar	2	269	1.0	0.0
-it	02_wind_on	2	269	1.0	0.0
-it	03_wind_off	2	269	1.0	0.0
-it	04_res	2	269	1.0	0.0
-it	05_nuclear	2	269	1.0	0.0
+it	01_solar	2	269	0.0	1.0
+it	02_wind_on	2	269	0.0	1.0
+it	03_wind_off	2	269	0.0	1.0
+it	04_res	2	269	0.0	1.0
+it	05_nuclear	2	269	0.0	1.0
 it	06_coal	2	269	0.0	0.0
 it	07_gas	2	269	0.0	0.0
 it	08_non-res	2	269	0.0	0.0
 it	09_hydro_pump	2	269	0.0	0.0
-it	01_solar	2	270	1.0	0.0
-it	02_wind_on	2	270	1.0	0.0
-it	03_wind_off	2	270	1.0	0.0
-it	04_res	2	270	1.0	0.0
-it	05_nuclear	2	270	1.0	0.0
-it	06_coal	2	270	1.0	0.0
+it	01_solar	2	270	0.0	1.0
+it	02_wind_on	2	270	0.0	1.0
+it	03_wind_off	2	270	0.0	1.0
+it	04_res	2	270	0.0	1.0
+it	05_nuclear	2	270	0.0	1.0
+it	06_coal	2	270	0.0	1.0
 it	07_gas	2	270	0.0	0.0
 it	08_non-res	2	270	0.0	0.0
 it	09_hydro_pump	2	270	0.0	0.0
-it	01_solar	2	271	1.0	0.0
-it	02_wind_on	2	271	1.0	0.0
-it	03_wind_off	2	271	1.0	0.0
-it	04_res	2	271	1.0	0.0
-it	05_nuclear	2	271	1.0	0.0
-it	06_coal	2	271	1.0	0.0
+it	01_solar	2	271	0.0	1.0
+it	02_wind_on	2	271	0.0	1.0
+it	03_wind_off	2	271	0.0	1.0
+it	04_res	2	271	0.0	1.0
+it	05_nuclear	2	271	0.0	1.0
+it	06_coal	2	271	0.0	1.0
 it	07_gas	2	271	0.0	0.0
 it	08_non-res	2	271	0.0	0.0
 it	09_hydro_pump	2	271	0.0	0.0
-it	01_solar	2	272	1.0	0.0
-it	02_wind_on	2	272	1.0	0.0
-it	03_wind_off	2	272	1.0	0.0
-it	04_res	2	272	1.0	0.0
-it	05_nuclear	2	272	1.0	0.0
-it	06_coal	2	272	1.0	0.0
+it	01_solar	2	272	0.0	1.0
+it	02_wind_on	2	272	0.0	1.0
+it	03_wind_off	2	272	0.0	1.0
+it	04_res	2	272	0.0	1.0
+it	05_nuclear	2	272	0.0	1.0
+it	06_coal	2	272	0.0	1.0
 it	07_gas	2	272	0.0	0.0
 it	08_non-res	2	272	0.0	0.0
 it	09_hydro_pump	2	272	0.0	0.0
-it	01_solar	2	273	1.0	0.0
-it	02_wind_on	2	273	1.0	0.0
-it	03_wind_off	2	273	1.0	0.0
-it	04_res	2	273	1.0	0.0
-it	05_nuclear	2	273	1.0	0.0
-it	06_coal	2	273	1.0	0.0
+it	01_solar	2	273	0.0	1.0
+it	02_wind_on	2	273	0.0	1.0
+it	03_wind_off	2	273	0.0	1.0
+it	04_res	2	273	0.0	1.0
+it	05_nuclear	2	273	0.0	1.0
+it	06_coal	2	273	0.0	1.0
 it	07_gas	2	273	0.0	0.0
 it	08_non-res	2	273	0.0	0.0
 it	09_hydro_pump	2	273	0.0	0.0
-it	01_solar	2	274	1.0	0.0
-it	02_wind_on	2	274	1.0	0.0
-it	03_wind_off	2	274	1.0	0.0
-it	04_res	2	274	1.0	0.0
-it	05_nuclear	2	274	1.0	0.0
-it	06_coal	2	274	1.0	0.0
+it	01_solar	2	274	0.0	1.0
+it	02_wind_on	2	274	0.0	1.0
+it	03_wind_off	2	274	0.0	1.0
+it	04_res	2	274	0.0	1.0
+it	05_nuclear	2	274	0.0	1.0
+it	06_coal	2	274	0.0	1.0
 it	07_gas	2	274	0.0	0.0
 it	08_non-res	2	274	0.0	0.0
 it	09_hydro_pump	2	274	0.0	0.0
-it	01_solar	2	275	1.0	0.0
-it	02_wind_on	2	275	1.0	0.0
-it	03_wind_off	2	275	1.0	0.0
-it	04_res	2	275	1.0	0.0
-it	05_nuclear	2	275	1.0	0.0
-it	06_coal	2	275	1.0	0.0
+it	01_solar	2	275	0.0	1.0
+it	02_wind_on	2	275	0.0	1.0
+it	03_wind_off	2	275	0.0	1.0
+it	04_res	2	275	0.0	1.0
+it	05_nuclear	2	275	0.0	1.0
+it	06_coal	2	275	0.0	1.0
 it	07_gas	2	275	0.0	0.0
 it	08_non-res	2	275	0.0	0.0
 it	09_hydro_pump	2	275	0.0	0.0
-it	01_solar	2	276	1.0	0.0
-it	02_wind_on	2	276	1.0	0.0
-it	03_wind_off	2	276	1.0	0.0
-it	04_res	2	276	1.0	0.0
-it	05_nuclear	2	276	1.0	0.0
-it	06_coal	2	276	1.0	0.0
+it	01_solar	2	276	0.0	1.0
+it	02_wind_on	2	276	0.0	1.0
+it	03_wind_off	2	276	0.0	1.0
+it	04_res	2	276	0.0	1.0
+it	05_nuclear	2	276	0.0	1.0
+it	06_coal	2	276	0.0	1.0
 it	07_gas	2	276	0.0	0.0
 it	08_non-res	2	276	0.0	0.0
 it	09_hydro_pump	2	276	0.0	0.0
-it	01_solar	2	277	1.0	0.0
-it	02_wind_on	2	277	1.0	0.0
-it	03_wind_off	2	277	1.0	0.0
-it	04_res	2	277	1.0	0.0
-it	05_nuclear	2	277	1.0	0.0
-it	06_coal	2	277	1.0	0.0
+it	01_solar	2	277	0.0	1.0
+it	02_wind_on	2	277	0.0	1.0
+it	03_wind_off	2	277	0.0	1.0
+it	04_res	2	277	0.0	1.0
+it	05_nuclear	2	277	0.0	1.0
+it	06_coal	2	277	0.0	1.0
 it	07_gas	2	277	0.0	0.0
 it	08_non-res	2	277	0.0	0.0
 it	09_hydro_pump	2	277	0.0	0.0
-it	01_solar	2	278	1.0	0.0
-it	02_wind_on	2	278	1.0	0.0
-it	03_wind_off	2	278	1.0	0.0
-it	04_res	2	278	1.0	0.0
-it	05_nuclear	2	278	1.0	0.0
-it	06_coal	2	278	1.0	0.0
+it	01_solar	2	278	0.0	1.0
+it	02_wind_on	2	278	0.0	1.0
+it	03_wind_off	2	278	0.0	1.0
+it	04_res	2	278	0.0	1.0
+it	05_nuclear	2	278	0.0	1.0
+it	06_coal	2	278	0.0	1.0
 it	07_gas	2	278	0.0	0.0
 it	08_non-res	2	278	0.0	0.0
 it	09_hydro_pump	2	278	0.0	0.0
-it	01_solar	2	279	1.0	0.0
-it	02_wind_on	2	279	1.0	0.0
-it	03_wind_off	2	279	1.0	0.0
-it	04_res	2	279	1.0	0.0
-it	05_nuclear	2	279	1.0	0.0
-it	06_coal	2	279	1.0	0.0
+it	01_solar	2	279	0.0	1.0
+it	02_wind_on	2	279	0.0	1.0
+it	03_wind_off	2	279	0.0	1.0
+it	04_res	2	279	0.0	1.0
+it	05_nuclear	2	279	0.0	1.0
+it	06_coal	2	279	0.0	1.0
 it	07_gas	2	279	0.0	0.0
 it	08_non-res	2	279	0.0	0.0
 it	09_hydro_pump	2	279	0.0	0.0
-it	01_solar	2	280	1.0	0.0
-it	02_wind_on	2	280	1.0	0.0
-it	03_wind_off	2	280	1.0	0.0
-it	04_res	2	280	1.0	0.0
-it	05_nuclear	2	280	1.0	0.0
-it	06_coal	2	280	1.0	0.0
+it	01_solar	2	280	0.0	1.0
+it	02_wind_on	2	280	0.0	1.0
+it	03_wind_off	2	280	0.0	1.0
+it	04_res	2	280	0.0	1.0
+it	05_nuclear	2	280	0.0	1.0
+it	06_coal	2	280	0.0	1.0
 it	07_gas	2	280	0.0	0.0
 it	08_non-res	2	280	0.0	0.0
 it	09_hydro_pump	2	280	0.0	0.0
-it	01_solar	2	281	1.0	0.0
-it	02_wind_on	2	281	1.0	0.0
-it	03_wind_off	2	281	1.0	0.0
-it	04_res	2	281	1.0	0.0
-it	05_nuclear	2	281	1.0	0.0
-it	06_coal	2	281	1.0	0.0
+it	01_solar	2	281	0.0	1.0
+it	02_wind_on	2	281	0.0	1.0
+it	03_wind_off	2	281	0.0	1.0
+it	04_res	2	281	0.0	1.0
+it	05_nuclear	2	281	0.0	1.0
+it	06_coal	2	281	0.0	1.0
 it	07_gas	2	281	0.0	0.0
 it	08_non-res	2	281	0.0	0.0
 it	09_hydro_pump	2	281	0.0	0.0
-it	01_solar	2	282	1.0	0.0
-it	02_wind_on	2	282	1.0	0.0
-it	03_wind_off	2	282	1.0	0.0
-it	04_res	2	282	1.0	0.0
-it	05_nuclear	2	282	1.0	0.0
-it	06_coal	2	282	1.0	0.0
+it	01_solar	2	282	0.0	1.0
+it	02_wind_on	2	282	0.0	1.0
+it	03_wind_off	2	282	0.0	1.0
+it	04_res	2	282	0.0	1.0
+it	05_nuclear	2	282	0.0	1.0
+it	06_coal	2	282	0.0	1.0
 it	07_gas	2	282	0.0	0.0
 it	08_non-res	2	282	0.0	0.0
 it	09_hydro_pump	2	282	0.0	0.0
-it	01_solar	2	283	1.0	0.0
-it	02_wind_on	2	283	1.0	0.0
-it	03_wind_off	2	283	1.0	0.0
-it	04_res	2	283	1.0	0.0
-it	05_nuclear	2	283	1.0	0.0
-it	06_coal	2	283	1.0	0.0
+it	01_solar	2	283	0.0	1.0
+it	02_wind_on	2	283	0.0	1.0
+it	03_wind_off	2	283	0.0	1.0
+it	04_res	2	283	0.0	1.0
+it	05_nuclear	2	283	0.0	1.0
+it	06_coal	2	283	0.0	1.0
 it	07_gas	2	283	0.0	0.0
 it	08_non-res	2	283	0.0	0.0
 it	09_hydro_pump	2	283	0.0	0.0
-it	01_solar	2	284	1.0	0.0
-it	02_wind_on	2	284	1.0	0.0
-it	03_wind_off	2	284	1.0	0.0
-it	04_res	2	284	1.0	0.0
-it	05_nuclear	2	284	1.0	0.0
-it	06_coal	2	284	1.0	0.0
+it	01_solar	2	284	0.0	1.0
+it	02_wind_on	2	284	0.0	1.0
+it	03_wind_off	2	284	0.0	1.0
+it	04_res	2	284	0.0	1.0
+it	05_nuclear	2	284	0.0	1.0
+it	06_coal	2	284	0.0	1.0
 it	07_gas	2	284	0.0	0.0
 it	08_non-res	2	284	0.0	0.0
 it	09_hydro_pump	2	284	0.0	0.0
-it	01_solar	2	285	1.0	0.0
-it	02_wind_on	2	285	1.0	0.0
-it	03_wind_off	2	285	1.0	0.0
-it	04_res	2	285	1.0	0.0
-it	05_nuclear	2	285	1.0	0.0
-it	06_coal	2	285	1.0	0.0
+it	01_solar	2	285	0.0	1.0
+it	02_wind_on	2	285	0.0	1.0
+it	03_wind_off	2	285	0.0	1.0
+it	04_res	2	285	0.0	1.0
+it	05_nuclear	2	285	0.0	1.0
+it	06_coal	2	285	0.0	1.0
 it	07_gas	2	285	0.0	0.0
 it	08_non-res	2	285	0.0	0.0
 it	09_hydro_pump	2	285	0.0	0.0
-it	01_solar	2	286	1.0	0.0
-it	02_wind_on	2	286	1.0	0.0
-it	03_wind_off	2	286	1.0	0.0
-it	04_res	2	286	1.0	0.0
-it	05_nuclear	2	286	1.0	0.0
-it	06_coal	2	286	1.0	0.0
+it	01_solar	2	286	0.0	1.0
+it	02_wind_on	2	286	0.0	1.0
+it	03_wind_off	2	286	0.0	1.0
+it	04_res	2	286	0.0	1.0
+it	05_nuclear	2	286	0.0	1.0
+it	06_coal	2	286	0.0	1.0
 it	07_gas	2	286	0.0	0.0
 it	08_non-res	2	286	0.0	0.0
 it	09_hydro_pump	2	286	0.0	0.0
-it	01_solar	2	287	1.0	0.0
-it	02_wind_on	2	287	1.0	0.0
-it	03_wind_off	2	287	1.0	0.0
-it	04_res	2	287	1.0	0.0
-it	05_nuclear	2	287	1.0	0.0
-it	06_coal	2	287	1.0	0.0
+it	01_solar	2	287	0.0	1.0
+it	02_wind_on	2	287	0.0	1.0
+it	03_wind_off	2	287	0.0	1.0
+it	04_res	2	287	0.0	1.0
+it	05_nuclear	2	287	0.0	1.0
+it	06_coal	2	287	0.0	1.0
 it	07_gas	2	287	0.0	0.0
 it	08_non-res	2	287	0.0	0.0
 it	09_hydro_pump	2	287	0.0	0.0
-it	01_solar	2	288	1.0	0.0
-it	02_wind_on	2	288	1.0	0.0
-it	03_wind_off	2	288	1.0	0.0
-it	04_res	2	288	1.0	0.0
-it	05_nuclear	2	288	1.0	0.0
-it	06_coal	2	288	1.0	0.0
+it	01_solar	2	288	0.0	1.0
+it	02_wind_on	2	288	0.0	1.0
+it	03_wind_off	2	288	0.0	1.0
+it	04_res	2	288	0.0	1.0
+it	05_nuclear	2	288	0.0	1.0
+it	06_coal	2	288	0.0	1.0
 it	07_gas	2	288	0.0	0.0
 it	08_non-res	2	288	0.0	0.0
 it	09_hydro_pump	2	288	0.0	0.0
-it	01_solar	2	289	1.0	0.0
-it	02_wind_on	2	289	1.0	0.0
-it	03_wind_off	2	289	1.0	0.0
-it	04_res	2	289	1.0	0.0
-it	05_nuclear	2	289	1.0	0.0
-it	06_coal	2	289	1.0	0.0
+it	01_solar	2	289	0.0	1.0
+it	02_wind_on	2	289	0.0	1.0
+it	03_wind_off	2	289	0.0	1.0
+it	04_res	2	289	0.0	1.0
+it	05_nuclear	2	289	0.0	1.0
+it	06_coal	2	289	0.0	1.0
 it	07_gas	2	289	0.0	0.0
 it	08_non-res	2	289	0.0	0.0
 it	09_hydro_pump	2	289	0.0	0.0
-it	01_solar	2	290	1.0	0.0
-it	02_wind_on	2	290	1.0	0.0
-it	03_wind_off	2	290	1.0	0.0
-it	04_res	2	290	1.0	0.0
-it	05_nuclear	2	290	1.0	0.0
-it	06_coal	2	290	1.0	0.0
-it	07_gas	2	290	1.0	0.0
+it	01_solar	2	290	0.0	1.0
+it	02_wind_on	2	290	0.0	1.0
+it	03_wind_off	2	290	0.0	1.0
+it	04_res	2	290	0.0	1.0
+it	05_nuclear	2	290	0.0	1.0
+it	06_coal	2	290	0.0	1.0
+it	07_gas	2	290	0.0	1.0
 it	08_non-res	2	290	0.0	0.0
 it	09_hydro_pump	2	290	0.0	0.0
-it	01_solar	2	291	1.0	0.0
-it	02_wind_on	2	291	1.0	0.0
-it	03_wind_off	2	291	1.0	0.0
-it	04_res	2	291	1.0	0.0
-it	05_nuclear	2	291	1.0	0.0
-it	06_coal	2	291	1.0	0.0
-it	07_gas	2	291	1.0	0.0
+it	01_solar	2	291	0.0	1.0
+it	02_wind_on	2	291	0.0	1.0
+it	03_wind_off	2	291	0.0	1.0
+it	04_res	2	291	0.0	1.0
+it	05_nuclear	2	291	0.0	1.0
+it	06_coal	2	291	0.0	1.0
+it	07_gas	2	291	0.0	1.0
 it	08_non-res	2	291	0.0	0.0
 it	09_hydro_pump	2	291	0.0	0.0
-it	01_solar	2	292	1.0	0.0
-it	02_wind_on	2	292	1.0	0.0
-it	03_wind_off	2	292	1.0	0.0
-it	04_res	2	292	1.0	0.0
-it	05_nuclear	2	292	1.0	0.0
-it	06_coal	2	292	1.0	0.0
-it	07_gas	2	292	1.0	0.0
+it	01_solar	2	292	0.0	1.0
+it	02_wind_on	2	292	0.0	1.0
+it	03_wind_off	2	292	0.0	1.0
+it	04_res	2	292	0.0	1.0
+it	05_nuclear	2	292	0.0	1.0
+it	06_coal	2	292	0.0	1.0
+it	07_gas	2	292	0.0	1.0
 it	08_non-res	2	292	0.0	0.0
 it	09_hydro_pump	2	292	0.0	0.0
-it	01_solar	2	293	1.0	0.0
-it	02_wind_on	2	293	1.0	0.0
-it	03_wind_off	2	293	1.0	0.0
-it	04_res	2	293	1.0	0.0
-it	05_nuclear	2	293	1.0	0.0
-it	06_coal	2	293	1.0	0.0
-it	07_gas	2	293	1.0	0.0
+it	01_solar	2	293	0.0	1.0
+it	02_wind_on	2	293	0.0	1.0
+it	03_wind_off	2	293	0.0	1.0
+it	04_res	2	293	0.0	1.0
+it	05_nuclear	2	293	0.0	1.0
+it	06_coal	2	293	0.0	1.0
+it	07_gas	2	293	0.0	1.0
 it	08_non-res	2	293	0.0	0.0
 it	09_hydro_pump	2	293	0.0	0.0
-it	01_solar	2	294	1.0	0.0
-it	02_wind_on	2	294	1.0	0.0
-it	03_wind_off	2	294	1.0	0.0
-it	04_res	2	294	1.0	0.0
-it	05_nuclear	2	294	1.0	0.0
-it	06_coal	2	294	1.0	0.0
-it	07_gas	2	294	1.0	0.0
+it	01_solar	2	294	0.0	1.0
+it	02_wind_on	2	294	0.0	1.0
+it	03_wind_off	2	294	0.0	1.0
+it	04_res	2	294	0.0	1.0
+it	05_nuclear	2	294	0.0	1.0
+it	06_coal	2	294	0.0	1.0
+it	07_gas	2	294	0.0	1.0
 it	08_non-res	2	294	0.0	0.0
 it	09_hydro_pump	2	294	0.0	0.0
-it	01_solar	2	295	1.0	0.0
-it	02_wind_on	2	295	1.0	0.0
-it	03_wind_off	2	295	1.0	0.0
-it	04_res	2	295	1.0	0.0
-it	05_nuclear	2	295	1.0	0.0
-it	06_coal	2	295	1.0	0.0
-it	07_gas	2	295	1.0	0.0
+it	01_solar	2	295	0.0	1.0
+it	02_wind_on	2	295	0.0	1.0
+it	03_wind_off	2	295	0.0	1.0
+it	04_res	2	295	0.0	1.0
+it	05_nuclear	2	295	0.0	1.0
+it	06_coal	2	295	0.0	1.0
+it	07_gas	2	295	0.0	1.0
 it	08_non-res	2	295	0.0	0.0
 it	09_hydro_pump	2	295	0.0	0.0
-it	01_solar	2	296	1.0	0.0
-it	02_wind_on	2	296	1.0	0.0
-it	03_wind_off	2	296	1.0	0.0
-it	04_res	2	296	1.0	0.0
-it	05_nuclear	2	296	1.0	0.0
-it	06_coal	2	296	1.0	0.0
-it	07_gas	2	296	1.0	0.0
+it	01_solar	2	296	0.0	1.0
+it	02_wind_on	2	296	0.0	1.0
+it	03_wind_off	2	296	0.0	1.0
+it	04_res	2	296	0.0	1.0
+it	05_nuclear	2	296	0.0	1.0
+it	06_coal	2	296	0.0	1.0
+it	07_gas	2	296	0.0	1.0
 it	08_non-res	2	296	0.0	0.0
 it	09_hydro_pump	2	296	0.0	0.0
-it	01_solar	2	297	1.0	0.0
-it	02_wind_on	2	297	1.0	0.0
-it	03_wind_off	2	297	1.0	0.0
-it	04_res	2	297	1.0	0.0
-it	05_nuclear	2	297	1.0	0.0
-it	06_coal	2	297	1.0	0.0
-it	07_gas	2	297	1.0	0.0
+it	01_solar	2	297	0.0	1.0
+it	02_wind_on	2	297	0.0	1.0
+it	03_wind_off	2	297	0.0	1.0
+it	04_res	2	297	0.0	1.0
+it	05_nuclear	2	297	0.0	1.0
+it	06_coal	2	297	0.0	1.0
+it	07_gas	2	297	0.0	1.0
 it	08_non-res	2	297	0.0	0.0
 it	09_hydro_pump	2	297	0.0	0.0
-it	01_solar	2	298	1.0	0.0
-it	02_wind_on	2	298	1.0	0.0
-it	03_wind_off	2	298	1.0	0.0
-it	04_res	2	298	1.0	0.0
-it	05_nuclear	2	298	1.0	0.0
-it	06_coal	2	298	1.0	0.0
-it	07_gas	2	298	1.0	0.0
+it	01_solar	2	298	0.0	1.0
+it	02_wind_on	2	298	0.0	1.0
+it	03_wind_off	2	298	0.0	1.0
+it	04_res	2	298	0.0	1.0
+it	05_nuclear	2	298	0.0	1.0
+it	06_coal	2	298	0.0	1.0
+it	07_gas	2	298	0.0	1.0
 it	08_non-res	2	298	0.0	0.0
 it	09_hydro_pump	2	298	0.0	0.0
-it	01_solar	2	299	1.0	0.0
-it	02_wind_on	2	299	1.0	0.0
-it	03_wind_off	2	299	1.0	0.0
-it	04_res	2	299	1.0	0.0
-it	05_nuclear	2	299	1.0	0.0
-it	06_coal	2	299	1.0	0.0
-it	07_gas	2	299	1.0	0.0
+it	01_solar	2	299	0.0	1.0
+it	02_wind_on	2	299	0.0	1.0
+it	03_wind_off	2	299	0.0	1.0
+it	04_res	2	299	0.0	1.0
+it	05_nuclear	2	299	0.0	1.0
+it	06_coal	2	299	0.0	1.0
+it	07_gas	2	299	0.0	1.0
 it	08_non-res	2	299	0.0	0.0
 it	09_hydro_pump	2	299	0.0	0.0
-it	01_solar	2	300	1.0	0.0
-it	02_wind_on	2	300	1.0	0.0
-it	03_wind_off	2	300	1.0	0.0
-it	04_res	2	300	1.0	0.0
-it	05_nuclear	2	300	1.0	0.0
-it	06_coal	2	300	1.0	0.0
-it	07_gas	2	300	1.0	0.0
+it	01_solar	2	300	0.0	1.0
+it	02_wind_on	2	300	0.0	1.0
+it	03_wind_off	2	300	0.0	1.0
+it	04_res	2	300	0.0	1.0
+it	05_nuclear	2	300	0.0	1.0
+it	06_coal	2	300	0.0	1.0
+it	07_gas	2	300	0.0	1.0
 it	08_non-res	2	300	0.0	0.0
 it	09_hydro_pump	2	300	0.0	0.0
-it	01_solar	2	301	1.0	0.0
-it	02_wind_on	2	301	1.0	0.0
-it	03_wind_off	2	301	1.0	0.0
-it	04_res	2	301	1.0	0.0
-it	05_nuclear	2	301	1.0	0.0
-it	06_coal	2	301	1.0	0.0
-it	07_gas	2	301	1.0	0.0
+it	01_solar	2	301	0.0	1.0
+it	02_wind_on	2	301	0.0	1.0
+it	03_wind_off	2	301	0.0	1.0
+it	04_res	2	301	0.0	1.0
+it	05_nuclear	2	301	0.0	1.0
+it	06_coal	2	301	0.0	1.0
+it	07_gas	2	301	0.0	1.0
 it	08_non-res	2	301	0.0	0.0
 it	09_hydro_pump	2	301	0.0	0.0
-it	01_solar	2	302	1.0	0.0
-it	02_wind_on	2	302	1.0	0.0
-it	03_wind_off	2	302	1.0	0.0
-it	04_res	2	302	1.0	0.0
-it	05_nuclear	2	302	1.0	0.0
-it	06_coal	2	302	1.0	0.0
-it	07_gas	2	302	1.0	0.0
+it	01_solar	2	302	0.0	1.0
+it	02_wind_on	2	302	0.0	1.0
+it	03_wind_off	2	302	0.0	1.0
+it	04_res	2	302	0.0	1.0
+it	05_nuclear	2	302	0.0	1.0
+it	06_coal	2	302	0.0	1.0
+it	07_gas	2	302	0.0	1.0
 it	08_non-res	2	302	0.0	0.0
 it	09_hydro_pump	2	302	0.0	0.0
-it	01_solar	2	303	1.0	0.0
-it	02_wind_on	2	303	1.0	0.0
-it	03_wind_off	2	303	1.0	0.0
-it	04_res	2	303	1.0	0.0
-it	05_nuclear	2	303	1.0	0.0
-it	06_coal	2	303	1.0	0.0
-it	07_gas	2	303	1.0	0.0
+it	01_solar	2	303	0.0	1.0
+it	02_wind_on	2	303	0.0	1.0
+it	03_wind_off	2	303	0.0	1.0
+it	04_res	2	303	0.0	1.0
+it	05_nuclear	2	303	0.0	1.0
+it	06_coal	2	303	0.0	1.0
+it	07_gas	2	303	0.0	1.0
 it	08_non-res	2	303	0.0	0.0
 it	09_hydro_pump	2	303	0.0	0.0
-it	01_solar	2	304	1.0	0.0
-it	02_wind_on	2	304	1.0	0.0
-it	03_wind_off	2	304	1.0	0.0
-it	04_res	2	304	1.0	0.0
-it	05_nuclear	2	304	1.0	0.0
-it	06_coal	2	304	1.0	0.0
-it	07_gas	2	304	1.0	0.0
+it	01_solar	2	304	0.0	1.0
+it	02_wind_on	2	304	0.0	1.0
+it	03_wind_off	2	304	0.0	1.0
+it	04_res	2	304	0.0	1.0
+it	05_nuclear	2	304	0.0	1.0
+it	06_coal	2	304	0.0	1.0
+it	07_gas	2	304	0.0	1.0
 it	08_non-res	2	304	0.0	0.0
 it	09_hydro_pump	2	304	0.0	0.0
-it	01_solar	2	305	1.0	0.0
-it	02_wind_on	2	305	1.0	0.0
-it	03_wind_off	2	305	1.0	0.0
-it	04_res	2	305	1.0	0.0
-it	05_nuclear	2	305	1.0	0.0
-it	06_coal	2	305	1.0	0.0
-it	07_gas	2	305	1.0	0.0
+it	01_solar	2	305	0.0	1.0
+it	02_wind_on	2	305	0.0	1.0
+it	03_wind_off	2	305	0.0	1.0
+it	04_res	2	305	0.0	1.0
+it	05_nuclear	2	305	0.0	1.0
+it	06_coal	2	305	0.0	1.0
+it	07_gas	2	305	0.0	1.0
 it	08_non-res	2	305	0.0	0.0
 it	09_hydro_pump	2	305	0.0	0.0
-it	01_solar	2	306	1.0	0.0
-it	02_wind_on	2	306	1.0	0.0
-it	03_wind_off	2	306	1.0	0.0
-it	04_res	2	306	1.0	0.0
-it	05_nuclear	2	306	1.0	0.0
-it	06_coal	2	306	1.0	0.0
-it	07_gas	2	306	1.0	0.0
+it	01_solar	2	306	0.0	1.0
+it	02_wind_on	2	306	0.0	1.0
+it	03_wind_off	2	306	0.0	1.0
+it	04_res	2	306	0.0	1.0
+it	05_nuclear	2	306	0.0	1.0
+it	06_coal	2	306	0.0	1.0
+it	07_gas	2	306	0.0	1.0
 it	08_non-res	2	306	0.0	0.0
 it	09_hydro_pump	2	306	0.0	0.0
-it	01_solar	2	307	1.0	0.0
-it	02_wind_on	2	307	1.0	0.0
-it	03_wind_off	2	307	1.0	0.0
-it	04_res	2	307	1.0	0.0
-it	05_nuclear	2	307	1.0	0.0
-it	06_coal	2	307	1.0	0.0
-it	07_gas	2	307	1.0	0.0
+it	01_solar	2	307	0.0	1.0
+it	02_wind_on	2	307	0.0	1.0
+it	03_wind_off	2	307	0.0	1.0
+it	04_res	2	307	0.0	1.0
+it	05_nuclear	2	307	0.0	1.0
+it	06_coal	2	307	0.0	1.0
+it	07_gas	2	307	0.0	1.0
 it	08_non-res	2	307	0.0	0.0
 it	09_hydro_pump	2	307	0.0	0.0
-it	01_solar	2	308	1.0	0.0
-it	02_wind_on	2	308	1.0	0.0
-it	03_wind_off	2	308	1.0	0.0
-it	04_res	2	308	1.0	0.0
-it	05_nuclear	2	308	1.0	0.0
-it	06_coal	2	308	1.0	0.0
-it	07_gas	2	308	1.0	0.0
+it	01_solar	2	308	0.0	1.0
+it	02_wind_on	2	308	0.0	1.0
+it	03_wind_off	2	308	0.0	1.0
+it	04_res	2	308	0.0	1.0
+it	05_nuclear	2	308	0.0	1.0
+it	06_coal	2	308	0.0	1.0
+it	07_gas	2	308	0.0	1.0
 it	08_non-res	2	308	0.0	0.0
 it	09_hydro_pump	2	308	0.0	0.0
-it	01_solar	2	309	1.0	0.0
-it	02_wind_on	2	309	1.0	0.0
-it	03_wind_off	2	309	1.0	0.0
-it	04_res	2	309	1.0	0.0
-it	05_nuclear	2	309	1.0	0.0
-it	06_coal	2	309	1.0	0.0
-it	07_gas	2	309	1.0	0.0
+it	01_solar	2	309	0.0	1.0
+it	02_wind_on	2	309	0.0	1.0
+it	03_wind_off	2	309	0.0	1.0
+it	04_res	2	309	0.0	1.0
+it	05_nuclear	2	309	0.0	1.0
+it	06_coal	2	309	0.0	1.0
+it	07_gas	2	309	0.0	1.0
 it	08_non-res	2	309	0.0	0.0
 it	09_hydro_pump	2	309	0.0	0.0
-it	01_solar	2	310	1.0	0.0
-it	02_wind_on	2	310	1.0	0.0
-it	03_wind_off	2	310	1.0	0.0
-it	04_res	2	310	1.0	0.0
-it	05_nuclear	2	310	1.0	0.0
-it	06_coal	2	310	1.0	0.0
-it	07_gas	2	310	1.0	0.0
-it	08_non-res	2	310	1.0	0.0
+it	01_solar	2	310	0.0	1.0
+it	02_wind_on	2	310	0.0	1.0
+it	03_wind_off	2	310	0.0	1.0
+it	04_res	2	310	0.0	1.0
+it	05_nuclear	2	310	0.0	1.0
+it	06_coal	2	310	0.0	1.0
+it	07_gas	2	310	0.0	1.0
+it	08_non-res	2	310	0.0	1.0
 it	09_hydro_pump	2	310	0.0	0.0
-it	01_solar	2	311	1.0	0.0
-it	02_wind_on	2	311	1.0	0.0
-it	03_wind_off	2	311	1.0	0.0
-it	04_res	2	311	1.0	0.0
-it	05_nuclear	2	311	1.0	0.0
-it	06_coal	2	311	1.0	0.0
-it	07_gas	2	311	1.0	0.0
-it	08_non-res	2	311	1.0	0.0
+it	01_solar	2	311	0.0	1.0
+it	02_wind_on	2	311	0.0	1.0
+it	03_wind_off	2	311	0.0	1.0
+it	04_res	2	311	0.0	1.0
+it	05_nuclear	2	311	0.0	1.0
+it	06_coal	2	311	0.0	1.0
+it	07_gas	2	311	0.0	1.0
+it	08_non-res	2	311	0.0	1.0
 it	09_hydro_pump	2	311	0.0	0.0
-it	01_solar	2	312	1.0	0.0
-it	02_wind_on	2	312	1.0	0.0
-it	03_wind_off	2	312	1.0	0.0
-it	04_res	2	312	1.0	0.0
-it	05_nuclear	2	312	1.0	0.0
-it	06_coal	2	312	1.0	0.0
-it	07_gas	2	312	1.0	0.0
-it	08_non-res	2	312	1.0	0.0
+it	01_solar	2	312	0.0	1.0
+it	02_wind_on	2	312	0.0	1.0
+it	03_wind_off	2	312	0.0	1.0
+it	04_res	2	312	0.0	1.0
+it	05_nuclear	2	312	0.0	1.0
+it	06_coal	2	312	0.0	1.0
+it	07_gas	2	312	0.0	1.0
+it	08_non-res	2	312	0.0	1.0
 it	09_hydro_pump	2	312	0.0	0.0
-it	01_solar	2	313	1.0	0.0
-it	02_wind_on	2	313	1.0	0.0
-it	03_wind_off	2	313	1.0	0.0
-it	04_res	2	313	1.0	0.0
-it	05_nuclear	2	313	1.0	0.0
-it	06_coal	2	313	1.0	0.0
-it	07_gas	2	313	1.0	0.0
-it	08_non-res	2	313	1.0	0.0
+it	01_solar	2	313	0.0	1.0
+it	02_wind_on	2	313	0.0	1.0
+it	03_wind_off	2	313	0.0	1.0
+it	04_res	2	313	0.0	1.0
+it	05_nuclear	2	313	0.0	1.0
+it	06_coal	2	313	0.0	1.0
+it	07_gas	2	313	0.0	1.0
+it	08_non-res	2	313	0.0	1.0
 it	09_hydro_pump	2	313	0.0	0.0
-it	01_solar	2	314	1.0	0.0
-it	02_wind_on	2	314	1.0	0.0
-it	03_wind_off	2	314	1.0	0.0
-it	04_res	2	314	1.0	0.0
-it	05_nuclear	2	314	1.0	0.0
-it	06_coal	2	314	1.0	0.0
-it	07_gas	2	314	1.0	0.0
-it	08_non-res	2	314	1.0	0.0
+it	01_solar	2	314	0.0	1.0
+it	02_wind_on	2	314	0.0	1.0
+it	03_wind_off	2	314	0.0	1.0
+it	04_res	2	314	0.0	1.0
+it	05_nuclear	2	314	0.0	1.0
+it	06_coal	2	314	0.0	1.0
+it	07_gas	2	314	0.0	1.0
+it	08_non-res	2	314	0.0	1.0
 it	09_hydro_pump	2	314	0.0	0.0
-it	01_solar	2	315	1.0	0.0
-it	02_wind_on	2	315	1.0	0.0
-it	03_wind_off	2	315	1.0	0.0
-it	04_res	2	315	1.0	0.0
-it	05_nuclear	2	315	1.0	0.0
-it	06_coal	2	315	1.0	0.0
-it	07_gas	2	315	1.0	0.0
-it	08_non-res	2	315	1.0	0.0
+it	01_solar	2	315	0.0	1.0
+it	02_wind_on	2	315	0.0	1.0
+it	03_wind_off	2	315	0.0	1.0
+it	04_res	2	315	0.0	1.0
+it	05_nuclear	2	315	0.0	1.0
+it	06_coal	2	315	0.0	1.0
+it	07_gas	2	315	0.0	1.0
+it	08_non-res	2	315	0.0	1.0
 it	09_hydro_pump	2	315	0.0	0.0
-it	01_solar	2	316	1.0	0.0
-it	02_wind_on	2	316	1.0	0.0
-it	03_wind_off	2	316	1.0	0.0
-it	04_res	2	316	1.0	0.0
-it	05_nuclear	2	316	1.0	0.0
-it	06_coal	2	316	1.0	0.0
-it	07_gas	2	316	1.0	0.0
-it	08_non-res	2	316	1.0	0.0
+it	01_solar	2	316	0.0	1.0
+it	02_wind_on	2	316	0.0	1.0
+it	03_wind_off	2	316	0.0	1.0
+it	04_res	2	316	0.0	1.0
+it	05_nuclear	2	316	0.0	1.0
+it	06_coal	2	316	0.0	1.0
+it	07_gas	2	316	0.0	1.0
+it	08_non-res	2	316	0.0	1.0
 it	09_hydro_pump	2	316	0.0	0.0
-it	01_solar	2	317	1.0	0.0
-it	02_wind_on	2	317	1.0	0.0
-it	03_wind_off	2	317	1.0	0.0
-it	04_res	2	317	1.0	0.0
-it	05_nuclear	2	317	1.0	0.0
-it	06_coal	2	317	1.0	0.0
-it	07_gas	2	317	1.0	0.0
-it	08_non-res	2	317	1.0	0.0
+it	01_solar	2	317	0.0	1.0
+it	02_wind_on	2	317	0.0	1.0
+it	03_wind_off	2	317	0.0	1.0
+it	04_res	2	317	0.0	1.0
+it	05_nuclear	2	317	0.0	1.0
+it	06_coal	2	317	0.0	1.0
+it	07_gas	2	317	0.0	1.0
+it	08_non-res	2	317	0.0	1.0
 it	09_hydro_pump	2	317	0.0	0.0
-it	01_solar	2	318	1.0	0.0
-it	02_wind_on	2	318	1.0	0.0
-it	03_wind_off	2	318	1.0	0.0
-it	04_res	2	318	1.0	0.0
-it	05_nuclear	2	318	1.0	0.0
-it	06_coal	2	318	1.0	0.0
-it	07_gas	2	318	1.0	0.0
-it	08_non-res	2	318	1.0	0.0
+it	01_solar	2	318	0.0	1.0
+it	02_wind_on	2	318	0.0	1.0
+it	03_wind_off	2	318	0.0	1.0
+it	04_res	2	318	0.0	1.0
+it	05_nuclear	2	318	0.0	1.0
+it	06_coal	2	318	0.0	1.0
+it	07_gas	2	318	0.0	1.0
+it	08_non-res	2	318	0.0	1.0
 it	09_hydro_pump	2	318	0.0	0.0
-it	01_solar	2	319	1.0	0.0
-it	02_wind_on	2	319	1.0	0.0
-it	03_wind_off	2	319	1.0	0.0
-it	04_res	2	319	1.0	0.0
-it	05_nuclear	2	319	1.0	0.0
-it	06_coal	2	319	1.0	0.0
-it	07_gas	2	319	1.0	0.0
-it	08_non-res	2	319	1.0	0.0
+it	01_solar	2	319	0.0	1.0
+it	02_wind_on	2	319	0.0	1.0
+it	03_wind_off	2	319	0.0	1.0
+it	04_res	2	319	0.0	1.0
+it	05_nuclear	2	319	0.0	1.0
+it	06_coal	2	319	0.0	1.0
+it	07_gas	2	319	0.0	1.0
+it	08_non-res	2	319	0.0	1.0
 it	09_hydro_pump	2	319	0.0	0.0
-it	01_solar	2	320	1.0	0.0
-it	02_wind_on	2	320	1.0	0.0
-it	03_wind_off	2	320	1.0	0.0
-it	04_res	2	320	1.0	0.0
-it	05_nuclear	2	320	1.0	0.0
-it	06_coal	2	320	1.0	0.0
-it	07_gas	2	320	1.0	0.0
-it	08_non-res	2	320	1.0	0.0
+it	01_solar	2	320	0.0	1.0
+it	02_wind_on	2	320	0.0	1.0
+it	03_wind_off	2	320	0.0	1.0
+it	04_res	2	320	0.0	1.0
+it	05_nuclear	2	320	0.0	1.0
+it	06_coal	2	320	0.0	1.0
+it	07_gas	2	320	0.0	1.0
+it	08_non-res	2	320	0.0	1.0
 it	09_hydro_pump	2	320	0.0	0.0
-it	01_solar	2	321	1.0	0.0
-it	02_wind_on	2	321	1.0	0.0
-it	03_wind_off	2	321	1.0	0.0
-it	04_res	2	321	1.0	0.0
-it	05_nuclear	2	321	1.0	0.0
-it	06_coal	2	321	1.0	0.0
-it	07_gas	2	321	1.0	0.0
-it	08_non-res	2	321	1.0	0.0
+it	01_solar	2	321	0.0	1.0
+it	02_wind_on	2	321	0.0	1.0
+it	03_wind_off	2	321	0.0	1.0
+it	04_res	2	321	0.0	1.0
+it	05_nuclear	2	321	0.0	1.0
+it	06_coal	2	321	0.0	1.0
+it	07_gas	2	321	0.0	1.0
+it	08_non-res	2	321	0.0	1.0
 it	09_hydro_pump	2	321	0.0	0.0
-it	01_solar	2	322	1.0	0.0
-it	02_wind_on	2	322	1.0	0.0
-it	03_wind_off	2	322	1.0	0.0
-it	04_res	2	322	1.0	0.0
-it	05_nuclear	2	322	1.0	0.0
-it	06_coal	2	322	1.0	0.0
-it	07_gas	2	322	1.0	0.0
-it	08_non-res	2	322	1.0	0.0
+it	01_solar	2	322	0.0	1.0
+it	02_wind_on	2	322	0.0	1.0
+it	03_wind_off	2	322	0.0	1.0
+it	04_res	2	322	0.0	1.0
+it	05_nuclear	2	322	0.0	1.0
+it	06_coal	2	322	0.0	1.0
+it	07_gas	2	322	0.0	1.0
+it	08_non-res	2	322	0.0	1.0
 it	09_hydro_pump	2	322	0.0	0.0
-it	01_solar	2	323	1.0	0.0
-it	02_wind_on	2	323	1.0	0.0
-it	03_wind_off	2	323	1.0	0.0
-it	04_res	2	323	1.0	0.0
-it	05_nuclear	2	323	1.0	0.0
-it	06_coal	2	323	1.0	0.0
-it	07_gas	2	323	1.0	0.0
-it	08_non-res	2	323	1.0	0.0
+it	01_solar	2	323	0.0	1.0
+it	02_wind_on	2	323	0.0	1.0
+it	03_wind_off	2	323	0.0	1.0
+it	04_res	2	323	0.0	1.0
+it	05_nuclear	2	323	0.0	1.0
+it	06_coal	2	323	0.0	1.0
+it	07_gas	2	323	0.0	1.0
+it	08_non-res	2	323	0.0	1.0
 it	09_hydro_pump	2	323	0.0	0.0
-it	01_solar	2	324	1.0	0.0
-it	02_wind_on	2	324	1.0	0.0
-it	03_wind_off	2	324	1.0	0.0
-it	04_res	2	324	1.0	0.0
-it	05_nuclear	2	324	1.0	0.0
-it	06_coal	2	324	1.0	0.0
-it	07_gas	2	324	1.0	0.0
-it	08_non-res	2	324	1.0	0.0
+it	01_solar	2	324	0.0	1.0
+it	02_wind_on	2	324	0.0	1.0
+it	03_wind_off	2	324	0.0	1.0
+it	04_res	2	324	0.0	1.0
+it	05_nuclear	2	324	0.0	1.0
+it	06_coal	2	324	0.0	1.0
+it	07_gas	2	324	0.0	1.0
+it	08_non-res	2	324	0.0	1.0
 it	09_hydro_pump	2	324	0.0	0.0
-it	01_solar	2	325	1.0	0.0
-it	02_wind_on	2	325	1.0	0.0
-it	03_wind_off	2	325	1.0	0.0
-it	04_res	2	325	1.0	0.0
-it	05_nuclear	2	325	1.0	0.0
-it	06_coal	2	325	1.0	0.0
-it	07_gas	2	325	1.0	0.0
-it	08_non-res	2	325	1.0	0.0
+it	01_solar	2	325	0.0	1.0
+it	02_wind_on	2	325	0.0	1.0
+it	03_wind_off	2	325	0.0	1.0
+it	04_res	2	325	0.0	1.0
+it	05_nuclear	2	325	0.0	1.0
+it	06_coal	2	325	0.0	1.0
+it	07_gas	2	325	0.0	1.0
+it	08_non-res	2	325	0.0	1.0
 it	09_hydro_pump	2	325	0.0	0.0
-it	01_solar	2	326	1.0	0.0
-it	02_wind_on	2	326	1.0	0.0
-it	03_wind_off	2	326	1.0	0.0
-it	04_res	2	326	1.0	0.0
-it	05_nuclear	2	326	1.0	0.0
-it	06_coal	2	326	1.0	0.0
-it	07_gas	2	326	1.0	0.0
-it	08_non-res	2	326	1.0	0.0
+it	01_solar	2	326	0.0	1.0
+it	02_wind_on	2	326	0.0	1.0
+it	03_wind_off	2	326	0.0	1.0
+it	04_res	2	326	0.0	1.0
+it	05_nuclear	2	326	0.0	1.0
+it	06_coal	2	326	0.0	1.0
+it	07_gas	2	326	0.0	1.0
+it	08_non-res	2	326	0.0	1.0
 it	09_hydro_pump	2	326	0.0	0.0
-it	01_solar	2	327	1.0	0.0
-it	02_wind_on	2	327	1.0	0.0
-it	03_wind_off	2	327	1.0	0.0
-it	04_res	2	327	1.0	0.0
-it	05_nuclear	2	327	1.0	0.0
-it	06_coal	2	327	1.0	0.0
-it	07_gas	2	327	1.0	0.0
-it	08_non-res	2	327	1.0	0.0
+it	01_solar	2	327	0.0	1.0
+it	02_wind_on	2	327	0.0	1.0
+it	03_wind_off	2	327	0.0	1.0
+it	04_res	2	327	0.0	1.0
+it	05_nuclear	2	327	0.0	1.0
+it	06_coal	2	327	0.0	1.0
+it	07_gas	2	327	0.0	1.0
+it	08_non-res	2	327	0.0	1.0
 it	09_hydro_pump	2	327	0.0	0.0
-it	01_solar	2	328	1.0	0.0
-it	02_wind_on	2	328	1.0	0.0
-it	03_wind_off	2	328	1.0	0.0
-it	04_res	2	328	1.0	0.0
-it	05_nuclear	2	328	1.0	0.0
-it	06_coal	2	328	1.0	0.0
-it	07_gas	2	328	1.0	0.0
-it	08_non-res	2	328	1.0	0.0
+it	01_solar	2	328	0.0	1.0
+it	02_wind_on	2	328	0.0	1.0
+it	03_wind_off	2	328	0.0	1.0
+it	04_res	2	328	0.0	1.0
+it	05_nuclear	2	328	0.0	1.0
+it	06_coal	2	328	0.0	1.0
+it	07_gas	2	328	0.0	1.0
+it	08_non-res	2	328	0.0	1.0
 it	09_hydro_pump	2	328	0.0	0.0
-it	01_solar	2	329	1.0	0.0
-it	02_wind_on	2	329	1.0	0.0
-it	03_wind_off	2	329	1.0	0.0
-it	04_res	2	329	1.0	0.0
-it	05_nuclear	2	329	1.0	0.0
-it	06_coal	2	329	1.0	0.0
-it	07_gas	2	329	1.0	0.0
-it	08_non-res	2	329	1.0	0.0
+it	01_solar	2	329	0.0	1.0
+it	02_wind_on	2	329	0.0	1.0
+it	03_wind_off	2	329	0.0	1.0
+it	04_res	2	329	0.0	1.0
+it	05_nuclear	2	329	0.0	1.0
+it	06_coal	2	329	0.0	1.0
+it	07_gas	2	329	0.0	1.0
+it	08_non-res	2	329	0.0	1.0
 it	09_hydro_pump	2	329	0.0	0.0
-it	01_solar	2	330	1.0	0.0
-it	02_wind_on	2	330	1.0	0.0
-it	03_wind_off	2	330	1.0	0.0
-it	04_res	2	330	1.0	0.0
-it	05_nuclear	2	330	1.0	0.0
-it	06_coal	2	330	1.0	0.0
-it	07_gas	2	330	1.0	0.0
-it	08_non-res	2	330	1.0	0.0
-it	09_hydro_pump	2	330	1.0	0.0
-it	01_solar	2	331	1.0	0.0
-it	02_wind_on	2	331	1.0	0.0
-it	03_wind_off	2	331	1.0	0.0
-it	04_res	2	331	1.0	0.0
-it	05_nuclear	2	331	1.0	0.0
-it	06_coal	2	331	1.0	0.0
-it	07_gas	2	331	1.0	0.0
-it	08_non-res	2	331	1.0	0.0
-it	09_hydro_pump	2	331	1.0	0.0
-it	01_solar	2	332	1.0	0.0
-it	02_wind_on	2	332	1.0	0.0
-it	03_wind_off	2	332	1.0	0.0
-it	04_res	2	332	1.0	0.0
-it	05_nuclear	2	332	1.0	0.0
-it	06_coal	2	332	1.0	0.0
-it	07_gas	2	332	1.0	0.0
-it	08_non-res	2	332	1.0	0.0
-it	09_hydro_pump	2	332	1.0	0.0
-it	01_solar	2	333	1.0	0.0
-it	02_wind_on	2	333	1.0	0.0
-it	03_wind_off	2	333	1.0	0.0
-it	04_res	2	333	1.0	0.0
-it	05_nuclear	2	333	1.0	0.0
-it	06_coal	2	333	1.0	0.0
-it	07_gas	2	333	1.0	0.0
-it	08_non-res	2	333	1.0	0.0
-it	09_hydro_pump	2	333	1.0	0.0
-it	01_solar	2	334	1.0	0.0
-it	02_wind_on	2	334	1.0	0.0
-it	03_wind_off	2	334	1.0	0.0
-it	04_res	2	334	1.0	0.0
-it	05_nuclear	2	334	1.0	0.0
-it	06_coal	2	334	1.0	0.0
-it	07_gas	2	334	1.0	0.0
-it	08_non-res	2	334	1.0	0.0
-it	09_hydro_pump	2	334	1.0	0.0
-it	01_solar	2	335	1.0	0.0
-it	02_wind_on	2	335	1.0	0.0
-it	03_wind_off	2	335	1.0	0.0
-it	04_res	2	335	1.0	0.0
-it	05_nuclear	2	335	1.0	0.0
-it	06_coal	2	335	1.0	0.0
-it	07_gas	2	335	1.0	0.0
-it	08_non-res	2	335	1.0	0.0
-it	09_hydro_pump	2	335	1.0	0.0
-it	01_solar	2	336	1.0	0.0
-it	02_wind_on	2	336	1.0	0.0
-it	03_wind_off	2	336	1.0	0.0
-it	04_res	2	336	1.0	0.0
-it	05_nuclear	2	336	1.0	0.0
-it	06_coal	2	336	1.0	0.0
-it	07_gas	2	336	1.0	0.0
-it	08_non-res	2	336	1.0	0.0
-it	09_hydro_pump	2	336	1.0	0.0
+it	01_solar	2	330	0.0	1.0
+it	02_wind_on	2	330	0.0	1.0
+it	03_wind_off	2	330	0.0	1.0
+it	04_res	2	330	0.0	1.0
+it	05_nuclear	2	330	0.0	1.0
+it	06_coal	2	330	0.0	1.0
+it	07_gas	2	330	0.0	1.0
+it	08_non-res	2	330	0.0	1.0
+it	09_hydro_pump	2	330	0.0	1.0
+it	01_solar	2	331	0.0	1.0
+it	02_wind_on	2	331	0.0	1.0
+it	03_wind_off	2	331	0.0	1.0
+it	04_res	2	331	0.0	1.0
+it	05_nuclear	2	331	0.0	1.0
+it	06_coal	2	331	0.0	1.0
+it	07_gas	2	331	0.0	1.0
+it	08_non-res	2	331	0.0	1.0
+it	09_hydro_pump	2	331	0.0	1.0
+it	01_solar	2	332	0.0	1.0
+it	02_wind_on	2	332	0.0	1.0
+it	03_wind_off	2	332	0.0	1.0
+it	04_res	2	332	0.0	1.0
+it	05_nuclear	2	332	0.0	1.0
+it	06_coal	2	332	0.0	1.0
+it	07_gas	2	332	0.0	1.0
+it	08_non-res	2	332	0.0	1.0
+it	09_hydro_pump	2	332	0.0	1.0
+it	01_solar	2	333	0.0	1.0
+it	02_wind_on	2	333	0.0	1.0
+it	03_wind_off	2	333	0.0	1.0
+it	04_res	2	333	0.0	1.0
+it	05_nuclear	2	333	0.0	1.0
+it	06_coal	2	333	0.0	1.0
+it	07_gas	2	333	0.0	1.0
+it	08_non-res	2	333	0.0	1.0
+it	09_hydro_pump	2	333	0.0	1.0
+it	01_solar	2	334	0.0	1.0
+it	02_wind_on	2	334	0.0	1.0
+it	03_wind_off	2	334	0.0	1.0
+it	04_res	2	334	0.0	1.0
+it	05_nuclear	2	334	0.0	1.0
+it	06_coal	2	334	0.0	1.0
+it	07_gas	2	334	0.0	1.0
+it	08_non-res	2	334	0.0	1.0
+it	09_hydro_pump	2	334	0.0	1.0
+it	01_solar	2	335	0.0	1.0
+it	02_wind_on	2	335	0.0	1.0
+it	03_wind_off	2	335	0.0	1.0
+it	04_res	2	335	0.0	1.0
+it	05_nuclear	2	335	0.0	1.0
+it	06_coal	2	335	0.0	1.0
+it	07_gas	2	335	0.0	1.0
+it	08_non-res	2	335	0.0	1.0
+it	09_hydro_pump	2	335	0.0	1.0
+it	01_solar	2	336	0.0	1.0
+it	02_wind_on	2	336	0.0	1.0
+it	03_wind_off	2	336	0.0	1.0
+it	04_res	2	336	0.0	1.0
+it	05_nuclear	2	336	0.0	1.0
+it	06_coal	2	336	0.0	1.0
+it	07_gas	2	336	0.0	1.0
+it	08_non-res	2	336	0.0	1.0
+it	09_hydro_pump	2	336	0.0	1.0
diff --git a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-08-all.result.tsv b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-08-all.result.tsv
index ebc9631010..444fe37192 100644
--- a/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-08-all.result.tsv
+++ b/tests/integration/raw_studies_blueprint/assets/aggregate_areas_raw_data/test-08-all.result.tsv
@@ -1,19 +1,19 @@
-area	cluster	timeId	NODU	NP Cost - Euro
-de	01_solar	1	167.0	0.0
-de	02_wind_on	1	147.0	0.0
-de	03_wind_off	1	127.0	0.0
-de	04_res	1	107.0	0.0
-de	05_nuclear	1	87.0	0.0
-de	06_coal	1	67.0	0.0
-de	07_gas	1	47.0	0.0
-de	08_non-res	1	27.0	0.0
-de	09_hydro_pump	1	7.0	0.0
-es	01_solar	1	167.0	0.0
-es	02_wind_on	1	147.0	0.0
-es	03_wind_off	1	127.0	0.0
-es	04_res	1	107.0	0.0
-es	05_nuclear	1	87.0	0.0
-es	06_coal	1	67.0	0.0
-es	07_gas	1	47.0	0.0
-es	08_non-res	1	27.0	0.0
-es	09_hydro_pump	1	7.0	0.0
+area	cluster	timeId	NP Cost	NODU
+de	01_solar	1	0.0	167.0
+de	02_wind_on	1	0.0	147.0
+de	03_wind_off	1	0.0	127.0
+de	04_res	1	0.0	107.0
+de	05_nuclear	1	0.0	87.0
+de	06_coal	1	0.0	67.0
+de	07_gas	1	0.0	47.0
+de	08_non-res	1	0.0	27.0
+de	09_hydro_pump	1	0.0	7.0
+es	01_solar	1	0.0	167.0
+es	02_wind_on	1	0.0	147.0
+es	03_wind_off	1	0.0	127.0
+es	04_res	1	0.0	107.0
+es	05_nuclear	1	0.0	87.0
+es	06_coal	1	0.0	67.0
+es	07_gas	1	0.0	47.0
+es	08_non-res	1	0.0	27.0
+es	09_hydro_pump	1	0.0	7.0
diff --git a/tests/integration/raw_studies_blueprint/test_aggregate_raw_data.py b/tests/integration/raw_studies_blueprint/test_aggregate_raw_data.py
index d1b1f304bf..f4532ea46f 100644
--- a/tests/integration/raw_studies_blueprint/test_aggregate_raw_data.py
+++ b/tests/integration/raw_studies_blueprint/test_aggregate_raw_data.py
@@ -531,37 +531,27 @@ def test_different_formats(
                 expected_df[col] = expected_df[col].astype(df[col].dtype)
             pd.testing.assert_frame_equal(df, expected_df)
 
-    def test_aggregation_with_incoherent_bodies(
-        self, client: TestClient, user_access_token: str, internal_study_id: str
+    def test_aggregation_errors(
+        self, client: TestClient, user_access_token: str, internal_study_id: str, tmp_path: Path
     ):
-        """
-        Asserts that requests with incoherent bodies don't crash but send empty dataframes
-        """
         client.headers = {"Authorization": f"Bearer {user_access_token}"}
+
+        # Asserts that requests with incoherent bodies don't crash but send empty dataframes
         for params in INCOHERENT_REQUESTS_BODIES__IND:
             output_id = params.pop("output_id")
             res = client.get(f"/v1/studies/{internal_study_id}/links/aggregate/mc-ind/{output_id}", params=params)
             assert res.status_code == 200, res.json()
             assert res.content.strip() == b""
 
-    def test_wrongly_typed_request(self, client: TestClient, user_access_token: str, internal_study_id: str):
-        """
-        Asserts that wrongly typed requests send an HTTP 422 Exception
-        """
-        client.headers = {"Authorization": f"Bearer {user_access_token}"}
+        # Asserts that wrongly typed requests send an HTTP 422 Exception
         for params in WRONGLY_TYPED_REQUESTS__IND:
             output_id = params.pop("output_id")
             res = client.get(f"/v1/studies/{internal_study_id}/links/aggregate/mc-ind/{output_id}", params=params)
             assert res.status_code == 422
             assert res.json()["exception"] == "RequestValidationError"
 
-    def test_aggregation_with_wrong_output(self, client: TestClient, user_access_token: str, internal_study_id: str):
-        """
-        Asserts that requests with wrong output send an HTTP 422 Exception
-        """
-        client.headers = {"Authorization": f"Bearer {user_access_token}"}
-
-        # test for areas
+        # Asserts that requests with wrong output send an HTTP 422 Exception
+        # for areas
         res = client.get(
             f"/v1/studies/{internal_study_id}/areas/aggregate/mc-ind/unknown_id",
             params={
@@ -573,7 +563,7 @@ def test_aggregation_with_wrong_output(self, client: TestClient, user_access_tok
         assert res.json()["exception"] == "OutputNotFound"
         assert "unknown_id" in res.json()["description"], "The output_id should be in the message"
 
-        # test for links
+        # for links
         res = client.get(
             f"/v1/studies/{internal_study_id}/links/aggregate/mc-ind/unknown_id",
             params={
@@ -585,6 +575,19 @@ def test_aggregation_with_wrong_output(self, client: TestClient, user_access_tok
         assert res.json()["exception"] == "OutputNotFound"
         assert "unknown_id" in res.json()["description"], "The output_id should be in the message"
 
+        # Asserts that requests with non-existing folders send an HTTP 404 Exception
+        # the mc-ind folder
+        mc_ind_folder = tmp_path.joinpath("ext_workspace/STA-mini/output/20201014-1425eco-goodbye/economy/mc-ind")
+        # delete the folder
+        shutil.rmtree(mc_ind_folder)
+        res = client.get(
+            f"/v1/studies/{internal_study_id}/areas/aggregate/mc-ind/20201014-1425eco-goodbye",
+            params={"query_file": "values", "frequency": "hourly"},
+        )
+        assert res.status_code == 404, res.json()
+        assert "economy/mc-ind" in res.json()["description"]
+        assert res.json()["exception"] == "OutputSubFolderNotFound"
+
     def test_empty_columns(self, client: TestClient, user_access_token: str, internal_study_id: str):
         """
         Asserts that requests get an empty dataframe when columns are not existing
@@ -615,26 +618,6 @@ def test_empty_columns(self, client: TestClient, user_access_token: str, interna
         assert res.status_code == 200, res.json()
         assert res.content.strip() == b""
 
-    def test_non_existing_folder(
-        self, tmp_path: Path, client: TestClient, user_access_token: str, internal_study_id: str
-    ):
-        """
-        Asserts that requests with non-existing folders send an HTTP 404 Exception
-        """
-        client.headers = {"Authorization": f"Bearer {user_access_token}"}
-
-        # the mc-ind folder
-        mc_ind_folder = tmp_path.joinpath("ext_workspace/STA-mini/output/20201014-1425eco-goodbye/economy/mc-ind")
-        # delete the folder
-        shutil.rmtree(mc_ind_folder)
-        res = client.get(
-            f"/v1/studies/{internal_study_id}/areas/aggregate/mc-ind/20201014-1425eco-goodbye",
-            params={"query_file": "values", "frequency": "hourly"},
-        )
-        assert res.status_code == 404, res.json()
-        assert "economy/mc-ind" in res.json()["description"]
-        assert res.json()["exception"] == "OutputSubFolderNotFound"
-
 
 @pytest.mark.integration_test
 class TestRawDataAggregationMCAll:
@@ -735,37 +718,27 @@ def test_different_formats(
                 expected_df[col] = expected_df[col].astype(df[col].dtype)
             pd.testing.assert_frame_equal(df, expected_df)
 
-    def test_aggregation_with_incoherent_bodies(
-        self, client: TestClient, user_access_token: str, internal_study_id: str
+    def test_aggregation_errors(
+        self, client: TestClient, user_access_token: str, internal_study_id: str, tmp_path: Path
     ):
-        """
-        Asserts that requests with incoherent bodies don't crash but send empty dataframes
-        """
         client.headers = {"Authorization": f"Bearer {user_access_token}"}
+
+        # Asserts that requests with incoherent bodies don't crash but send empty dataframes
         for params in INCOHERENT_REQUESTS_BODIES__ALL:
             output_id = params.pop("output_id")
             res = client.get(f"/v1/studies/{internal_study_id}/links/aggregate/mc-all/{output_id}", params=params)
             assert res.status_code == 200, res.json()
             assert res.content.strip() == b""
 
-    def test_wrongly_typed_request(self, client: TestClient, user_access_token: str, internal_study_id: str):
-        """
-        Asserts that wrongly typed requests send an HTTP 422 Exception
-        """
-        client.headers = {"Authorization": f"Bearer {user_access_token}"}
+        # Asserts that wrongly typed requests send an HTTP 422 Exception
         for params in WRONGLY_TYPED_REQUESTS__ALL:
             output_id = params.pop("output_id")
             res = client.get(f"/v1/studies/{internal_study_id}/links/aggregate/mc-all/{output_id}", params=params)
             assert res.status_code == 422
             assert res.json()["exception"] == "RequestValidationError"
 
-    def test_aggregation_with_wrong_output(self, client: TestClient, user_access_token: str, internal_study_id: str):
-        """
-        Asserts that requests with wrong output send an HTTP 422 Exception
-        """
-        client.headers = {"Authorization": f"Bearer {user_access_token}"}
-
-        # test for areas
+        # Asserts that requests with wrong output send an HTTP 422 Exception
+        # for areas
         res = client.get(
             f"/v1/studies/{internal_study_id}/areas/aggregate/mc-all/unknown_id",
             params={
@@ -777,7 +750,7 @@ def test_aggregation_with_wrong_output(self, client: TestClient, user_access_tok
         assert res.json()["exception"] == "OutputNotFound"
         assert "unknown_id" in res.json()["description"], "The output_id should be in the message"
 
-        # test for links
+        # for links
         res = client.get(
             f"/v1/studies/{internal_study_id}/links/aggregate/mc-all/unknown_id",
             params={
@@ -789,6 +762,18 @@ def test_aggregation_with_wrong_output(self, client: TestClient, user_access_tok
         assert res.json()["exception"] == "OutputNotFound"
         assert "unknown_id" in res.json()["description"], "The output_id should be in the message"
 
+        # Asserts that an error 404 is raised when the `economy/mc-all` folder does not exist
+        mc_all_path = tmp_path.joinpath("ext_workspace/STA-mini/output/20241807-1540eco-extra-outputs/economy/mc-all")
+        # delete the folder
+        shutil.rmtree(mc_all_path)
+        res = client.get(
+            f"/v1/studies/{internal_study_id}/links/aggregate/mc-all/20241807-1540eco-extra-outputs",
+            params={"query_file": "values", "frequency": "daily"},
+        )
+        assert res.status_code == 404, res.json()
+        assert "economy/mc-all" in res.json()["description"]
+        assert res.json()["exception"] == "OutputSubFolderNotFound"
+
     def test_empty_columns(self, client: TestClient, user_access_token: str, internal_study_id: str):
         """
         Asserts that requests get an empty dataframe when columns are not existing
@@ -820,20 +805,36 @@ def test_empty_columns(self, client: TestClient, user_access_token: str, interna
         assert res.status_code == 200, res.json()
         assert res.content.strip() == b""
 
-    def test_non_existing_folder(
-        self, tmp_path: Path, client: TestClient, user_access_token: str, internal_study_id: str
+
+@pytest.mark.integration_test
+class TestRawDataAggregationColumnsFormatting:
+    def test_columns_formatting(
+        self, client: TestClient, user_access_token: str, internal_study_id: str, tmp_path: Path
     ):
         """
-        Test that an error 404 is raised when the `economy/mc-all` folder does not exist
+        Check returned columns names are post-processed
         """
         client.headers = {"Authorization": f"Bearer {user_access_token}"}
-        mc_all_path = tmp_path.joinpath("ext_workspace/STA-mini/output/20241807-1540eco-extra-outputs/economy/mc-all")
-        # delete the folder
-        shutil.rmtree(mc_all_path)
+
+        # Prepare output
+        output_id = "20201014-1422eco-hello"
+        output_path = (
+            tmp_path / "ext_workspace" / "STA-mini" / "output" / output_id / "economy" / "mc-all" / "areas" / "de"
+        )
+        matrix_path = ASSETS_DIR / "aggregate_areas_raw_data" / "details-STstorage-annual.txt"
+        shutil.copy(matrix_path, output_path)
+
+        # asserts STS column names are post-processed by the back-end
         res = client.get(
-            f"/v1/studies/{internal_study_id}/links/aggregate/mc-all/20241807-1540eco-extra-outputs",
-            params={"query_file": "values", "frequency": "daily"},
+            f"/v1/studies/{internal_study_id}/areas/aggregate/mc-all/{output_id}",
+            params={
+                "query_file": "details-STstorage",
+                "frequency": "annual",
+            },
         )
-        assert res.status_code == 404, res.json()
-        assert "economy/mc-all" in res.json()["description"]
-        assert res.json()["exception"] == "OutputSubFolderNotFound"
+        assert res.status_code == 200
+        content = io.BytesIO(res.content)
+        actual_df = pd.read_csv(content, sep=",")
+        expected_df_path = ASSETS_DIR / "aggregate_areas_raw_data" / "expected_result_sts.csv"
+        expected_df = pd.read_csv(expected_df_path, sep=",")
+        assert actual_df.equals(expected_df)

From bbd48d002bafb6496800b1214839a57a6cc01a92 Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:06:12 +0100
Subject: [PATCH 13/31] feat(ui-utils): add `validatePath` function in
 validation

---
 webapp/src/utils/validation/array.ts  |   1 -
 webapp/src/utils/validation/number.ts |   3 +-
 webapp/src/utils/validation/string.ts | 104 +++++++++++++++++++++++++-
 3 files changed, 103 insertions(+), 5 deletions(-)

diff --git a/webapp/src/utils/validation/array.ts b/webapp/src/utils/validation/array.ts
index d0edd43a15..98c7b50251 100644
--- a/webapp/src/utils/validation/array.ts
+++ b/webapp/src/utils/validation/array.ts
@@ -29,7 +29,6 @@ interface ArrayValidationOptions {
  * validateArray([1, 2, 3], { allowDuplicate: false }); // true
  * validateArray([1, 1, 2, 3], { allowDuplicate: false }); // Error message
  *
- *
  * @example <caption>With currying.</caption>
  * const fn = validateArray({ allowDuplicate: false });
  * fn([1, 2, 3]); // true
diff --git a/webapp/src/utils/validation/number.ts b/webapp/src/utils/validation/number.ts
index fd96c1502e..f975ef29ba 100644
--- a/webapp/src/utils/validation/number.ts
+++ b/webapp/src/utils/validation/number.ts
@@ -28,11 +28,10 @@ interface NumberValidationOptions {
  * validateNumber(5, { min: 0, max: 10 }); // true
  * validateNumber(9, { min: 10, max: 20 }); // Error message
  *
- *
  * @example <caption>With currying.</caption>
  * const fn = validateNumber({ min: 0, max: 10 });
  * fn(5); // true
- * fn(11); // Error message
+ * fn(9); // Error message
  *
  * @param value - The number to validate.
  * @param [options] - Configuration options for validation.
diff --git a/webapp/src/utils/validation/string.ts b/webapp/src/utils/validation/string.ts
index bd9bdef1e8..bf47d6775c 100644
--- a/webapp/src/utils/validation/string.ts
+++ b/webapp/src/utils/validation/string.ts
@@ -33,6 +33,15 @@ interface StringValidationOptions {
  * Validates the input string against a variety of checks including length restrictions,
  * character validations, and uniqueness against provided arrays of existing and excluded values.
  *
+ * @example
+ * validateString("foo", { allowSpaces: false }); // true
+ * validateNumber("foo bar", { allowSpaces: false }); // Error message
+ *
+ * @example <caption>With currying.</caption>
+ * const fn = validateString({ allowSpaces: false });
+ * fn("foo"); // true
+ * fn("foo bar"); // Error message
+ *
  * @param value - The string to validate. Leading and trailing spaces will be trimmed.
  * @param options - Configuration options for validation. (Optional)
  * @param [options.existingValues=[]] - An array of strings to check against for duplicates. Comparison is case-insensitive by default.
@@ -49,7 +58,22 @@ interface StringValidationOptions {
 export function validateString(
   value: string,
   options?: StringValidationOptions,
-): ValidationReturn {
+): ValidationReturn;
+
+export function validateString(
+  options?: StringValidationOptions,
+): (value: string) => ValidationReturn;
+
+export function validateString(
+  valueOrOpts?: string | StringValidationOptions,
+  options: StringValidationOptions = {},
+): ValidationReturn | ((value: string) => ValidationReturn) {
+  if (typeof valueOrOpts !== "string") {
+    return (v: string) => validateString(v, valueOrOpts);
+  }
+
+  const value = valueOrOpts;
+
   const {
     existingValues = [],
     excludedValues = [],
@@ -60,7 +84,7 @@ export function validateString(
     editedValue = "",
     minLength = 0,
     maxLength = 255,
-  } = options || {};
+  } = options;
 
   const trimmedValue = value.trim();
 
@@ -183,3 +207,79 @@ function generatePattern(
     allowSpecialChars && specialChars ? escapeSpecialChars(specialChars) : "";
   return basePattern + spacePattern + specialCharsPattern + "]*$";
 }
+
+interface PathValidationOptions {
+  allowToStartWithSlash?: boolean;
+  allowToEndWithSlash?: boolean;
+  allowEmpty?: boolean;
+}
+
+/**
+ * Validates a path against specified criteria.
+ *
+ * @example
+ * validatePath("foo/bar", { allowToEndWithSlash: false }); // true
+ * validatePath("foo/bar/", { allowToEndWithSlash: false }); // Error message
+ *
+ * @example <caption>With currying.</caption>
+ * const fn = validateString({ allowToEndWithSlash: false });
+ * fn("foo/bar"); // true
+ * fn("foo/bar/"); // Error message
+ *
+ * @param path - The string to validate.
+ * @param options - Configuration options for validation. (Optional)
+ * @param [options.allowToStartWithSlash=true] - Indicates if the path is allowed to start with a '/'.
+ * @param [options.allowToEndWithSlash=true] - Indicates if the path is allowed to end with a '/'.
+ * @param [options.allowEmpty=false] - Indicates if an empty path is allowed.
+ * @returns True if validation is successful, or a localized error message if it fails.
+ */
+export function validatePath(
+  path: string,
+  options?: PathValidationOptions,
+): ValidationReturn;
+
+export function validatePath(
+  options?: PathValidationOptions,
+): (value: string) => ValidationReturn;
+
+export function validatePath(
+  pathOrOpts?: string | PathValidationOptions,
+  options: PathValidationOptions = {},
+): ValidationReturn | ((value: string) => ValidationReturn) {
+  if (typeof pathOrOpts !== "string") {
+    return (v: string) => validatePath(v, pathOrOpts);
+  }
+
+  const path = pathOrOpts;
+
+  const {
+    allowToStartWithSlash = true,
+    allowToEndWithSlash = true,
+    allowEmpty = false,
+  } = options;
+
+  if (!path) {
+    return allowEmpty ? true : t("form.field.required");
+  }
+
+  if (!allowToStartWithSlash && path.startsWith("/")) {
+    return t("form.field.path.startWithSlashNotAllowed");
+  }
+
+  if (!allowToEndWithSlash && path.endsWith("/")) {
+    return t("form.field.path.endWithSlashNotAllowed");
+  }
+
+  if (
+    path
+      .replace(/^\//, "") // Remove first "/" if present
+      .replace(/\/$/, "") // Remove last "/" if present
+      .split("/")
+      .map((v) => v.trim())
+      .includes("")
+  ) {
+    return t("form.field.path.invalid");
+  }
+
+  return true;
+}

From e7496836c5088ae7b3c35dce14e928d6655ad4a6 Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:10:56 +0100
Subject: [PATCH 14/31] fix(ui-studies): small bottom part not visible with
 scroll

---
 .../App/Studies/StudiesList/index.tsx           |  7 ++-----
 webapp/src/components/App/Studies/StudyTree.tsx | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/webapp/src/components/App/Studies/StudiesList/index.tsx b/webapp/src/components/App/Studies/StudiesList/index.tsx
index a6c412e625..6d90785471 100644
--- a/webapp/src/components/App/Studies/StudiesList/index.tsx
+++ b/webapp/src/components/App/Studies/StudiesList/index.tsx
@@ -39,10 +39,7 @@ import { FixedSizeGrid, GridOnScrollProps } from "react-window";
 import { v4 as uuidv4 } from "uuid";
 import { AxiosError } from "axios";
 import { StudyMetadata } from "../../../../common/types";
-import {
-  STUDIES_HEIGHT_HEADER,
-  STUDIES_LIST_HEADER_HEIGHT,
-} from "../../../../theme";
+import { STUDIES_LIST_HEADER_HEIGHT } from "../../../../theme";
 import {
   setStudyScrollPosition,
   StudiesSortConf,
@@ -184,7 +181,7 @@ function StudiesList(props: StudiesListProps) {
 
   return (
     <Box
-      height={`calc(100vh - ${STUDIES_HEIGHT_HEADER}px)`}
+      height={1}
       flex={1}
       display="flex"
       flexDirection="column"
diff --git a/webapp/src/components/App/Studies/StudyTree.tsx b/webapp/src/components/App/Studies/StudyTree.tsx
index 638d475f50..7208caaec4 100644
--- a/webapp/src/components/App/Studies/StudyTree.tsx
+++ b/webapp/src/components/App/Studies/StudyTree.tsx
@@ -40,17 +40,17 @@ function StudyTree() {
   ////////////////////////////////////////////////////////////////
 
   const buildTree = (children: StudyTreeNode[], parentId?: string) => {
-    return children.map((elm) => {
-      const id = parentId ? `${parentId}/${elm.name}` : elm.name;
+    return children.map((child) => {
+      const id = parentId ? `${parentId}/${child.name}` : child.name;
 
       return (
         <TreeItemEnhanced
           key={id}
           itemId={id}
-          label={elm.name}
+          label={child.name}
           onClick={() => handleTreeItemClick(id)}
         >
-          {buildTree(elm.children, id)}
+          {buildTree(child.children, id)}
         </TreeItemEnhanced>
       );
     });
@@ -60,7 +60,14 @@ function StudyTree() {
     <SimpleTreeView
       defaultExpandedItems={[...getParentPaths(folder), folder]}
       defaultSelectedItems={folder}
-      sx={{ flexGrow: 1, height: 0, width: 1, py: 1 }}
+      sx={{
+        flexGrow: 1,
+        height: 0,
+        overflowY: "auto",
+        overflowX: "hidden",
+        width: 1,
+        py: 1,
+      }}
     >
       {buildTree([studiesTree])}
     </SimpleTreeView>

From 68c49fac25305f082062671e4860bad3b54892c5 Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:11:56 +0100
Subject: [PATCH 15/31] refactor(ui-studies): function to build tree

---
 webapp/src/components/App/Studies/utils.ts | 75 +++++++++++-----------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/webapp/src/components/App/Studies/utils.ts b/webapp/src/components/App/Studies/utils.ts
index dc2d1c5396..3f2ff61564 100644
--- a/webapp/src/components/App/Studies/utils.ts
+++ b/webapp/src/components/App/Studies/utils.ts
@@ -20,46 +20,45 @@ export interface StudyTreeNode {
   children: StudyTreeNode[];
 }
 
-const nodeProcess = (
-  tree: StudyTreeNode,
-  path: string[],
-  folderPath: string,
-): void => {
-  const { children } = tree;
-  if (path.length === 1) {
-    return;
-  }
-  const element = path.pop() || "";
-  const index = children.findIndex(
-    (elm: StudyTreeNode) => elm.name === element,
-  );
-  const newFolderPath = `${folderPath}/${element}`;
-  if (index < 0) {
-    children.push({ name: element, children: [], path: newFolderPath });
-    nodeProcess(
-      children[children.length - 1] as StudyTreeNode,
-      path,
-      newFolderPath,
-    );
-  } else {
-    nodeProcess(children[index] as StudyTreeNode, path, newFolderPath);
-  }
-};
-
-export const buildStudyTree = (studies: StudyMetadata[]): StudyTreeNode => {
+/**
+ * Builds a tree structure from a list of study metadata.
+ *
+ * @param studies - Array of study metadata objects.
+ * @returns A tree structure representing the studies.
+ */
+export function buildStudyTree(studies: StudyMetadata[]) {
   const tree: StudyTreeNode = { name: "root", children: [], path: "" };
-  let path: string[] = [];
+
   for (const study of studies) {
-    if (study.folder !== undefined && study.folder !== null) {
-      path = [
-        study.workspace,
-        ...(study.folder as string).split("/").filter((elm) => elm !== ""),
-      ];
-    } else {
-      path = [study.workspace];
+    const path =
+      typeof study.folder === "string"
+        ? [study.workspace, ...study.folder.split("/").filter(Boolean)]
+        : [study.workspace];
+
+    let current = tree;
+
+    for (let i = 0; i < path.length; i++) {
+      // Skip the last folder, as it represents the study itself
+      if (i === path.length - 1) {
+        break;
+      }
+
+      const folderName = path[i];
+      let child = current.children.find((child) => child.name === folderName);
+
+      if (!child) {
+        child = {
+          name: folderName,
+          children: [],
+          path: current.path ? `${current.path}/${folderName}` : folderName,
+        };
+
+        current.children.push(child);
+      }
+
+      current = child;
     }
-    path.reverse();
-    nodeProcess(tree, path, "");
   }
+
   return tree;
-};
+}

From 373f8942f0f16df93daee3e9335a6abe01de8556 Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:12:53 +0100
Subject: [PATCH 16/31] feat(ui-studies): update validation in MoveStudyDialog

ANT-2390
---
 webapp/public/locales/en/main.json            |  8 +-
 webapp/public/locales/fr/main.json            |  8 +-
 .../App/Studies/MoveStudyDialog.tsx           | 96 +++++++++++--------
 webapp/src/services/api/study.ts              | 13 ++-
 4 files changed, 71 insertions(+), 54 deletions(-)

diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json
index df948d3920..98abe54461 100644
--- a/webapp/public/locales/en/main.json
+++ b/webapp/public/locales/en/main.json
@@ -78,6 +78,7 @@
   "global.status": "Status",
   "global.semicolon": "Semicolon",
   "global.language": "Language",
+  "global.path": "Path",
   "global.time.hourly": "Hourly",
   "global.time.daily": "Daily",
   "global.time.weekly": "Weekly",
@@ -154,6 +155,9 @@
   "form.field.requireUppercase": "Must contain at least one uppercase letter.",
   "form.field.requireDigit": "Must contain at least one digit.",
   "form.field.requireSpecialChars": "Must contain at least one special character.",
+  "form.field.path.startWithSlashNotAllowed": "Path must not start with a '/'",
+  "form.field.path.endWithSlashNotAllowed": "Path must not end with a '/'",
+  "form.field.path.invalid": "Invalid path",
   "matrix.graphSelector": "Columns",
   "matrix.message.importHint": "Click or drag and drop a matrix here",
   "matrix.importNewMatrix": "Import a new matrix",
@@ -620,7 +624,6 @@
   "studies.error.loadStudy": "Failed to load study",
   "studies.error.runStudy": "Failed to run study",
   "studies.error.scanFolder": "Failed to start folder scan",
-  "studies.error.moveStudy": "Failed to move study {{study}}",
   "studies.error.saveData": "Failed to save data",
   "studies.error.copyStudy": "Failed to copy study",
   "studies.error.import": "Failed to import Study ({{uploadFile}})",
@@ -631,11 +634,10 @@
   "studies.error.createStudy": "Failed to create Study {{studyname}}",
   "studies.success.saveData": "Data saved with success",
   "studies.success.scanFolder": "Folder scan started",
-  "studies.success.moveStudy": "Study {{study}} was successfully moved to {{folder}}",
+  "studies.success.moveStudy": "Study '{{study}}' was successfully moved to '{{path}}'",
   "studies.success.createStudy": "Study {{studyname}} created successfully",
   "studies.studylaunched": "{{studyname}} launched!",
   "studies.copySuffix": "Copy",
-  "studies.folder": "Folder",
   "studies.filters.strictfolder": "Show only direct folder children",
   "studies.scanFolder": "Scan folder",
   "studies.moveStudy": "Move",
diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json
index 3dacacb6e0..8e64c877be 100644
--- a/webapp/public/locales/fr/main.json
+++ b/webapp/public/locales/fr/main.json
@@ -78,6 +78,7 @@
   "global.status": "Statut",
   "global.semicolon": "Point-virgule",
   "global.language": "Langue",
+  "global.path": "Chemin",
   "global.time.hourly": "Horaire",
   "global.time.daily": "Journalier",
   "global.time.weekly": "Hebdomadaire",
@@ -154,6 +155,9 @@
   "form.field.requireUppercase": "Doit contenir au moins une lettre majuscule.",
   "form.field.requireDigit": "Doit contenir au moins un chiffre.",
   "form.field.requireSpecialChars": "Doit contenir au moins un caractère spécial.",
+  "form.field.path.startWithSlashNotAllowed": "Le chemin ne doit pas commencer par un '/'",
+  "form.field.path.endWithSlashNotAllowed": "Le chemin ne doit pas finir par un '/'",
+  "form.field.path.invalid": "Chemin invalide",
   "matrix.graphSelector": "Colonnes",
   "matrix.message.importHint": "Cliquer ou glisser une matrice ici",
   "matrix.importNewMatrix": "Import d'une nouvelle matrice",
@@ -620,7 +624,6 @@
   "studies.error.loadStudy": "Échec du chargement de l'étude",
   "studies.error.runStudy": "Échec du lancement de l'étude",
   "studies.error.scanFolder": "Échec du lancement du scan",
-  "studies.error.moveStudy": "Échec du déplacement de l'étude {{study}}",
   "studies.error.saveData": "Erreur lors de la sauvegarde des données",
   "studies.error.copyStudy": "Erreur lors de la copie de l'étude",
   "studies.error.import": "L'import de l'étude a échoué ({{uploadFile}})",
@@ -631,11 +634,10 @@
   "studies.error.createStudy": "Erreur lors de la création de l'étude {{studyname}}",
   "studies.success.saveData": "Donnée sauvegardée avec succès",
   "studies.success.scanFolder": "L'analyse du dossier a commencé",
-  "studies.success.moveStudy": "L'étude {{study}} a été déplacée avec succès vers {{folder}}",
+  "studies.success.moveStudy": "L'étude \"{{study}}\" a été déplacée avec succès vers \"{{path}}\"",
   "studies.success.createStudy": "L'étude {{studyname}} a été crée avec succès",
   "studies.studylaunched": "{{studyname}} lancé(s) !",
   "studies.copySuffix": "Copie",
-  "studies.folder": "Dossier",
   "studies.filters.strictfolder": "Afficher uniquement les descendants directs",
   "studies.scanFolder": "Scanner le dossier",
   "studies.moveStudy": "Déplacer",
diff --git a/webapp/src/components/App/Studies/MoveStudyDialog.tsx b/webapp/src/components/App/Studies/MoveStudyDialog.tsx
index e3698438a5..ff9687f8af 100644
--- a/webapp/src/components/App/Studies/MoveStudyDialog.tsx
+++ b/webapp/src/components/App/Studies/MoveStudyDialog.tsx
@@ -13,17 +13,40 @@
  */
 
 import { DialogProps } from "@mui/material";
-import TextField from "@mui/material/TextField";
 import { useSnackbar } from "notistack";
-import * as R from "ramda";
 import { useTranslation } from "react-i18next";
-import { usePromise } from "react-use";
 import { StudyMetadata } from "../../../common/types";
-import useEnqueueErrorSnackbar from "../../../hooks/useEnqueueErrorSnackbar";
 import { moveStudy } from "../../../services/api/study";
-import { isStringEmpty } from "../../../services/utils";
 import FormDialog from "../../common/dialogs/FormDialog";
 import { SubmitHandlerPlus } from "../../common/Form/types";
+import StringFE from "@/components/common/fieldEditors/StringFE";
+import * as R from "ramda";
+import { validatePath } from "@/utils/validation/string";
+
+function formalizePath(
+  path: string | undefined,
+  studyId?: StudyMetadata["id"],
+) {
+  const trimmedPath = path?.trim();
+
+  if (!trimmedPath) {
+    return "";
+  }
+
+  const pathArray = trimmedPath.split("/").filter(Boolean);
+
+  if (studyId) {
+    const lastFolder = R.last(pathArray);
+
+    // The API automatically add the study ID to a not empty path when moving a study.
+    // So we need to remove it from the display path.
+    if (lastFolder === studyId) {
+      return pathArray.slice(0, -1).join("/");
+    }
+  }
+
+  return pathArray.join("/");
+}
 
 interface Props extends DialogProps {
   study: StudyMetadata;
@@ -33,36 +56,35 @@ interface Props extends DialogProps {
 function MoveStudyDialog(props: Props) {
   const { study, open, onClose } = props;
   const [t] = useTranslation();
-  const mounted = usePromise();
   const { enqueueSnackbar } = useSnackbar();
-  const enqueueErrorSnackbar = useEnqueueErrorSnackbar();
+
   const defaultValues = {
-    folder: R.join("/", R.dropLast(1, R.split("/", study.folder || ""))),
+    path: formalizePath(study.folder, study.id),
   };
 
   ////////////////////////////////////////////////////////////////
   // Event Handlers
   ////////////////////////////////////////////////////////////////
 
-  const handleSubmit = async (
+  const handleSubmit = (data: SubmitHandlerPlus<typeof defaultValues>) => {
+    const path = formalizePath(data.values.path);
+    return moveStudy(study.id, path);
+  };
+
+  const handleSubmitSuccessful = (
     data: SubmitHandlerPlus<typeof defaultValues>,
   ) => {
-    const { folder } = data.values;
-    try {
-      await mounted(moveStudy(study.id, folder));
-      enqueueSnackbar(
-        t("studies.success.moveStudy", { study: study.name, folder }),
-        {
-          variant: "success",
-        },
-      );
-      onClose();
-    } catch (e) {
-      enqueueErrorSnackbar(
-        t("studies.error.moveStudy", { study: study.name }),
-        e as Error,
-      );
-    }
+    onClose();
+
+    enqueueSnackbar(
+      t("studies.success.moveStudy", {
+        study: study.name,
+        path: data.values.path || "/", // Empty path move the study to the root
+      }),
+      {
+        variant: "success",
+      },
+    );
   };
 
   ////////////////////////////////////////////////////////////////
@@ -74,27 +96,19 @@ function MoveStudyDialog(props: Props) {
       open={open}
       config={{ defaultValues }}
       onSubmit={handleSubmit}
+      onSubmitSuccessful={handleSubmitSuccessful}
       onCancel={onClose}
     >
-      {(formObj) => (
-        <TextField
+      {({ control }) => (
+        <StringFE
+          name="path"
+          control={control}
+          rules={{ validate: validatePath({ allowEmpty: true }) }}
+          label={t("global.path")}
+          placeholder={t("studies.movefolderplaceholder")}
           sx={{ mx: 0 }}
           autoFocus
-          label={t("studies.folder")}
-          error={!!formObj.formState.errors.folder}
-          helperText={formObj.formState.errors.folder?.message}
-          placeholder={t("studies.movefolderplaceholder") as string}
-          InputLabelProps={
-            // Allow to show placeholder when field is empty
-            formObj.formState.defaultValues?.folder ? { shrink: true } : {}
-          }
           fullWidth
-          {...formObj.register("folder", {
-            required: t("form.field.required") as string,
-            validate: (value) => {
-              return !isStringEmpty(value);
-            },
-          })}
         />
       )}
     </FormDialog>
diff --git a/webapp/src/services/api/study.ts b/webapp/src/services/api/study.ts
index 8750b177f4..53d4a67925 100644
--- a/webapp/src/services/api/study.ts
+++ b/webapp/src/services/api/study.ts
@@ -13,7 +13,7 @@
  */
 
 import { AxiosRequestConfig } from "axios";
-import { isBoolean, trimCharsStart } from "ramda-adjunct";
+import * as RA from "ramda-adjunct";
 import client from "./client";
 import {
   FileStudyTreeConfigDTO,
@@ -135,7 +135,7 @@ export const editStudy = async (
   depth = 1,
 ): Promise<void> => {
   let formattedData: unknown = data;
-  if (isBoolean(data)) {
+  if (RA.isBoolean(data)) {
     formattedData = JSON.stringify(data);
   }
   const res = await client.post(
@@ -163,11 +163,10 @@ export const copyStudy = async (
   return res.data;
 };
 
-export const moveStudy = async (sid: string, folder: string): Promise<void> => {
-  const folderWithId = trimCharsStart("/", `${folder.trim()}/${sid}`);
-  await client.put(
-    `/v1/studies/${sid}/move?folder_dest=${encodeURIComponent(folderWithId)}`,
-  );
+export const moveStudy = async (studyId: string, folder: string) => {
+  await client.put(`/v1/studies/${studyId}/move`, null, {
+    params: { folder_dest: folder },
+  });
 };
 
 export const archiveStudy = async (sid: string): Promise<void> => {

From 6d454f4aac26d3c4b09230333307d0d81e94802a Mon Sep 17 00:00:00 2001
From: belthlemar <martin.belthle@rte-france.com>
Date: Thu, 5 Dec 2024 11:40:04 +0100
Subject: [PATCH 17/31] feat(move): adapt back-end code and add tests

---
 antarest/study/service.py                     |  6 ++-
 .../variantstudy/variant_study_service.py     |  2 +-
 .../studies_blueprint/test_move.py            | 51 +++++++++++++++++++
 tests/integration/test_integration.py         |  3 +-
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 tests/integration/studies_blueprint/test_move.py

diff --git a/antarest/study/service.py b/antarest/study/service.py
index 7e1198c6b7..71d4bc3881 100644
--- a/antarest/study/service.py
+++ b/antarest/study/service.py
@@ -1073,11 +1073,15 @@ def copy_task(notifier: ITaskNotifier) -> TaskResult:
 
         return task_or_study_id
 
-    def move_study(self, study_id: str, new_folder: str, params: RequestParameters) -> None:
+    def move_study(self, study_id: str, folder_dest: str, params: RequestParameters) -> None:
         study = self.get_study(study_id)
         assert_permission(params.user, study, StudyPermissionType.WRITE)
         if not is_managed(study):
             raise NotAManagedStudyException(study_id)
+        if folder_dest:
+            new_folder = folder_dest.rstrip("/") + f"/{study.id}"
+        else:
+            new_folder = None
         study.folder = new_folder
         self.repository.save(study, update_modification_date=False)
         self.event_bus.push(
diff --git a/antarest/study/storage/variantstudy/variant_study_service.py b/antarest/study/storage/variantstudy/variant_study_service.py
index a57b7f1b2f..37493be684 100644
--- a/antarest/study/storage/variantstudy/variant_study_service.py
+++ b/antarest/study/storage/variantstudy/variant_study_service.py
@@ -610,7 +610,7 @@ def create_variant_study(self, uuid: str, name: str, params: RequestParameters)
             created_at=datetime.utcnow(),
             updated_at=datetime.utcnow(),
             version=study.version,
-            folder=(re.sub(f"/?{study.id}", "", study.folder) if study.folder is not None else None),
+            folder=(re.sub(study.id, new_id, study.folder) if study.folder is not None else None),
             groups=study.groups,  # Create inherit_group boolean
             owner_id=params.user.impersonator if params.user else None,
             snapshot=None,
diff --git a/tests/integration/studies_blueprint/test_move.py b/tests/integration/studies_blueprint/test_move.py
new file mode 100644
index 0000000000..83defc9aad
--- /dev/null
+++ b/tests/integration/studies_blueprint/test_move.py
@@ -0,0 +1,51 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
+from starlette.testclient import TestClient
+
+
+class TestMove:
+    def test_move_endpoint(self, client: TestClient, internal_study_id: str, user_access_token: str) -> None:
+        client.headers = {"Authorization": f"Bearer {user_access_token}"}
+
+        res = client.post("/v1/studies?name=study_test")
+        assert res.status_code == 201
+        study_id = res.json()
+
+        # asserts move with a given folder adds the /study_id at the end of the path
+        res = client.put(f"/v1/studies/{study_id}/move", params={"folder_dest": "folder1"})
+        res.raise_for_status()
+        res = client.get(f"/v1/studies/{study_id}")
+        assert res.json()["folder"] == f"folder1/{study_id}"
+
+        # asserts move to a folder with //// removes the unwanted `/`
+        res = client.put(f"/v1/studies/{study_id}/move", params={"folder_dest": "folder2///////"})
+        res.raise_for_status()
+        res = client.get(f"/v1/studies/{study_id}")
+        assert res.json()["folder"] == f"folder2/{study_id}"
+
+        # asserts the created variant has the same parent folder
+        res = client.post(f"/v1/studies/{study_id}/variants?name=Variant1")
+        variant_id = res.json()
+        res = client.get(f"/v1/studies/{variant_id}")
+        assert res.json()["folder"] == f"folder2/{variant_id}"
+
+        # asserts move doesn't work on un-managed studies
+        res = client.put(f"/v1/studies/{internal_study_id}/move", params={"folder_dest": "folder1"})
+        assert res.status_code == 422
+        assert res.json()["exception"] == "NotAManagedStudyException"
+
+        # asserts users can put back a study at the root folder
+        res = client.put(f"/v1/studies/{study_id}/move", params={"folder_dest": ""})
+        res.raise_for_status()
+        res = client.get(f"/v1/studies/{study_id}")
+        assert res.json()["folder"] is None
diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py
index 27cb8cf78a..0f691d733f 100644
--- a/tests/integration/test_integration.py
+++ b/tests/integration/test_integration.py
@@ -207,7 +207,8 @@ def test_main(client: TestClient, admin_access_token: str) -> None:
         headers={"Authorization": f'Bearer {george_credentials["access_token"]}'},
     )
     assert len(res.json()) == 3
-    assert filter(lambda s: s["id"] == copied.json(), res.json().values()).__next__()["folder"] == "foo/bar"
+    moved_study = filter(lambda s: s["id"] == copied.json(), res.json().values()).__next__()
+    assert moved_study["folder"] == f"foo/bar/{moved_study['id']}"
 
     # Study delete
     client.delete(

From 6ae24ef2182935b57d10c0d93a26b669b134a53e Mon Sep 17 00:00:00 2001
From: Hatim Dinia <33469289+hdinia@users.noreply.github.com>
Date: Tue, 17 Dec 2024 11:59:12 +0100
Subject: [PATCH 18/31] fix(ui-results): resolve data misalignment in matrix
 column filtering (#2269)

---
 .../Results/ResultDetails/ResultFilters.tsx   | 83 +++++++++++--------
 .../explore/Results/ResultDetails/index.tsx   | 44 ++++++++--
 2 files changed, 86 insertions(+), 41 deletions(-)

diff --git a/webapp/src/components/App/Singlestudy/explore/Results/ResultDetails/ResultFilters.tsx b/webapp/src/components/App/Singlestudy/explore/Results/ResultDetails/ResultFilters.tsx
index fac74da93c..5e460b5d3e 100644
--- a/webapp/src/components/App/Singlestudy/explore/Results/ResultDetails/ResultFilters.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Results/ResultDetails/ResultFilters.tsx
@@ -62,7 +62,7 @@ interface Props {
   studyId: string;
   path: string;
   colHeaders: string[][];
-  onColHeadersChange: (colHeaders: string[][]) => void;
+  onColHeadersChange: (colHeaders: string[][], indices: number[]) => void;
 }
 
 function ResultFilters({
@@ -104,48 +104,61 @@ function ResultFilters({
     );
   }, [colHeaders]);
 
-  useEffect(() => {
-    const filteredHeaders = parsedHeaders.filter((header) => {
-      // Apply search filters
-      if (filters.search) {
-        const matchesVariable = matchesSearchTerm(
-          header.variable,
-          filters.search,
-        );
+  // Process headers while keeping track of their original positions
+  // This ensures we can properly filter the data matrix later
+  // Example: if we filter out column 1, we need to know that column 2
+  // becomes column 1 in the filtered view but maps to index 2 in the data
+  const filteredHeaders = useMemo(() => {
+    return parsedHeaders
+      .map((header, index) => ({ ...header, index }))
+      .filter((header) => {
+        // Apply search filter
+        if (filters.search) {
+          const matchesVariable = matchesSearchTerm(
+            header.variable,
+            filters.search,
+          );
 
-        const matchesUnit = matchesSearchTerm(header.unit, filters.search);
+          const matchesUnit = matchesSearchTerm(header.unit, filters.search);
 
-        if (!matchesVariable && !matchesUnit) {
-          return false;
+          if (!matchesVariable && !matchesUnit) {
+            return false;
+          }
         }
-      }
 
-      // Apply stat filters
-      if (header.stat) {
-        const stat = header.stat.toLowerCase();
+        // Apply statistical filters
+        if (header.stat) {
+          const stat = header.stat.toLowerCase();
 
-        if (!filters.exp && stat.includes("exp")) {
-          return false;
-        }
-        if (!filters.min && stat.includes("min")) {
-          return false;
-        }
-        if (!filters.max && stat.includes("max")) {
-          return false;
-        }
-        if (!filters.std && stat.includes("std")) {
-          return false;
+          if (!filters.exp && stat.includes("exp")) {
+            return false;
+          }
+          if (!filters.min && stat.includes("min")) {
+            return false;
+          }
+          if (!filters.max && stat.includes("max")) {
+            return false;
+          }
+          if (!filters.std && stat.includes("std")) {
+            return false;
+          }
+          if (!filters.values && stat.includes("values")) {
+            return false;
+          }
         }
-        if (!filters.values && stat.includes("values")) {
-          return false;
-        }
-      }
 
-      return true;
-    });
+        return true;
+      });
+  }, [filters, parsedHeaders]);
 
-    onColHeadersChange(filteredHeaders.map((h) => h.original));
-  }, [filters, parsedHeaders, onColHeadersChange]);
+  // Notify parent of both filtered headers and their original indices
+  // This allows the parent to correctly map the filtered view back to the original data
+  useEffect(() => {
+    onColHeadersChange(
+      filteredHeaders.map((h) => h.original),
+      filteredHeaders.map((h) => h.index),
+    );
+  }, [filteredHeaders, onColHeadersChange]);
 
   ////////////////////////////////////////////////////////////////
   // Event handlers
diff --git a/webapp/src/components/App/Singlestudy/explore/Results/ResultDetails/index.tsx b/webapp/src/components/App/Singlestudy/explore/Results/ResultDetails/index.tsx
index 3aaaf4509b..1814bd876d 100644
--- a/webapp/src/components/App/Singlestudy/explore/Results/ResultDetails/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Results/ResultDetails/index.tsx
@@ -68,6 +68,8 @@ import { getStudyMatrixIndex } from "../../../../../../services/api/matrix.ts";
 import { MatrixGridSynthesis } from "@/components/common/Matrix/components/MatrixGridSynthesis";
 import { ResultMatrixDTO } from "@/components/common/Matrix/shared/types.ts";
 
+type SetResultColHeaders = (headers: string[][], indices: number[]) => void;
+
 function ResultDetails() {
   const { study } = useOutletContext<{ study: StudyMetadata }>();
   const { outputId } = useParams();
@@ -84,7 +86,11 @@ function ResultDetails() {
   const [itemType, setItemType] = useState(OutputItemType.Areas);
   const [selectedItemId, setSelectedItemId] = useState("");
   const [searchValue, setSearchValue] = useState("");
+  // Store filtered headers and their original indices separately
+  // This allows us to correctly map the data rows to their corresponding headers
+  // when some columns are filtered out
   const [resultColHeaders, setResultColHeaders] = useState<string[][]>([]);
+  const [headerIndices, setHeaderIndices] = useState<number[]>([]);
   const isSynthesis = itemType === OutputItemType.Synthesis;
   const { t } = useTranslation();
   const navigate = useNavigate();
@@ -143,16 +149,24 @@ function ResultDetails() {
       }
 
       const res = await getStudyData(study.id, path);
-      // TODO add backend parse
+
       if (typeof res === "string") {
         const fixed = res
           .replace(/NaN/g, '"NaN"')
           .replace(/Infinity/g, '"Infinity"');
 
-        return JSON.parse(fixed);
+        const parsed = JSON.parse(fixed);
+
+        return {
+          ...parsed,
+          indices: Array.from({ length: parsed.columns.length }, (_, i) => i),
+        };
       }
 
-      return res;
+      return {
+        ...res,
+        indices: Array.from({ length: res.columns.length }, (_, i) => i),
+      };
     },
     {
       resetDataOnReload: true,
@@ -161,6 +175,19 @@ function ResultDetails() {
     },
   );
 
+  // Transform the matrix data by keeping only the columns that match our filters
+  // headerIndices contains the original positions of our kept columns, ensuring
+  // the data stays aligned with its corresponding headers
+  const filteredData = useMemo(() => {
+    if (!matrixRes.data) {
+      return [];
+    }
+
+    return matrixRes.data.data.map((row) => {
+      return headerIndices.map((index) => row[index]);
+    });
+  }, [matrixRes.data, headerIndices]);
+
   const synthesisRes = usePromise(
     () => {
       if (outputId && selectedItem && isSynthesis) {
@@ -213,6 +240,11 @@ function ResultDetails() {
     }
   };
 
+  const handleColHeadersChange: SetResultColHeaders = (headers, indices) => {
+    setResultColHeaders(headers);
+    setHeaderIndices(indices);
+  };
+
   ////////////////////////////////////////////////////////////////
   // JSX
   ////////////////////////////////////////////////////////////////
@@ -295,7 +327,7 @@ function ResultDetails() {
               studyId={study.id}
               path={path}
               colHeaders={matrixRes.data?.columns || []}
-              onColHeadersChange={setResultColHeaders}
+              onColHeadersChange={handleColHeadersChange}
             />
             <UsePromiseCond
               response={mergeResponses(outputRes, matrixRes)}
@@ -313,8 +345,8 @@ function ResultDetails() {
                     ) : (
                       <MatrixGrid
                         key={`grid-${resultColHeaders.length}`}
-                        data={matrix.data}
-                        rows={matrix.data.length}
+                        data={filteredData}
+                        rows={filteredData.length}
                         columns={resultColumns}
                         dateTime={dateTime}
                         readOnly

From ad70926f3eefbae3d10a3fd1d39147761433d1da Mon Sep 17 00:00:00 2001
From: mabw-rte <41002227+mabw-rte@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:58:27 +0100
Subject: [PATCH 19/31] feat(raw-api): add an endpoint to retrieve files in
 their original format (#2244)

Co-authored-by: belthlemar <martin.belthle@rte-france.com>
---
 antarest/core/exceptions.py                   |   5 +
 antarest/core/swagger.py                      |   7 +-
 antarest/core/utils/archives.py               |  25 +-
 antarest/study/business/matrix_management.py  |   5 +-
 antarest/study/common/studystorage.py         |  18 +
 antarest/study/service.py                     |  26 +-
 .../study/storage/abstract_storage_service.py |  27 +-
 .../rawstudy/model/filesystem/folder_node.py  |   8 +-
 .../rawstudy/model/filesystem/inode.py        |  25 +-
 .../rawstudy/model/filesystem/lazy_node.py    |   1 -
 .../filesystem/matrix/input_series_matrix.py  |  67 ++-
 .../model/filesystem/matrix/matrix.py         |  25 +-
 .../generate_thermal_cluster_timeseries.py    |  19 +-
 .../variantstudy/variant_study_service.py     |  24 +
 antarest/study/web/raw_studies_blueprint.py   |  61 +-
 .../test_fetch_raw_data.py                    | 522 +++++++++++-------
 .../filesystem/matrix/test_matrix_node.py     |  17 +-
 17 files changed, 598 insertions(+), 284 deletions(-)

diff --git a/antarest/core/exceptions.py b/antarest/core/exceptions.py
index d41d04d9cf..d6c392b9cf 100644
--- a/antarest/core/exceptions.py
+++ b/antarest/core/exceptions.py
@@ -688,6 +688,11 @@ def __init__(self, message: str) -> None:
         super().__init__(HTTPStatus.NOT_FOUND, message)
 
 
+class PathIsAFolderError(HTTPException):
+    def __init__(self, message: str) -> None:
+        super().__init__(HTTPStatus.UNPROCESSABLE_ENTITY, message)
+
+
 class WorkspaceNotFound(HTTPException):
     """
     This will be raised when we try to load a workspace that does not exist
diff --git a/antarest/core/swagger.py b/antarest/core/swagger.py
index 3d1b62441a..047f6c4809 100644
--- a/antarest/core/swagger.py
+++ b/antarest/core/swagger.py
@@ -10,9 +10,10 @@
 #
 # This file is part of the Antares project.
 
-from typing import Any, List, Tuple
+import typing as t
 
 from fastapi import FastAPI
+from fastapi.openapi.models import Example
 from fastapi.routing import APIRoute
 
 sim = "{sim} = simulation index <br/>"
@@ -21,7 +22,7 @@
 attachment = "User-defined file attachment <br/>"
 
 # noinspection SpellCheckingInspection
-urls: List[Tuple[str, str]] = [
+urls: t.List[t.Tuple[str, str]] = [
     ("layers/layers", ""),
     ("settings/generaldata", ""),
     ("output/{sim}/about-the-study/parameters", sim),
@@ -41,7 +42,7 @@
 ]
 
 
-def get_path_examples() -> Any:
+def get_path_examples() -> t.Dict[str, Example]:
     return {url: {"value": url, "description": des} for url, des in urls}
 
 
diff --git a/antarest/core/utils/archives.py b/antarest/core/utils/archives.py
index 2356653b78..d12082a835 100644
--- a/antarest/core/utils/archives.py
+++ b/antarest/core/utils/archives.py
@@ -145,7 +145,7 @@ def extract_file_to_tmp_dir(archive_path: Path, inside_archive_path: Path) -> t.
     return path, tmp_dir
 
 
-def read_file_from_archive(archive_path: Path, posix_path: str) -> str:
+def read_original_file_in_archive(archive_path: Path, posix_path: str) -> bytes:
     """
     Read a file from an archive.
 
@@ -154,21 +154,36 @@ def read_file_from_archive(archive_path: Path, posix_path: str) -> str:
         posix_path: path to the file inside the archive.
 
     Returns:
-        The content of the file as a string.
+        The content of the file as `bytes`.
     """
 
     if archive_path.suffix == ArchiveFormat.ZIP:
         with zipfile.ZipFile(archive_path) as zip_obj:
             with zip_obj.open(posix_path) as f:
-                return f.read().decode("utf-8")
+                return f.read()
     elif archive_path.suffix == ArchiveFormat.SEVEN_ZIP:
         with py7zr.SevenZipFile(archive_path, mode="r") as szf:
-            file_text: str = szf.read([posix_path])[posix_path].read().decode("utf-8")
-            return file_text
+            output: bytes = szf.read([posix_path])[posix_path].read()
+            return output
     else:
         raise ValueError(f"Unsupported {archive_path.suffix} archive format for {archive_path}")
 
 
+def read_file_from_archive(archive_path: Path, posix_path: str) -> str:
+    """
+    Read a file from an archive.
+
+    Args:
+        archive_path: the path to the archive file.
+        posix_path: path to the file inside the archive.
+
+    Returns:
+        The content of the file as a string.
+    """
+
+    return read_original_file_in_archive(archive_path, posix_path).decode("utf-8")
+
+
 def extract_lines_from_archive(root: Path, posix_path: str) -> t.List[str]:
     """
     Extract text lines from various types of files.
diff --git a/antarest/study/business/matrix_management.py b/antarest/study/business/matrix_management.py
index fcdfc07eb8..a80034b603 100644
--- a/antarest/study/business/matrix_management.py
+++ b/antarest/study/business/matrix_management.py
@@ -252,10 +252,7 @@ def update_matrix(
 
         try:
             logger.info(f"Loading matrix data from node '{path}'...")
-            matrix_df = cast(
-                pd.DataFrame,
-                matrix_node.parse(return_dataframe=True),
-            )
+            matrix_df = matrix_node.parse_as_dataframe()
         except ValueError as exc:
             raise MatrixManagerError(f"Cannot parse matrix: {exc}") from exc
 
diff --git a/antarest/study/common/studystorage.py b/antarest/study/common/studystorage.py
index 906564da35..cedb352051 100644
--- a/antarest/study/common/studystorage.py
+++ b/antarest/study/common/studystorage.py
@@ -20,6 +20,7 @@
 from antarest.study.model import Study, StudyMetadataDTO, StudyMetadataPatchDTO, StudySimResultDTO
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfigDTO
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
+from antarest.study.storage.rawstudy.model.filesystem.inode import OriginalFile
 
 T = t.TypeVar("T", bound=Study)
 
@@ -56,6 +57,23 @@ def get(
 
         """
 
+    @abstractmethod
+    def get_file(
+        self,
+        metadata: T,
+        url: str = "",
+    ) -> OriginalFile:
+        """
+        Entry point to fetch for a specific file inside a study folder
+
+        Args:
+            metadata: study
+            url: path data inside study to reach the file
+
+        Returns: study file content and extension
+
+        """
+
     @abstractmethod
     def exists(self, metadata: T) -> bool:
         """
diff --git a/antarest/study/service.py b/antarest/study/service.py
index 71d4bc3881..3e198addb3 100644
--- a/antarest/study/service.py
+++ b/antarest/study/service.py
@@ -134,7 +134,7 @@
 from antarest.study.storage.matrix_profile import adjust_matrix_columns_index
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfigDTO
 from antarest.study.storage.rawstudy.model.filesystem.ini_file_node import IniFileNode
-from antarest.study.storage.rawstudy.model.filesystem.inode import INode
+from antarest.study.storage.rawstudy.model.filesystem.inode import INode, OriginalFile
 from antarest.study.storage.rawstudy.model.filesystem.matrix.input_series_matrix import InputSeriesMatrix
 from antarest.study.storage.rawstudy.model.filesystem.matrix.matrix import MatrixFrequency
 from antarest.study.storage.rawstudy.model.filesystem.matrix.output_series_matrix import OutputSeriesMatrix
@@ -451,6 +451,30 @@ def get(
 
         return self.storage_service.get_storage(study).get(study, url, depth, formatted)
 
+    def get_file(
+        self,
+        uuid: str,
+        url: str,
+        params: RequestParameters,
+    ) -> OriginalFile:
+        """
+        retrieve a file from a study folder
+
+        Args:
+            uuid: study uuid
+            url: route to follow inside study structure
+            params: request parameters
+
+        Returns: data study formatted in json
+
+        """
+        study = self.get_study(uuid)
+        assert_permission(params.user, study, StudyPermissionType.READ)
+
+        output = self.storage_service.get_storage(study).get_file(study, url)
+
+        return output
+
     def aggregate_output_data(
         self,
         uuid: str,
diff --git a/antarest/study/storage/abstract_storage_service.py b/antarest/study/storage/abstract_storage_service.py
index ccaa477673..3b4c002597 100644
--- a/antarest/study/storage/abstract_storage_service.py
+++ b/antarest/study/storage/abstract_storage_service.py
@@ -18,8 +18,6 @@
 from pathlib import Path
 from uuid import uuid4
 
-import py7zr
-
 from antarest.core.config import Config
 from antarest.core.exceptions import BadOutputError, StudyOutputNotFoundError
 from antarest.core.interfaces.cache import CacheConstants, ICache
@@ -45,6 +43,7 @@
 from antarest.study.storage.rawstudy.model.filesystem.config.files import get_playlist
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Simulation
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy, StudyFactory
+from antarest.study.storage.rawstudy.model.filesystem.inode import OriginalFile
 from antarest.study.storage.rawstudy.model.helpers import FileStudyHelpers
 from antarest.study.storage.utils import extract_output_name, fix_study_root, remove_from_cache
 
@@ -171,6 +170,30 @@ def get(
         del study
         return data
 
+    def get_file(
+        self,
+        metadata: T,
+        url: str = "",
+        use_cache: bool = True,
+    ) -> OriginalFile:
+        """
+        Entry point to fetch data inside study.
+        Args:
+            metadata: study
+            url: path data inside study to reach
+            use_cache: indicate if the cache must be used
+
+        Returns: a file content with its extension and name
+
+        """
+        self._check_study_exists(metadata)
+        study = self.get_raw(metadata, use_cache)
+        parts = [item for item in url.split("/") if item]
+
+        file_node = study.tree.get_node(parts)
+
+        return file_node.get_file_content()
+
     def get_study_sim_result(
         self,
         study: T,
diff --git a/antarest/study/storage/rawstudy/model/filesystem/folder_node.py b/antarest/study/storage/rawstudy/model/filesystem/folder_node.py
index 58b42a1388..974c2acdfa 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/folder_node.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/folder_node.py
@@ -14,11 +14,11 @@
 import typing as t
 from abc import ABC, abstractmethod
 
-from antarest.core.exceptions import ChildNotFoundError
+from antarest.core.exceptions import ChildNotFoundError, PathIsAFolderError
 from antarest.core.model import JSON, SUB_JSON
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
-from antarest.study.storage.rawstudy.model.filesystem.inode import TREE, INode
+from antarest.study.storage.rawstudy.model.filesystem.inode import TREE, INode, OriginalFile
 
 
 class FilterError(Exception):
@@ -216,3 +216,7 @@ def extract_child(self, children: TREE, url: t.List[str]) -> t.Tuple[t.List[str]
             if not isinstance(children[name], child_class):
                 raise FilterError("Filter selection has different classes")
         return names, sub_url
+
+    def get_file_content(self) -> OriginalFile:
+        relative_path = self.config.path.relative_to(self.config.study_path).as_posix()
+        raise PathIsAFolderError(f"Node at {relative_path} is a folder node.")
diff --git a/antarest/study/storage/rawstudy/model/filesystem/inode.py b/antarest/study/storage/rawstudy/model/filesystem/inode.py
index 4b1046162a..d910234f03 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/inode.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/inode.py
@@ -11,11 +11,12 @@
 # This file is part of the Antares project.
 
 from abc import ABC, abstractmethod
+from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, Generic, List, Optional, Tuple, TypeVar
 
 from antarest.core.exceptions import WritingInsideZippedFileException
-from antarest.core.utils.archives import extract_file_to_tmp_dir
+from antarest.core.utils.archives import extract_file_to_tmp_dir, read_original_file_in_archive
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 
 G = TypeVar("G")
@@ -23,6 +24,13 @@
 V = TypeVar("V")
 
 
+@dataclass
+class OriginalFile:
+    suffix: str
+    content: bytes
+    filename: str
+
+
 class INode(ABC, Generic[G, S, V]):
     """
     Abstract tree element, have to be implemented to create hub or left.
@@ -124,6 +132,21 @@ def denormalize(self) -> None:
         """
         raise NotImplementedError()
 
+    def get_file_content(self) -> OriginalFile:
+        suffix = self.config.path.suffix
+        filename = self.config.path.name
+        if self.config.archive_path:
+            content = read_original_file_in_archive(
+                self.config.archive_path,
+                self.get_relative_path_inside_archive(self.config.archive_path),
+            )
+            return OriginalFile(suffix=suffix, filename=filename, content=content)
+        else:
+            return OriginalFile(content=self.config.path.read_bytes(), suffix=suffix, filename=filename)
+
+    def get_relative_path_inside_archive(self, archive_path: Path) -> str:
+        return self.config.path.relative_to(archive_path.parent / self.config.study_id).as_posix()
+
     def _assert_url_end(self, url: Optional[List[str]] = None) -> None:
         """
         Raise error if elements remain in url
diff --git a/antarest/study/storage/rawstudy/model/filesystem/lazy_node.py b/antarest/study/storage/rawstudy/model/filesystem/lazy_node.py
index 2662cde82b..296f3efc13 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/lazy_node.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/lazy_node.py
@@ -9,7 +9,6 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-
 import typing as t
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
diff --git a/antarest/study/storage/rawstudy/model/filesystem/matrix/input_series_matrix.py b/antarest/study/storage/rawstudy/model/filesystem/matrix/input_series_matrix.py
index 2efb5a3f05..ec9d04a2a9 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/matrix/input_series_matrix.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/matrix/input_series_matrix.py
@@ -9,11 +9,11 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-
+import io
 import logging
 import shutil
+import typing as t
 from pathlib import Path
-from typing import Any, List, Optional, Union, cast
 
 import numpy as np
 import pandas as pd
@@ -22,10 +22,12 @@
 
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.core.model import JSON
+from antarest.core.utils.archives import read_original_file_in_archive
 from antarest.core.utils.utils import StopWatch
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
-from antarest.study.storage.rawstudy.model.filesystem.matrix.matrix import MatrixFrequency, MatrixNode
+from antarest.study.storage.rawstudy.model.filesystem.inode import OriginalFile
+from antarest.study.storage.rawstudy.model.filesystem.matrix.matrix import MatrixFrequency, MatrixNode, dump_dataframe
 
 logger = logging.getLogger(__name__)
 
@@ -40,8 +42,8 @@ def __init__(
         context: ContextServer,
         config: FileStudyTreeConfig,
         freq: MatrixFrequency = MatrixFrequency.HOURLY,
-        nb_columns: Optional[int] = None,
-        default_empty: Optional[npt.NDArray[np.float64]] = None,
+        nb_columns: t.Optional[int] = None,
+        default_empty: t.Optional[npt.NDArray[np.float64]] = None,
     ):
         super().__init__(context=context, config=config, freq=freq)
         self.nb_columns = nb_columns
@@ -52,21 +54,15 @@ def __init__(
             self.default_empty = np.copy(default_empty)
             self.default_empty.flags.writeable = True
 
-    def parse(
-        self,
-        file_path: Optional[Path] = None,
-        tmp_dir: Any = None,
-        return_dataframe: bool = False,
-    ) -> Union[JSON, pd.DataFrame]:
+    def parse_as_dataframe(self, file_path: t.Optional[Path] = None) -> pd.DataFrame:
         file_path = file_path or self.config.path
         try:
-            # sourcery skip: extract-method
             stopwatch = StopWatch()
             link_path = self.get_link_path()
             if link_path.exists():
                 link = link_path.read_text()
                 matrix_json = self.context.resolver.resolve(link)
-                matrix_json = cast(JSON, matrix_json)
+                matrix_json = t.cast(JSON, matrix_json)
                 matrix: pd.DataFrame = pd.DataFrame(**matrix_json)
             else:
                 try:
@@ -83,29 +79,29 @@ def parse(
                     study_id = self.config.study_id
                     relpath = file_path.relative_to(self.config.study_path).as_posix()
                     raise ChildNotFoundError(f"File '{relpath}' not found in the study '{study_id}'") from e
-
             stopwatch.log_elapsed(lambda x: logger.info(f"Matrix parsed in {x}s"))
             final_matrix = matrix.dropna(how="any", axis=1)
-            if return_dataframe:
-                return final_matrix
-
-            data = cast(JSON, final_matrix.to_dict(orient="split"))
-            stopwatch.log_elapsed(lambda x: logger.info(f"Matrix to dict in {x}s"))
-
-            return data
+            return final_matrix
         except EmptyDataError:
             logger.warning(f"Empty file found when parsing {file_path}")
-            matrix = pd.DataFrame()
+            final_matrix = pd.DataFrame()
             if self.default_empty is not None:
-                matrix = pd.DataFrame(self.default_empty)
-            return matrix if return_dataframe else cast(JSON, matrix.to_dict(orient="split"))
+                final_matrix = pd.DataFrame(self.default_empty)
+            return final_matrix
+
+    def parse_as_json(self, file_path: t.Optional[Path] = None) -> JSON:
+        df = self.parse_as_dataframe(file_path)
+        stopwatch = StopWatch()
+        data = t.cast(JSON, df.to_dict(orient="split"))
+        stopwatch.log_elapsed(lambda x: logger.info(f"Matrix to dict in {x}s"))
+        return data
 
     def check_errors(
         self,
         data: JSON,
-        url: Optional[List[str]] = None,
+        url: t.Optional[t.List[str]] = None,
         raising: bool = False,
-    ) -> List[str]:
+    ) -> t.List[str]:
         self._assert_url_end(url)
 
         errors = []
@@ -131,3 +127,22 @@ def copy_file(self, target: str) -> None:
         target_path = self.config.path.parent.joinpath(f"{target}{''.join(self._infer_path().suffixes)}")
         target_path.unlink(missing_ok=True)
         shutil.copy(self._infer_path(), target_path)
+
+    def get_file_content(self) -> OriginalFile:
+        suffix = self.config.path.suffix
+        filename = self.config.path.name
+        if self.config.archive_path:
+            content = read_original_file_in_archive(
+                self.config.archive_path, self.get_relative_path_inside_archive(self.config.archive_path)
+            )
+        elif self.get_link_path().is_file():
+            target_path = self.config.path.with_suffix(".txt")
+            buffer = io.BytesIO()
+            df = self.parse_as_dataframe()
+            dump_dataframe(df, buffer, None)
+            content = buffer.getvalue()
+            suffix = target_path.suffix
+            filename = target_path.name
+        else:
+            content = self.config.path.read_bytes()
+        return OriginalFile(content=content, suffix=suffix, filename=filename)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/matrix/matrix.py b/antarest/study/storage/rawstudy/model/filesystem/matrix/matrix.py
index 427631427a..6af089a8a5 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/matrix/matrix.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/matrix/matrix.py
@@ -9,12 +9,12 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-
+import io
 import logging
 from abc import ABC, abstractmethod
 from enum import StrEnum
 from pathlib import Path
-from typing import Any, List, Optional, Union, cast
+from typing import List, Optional, Union, cast
 
 import pandas as pd
 
@@ -41,12 +41,12 @@ class MatrixFrequency(StrEnum):
     HOURLY = "hourly"
 
 
-def dump_dataframe(df: pd.DataFrame, path: Path, float_format: Optional[str] = "%.6f") -> None:
-    if df.empty:
-        path.write_bytes(b"")
+def dump_dataframe(df: pd.DataFrame, path_or_buf: Path | io.BytesIO, float_format: Optional[str] = "%.6f") -> None:
+    if df.empty and isinstance(path_or_buf, Path):
+        path_or_buf.write_bytes(b"")
     else:
         df.to_csv(
-            path,
+            path_or_buf,
             sep="\t",
             header=False,
             index=False,
@@ -87,7 +87,7 @@ def normalize(self) -> None:
         if self.get_link_path().exists() or self.config.archive_path:
             return
 
-        matrix = self.parse()
+        matrix = self.parse_as_json()
 
         if "data" in matrix:
             data = cast(List[List[float]], matrix["data"])
@@ -131,17 +131,12 @@ def load(
                 tmp_dir.cleanup()
             return b""
 
-        return cast(JSON, self.parse(file_path, tmp_dir))
+        return self.parse_as_json(file_path)
 
     @abstractmethod
-    def parse(
-        self,
-        file_path: Optional[Path] = None,
-        tmp_dir: Any = None,
-        return_dataframe: bool = False,
-    ) -> Union[JSON, pd.DataFrame]:
+    def parse_as_json(self, file_path: Optional[Path] = None) -> JSON:
         """
-        Parse the matrix content
+        Parse the matrix content and return it as a JSON object
         """
         raise NotImplementedError()
 
diff --git a/antarest/study/storage/variantstudy/model/command/generate_thermal_cluster_timeseries.py b/antarest/study/storage/variantstudy/model/command/generate_thermal_cluster_timeseries.py
index ff2935d30e..e6e4bf17a1 100644
--- a/antarest/study/storage/variantstudy/model/command/generate_thermal_cluster_timeseries.py
+++ b/antarest/study/storage/variantstudy/model/command/generate_thermal_cluster_timeseries.py
@@ -25,6 +25,7 @@
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.config.thermal import LocalTSGenerationBehavior
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
+from antarest.study.storage.rawstudy.model.filesystem.matrix.input_series_matrix import InputSeriesMatrix
 from antarest.study.storage.rawstudy.model.filesystem.matrix.matrix import dump_dataframe
 from antarest.study.storage.utils import TS_GEN_PREFIX, TS_GEN_SUFFIX
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
@@ -36,8 +37,6 @@
 
 
 MODULATION_CAPACITY_COLUMN = 2
-FO_RATE_COLUMN = 2
-PO_RATE_COLUMN = 3
 
 
 class GenerateThermalClusterTimeSeries(ICommand):
@@ -94,15 +93,19 @@ def _build_timeseries(
                     # 7- Build the cluster
                     url = ["input", "thermal", "prepro", area_id, thermal.id.lower(), "modulation"]
                     matrix = study_data.tree.get_node(url)
-                    matrix_df = matrix.parse(return_dataframe=True)  # type: ignore
+                    assert isinstance(matrix, InputSeriesMatrix)
+                    matrix_df = matrix.parse_as_dataframe()
                     modulation_capacity = matrix_df[MODULATION_CAPACITY_COLUMN].to_numpy()
                     url = ["input", "thermal", "prepro", area_id, thermal.id.lower(), "data"]
                     matrix = study_data.tree.get_node(url)
-                    matrix_df = matrix.parse(return_dataframe=True)  # type: ignore
-                    fo_duration, po_duration, fo_rate, po_rate, npo_min, npo_max = [
-                        np.array(matrix_df[i], dtype=float if i in [FO_RATE_COLUMN, PO_RATE_COLUMN] else int)
-                        for i in matrix_df.columns
-                    ]
+                    assert isinstance(matrix, InputSeriesMatrix)
+                    matrix_df = matrix.parse_as_dataframe()
+                    fo_duration = np.array(matrix_df[0], dtype=int)
+                    po_duration = np.array(matrix_df[1], dtype=int)
+                    fo_rate = np.array(matrix_df[2], dtype=float)
+                    po_rate = np.array(matrix_df[3], dtype=float)
+                    npo_min = np.array(matrix_df[4], dtype=int)
+                    npo_max = np.array(matrix_df[5], dtype=int)
                     generation_params = OutageGenerationParameters(
                         unit_count=thermal.unit_count,
                         fo_law=ProbabilityLaw(thermal.law_forced.value.upper()),
diff --git a/antarest/study/storage/variantstudy/variant_study_service.py b/antarest/study/storage/variantstudy/variant_study_service.py
index 37493be684..75154dae95 100644
--- a/antarest/study/storage/variantstudy/variant_study_service.py
+++ b/antarest/study/storage/variantstudy/variant_study_service.py
@@ -57,6 +57,7 @@
 from antarest.study.storage.patch_service import PatchService
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig, FileStudyTreeConfigDTO
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy, StudyFactory
+from antarest.study.storage.rawstudy.model.filesystem.inode import OriginalFile
 from antarest.study.storage.rawstudy.raw_study_service import RawStudyService
 from antarest.study.storage.utils import assert_permission, export_study_flat, is_managed, remove_from_cache
 from antarest.study.storage.variantstudy.business.utils import transform_command_to_dto
@@ -560,6 +561,29 @@ def get(
             use_cache=use_cache,
         )
 
+    def get_file(
+        self,
+        metadata: VariantStudy,
+        url: str = "",
+        use_cache: bool = True,
+    ) -> OriginalFile:
+        """
+        Entry point to fetch for a file inside a study folder.
+        Args:
+            metadata: study
+            url: path data inside study to reach
+            use_cache: indicate if cache should be used to fetch study tree
+
+        Returns: the file content and extension
+        """
+        self._safe_generation(metadata, timeout=600)
+        self.repository.refresh(metadata)
+        return super().get_file(
+            metadata=metadata,
+            url=url,
+            use_cache=use_cache,
+        )
+
     def create_variant_study(self, uuid: str, name: str, params: RequestParameters) -> VariantStudy:
         """
         Create a new variant study.
diff --git a/antarest/study/web/raw_studies_blueprint.py b/antarest/study/web/raw_studies_blueprint.py
index fcab2738fd..730402a9ee 100644
--- a/antarest/study/web/raw_studies_blueprint.py
+++ b/antarest/study/web/raw_studies_blueprint.py
@@ -18,7 +18,7 @@
 from pathlib import Path, PurePosixPath
 
 from fastapi import APIRouter, Body, Depends, File, HTTPException
-from fastapi.params import Param, Query
+from fastapi.params import Query
 from starlette.responses import FileResponse, JSONResponse, PlainTextResponse, Response, StreamingResponse
 
 from antarest.core.config import Config
@@ -75,9 +75,14 @@
     ".txt": ("text/plain", "utf-8"),
     # (JSON)
     ".json": ("application/json", "utf-8"),
+    # (INI FILE)
+    ".ini": ("text/plain", "utf-8"),
+    # (antares file)
+    ".antares": ("text/plain", "utf-8"),
 }
 
 DEFAULT_EXPORT_FORMAT = Query(TableExportFormat.CSV, alias="format", description="Export format", title="Export Format")
+PATH_TYPE = t.Annotated[str, Query(openapi_examples=get_path_examples())]
 
 
 def _split_comma_separated_values(value: str, *, default: t.Sequence[str] = ()) -> t.Sequence[str]:
@@ -110,9 +115,9 @@ def create_raw_study_routes(
         tags=[APITag.study_raw_data],
         summary="Retrieve Raw Data from Study: JSON, Text, or File Attachment",
     )
-    def get_study(
+    def get_study_data(
         uuid: str,
-        path: str = Param("/", examples=get_path_examples()),  # type: ignore
+        path: PATH_TYPE = "/",
         depth: int = 3,
         formatted: bool = True,
         current_user: JWTUser = Depends(auth.get_current_user),
@@ -186,6 +191,43 @@ def get_study(
         json_response = to_json(output)
         return Response(content=json_response, media_type="application/json")
 
+    @bp.get(
+        "/studies/{uuid}/raw/original-file",
+        tags=[APITag.study_raw_data],
+        summary="Retrieve Raw file from a Study folder in its original format",
+    )
+    def get_study_file(
+        uuid: str,
+        path: PATH_TYPE = "/",
+        current_user: JWTUser = Depends(auth.get_current_user),
+    ) -> t.Any:
+        """
+        Fetches for a file in its original format from a study folder
+
+        Parameters:
+        - `uuid`: The UUID of the study.
+        - `path`: The path to the file to fetch.
+
+        Returns the fetched file in its original format.
+        """
+        logger.info(
+            f"📘 Fetching file at {path} from study {uuid}",
+            extra={"user": current_user.id},
+        )
+        parameters = RequestParameters(user=current_user)
+        original_file = study_service.get_file(uuid, path, params=parameters)
+        filename = original_file.filename
+        output = original_file.content
+        suffix = original_file.suffix
+        headers = {
+            "Content-Disposition": f"attachment; filename={filename}",
+        }
+
+        # Guess the suffix form the filename suffix
+        content_type, _ = CONTENT_TYPES.get(suffix, (None, None))
+        media_type = content_type or "application/octet-stream"
+        return Response(content=output, media_type=media_type, headers=headers)
+
     @bp.delete(
         "/studies/{uuid}/raw",
         tags=[APITag.study_raw_data],
@@ -194,7 +236,14 @@ def get_study(
     )
     def delete_file(
         uuid: str,
-        path: str = Param("/", examples=["user/wind_solar/synthesis_windSolar.xlsx"]),  # type: ignore
+        path: t.Annotated[
+            str,
+            Query(
+                openapi_examples={
+                    "user/wind_solar/synthesis_windSolar.xlsx": {"value": "user/wind_solar/synthesis_windSolar.xlsx"}
+                },
+            ),
+        ] = "/",
         current_user: JWTUser = Depends(auth.get_current_user),
     ) -> t.Any:
         uuid = sanitize_uuid(uuid)
@@ -481,7 +530,7 @@ def aggregate_links_raw_data__all(
     )
     def edit_study(
         uuid: str,
-        path: str = Param("/", examples=get_path_examples()),  # type: ignore
+        path: PATH_TYPE = "/",
         data: SUB_JSON = Body(default=""),
         current_user: JWTUser = Depends(auth.get_current_user),
     ) -> None:
@@ -510,7 +559,7 @@ def edit_study(
     )
     def replace_study_file(
         uuid: str,
-        path: str = Param("/", examples=get_path_examples()),  # type: ignore
+        path: PATH_TYPE = "/",
         file: bytes = File(default=None),
         create_missing: bool = Query(
             False,
diff --git a/tests/integration/raw_studies_blueprint/test_fetch_raw_data.py b/tests/integration/raw_studies_blueprint/test_fetch_raw_data.py
index 58749c0b09..e30e929a0b 100644
--- a/tests/integration/raw_studies_blueprint/test_fetch_raw_data.py
+++ b/tests/integration/raw_studies_blueprint/test_fetch_raw_data.py
@@ -62,9 +62,9 @@ class TestFetchRawData:
     """
 
     @pytest.mark.parametrize("study_type", ["raw", "variant"])
-    def test_get_study(self, client: TestClient, user_access_token: str, internal_study_id: str, study_type: str):
+    def test_get_study_data(self, client: TestClient, user_access_token: str, internal_study_id: str, study_type: str):
         """
-        Test the `get_study` endpoint for fetching raw data from a study.
+        Test the `get_study_data` endpoint for fetching raw data from a study.
 
         This test retrieves raw data from a study identified by a UUID and checks
         if the returned data matches the expected data.
@@ -297,206 +297,340 @@ def test_get_study(self, client: TestClient, user_access_token: str, internal_st
             res = client.get(raw_url, params={"path": path, "depth": depth})
             assert res.status_code == 200, f"Error for path={path} and depth={depth}"
 
+    @pytest.mark.parametrize("study_type", ["raw", "variant"])
+    def test_delete_raw(
+        self, client: TestClient, user_access_token: str, internal_study_id: str, study_type: str
+    ) -> None:
+        # =============================
+        #  SET UP
+        # =============================
+        client.headers = {"Authorization": f"Bearer {user_access_token}"}
+
+        if study_type == "variant":
+            # Copies the study, to convert it into a managed one.
+            res = client.post(
+                f"/v1/studies/{internal_study_id}/copy",
+                headers={"Authorization": f"Bearer {user_access_token}"},
+                params={"dest": "default", "with_outputs": False, "use_task": False},
+            )
+            assert res.status_code == 201
+            parent_id = res.json()
+            res = client.post(f"/v1/studies/{parent_id}/variants", params={"name": "variant 1"})
+            internal_study_id = res.json()
+
+        # =============================
+        #  NOMINAL CASES
+        # =============================
+
+        content = io.BytesIO(b"This is the end!")
+        file_1_path = "user/file_1.txt"
+        file_2_path = "user/folder/file_2.txt"
+        file_3_path = "user/folder_2/file_3.txt"
+        for f in [file_1_path, file_2_path, file_3_path]:
+            # Creates a file / folder inside user folder.
+            res = client.put(
+                f"/v1/studies/{internal_study_id}/raw",
+                params={"path": f, "create_missing": True},
+                files={"file": content},
+            )
+            assert res.status_code == 204, res.json()
+
+            # Deletes the file / folder
+            if f == file_2_path:
+                f = "user/folder"
+            res = client.delete(f"/v1/studies/{internal_study_id}/raw?path={f}")
+            assert res.status_code == 200
+            # Asserts it doesn't exist anymore
+            res = client.get(f"/v1/studies/{internal_study_id}/raw?path={f}")
+            assert res.status_code == 404
+            assert "not a child of" in res.json()["description"]
+
+            # checks debug view
+            res = client.get(f"/v1/studies/{internal_study_id}/raw?path=&depth=-1")
+            assert res.status_code == 200
+            tree = res.json()["user"]
+            if f == file_3_path:
+                # asserts the folder that wasn't deleted is still here.
+                assert list(tree.keys()) == ["expansion", "folder_2"]
+                assert tree["folder_2"] == {}
+            else:
+                # asserts deleted files cannot be seen inside the debug view
+                assert list(tree.keys()) == ["expansion"]
+
+        # =============================
+        #  ERRORS
+        # =============================
+
+        # try to delete expansion folder
+        res = client.delete(f"/v1/studies/{internal_study_id}/raw?path=/user/expansion")
+        expected_msg = "you are not allowed to delete this resource"
+        _check_endpoint_response(study_type, res, client, internal_study_id, expected_msg, "ResourceDeletionNotAllowed")
+
+        # try to delete a file which isn't inside the 'User' folder
+        res = client.delete(f"/v1/studies/{internal_study_id}/raw?path=/input/thermal")
+        expected_msg = "the given path isn't inside the 'User' folder"
+        assert res.status_code == 403
+        assert res.json()["exception"] == "ResourceDeletionNotAllowed"
+        assert expected_msg in res.json()["description"]
+
+        # With a path that doesn't exist
+        res = client.delete(f"/v1/studies/{internal_study_id}/raw?path=user/fake_folder/fake_file.txt")
+        expected_msg = "the given path doesn't exist"
+        _check_endpoint_response(study_type, res, client, internal_study_id, expected_msg, "ResourceDeletionNotAllowed")
+
+    @pytest.mark.parametrize("study_type", ["raw", "variant"])
+    def test_create_folder(
+        self, client: TestClient, user_access_token: str, internal_study_id: str, study_type: str
+    ) -> None:
+        client.headers = {"Authorization": f"Bearer {user_access_token}"}
+
+        if study_type == "variant":
+            # Copies the study, to convert it into a managed one.
+            res = client.post(
+                f"/v1/studies/{internal_study_id}/copy",
+                headers={"Authorization": f"Bearer {user_access_token}"},
+                params={"dest": "default", "with_outputs": False, "use_task": False},
+            )
+            assert res.status_code == 201
+            parent_id = res.json()
+            res = client.post(f"/v1/studies/{parent_id}/variants", params={"name": "variant 1"})
+            internal_study_id = res.json()
+
+        raw_url = f"/v1/studies/{internal_study_id}/raw"
+
+        # =============================
+        # NOMINAL CASES
+        # =============================
+        additional_params = {"resource_type": "folder", "create_missing": True}
+
+        res = client.put(raw_url, params={"path": "user/folder_1", **additional_params})
+        assert res.status_code == 204
+
+        # same case with different writing should succeed
+        res = client.put(raw_url, params={"path": "/user/folder_2", **additional_params})
+        assert res.status_code == 204
+
+        # create a folder within a non-existing one
+        res = client.put(raw_url, params={"path": "/user/folder_x/folder_y", **additional_params})
+        assert res.status_code == 204
+
+        # checks debug view to see that folders were created
+        res = client.get(f"/v1/studies/{internal_study_id}/raw?path=&depth=-1")
+        assert res.status_code == 200
+        tree = res.json()["user"]
+        assert list(tree.keys()) == ["expansion", "folder_1", "folder_2", "folder_x"]
+        assert tree["folder_x"] == {"folder_y": {}}
+
+        # =============================
+        #  ERRORS
+        # =============================
+
+        # we can't create a file without specifying a content
+        res = client.put(raw_url, params={"path": "fake_path"})
+        assert res.status_code == 422
+        assert res.json()["description"] == "Argument mismatch: Must give a content to create a file"
+
+        # we can't create a folder and specify a content at the same time
+        res = client.put(raw_url, params={"path": "", "resource_type": "folder"}, files={"file": b"content"})
+        assert res.status_code == 422
+        assert res.json()["description"] == "Argument mismatch: Cannot give a content to create a folder"
+
+        # try to create a folder outside `user` folder
+        wrong_folder = "input/wrong_folder"
+        expected_msg = f"the given path isn't inside the 'User' folder: {wrong_folder}"
+        res = client.put(raw_url, params={"path": wrong_folder, **additional_params})
+        assert res.status_code == 403
+        assert res.json()["exception"] == "FolderCreationNotAllowed"
+        assert expected_msg in res.json()["description"]
+
+        # try to create a folder inside the 'expansion` folder
+        expansion_folder = "user/expansion/wrong_folder"
+        expected_msg = "you are not allowed to create a resource here"
+        res = client.put(raw_url, params={"path": expansion_folder, **additional_params})
+        _check_endpoint_response(study_type, res, client, internal_study_id, expected_msg, "FolderCreationNotAllowed")
+
+        # try to create an already existing folder
+        existing_folder = "user/folder_1"
+        expected_msg = "the given resource already exists"
+        res = client.put(raw_url, params={"path": existing_folder, **additional_params})
+        _check_endpoint_response(study_type, res, client, internal_study_id, expected_msg, "FolderCreationNotAllowed")
+
+    def test_retrieve_from_archive(self, client: TestClient, user_access_token: str) -> None:
+        # client headers
+        client.headers = {"Authorization": f"Bearer {user_access_token}"}
+
+        # create a new study
+        res = client.post("/v1/studies?name=MyStudy")
+        assert res.status_code == 201
 
-@pytest.mark.parametrize("study_type", ["raw", "variant"])
-def test_delete_raw(client: TestClient, user_access_token: str, internal_study_id: str, study_type: str) -> None:
-    # =============================
-    #  SET UP
-    # =============================
-    client.headers = {"Authorization": f"Bearer {user_access_token}"}
+        # get the study id
+        study_id = res.json()
 
-    if study_type == "variant":
-        # Copies the study, to convert it into a managed one.
+        # add a new area to the study
         res = client.post(
-            f"/v1/studies/{internal_study_id}/copy",
-            headers={"Authorization": f"Bearer {user_access_token}"},
-            params={"dest": "default", "with_outputs": False, "use_task": False},
+            f"/v1/studies/{study_id}/areas",
+            json={
+                "name": "area 1",
+                "type": "AREA",
+                "metadata": {"country": "FR", "tags": ["a"]},
+            },
         )
-        assert res.status_code == 201
-        parent_id = res.json()
-        res = client.post(f"/v1/studies/{parent_id}/variants", params={"name": "variant 1"})
-        internal_study_id = res.json()
-
-    # =============================
-    #  NOMINAL CASES
-    # =============================
-
-    content = io.BytesIO(b"This is the end!")
-    file_1_path = "user/file_1.txt"
-    file_2_path = "user/folder/file_2.txt"
-    file_3_path = "user/folder_2/file_3.txt"
-    for f in [file_1_path, file_2_path, file_3_path]:
-        # Creates a file / folder inside user folder.
-        res = client.put(
-            f"/v1/studies/{internal_study_id}/raw", params={"path": f, "create_missing": True}, files={"file": content}
+        assert res.status_code == 200, res.json()
+
+        # archive the study
+        res = client.put(f"/v1/studies/{study_id}/archive")
+        assert res.status_code == 200
+        task_id = res.json()
+        wait_for(
+            lambda: client.get(
+                f"/v1/tasks/{task_id}",
+            ).json()["status"]
+            == 3
         )
-        assert res.status_code == 204, res.json()
 
-        # Deletes the file / folder
-        if f == file_2_path:
-            f = "user/folder"
-        res = client.delete(f"/v1/studies/{internal_study_id}/raw?path={f}")
+        # retrieve a `Desktop.ini` file from inside the archive
+        rel_path = "Desktop"
+        res = client.get(
+            f"/v1/studies/{study_id}/raw",
+            params={"path": rel_path, "formatted": True},
+        )
         assert res.status_code == 200
-        # Asserts it doesn't exist anymore
-        res = client.get(f"/v1/studies/{internal_study_id}/raw?path={f}")
-        assert res.status_code == 404
-        assert "not a child of" in res.json()["description"]
 
-        # checks debug view
-        res = client.get(f"/v1/studies/{internal_study_id}/raw?path=&depth=-1")
+        # retrieve a `study.antares` file from inside the archive
+        rel_path = "study"
+        res = client.get(
+            f"/v1/studies/{study_id}/raw",
+            params={"path": rel_path, "formatted": True},
+        )
         assert res.status_code == 200
-        tree = res.json()["user"]
-        if f == file_3_path:
-            # asserts the folder that wasn't deleted is still here.
-            assert list(tree.keys()) == ["expansion", "folder_2"]
-            assert tree["folder_2"] == {}
-        else:
-            # asserts deleted files cannot be seen inside the debug view
-            assert list(tree.keys()) == ["expansion"]
-
-    # =============================
-    #  ERRORS
-    # =============================
-
-    # try to delete expansion folder
-    res = client.delete(f"/v1/studies/{internal_study_id}/raw?path=/user/expansion")
-    expected_msg = "you are not allowed to delete this resource"
-    _check_endpoint_response(study_type, res, client, internal_study_id, expected_msg, "ResourceDeletionNotAllowed")
-
-    # try to delete a file which isn't inside the 'User' folder
-    res = client.delete(f"/v1/studies/{internal_study_id}/raw?path=/input/thermal")
-    expected_msg = "the given path isn't inside the 'User' folder"
-    assert res.status_code == 403
-    assert res.json()["exception"] == "ResourceDeletionNotAllowed"
-    assert expected_msg in res.json()["description"]
-
-    # With a path that doesn't exist
-    res = client.delete(f"/v1/studies/{internal_study_id}/raw?path=user/fake_folder/fake_file.txt")
-    expected_msg = "the given path doesn't exist"
-    _check_endpoint_response(study_type, res, client, internal_study_id, expected_msg, "ResourceDeletionNotAllowed")
-
-
-@pytest.mark.parametrize("study_type", ["raw", "variant"])
-def test_create_folder(client: TestClient, user_access_token: str, internal_study_id: str, study_type: str) -> None:
-    client.headers = {"Authorization": f"Bearer {user_access_token}"}
-
-    if study_type == "variant":
-        # Copies the study, to convert it into a managed one.
-        res = client.post(
-            f"/v1/studies/{internal_study_id}/copy",
-            headers={"Authorization": f"Bearer {user_access_token}"},
-            params={"dest": "default", "with_outputs": False, "use_task": False},
+
+
+@pytest.mark.integration_test
+class TestFetchOriginalFile:
+    """
+    Check the retrieval of a file from Study folder
+    """
+
+    def test_get_study_file(
+        self,
+        client: TestClient,
+        user_access_token: str,
+        internal_study_id: str,
+    ):
+        """
+        Test the `get_study_file` endpoint for fetching for a file in its original format.
+
+        This test retrieves a specific file from a study identified by a UUID and checks
+
+        The test performs the following steps:
+        1. Copies the user resources in the Study directory.
+        2. Uses the API to download a file from the "user/folder" directory.
+        3. Compares the fetched data with the expected file from disk.
+        4. Check for cases where Errors should be returned.
+        """
+        # First copy the user resources in the Study directory
+        with db():
+            study: RawStudy = db.session.get(Study, internal_study_id)
+            study_dir = pathlib.Path(study.path)
+        client.headers = {"Authorization": f"Bearer {user_access_token}"}
+        original_file_url = f"/v1/studies/{internal_study_id}/raw/original-file"
+
+        shutil.copytree(
+            ASSETS_DIR.joinpath("user"),
+            study_dir.joinpath("user"),
+            dirs_exist_ok=True,
         )
+
+        # Then, use the API to download the files from the "user/folder" directory
+        user_folder_dir = study_dir.joinpath("user/folder")
+        for file_path in user_folder_dir.glob("*.*"):
+            rel_path = file_path.relative_to(study_dir).as_posix()
+            res = client.get(original_file_url, params={"path": rel_path})
+            assert res.status_code == 200, res.json()
+            actual = res.content
+            expected = file_path.read_bytes()
+            assert actual == expected
+
+        # retrieves a txt file from the outputs
+        file_path = "output/20201014-1422eco-hello/simulation"
+        res = client.get(f"/v1/studies/{internal_study_id}/raw/original-file", params={"path": file_path})
+        assert res.status_code == 200
+        assert res.headers.get("content-disposition") == "attachment; filename=simulation.log"
+        actual = res.content
+        expected = study_dir.joinpath(f"{file_path}.log").read_bytes()
+        assert actual == expected
+
+        # If the extension is unknown, we should have a "binary" content
+        user_folder_dir = study_dir.joinpath("user/unknown")
+        for file_path in user_folder_dir.glob("*.*"):
+            rel_path = file_path.relative_to(study_dir)
+            res = client.get(original_file_url, params={"path": f"/{rel_path.as_posix()}"})
+            assert res.status_code == 200, res.json()
+
+            actual = res.content
+            expected = file_path.read_bytes()
+            assert actual == expected
+
+        # If you try to retrieve a file that doesn't exist, we should have a 404 error
+        res = client.get(original_file_url, params={"path": "user/somewhere/something.txt"})
+        assert res.status_code == 404, res.json()
+        assert res.json() == {
+            "description": "'somewhere' not a child of User",
+            "exception": "ChildNotFoundError",
+        }
+
+        # If you try to retrieve a folder, we should get an Error 422
+        res = client.get(original_file_url, params={"path": "user/folder"})
+        assert res.status_code == 422, res.json()
+        assert res.json()["description"] == "Node at user/folder is a folder node."
+        assert res.json()["exception"] == "PathIsAFolderError"
+
+    @pytest.mark.parametrize("archive", [True, False])
+    def test_retrieve_original_files(self, client: TestClient, user_access_token: str, archive: bool) -> None:
+        # client headers
+        client.headers = {"Authorization": f"Bearer {user_access_token}"}
+
+        # create a new study
+        res = client.post("/v1/studies", params={"name": "MyStudy", "version": "880"})
         assert res.status_code == 201
-        parent_id = res.json()
-        res = client.post(f"/v1/studies/{parent_id}/variants", params={"name": "variant 1"})
-        internal_study_id = res.json()
-
-    raw_url = f"/v1/studies/{internal_study_id}/raw"
-
-    # =============================
-    # NOMINAL CASES
-    # =============================
-    additional_params = {"resource_type": "folder", "create_missing": True}
-
-    res = client.put(raw_url, params={"path": "user/folder_1", **additional_params})
-    assert res.status_code == 204
-
-    # same case with different writing should succeed
-    res = client.put(raw_url, params={"path": "/user/folder_2", **additional_params})
-    assert res.status_code == 204
-
-    # create a folder within a non-existing one
-    res = client.put(raw_url, params={"path": "/user/folder_x/folder_y", **additional_params})
-    assert res.status_code == 204
-
-    # checks debug view to see that folders were created
-    res = client.get(f"/v1/studies/{internal_study_id}/raw?path=&depth=-1")
-    assert res.status_code == 200
-    tree = res.json()["user"]
-    assert list(tree.keys()) == ["expansion", "folder_1", "folder_2", "folder_x"]
-    assert tree["folder_x"] == {"folder_y": {}}
-
-    # =============================
-    #  ERRORS
-    # =============================
-
-    # we can't create a file without specifying a content
-    res = client.put(raw_url, params={"path": "fake_path"})
-    assert res.status_code == 422
-    assert res.json()["description"] == "Argument mismatch: Must give a content to create a file"
-
-    # we can't create a folder and specify a content at the same time
-    res = client.put(raw_url, params={"path": "", "resource_type": "folder"}, files={"file": b"content"})
-    assert res.status_code == 422
-    assert res.json()["description"] == "Argument mismatch: Cannot give a content to create a folder"
-
-    # try to create a folder outside `user` folder
-    wrong_folder = "input/wrong_folder"
-    expected_msg = f"the given path isn't inside the 'User' folder: {wrong_folder}"
-    res = client.put(raw_url, params={"path": wrong_folder, **additional_params})
-    assert res.status_code == 403
-    assert res.json()["exception"] == "FolderCreationNotAllowed"
-    assert expected_msg in res.json()["description"]
-
-    # try to create a folder inside the 'expansion` folder
-    expansion_folder = "user/expansion/wrong_folder"
-    expected_msg = "you are not allowed to create a resource here"
-    res = client.put(raw_url, params={"path": expansion_folder, **additional_params})
-    _check_endpoint_response(study_type, res, client, internal_study_id, expected_msg, "FolderCreationNotAllowed")
-
-    # try to create an already existing folder
-    existing_folder = "user/folder_1"
-    expected_msg = "the given resource already exists"
-    res = client.put(raw_url, params={"path": existing_folder, **additional_params})
-    _check_endpoint_response(study_type, res, client, internal_study_id, expected_msg, "FolderCreationNotAllowed")
-
-
-def test_retrieve_from_archive(client: TestClient, user_access_token: str) -> None:
-    # client headers
-    client.headers = {"Authorization": f"Bearer {user_access_token}"}
-
-    # create a new study
-    res = client.post("/v1/studies?name=MyStudy")
-    assert res.status_code == 201
-
-    # get the study id
-    study_id = res.json()
-
-    # add a new area to the study
-    res = client.post(
-        f"/v1/studies/{study_id}/areas",
-        json={
-            "name": "area 1",
-            "type": "AREA",
-            "metadata": {"country": "FR", "tags": ["a"]},
-        },
-    )
-    assert res.status_code == 200, res.json()
-
-    # archive the study
-    res = client.put(f"/v1/studies/{study_id}/archive")
-    assert res.status_code == 200
-    task_id = res.json()
-    wait_for(
-        lambda: client.get(
-            f"/v1/tasks/{task_id}",
-        ).json()["status"]
-        == 3
-    )
-
-    # retrieve a `Desktop.ini` file from inside the archive
-    rel_path = "Desktop"
-    res = client.get(
-        f"/v1/studies/{study_id}/raw",
-        params={"path": rel_path, "formatted": True},
-    )
-    assert res.status_code == 200
-
-    # retrieve a `study.antares` file from inside the archive
-    rel_path = "study"
-    res = client.get(
-        f"/v1/studies/{study_id}/raw",
-        params={"path": rel_path, "formatted": True},
-    )
-    assert res.status_code == 200
+        study_id = res.json()
+
+        # add a new area to the study
+        res = client.post(
+            f"/v1/studies/{study_id}/areas",
+            json={
+                "name": "area 1",
+                "type": "AREA",
+                "metadata": {"country": "FR", "tags": ["a"]},
+            },
+        )
+        assert res.status_code == 200, res.json()
+
+        if archive:
+            # archive the study
+            res = client.put(f"/v1/studies/{study_id}/archive")
+            assert res.status_code == 200
+            task_id = res.json()
+            wait_for(lambda: client.get(f"/v1/tasks/{task_id}").json()["status"] == 3)
+
+        # retrieves an `ini` file
+        res = client.get(
+            f"/v1/studies/{study_id}/raw/original-file", params={"path": "input/areas/area 1/adequacy_patch"}
+        )
+        assert res.status_code == 200
+        assert res.headers.get("content-disposition") == "attachment; filename=adequacy_patch.ini"
+        assert res.content.strip().decode("utf-8").splitlines() == ["[adequacy-patch]", "adequacy-patch-mode = outside"]
+
+        # retrieves the `study.antares`
+        res = client.get(f"/v1/studies/{study_id}/raw/original-file", params={"path": "study"})
+        assert res.status_code == 200
+        assert res.headers.get("content-disposition") == "attachment; filename=study.antares"
+        assert res.content.strip().decode().splitlines()[:3] == ["[antares]", "version = 880", "caption = MyStudy"]
+
+        # retrieves a matrix (a link towards the matrix store if the study is unarchived, else the real matrix)
+        res = client.get(f"/v1/studies/{study_id}/raw/original-file", params={"path": "input/load/series/load_area 1"})
+        assert res.status_code == 200
+        assert res.headers.get("content-disposition") == "attachment; filename=load_area 1.txt"
+        expected_content = np.zeros((8760, 1))
+        actual_content = pd.read_csv(io.BytesIO(res.content), header=None)
+        assert actual_content.to_numpy().tolist() == expected_content.tolist()
diff --git a/tests/storage/repository/filesystem/matrix/test_matrix_node.py b/tests/storage/repository/filesystem/matrix/test_matrix_node.py
index decac6e2e0..38dce45486 100644
--- a/tests/storage/repository/filesystem/matrix/test_matrix_node.py
+++ b/tests/storage/repository/filesystem/matrix/test_matrix_node.py
@@ -11,7 +11,6 @@
 # This file is part of the Antares project.
 
 from pathlib import Path
-from tempfile import TemporaryDirectory
 from typing import List, Optional
 from unittest.mock import Mock
 
@@ -39,23 +38,9 @@ def __init__(self, context: ContextServer, config: FileStudyTreeConfig) -> None:
             freq=MatrixFrequency.ANNUAL,
         )
 
-    def parse(
-        self,
-        file_path: Optional[Path] = None,
-        tmp_dir: Optional[TemporaryDirectory] = None,
-        return_dataframe: bool = False,
-    ) -> JSON:
+    def parse_as_json(self, file_path: Optional[Path] = None) -> JSON:
         return MOCK_MATRIX_JSON
 
-    # def dump(
-    #     self, data: Union[bytes, JSON], url: Optional[List[str]] = None
-    # ) -> None:
-    #     """Dump the matrix data in JSON format to simplify the tests"""
-    #     self.config.path.parent.mkdir(exist_ok=True, parents=True)
-    #     self.config.path.write_text(
-    #         json.dumps(data, indent=2), encoding="utf-8"
-    #     )
-
     def check_errors(self, data: str, url: Optional[List[str]] = None, raising: bool = False) -> List[str]:
         pass  # not used
 

From c98a28d17f752e6b868574753f31b8039cc07ddb Mon Sep 17 00:00:00 2001
From: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
Date: Tue, 17 Dec 2024 15:24:04 +0100
Subject: [PATCH 20/31] chore: bump version to 2.18.3

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
---
 antarest/__init__.py     | 4 ++--
 docs/CHANGELOG.md        | 4 ++++
 pyproject.toml           | 2 +-
 sonar-project.properties | 2 +-
 webapp/package-lock.json | 4 ++--
 webapp/package.json      | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/antarest/__init__.py b/antarest/__init__.py
index 8fd62ea94a..adaa163763 100644
--- a/antarest/__init__.py
+++ b/antarest/__init__.py
@@ -19,9 +19,9 @@
 
 # Standard project metadata
 
-__version__ = "2.18.2"
+__version__ = "2.18.3"
 __author__ = "RTE, Antares Web Team"
-__date__ = "2024-12-11"
+__date__ = "2024-12-17"
 # noinspection SpellCheckingInspection
 __credits__ = "(c) Réseau de Transport de l’Électricité (RTE)"
 
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index a8c6b3cf13..5d79791197 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Antares Web Changelog
 =====================
 
+v2.18.3 (2024-12-17)
+--------------------
+
+
 v2.18.2 (2024-12-11)
 --------------------
 
diff --git a/pyproject.toml b/pyproject.toml
index bc4332d38f..6073d80770 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools"]
 
 [project]
 name = "AntaREST"
-version = "2.18.2"
+version = "2.18.3"
 authors = [{name="RTE, Antares Web Team", email="andrea.sgattoni@rte-france.com" }]
 description="Antares Server"
 readme = {file = "README.md", content-type = "text/markdown"}
diff --git a/sonar-project.properties b/sonar-project.properties
index 704e6924d8..8c55e49a3b 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,5 +6,5 @@ sonar.exclusions=antarest/gui.py,antarest/main.py
 sonar.python.coverage.reportPaths=coverage.xml
 sonar.python.version=3.11
 sonar.javascript.lcov.reportPaths=webapp/coverage/lcov.info
-sonar.projectVersion=2.18.2
+sonar.projectVersion=2.18.3
 sonar.coverage.exclusions=antarest/gui.py,antarest/main.py,antarest/singleton_services.py,antarest/worker/archive_worker_service.py,webapp/**/*,,antarest/fastapi_jwt_auth/**
\ No newline at end of file
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 2222e73412..f8b6a36ebb 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "antares-web",
-  "version": "2.18.2",
+  "version": "2.18.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "antares-web",
-      "version": "2.18.2",
+      "version": "2.18.3",
       "dependencies": {
         "@emotion/react": "11.13.3",
         "@emotion/styled": "11.13.0",
diff --git a/webapp/package.json b/webapp/package.json
index e63d40860e..976ad31566 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antares-web",
-  "version": "2.18.2",
+  "version": "2.18.3",
   "private": true,
   "type": "module",
   "scripts": {

From bb7223451103cdb8b9862474362cafea3d851846 Mon Sep 17 00:00:00 2001
From: Hatim Dinia <33469289+hdinia@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:26:18 +0100
Subject: [PATCH 21/31] feat(ui-links): set first link as default when
 component mounts (#2268)

---
 webapp/public/locales/en/main.json            |  6 +-
 webapp/public/locales/fr/main.json            |  6 +-
 .../BindingConstView/index.tsx                | 19 ++----
 .../Modelization/BindingConstraints/index.tsx | 24 +++----
 .../Modelization/Links/LinkView/LinkForm.tsx  |  2 +-
 .../explore/Modelization/Links/index.tsx      | 48 ++++++++++----
 .../explore/Modelization/index.tsx            |  2 +-
 .../explore/TableModeList/index.tsx           | 13 +++-
 .../Xpansion/Candidates/CandidateForm.tsx     |  5 +-
 .../explore/Xpansion/Candidates/index.tsx     | 62 ++++++++++++-------
 .../explore/Xpansion/Settings/index.tsx       | 32 +++++-----
 .../src/components/common/PropertiesView.tsx  |  2 +-
 .../components/common/page/ViewWrapper.tsx    |  1 +
 13 files changed, 134 insertions(+), 88 deletions(-)

diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json
index 98abe54461..250a75f2e6 100644
--- a/webapp/public/locales/en/main.json
+++ b/webapp/public/locales/en/main.json
@@ -253,7 +253,8 @@
   "study.links": "Links",
   "study.diskUsage": "Disk usage",
   "study.district": "District",
-  "study.bindingconstraints": "Binding Constraints",
+  "study.bindingConstraints": "Binding Constraints",
+  "study.bindingConstraints.empty": "No Binding Constraints",
   "study.debug": "Debug",
   "study.debug.file.unsupported": "Unsupported file type",
   "study.debug.file.deleteConfirm.title": "Delete File?",
@@ -295,6 +296,7 @@
   "study.outputFilters": "Output print status",
   "study.outputFilters.filterByYear": "Output year by year",
   "study.outputFilters.filterSynthesis": "Synthesis outputs",
+  "study.modelization.links.empty": "No links available",
   "study.modelization.links.hurdleCost": "Hurdle costs",
   "study.modelization.links.loopFlows": "Loop flows",
   "study.modelization.links.pst": "PST",
@@ -566,6 +568,7 @@
   "study.modelization.bindingConst.offset": "Offset",
   "study.modelization.bindingConst.question.deleteConstraintTerm": "Are you sure you want to delete this constraint term?",
   "study.modelization.bindingConst.question.deleteBindingConstraint": "Are you sure you want to delete this binding constraint?",
+  "study.tableMode.empty": "No table available",
   "study.tableMode": "Table Mode",
   "study.tableMode.dialog.add.title": "Add table",
   "study.tableMode.dialog.edit.title": "Edit table",
@@ -703,6 +706,7 @@
   "variants.commands.exportMatrices": "Export matrices",
   "variants.commands.question.deleteAll": "Are you sure you want to delete all commands?",
   "variants.commands.question.delete": "Are you sure you want to delete this command?",
+  "xpansion.candidates.empty": "No Xpansion candidates",
   "xpansion.timeSeries": "Time-Series",
   "xpansion.link": "Link",
   "xpansion.annualCost": "Annual cost per MW",
diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json
index 8e64c877be..98d6ee71b9 100644
--- a/webapp/public/locales/fr/main.json
+++ b/webapp/public/locales/fr/main.json
@@ -253,7 +253,8 @@
   "study.links": "Liens",
   "study.diskUsage": "Espace disque",
   "study.district": "District",
-  "study.bindingconstraints": "Contraintes Couplantes",
+  "study.bindingConstraints": "Contraintes Couplantes",
+  "study.bindingConstraints.empty": "Aucune Contraintes Couplantes",
   "study.debug": "Debug",
   "study.debug.folder.empty": "Le dossier est vide",
   "study.debug.file.unsupported": "Type de fichier non supporté",
@@ -295,6 +296,7 @@
   "study.outputFilters": "Affichage des sorties",
   "study.outputFilters.filterByYear": "Sorties année par année",
   "study.outputFilters.filterSynthesis": "Sorties de la synthèse",
+  "study.modelization.links.empty": "Aucun lien disponible",
   "study.modelization.links.hurdleCost": "Hurdle costs",
   "study.modelization.links.loopFlows": "Loop flows",
   "study.modelization.links.pst": "PST",
@@ -566,6 +568,7 @@
   "study.modelization.bindingConst.offset": "Décalage",
   "study.modelization.bindingConst.question.deleteConstraintTerm": "Êtes-vous sûr de vouloir supprimer ce terme ?",
   "study.modelization.bindingConst.question.deleteBindingConstraint": "Êtes-vous sûr de vouloir supprimer cette contrainte couplante ?",
+  "study.tableMode.empty": "Aucun tableau disponible",
   "study.tableMode": "Table Mode",
   "study.tableMode.dialog.add.title": "Ajouter une table",
   "study.tableMode.dialog.edit.title": "Modifier une table",
@@ -703,6 +706,7 @@
   "variants.commands.exportMatrices": "Exporter les matrices",
   "variants.commands.question.deleteAll": "Êtes-vous sûr de vouloir supprimer toutes les commandes ?",
   "variants.commands.question.delete": "Êtes-vous sûr de vouloir supprimer cette commande ?",
+  "xpansion.candidates.empty": "Aucun candidats Xpansion",
   "xpansion.timeSeries": "Séries temporelles",
   "xpansion.link": "Lien",
   "xpansion.annualCost": "Coût annuel par mw",
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/BindingConstraints/BindingConstView/index.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/BindingConstraints/BindingConstView/index.tsx
index 5b33ac97d8..6360007bef 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/BindingConstraints/BindingConstView/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/BindingConstraints/BindingConstView/index.tsx
@@ -13,7 +13,7 @@
  */
 
 import { BindingConstraint } from "./utils";
-import { Box, Button, Paper, Skeleton } from "@mui/material";
+import { Box, Button, Skeleton } from "@mui/material";
 import Form from "../../../../../../common/Form";
 import UsePromiseCond, {
   mergeResponses,
@@ -120,20 +120,11 @@ function BindingConstView({ constraintId }: Props) {
   ////////////////////////////////////////////////////////////////
 
   return (
-    <Paper
-      sx={{
-        p: 2,
-        width: 1,
-        height: 1,
-        display: "flex",
-        flexDirection: "column",
-        overflow: "auto",
-      }}
-    >
+    <>
       <UsePromiseCond
         response={mergeResponses(constraint, linksAndClusters)}
         ifFulfilled={([defaultValues, linksAndClusters]) => (
-          <>
+          <Box sx={{ display: "flex", flexDirection: "column" }}>
             <Box sx={{ alignSelf: "flex-end" }}>
               <Button
                 variant="outlined"
@@ -166,7 +157,7 @@ function BindingConstView({ constraintId }: Props) {
                 />
               </Form>
             </Box>
-          </>
+          </Box>
         )}
         ifPending={() => <Skeleton sx={{ height: 1, transform: "none" }} />}
       />
@@ -184,7 +175,7 @@ function BindingConstView({ constraintId }: Props) {
           )}
         </ConfirmationDialog>
       )}
-    </Paper>
+    </>
   );
 }
 
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/BindingConstraints/index.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/BindingConstraints/index.tsx
index 40d0f528c3..c1e04de1e0 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/BindingConstraints/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/BindingConstraints/index.tsx
@@ -12,10 +12,8 @@
  * This file is part of the Antares project.
  */
 
-import { Box } from "@mui/material";
 import { useOutletContext } from "react-router";
 import { StudyMetadata } from "../../../../../../common/types";
-import SimpleLoader from "../../../../../common/loaders/SimpleLoader";
 import EmptyView from "../../../../../common/page/SimpleContent";
 import BindingConstPropsView from "./BindingConstPropsView";
 import {
@@ -31,9 +29,12 @@ import { getBindingConstraintList } from "../../../../../../services/api/studyda
 import UsePromiseCond from "../../../../../common/utils/UsePromiseCond";
 import { useEffect } from "react";
 import SplitView from "../../../../../common/SplitView";
+import ViewWrapper from "@/components/common/page/ViewWrapper";
+import { useTranslation } from "react-i18next";
 
 function BindingConstraints() {
   const { study } = useOutletContext<{ study: StudyMetadata }>();
+  const [t] = useTranslation();
   const dispatch = useAppDispatch();
 
   const currentConstraintId = useAppSelector(getCurrentBindingConstId);
@@ -42,14 +43,13 @@ function BindingConstraints() {
     getBindingConst(state, study.id),
   );
 
-  // TODO find better name
-  const constraints = usePromise(
+  const constraintsRes = usePromise(
     () => getBindingConstraintList(study.id),
     [study.id, bindingConstraints],
   );
 
   useEffect(() => {
-    const { data } = constraints;
+    const { data } = constraintsRes;
 
     if (!data || data.length === 0 || currentConstraintId) {
       return;
@@ -57,7 +57,8 @@ function BindingConstraints() {
 
     const firstConstraintId = data[0].id;
     dispatch(setCurrentBindingConst(firstConstraintId));
-  }, [constraints, currentConstraintId, dispatch]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [constraintsRes.data, currentConstraintId, dispatch]);
 
   ////////////////////////////////////////////////////////////////
   // Event Handlers
@@ -73,8 +74,7 @@ function BindingConstraints() {
 
   return (
     <UsePromiseCond
-      response={constraints}
-      ifPending={() => <SimpleLoader />}
+      response={constraintsRes}
       ifFulfilled={(data) => (
         <SplitView id="binding-constraints" sizes={[10, 90]}>
           {/* Left */}
@@ -82,16 +82,16 @@ function BindingConstraints() {
             list={data}
             onClick={handleConstraintChange}
             currentConstraint={currentConstraintId}
-            reloadConstraintsList={constraints.reload}
+            reloadConstraintsList={constraintsRes.reload}
           />
           {/* Right */}
-          <Box>
+          <ViewWrapper>
             {data.length > 0 && currentConstraintId ? (
               <BindingConstView constraintId={currentConstraintId} />
             ) : (
-              <EmptyView title="No Binding Constraints" />
+              <EmptyView title={t("study.bindingConstraints.empty")} />
             )}
-          </Box>
+          </ViewWrapper>
         </SplitView>
       )}
       ifRejected={(error) => <EmptyView title={error?.toString()} />}
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Links/LinkView/LinkForm.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Links/LinkView/LinkForm.tsx
index 9721b9b82c..dbfccc9e82 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Links/LinkView/LinkForm.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Links/LinkView/LinkForm.tsx
@@ -241,7 +241,7 @@ function LinkForm(props: Props) {
             width: "100%",
             display: "flex",
             flexDirection: "column",
-            height: "500px",
+            height: "70vh",
           }}
         >
           {isTabMatrix ? (
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Links/index.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Links/index.tsx
index f00359449c..3749bb784b 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Links/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Links/index.tsx
@@ -16,30 +16,52 @@ import { useOutletContext } from "react-router";
 import { StudyMetadata } from "../../../../../../common/types";
 import EmptyView from "../../../../../common/page/SimpleContent";
 import LinkPropsView from "./LinkPropsView";
-import useStudySynthesis from "../../../../../../redux/hooks/useStudySynthesis";
 import { getCurrentLink } from "../../../../../../redux/selectors";
 import useAppDispatch from "../../../../../../redux/hooks/useAppDispatch";
+import useAppSelector from "../../../../../../redux/hooks/useAppSelector";
 import { setCurrentLink } from "../../../../../../redux/ducks/studySyntheses";
 import LinkView from "./LinkView";
+import usePromise from "../../../../../../hooks/usePromise";
+import { getLinks } from "@/services/api/studies/links";
 import UsePromiseCond from "../../../../../common/utils/UsePromiseCond";
 import SplitView from "../../../../../common/SplitView";
-import ViewWrapper from "../../../../../common/page/ViewWrapper";
+import { useEffect } from "react";
+import { makeLinkId } from "@/redux/utils";
+import ViewWrapper from "@/components/common/page/ViewWrapper";
+import { useTranslation } from "react-i18next";
 
 function Links() {
   const { study } = useOutletContext<{ study: StudyMetadata }>();
-  const res = useStudySynthesis({
-    studyId: study.id,
-    selector: getCurrentLink,
-  });
-
+  const [t] = useTranslation();
   const dispatch = useAppDispatch();
+  const currentLink = useAppSelector((state) =>
+    getCurrentLink(state, study.id),
+  );
+
+  const linksRes = usePromise(
+    () => getLinks({ studyId: study.id }),
+    [study.id],
+  );
+
+  // Handle automatic selection of the first link
+  useEffect(() => {
+    const { data } = linksRes;
+
+    if (!data || data.length === 0 || currentLink) {
+      return;
+    }
+
+    const firstLinkId = makeLinkId(data[0].area1, data[0].area2);
+    dispatch(setCurrentLink(firstLinkId));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [linksRes.data, currentLink, dispatch]);
 
   ////////////////////////////////////////////////////////////////
   // Event Handlers
   ////////////////////////////////////////////////////////////////
 
-  const handleLinkClick = (linkName: string): void => {
-    dispatch(setCurrentLink(linkName));
+  const handleLinkClick = (linkId: string) => {
+    dispatch(setCurrentLink(linkId));
   };
 
   ////////////////////////////////////////////////////////////////
@@ -53,12 +75,12 @@ function Links() {
       {/* Right */}
       <ViewWrapper>
         <UsePromiseCond
-          response={res}
-          ifFulfilled={(currentLink) =>
-            currentLink ? (
+          response={linksRes}
+          ifFulfilled={(data) =>
+            data.length > 0 && currentLink ? (
               <LinkView link={currentLink} />
             ) : (
-              <EmptyView title="No Links" />
+              <EmptyView title={t("study.modelization.links.empty")} />
             )
           }
         />
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/index.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/index.tsx
index 629e345f3c..0099e90986 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/index.tsx
@@ -76,7 +76,7 @@ function Modelization() {
         disabled: links.length === 0,
       },
       {
-        label: t("study.bindingconstraints"),
+        label: t("study.bindingConstraints"),
         path: `${basePath}/bindingcontraint`,
       },
     ];
diff --git a/webapp/src/components/App/Singlestudy/explore/TableModeList/index.tsx b/webapp/src/components/App/Singlestudy/explore/TableModeList/index.tsx
index ab4dcd787c..bf4655465a 100644
--- a/webapp/src/components/App/Singlestudy/explore/TableModeList/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/TableModeList/index.tsx
@@ -12,7 +12,7 @@
  * This file is part of the Antares project.
  */
 
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { MenuItem } from "@mui/material";
 import { useOutletContext } from "react-router";
 import { useUpdateEffect } from "react-use";
@@ -32,6 +32,7 @@ import ConfirmationDialog from "../../../../common/dialogs/ConfirmationDialog";
 import TableMode from "../../../../common/TableMode";
 import SplitView from "../../../../common/SplitView";
 import ViewWrapper from "../../../../common/page/ViewWrapper";
+import EmptyView from "@/components/common/page/SimpleContent";
 
 function TableModeList() {
   const { t } = useTranslation();
@@ -56,6 +57,13 @@ function TableModeList() {
   const dialogTemplate =
     dialog && templates.find((tp) => tp.id === dialog.templateId);
 
+  // Handle automatic selection of the first element
+  useEffect(() => {
+    if (templates.length > 0 && !selectedTemplate) {
+      setSelectedTemplateId(templates[0].id);
+    }
+  }, [templates, selectedTemplate]);
+
   // Update local storage
   useUpdateEffect(() => {
     storage.setItem(
@@ -132,6 +140,9 @@ function TableModeList() {
         />
         {/* Right */}
         <ViewWrapper>
+          {!templates.length && (
+            <EmptyView title={t("study.tableMode.empty")} />
+          )}
           {selectedTemplate && (
             <TableMode
               studyId={study.id}
diff --git a/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/CandidateForm.tsx b/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/CandidateForm.tsx
index 8f0be1caa7..5460e855f2 100644
--- a/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/CandidateForm.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/CandidateForm.tsx
@@ -19,7 +19,6 @@ import {
   Typography,
   Button,
   ButtonGroup,
-  Paper,
   TextField,
 } from "@mui/material";
 import { useTranslation } from "react-i18next";
@@ -100,7 +99,7 @@ function CandidateForm(props: PropType) {
   }, [candidate]);
 
   return (
-    <Paper sx={{ width: "100%", height: "100%", overflow: "auto", p: 2 }}>
+    <Box sx={{ width: "100%", height: "100%", overflow: "auto", p: 1 }}>
       <Box>
         <Box
           display="flex"
@@ -449,7 +448,7 @@ function CandidateForm(props: PropType) {
           {t("xpansion.question.deleteCandidate")}
         </ConfirmationDialog>
       )}
-    </Paper>
+    </Box>
   );
 }
 
diff --git a/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/index.tsx b/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/index.tsx
index e9880194d4..fafe0236ed 100644
--- a/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Xpansion/Candidates/index.tsx
@@ -12,7 +12,7 @@
  * This file is part of the Antares project.
  */
 
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useOutletContext, useNavigate } from "react-router-dom";
 import { AxiosError } from "axios";
 import { useTranslation } from "react-i18next";
@@ -45,6 +45,8 @@ import EmptyView from "../../../../../common/page/SimpleContent";
 import SplitView from "../../../../../common/SplitView";
 import { getLinks } from "@/services/api/studies/links";
 import { MatrixDataDTO } from "@/components/common/Matrix/shared/types";
+import ViewWrapper from "@/components/common/page/ViewWrapper";
+import SimpleLoader from "@/components/common/loaders/SimpleLoader";
 
 function Candidates() {
   const [t] = useTranslation();
@@ -63,7 +65,7 @@ function Candidates() {
 
   const {
     data: candidates,
-    isLoading,
+    isLoading: isCandidatesLoading,
     isRejected,
     reload,
   } = usePromiseWithSnackbarError(
@@ -96,22 +98,30 @@ function Candidates() {
     },
   );
 
-  const { data: capaLinks } = usePromiseWithSnackbarError(
-    async () => {
-      if (!study) {
+  const { data: capaLinks, isLoading: isLinksLoading } =
+    usePromiseWithSnackbarError(
+      async () => {
+        if (!study) {
+          return {};
+        }
+        const exist = await xpansionConfigurationExist(study.id);
+        if (exist) {
+          return {
+            capacities: await getAllCapacities(study.id),
+            links: await getLinks({ studyId: study.id }),
+          };
+        }
         return {};
-      }
-      const exist = await xpansionConfigurationExist(study.id);
-      if (exist) {
-        return {
-          capacities: await getAllCapacities(study.id),
-          links: await getLinks({ studyId: study.id }),
-        };
-      }
-      return {};
-    },
-    { errorMessage: t("xpansion.error.loadConfiguration"), deps: [study] },
-  );
+      },
+      { errorMessage: t("xpansion.error.loadConfiguration"), deps: [study] },
+    );
+
+  // Handle automatic selection of the first element
+  useEffect(() => {
+    if (candidates && candidates.length > 0 && !selectedItem) {
+      setSelectedItem(candidates[0].name);
+    }
+  }, [candidates, selectedItem]);
 
   const deleteXpansion = async () => {
     try {
@@ -224,13 +234,17 @@ function Candidates() {
     }
   };
 
+  if (isCandidatesLoading || isLinksLoading) {
+    return <SimpleLoader />;
+  }
+
   if (isRejected) {
     return <EmptyView title={t("xpansion.error.loadConfiguration")} />;
   }
 
   return (
     <>
-      <SplitView id="xpansion">
+      <SplitView id="xpansion" sizes={[10, 90]}>
         <Box>
           <XpansionPropsView
             candidateList={candidates || []}
@@ -241,11 +255,15 @@ function Candidates() {
           />
         </Box>
         <Box>
-          <Box width="100%" height="100%" boxSizing="border-box">
-            {renderView()}
-          </Box>
+          <ViewWrapper>
+            {!candidates?.length ? (
+              <EmptyView title={t("xpansion.candidates.empty")} />
+            ) : (
+              renderView()
+            )}
+          </ViewWrapper>
           <Backdrop
-            open={isLoading && !candidates}
+            open={isCandidatesLoading && !candidates}
             sx={{
               position: "absolute",
               zIndex: (theme) => theme.zIndex.drawer + 1,
diff --git a/webapp/src/components/App/Singlestudy/explore/Xpansion/Settings/index.tsx b/webapp/src/components/App/Singlestudy/explore/Xpansion/Settings/index.tsx
index e418bb0220..ea11bd06a0 100644
--- a/webapp/src/components/App/Singlestudy/explore/Xpansion/Settings/index.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Xpansion/Settings/index.tsx
@@ -16,7 +16,6 @@ import { useState } from "react";
 import { useOutletContext } from "react-router-dom";
 import { AxiosError } from "axios";
 import { useTranslation } from "react-i18next";
-import { Box, Paper } from "@mui/material";
 import { useSnackbar } from "notistack";
 import { StudyMetadata } from "../../../../../../common/types";
 import { XpansionResourceType, XpansionSettings } from "../types";
@@ -31,10 +30,11 @@ import {
 } from "../../../../../../services/api/xpansion";
 import SettingsForm from "./SettingsForm";
 import useEnqueueErrorSnackbar from "../../../../../../hooks/useEnqueueErrorSnackbar";
-import SimpleLoader from "../../../../../common/loaders/SimpleLoader";
 import { removeEmptyFields } from "../../../../../../services/utils/index";
 import DataViewerDialog from "../../../../../common/dialogs/DataViewerDialog";
 import usePromiseWithSnackbarError from "../../../../../../hooks/usePromiseWithSnackbarError";
+import ViewWrapper from "@/components/common/page/ViewWrapper";
+import UsePromiseCond from "@/components/common/utils/UsePromiseCond";
 
 const resourceContentFetcher = (
   resourceType: string,
@@ -56,11 +56,7 @@ function Settings() {
   const enqueueErrorSnackbar = useEnqueueErrorSnackbar();
   const { enqueueSnackbar } = useSnackbar();
 
-  const {
-    data: settings,
-    isLoading: settingsLoading,
-    reload: reloadSettings,
-  } = usePromiseWithSnackbarError(
+  const settingsRes = usePromiseWithSnackbarError(
     async () => {
       if (study) {
         return getXpansionSettings(study.id);
@@ -129,7 +125,7 @@ function Settings() {
     } catch (e) {
       enqueueErrorSnackbar(t("xpansion.error.updateSettings"), e as AxiosError);
     } finally {
-      reloadSettings();
+      settingsRes.reload();
       enqueueSnackbar(t("studies.success.saveData"), {
         variant: "success",
       });
@@ -160,23 +156,23 @@ function Settings() {
 
   return (
     <>
-      {!settingsLoading && settings ? (
-        <Box sx={{ width: "100%", flexGrow: 1, overflow: "hidden", p: 2 }}>
-          <Paper sx={{ width: "100%", height: "100%", overflow: "auto", p: 2 }}>
+      <ViewWrapper>
+        <UsePromiseCond
+          response={settingsRes}
+          ifFulfilled={(data) => (
             <SettingsForm
-              settings={settings}
+              settings={data}
               candidates={candidates || []}
               constraints={constraints || []}
               weights={weights || []}
               updateSettings={updateSettings}
               onRead={getResourceContent}
             />
-          </Paper>
-        </Box>
-      ) : (
-        <SimpleLoader />
-      )}
-      {!!resourceViewDialog && (
+          )}
+        />
+      </ViewWrapper>
+
+      {resourceViewDialog && (
         <DataViewerDialog
           filename={resourceViewDialog.filename}
           content={resourceViewDialog.content}
diff --git a/webapp/src/components/common/PropertiesView.tsx b/webapp/src/components/common/PropertiesView.tsx
index dc8fb61ab7..4a07bb1078 100644
--- a/webapp/src/components/common/PropertiesView.tsx
+++ b/webapp/src/components/common/PropertiesView.tsx
@@ -54,7 +54,7 @@ function PropertiesView({
         <SearchFE onSearchValueChange={onSearchFilterChange} />
       )}
       {onAdd && (
-        <Box sx={{ display: "flex", px: 1, mb: 1 }}>
+        <Box sx={{ display: "flex", px: 1, my: 1 }}>
           <Button
             color="primary"
             variant="contained"
diff --git a/webapp/src/components/common/page/ViewWrapper.tsx b/webapp/src/components/common/page/ViewWrapper.tsx
index 33cf4df198..1c81251734 100644
--- a/webapp/src/components/common/page/ViewWrapper.tsx
+++ b/webapp/src/components/common/page/ViewWrapper.tsx
@@ -29,6 +29,7 @@ function ViewWrapper({ children }: ViewWrapperProps) {
         ":has(.TabsView:first-child), :has(.TabWrapper:first-child)": {
           pt: 0,
         },
+        overflow: "auto",
       }}
     >
       {children}

From 6512d63ceeddb42d92c68d200da29e1165cfb050 Mon Sep 17 00:00:00 2001
From: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
Date: Tue, 17 Dec 2024 15:28:47 +0100
Subject: [PATCH 22/31] chore: update changelog for 2.18.3 release

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
---
 docs/CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5d79791197..959376e0d5 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,6 +4,14 @@ Antares Web Changelog
 v2.18.3 (2024-12-17)
 --------------------
 
+## What's Changed
+
+### Bug Fixes
+
+* **ui-results**: resolve data misalignment in matrix column filtering [`2269`](https://github.com/AntaresSimulatorTeam/AntaREST/pull/2269)
+
+**Full Changelog**: https://github.com/AntaresSimulatorTeam/AntaREST/compare/v2.18.2...v2.18.3
+
 
 v2.18.2 (2024-12-11)
 --------------------

From 961df68a04ee29cba12ada211a20c1996c467c1b Mon Sep 17 00:00:00 2001
From: Hatim Dinia <33469289+hdinia@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:31:47 +0100
Subject: [PATCH 23/31] refactor(ui): update clusters group names to lowercase
 (#2271)

---
 .../Modelization/Areas/Renewables/Fields.tsx  |  1 +
 .../Modelization/Areas/Renewables/Form.tsx    |  1 -
 .../Modelization/Areas/Renewables/utils.ts    | 18 ++++++++---------
 .../Modelization/Areas/Storages/Fields.tsx    |  1 +
 .../Modelization/Areas/Storages/Form.tsx      |  1 -
 .../Modelization/Areas/Storages/utils.ts      | 18 ++++++++---------
 .../Modelization/Areas/Thermal/Fields.tsx     |  1 +
 .../Modelization/Areas/Thermal/utils.ts       | 20 +++++++++----------
 8 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Fields.tsx
index 0ee371d7fa..8983dde2e8 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Fields.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Fields.tsx
@@ -47,6 +47,7 @@ function Fields() {
           name="group"
           control={control}
           options={RENEWABLE_GROUPS}
+          startCaseLabel={false}
           sx={{
             alignSelf: "center",
           }}
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Form.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Form.tsx
index a180b0fe05..5c3e62b81f 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Form.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Form.tsx
@@ -81,7 +81,6 @@ function Renewables() {
           config={{ defaultValues }}
           onSubmit={handleSubmit}
           enableUndoRedo
-          sx={{ height: "50%" }}
         >
           <Fields />
         </Form>
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/utils.ts b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/utils.ts
index f3e2520aa2..8ad72eeffc 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/utils.ts
@@ -26,15 +26,15 @@ import type { ClusterWithCapacity } from "../common/clustersUtils";
 ////////////////////////////////////////////////////////////////
 
 export const RENEWABLE_GROUPS = [
-  "Wind Onshore",
-  "Wind Offshore",
-  "Solar Thermal",
-  "Solar PV",
-  "Solar Rooftop",
-  "Other RES 1",
-  "Other RES 2",
-  "Other RES 3",
-  "Other RES 4",
+  "wind onshore",
+  "wind offshore",
+  "solar thermal",
+  "solar pv",
+  "solar rooftop",
+  "other res 1",
+  "other res 2",
+  "other res 3",
+  "other res 4",
 ] as const;
 
 export const TS_INTERPRETATION_OPTIONS = [
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Fields.tsx
index 62f351772a..e3cacb065d 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Fields.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Fields.tsx
@@ -49,6 +49,7 @@ function Fields() {
           name="group"
           control={control}
           options={STORAGE_GROUPS}
+          startCaseLabel={false}
           sx={{
             alignSelf: "center",
           }}
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Form.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Form.tsx
index 22899502df..4ee29080d4 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Form.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Form.tsx
@@ -95,7 +95,6 @@ function Storages() {
           }}
           onSubmit={handleSubmit}
           enableUndoRedo
-          sx={{ height: "50%" }}
         >
           <Fields />
         </Form>
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/utils.ts b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/utils.ts
index 83bd3c60f7..3d05b9a659 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/utils.ts
@@ -21,15 +21,15 @@ import type { PartialExceptFor } from "../../../../../../../utils/tsUtils";
 ////////////////////////////////////////////////////////////////
 
 export const STORAGE_GROUPS = [
-  "PSP_open",
-  "PSP_closed",
-  "Pondage",
-  "Battery",
-  "Other1",
-  "Other2",
-  "Other3",
-  "Other4",
-  "Other5",
+  "psp_open",
+  "psp_closed",
+  "pondage",
+  "battery",
+  "other1",
+  "other2",
+  "other3",
+  "other4",
+  "other5",
 ] as const;
 
 ////////////////////////////////////////////////////////////////
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx
index 3aaf182b48..7d3d5bb0de 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx
@@ -59,6 +59,7 @@ function Fields() {
           name="group"
           control={control}
           options={THERMAL_GROUPS}
+          startCaseLabel={false}
           sx={{
             alignSelf: "center",
           }}
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/utils.ts b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/utils.ts
index 3a5895c8f6..6747954f6b 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/utils.ts
@@ -42,16 +42,16 @@ export const TS_GEN_MATRIX_COLS = [
 ] as const;
 
 export const THERMAL_GROUPS = [
-  "Gas",
-  "Hard Coal",
-  "Lignite",
-  "Mixed fuel",
-  "Nuclear",
-  "Oil",
-  "Other 1",
-  "Other 2",
-  "Other 3",
-  "Other 4",
+  "gas",
+  "hard coal",
+  "lignite",
+  "mixed fuel",
+  "nuclear",
+  "oil",
+  "other 1",
+  "other 2",
+  "other 3",
+  "other 4",
 ] as const;
 
 export const THERMAL_POLLUTANTS = [

From 763f3707a969da706d3b5b004103a1676e3b02ba Mon Sep 17 00:00:00 2001
From: Anis <smailio@users.noreply.github.com>
Date: Wed, 18 Dec 2024 18:12:38 +0100
Subject: [PATCH 24/31] feat(ui-studies): add on click fetch and display list
 of non studies folder (#2224)

There's a scan process that run on the server to update continuously the studies in the database.

However this process can take a long time, and the user shouldn't wait for hours before he can see a study he knows is already uploaded.

The scan button now by default run a non recursive scan, that way it takes less time.

When the user clicks on a folder we fetch its subfolders using the explorer API. This enable the user to navigate to subfolders that aren't discovered by the scan yet, so subfolders that wouldn't be visible before hours if we rely only on the scan.

By combining these two features, the user won't need to wait the full scan to complete, instead , he'll walk into the tree and run a fast scan process only subfolder he needs.

This commit is mostly a front commit but also make small adjustment on the back.
---
 antarest/study/model.py                       |  17 +-
 antarest/study/storage/explorer_service.py    |   6 +-
 antarest/study/web/explorer_blueprint.py      |   6 +-
 .../explorer_blueprint/test_explorer.py       |   6 +-
 .../storage/business/test_explorer_service.py |  12 +-
 webapp/public/locales/en/main.json            |   5 +
 webapp/public/locales/fr/main.json            |   6 +-
 webapp/src/components/App/Studies/SideNav.tsx |   2 +-
 .../App/Studies/StudiesList/index.tsx         |  44 +++-
 .../src/components/App/Studies/StudyTree.tsx  |  77 -------
 .../Studies/StudyTree/__test__/fixtures.ts    | 157 +++++++++++++
 .../Studies/StudyTree/__test__/utils.test.tsx | 113 ++++++++++
 .../App/Studies/StudyTree/index.tsx           | 154 +++++++++++++
 .../components/App/Studies/StudyTree/utils.ts | 208 ++++++++++++++++++
 webapp/src/components/App/Studies/utils.ts    |   7 +
 webapp/src/redux/ducks/studies.ts             |   2 +-
 webapp/src/services/api/study.ts              |  38 +++-
 17 files changed, 750 insertions(+), 110 deletions(-)
 delete mode 100644 webapp/src/components/App/Studies/StudyTree.tsx
 create mode 100644 webapp/src/components/App/Studies/StudyTree/__test__/fixtures.ts
 create mode 100644 webapp/src/components/App/Studies/StudyTree/__test__/utils.test.tsx
 create mode 100644 webapp/src/components/App/Studies/StudyTree/index.tsx
 create mode 100644 webapp/src/components/App/Studies/StudyTree/utils.ts

diff --git a/antarest/study/model.py b/antarest/study/model.py
index b8378aa356..207662aeea 100644
--- a/antarest/study/model.py
+++ b/antarest/study/model.py
@@ -19,7 +19,7 @@
 from pathlib import Path
 
 from antares.study.version import StudyVersion
-from pydantic import BeforeValidator, PlainSerializer, field_validator
+from pydantic import BeforeValidator, PlainSerializer, computed_field, field_validator
 from sqlalchemy import (  # type: ignore
     Boolean,
     Column,
@@ -323,7 +323,7 @@ class StudyFolder:
     groups: t.List[Group]
 
 
-class NonStudyFolder(AntaresBaseModel):
+class NonStudyFolderDTO(AntaresBaseModel):
     """
     DTO used by the explorer to list directories that aren't studies directory, this will be usefull for the front
     so the user can navigate in the hierarchy
@@ -333,6 +333,19 @@ class NonStudyFolder(AntaresBaseModel):
     workspace: str
     name: str
 
+    @computed_field(alias="parentPath")
+    def parent_path(self) -> Path:
+        """
+        This computed field is convenient for the front.
+
+        This field is also aliased as parentPath to match the front-end naming convention.
+
+        Returns: the parent path of the current directory. Starting with the workspace as a root directory (we want /workspafe/folder1/sub... and not workspace/folder1/fsub... ).
+        """
+        workspace_path = Path(f"/{self.workspace}")
+        full_path = workspace_path.joinpath(self.path)
+        return full_path.parent
+
 
 class WorkspaceMetadata(AntaresBaseModel):
     """
diff --git a/antarest/study/storage/explorer_service.py b/antarest/study/storage/explorer_service.py
index 5610f3e5f8..fa9ef7fa30 100644
--- a/antarest/study/storage/explorer_service.py
+++ b/antarest/study/storage/explorer_service.py
@@ -14,7 +14,7 @@
 from typing import List
 
 from antarest.core.config import Config
-from antarest.study.model import DEFAULT_WORKSPACE_NAME, NonStudyFolder, WorkspaceMetadata
+from antarest.study.model import DEFAULT_WORKSPACE_NAME, NonStudyFolderDTO, WorkspaceMetadata
 from antarest.study.storage.utils import (
     get_folder_from_workspace,
     get_workspace_from_config,
@@ -33,7 +33,7 @@ def list_dir(
         self,
         workspace_name: str,
         workspace_directory_path: str,
-    ) -> List[NonStudyFolder]:
+    ) -> List[NonStudyFolderDTO]:
         """
         return a list of all directories under workspace_directory_path, that aren't studies.
         """
@@ -44,7 +44,7 @@ def list_dir(
             if child.is_dir() and not is_study_folder(child) and not should_ignore_folder_for_scan(child):
                 # we don't want to expose the full absolute path on the server
                 child_rel_path = child.relative_to(workspace.path)
-                directories.append(NonStudyFolder(path=child_rel_path, workspace=workspace_name, name=child.name))
+                directories.append(NonStudyFolderDTO(path=child_rel_path, workspace=workspace_name, name=child.name))
         return directories
 
     def list_workspaces(
diff --git a/antarest/study/web/explorer_blueprint.py b/antarest/study/web/explorer_blueprint.py
index 0981ba5214..b453cab787 100644
--- a/antarest/study/web/explorer_blueprint.py
+++ b/antarest/study/web/explorer_blueprint.py
@@ -18,7 +18,7 @@
 from antarest.core.config import Config
 from antarest.core.jwt import JWTUser
 from antarest.login.auth import Auth
-from antarest.study.model import NonStudyFolder, WorkspaceMetadata
+from antarest.study.model import NonStudyFolderDTO, WorkspaceMetadata
 from antarest.study.storage.explorer_service import Explorer
 
 logger = logging.getLogger(__name__)
@@ -40,13 +40,13 @@ def create_explorer_routes(config: Config, explorer: Explorer) -> APIRouter:
     @bp.get(
         "/explorer/{workspace}/_list_dir",
         summary="For a given directory, list sub directories that aren't studies",
-        response_model=List[NonStudyFolder],
+        response_model=List[NonStudyFolderDTO],
     )
     def list_dir(
         workspace: str,
         path: str,
         current_user: JWTUser = Depends(auth.get_current_user),
-    ) -> List[NonStudyFolder]:
+    ) -> List[NonStudyFolderDTO]:
         """
         Endpoint to list sub directories of a given directory
         Args:
diff --git a/tests/integration/explorer_blueprint/test_explorer.py b/tests/integration/explorer_blueprint/test_explorer.py
index dbb6f83ebc..31990b1781 100644
--- a/tests/integration/explorer_blueprint/test_explorer.py
+++ b/tests/integration/explorer_blueprint/test_explorer.py
@@ -14,7 +14,7 @@
 import pytest
 from starlette.testclient import TestClient
 
-from antarest.study.model import NonStudyFolder, WorkspaceMetadata
+from antarest.study.model import NonStudyFolderDTO, WorkspaceMetadata
 
 BAD_REQUEST_STATUS_CODE = 400
 # Status code for directory listing with invalid parameters
@@ -65,9 +65,9 @@ def test_explorer(client: TestClient, admin_access_token: str, study_tree: Path)
     )
     res.raise_for_status()
     directories_res = res.json()
-    directories_res = [NonStudyFolder(**d) for d in directories_res]
+    directories_res = [NonStudyFolderDTO(**d) for d in directories_res]
     directorires_expected = [
-        NonStudyFolder(
+        NonStudyFolderDTO(
             path=Path("folder/trash"),
             workspace="ext",
             name="trash",
diff --git a/tests/storage/business/test_explorer_service.py b/tests/storage/business/test_explorer_service.py
index 883e79cfca..37a7c0c033 100644
--- a/tests/storage/business/test_explorer_service.py
+++ b/tests/storage/business/test_explorer_service.py
@@ -15,7 +15,7 @@
 import pytest
 
 from antarest.core.config import Config, StorageConfig, WorkspaceConfig
-from antarest.study.model import DEFAULT_WORKSPACE_NAME, NonStudyFolder, WorkspaceMetadata
+from antarest.study.model import DEFAULT_WORKSPACE_NAME, NonStudyFolderDTO, WorkspaceMetadata
 from antarest.study.storage.explorer_service import Explorer
 
 
@@ -85,8 +85,7 @@ def test_list_dir_empty_string(config_scenario_a: Config):
     result = explorer.list_dir("diese", "")
 
     assert len(result) == 1
-    workspace_path = config_scenario_a.get_workspace_path(workspace="diese")
-    assert result[0] == NonStudyFolder(path=Path("folder"), workspace="diese", name="folder")
+    assert result[0] == NonStudyFolderDTO(path=Path("folder"), workspace="diese", name="folder")
 
 
 @pytest.mark.unit_test
@@ -95,11 +94,10 @@ def test_list_dir_several_subfolders(config_scenario_a: Config):
     result = explorer.list_dir("diese", "folder")
 
     assert len(result) == 3
-    workspace_path = config_scenario_a.get_workspace_path(workspace="diese")
     folder_path = Path("folder")
-    assert NonStudyFolder(path=(folder_path / "subfolder1"), workspace="diese", name="subfolder1") in result
-    assert NonStudyFolder(path=(folder_path / "subfolder2"), workspace="diese", name="subfolder2") in result
-    assert NonStudyFolder(path=(folder_path / "subfolder3"), workspace="diese", name="subfolder3") in result
+    assert NonStudyFolderDTO(path=(folder_path / "subfolder1"), workspace="diese", name="subfolder1") in result
+    assert NonStudyFolderDTO(path=(folder_path / "subfolder2"), workspace="diese", name="subfolder2") in result
+    assert NonStudyFolderDTO(path=(folder_path / "subfolder3"), workspace="diese", name="subfolder3") in result
 
 
 @pytest.mark.unit_test
diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json
index 250a75f2e6..1f13b6e551 100644
--- a/webapp/public/locales/en/main.json
+++ b/webapp/public/locales/en/main.json
@@ -642,7 +642,9 @@
   "studies.studylaunched": "{{studyname}} launched!",
   "studies.copySuffix": "Copy",
   "studies.filters.strictfolder": "Show only direct folder children",
+  "studies.filters.showAllDescendants": "Show all children",
   "studies.scanFolder": "Scan folder",
+  "studies.requestDeepScan": "Recursive scan",
   "studies.moveStudy": "Move",
   "studies.movefolderplaceholder": "Path separated by '/'",
   "studies.importcopy": "Copy to database",
@@ -674,6 +676,9 @@
   "studies.exportOutputFilter": "Export filtered output",
   "studies.selectOutput": "Select an output",
   "studies.variant": "Variant",
+  "studies.tree.error.failToFetchWorkspace": "Failed to load workspaces",
+  "studies.tree.error.failToFetchFolder": "Failed to load subfolders for {{path}}",
+  "studies.tree.error.detailsInConsole": "Details logged in the console",
   "variants.createNewVariant": "Create new variant",
   "variants.newVariant": "New variant",
   "variants.newCommand": "Add new command",
diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json
index 98d6ee71b9..14dbcda923 100644
--- a/webapp/public/locales/fr/main.json
+++ b/webapp/public/locales/fr/main.json
@@ -642,7 +642,9 @@
   "studies.studylaunched": "{{studyname}} lancé(s) !",
   "studies.copySuffix": "Copie",
   "studies.filters.strictfolder": "Afficher uniquement les descendants directs",
+  "studies.filters.showAllDescendants": "Voir les sous-dossiers",
   "studies.scanFolder": "Scanner le dossier",
+  "studies.requestDeepScan": "Scan récursif",
   "studies.moveStudy": "Déplacer",
   "studies.movefolderplaceholder": "Chemin séparé par des '/'",
   "studies.importcopy": "Copier en base",
@@ -673,7 +675,9 @@
   "studies.exportOutput": "Exporter une sortie",
   "studies.exportOutputFilter": "Exporter une sortie filtrée",
   "studies.selectOutput": "Selectionnez une sortie",
-  "studies.variant": "Variante",
+  "studies.tree.error.failToFetchWorkspace": "Échec lors de la récupération de l'espace de travail",
+  "studies.tree.error.failToFetchFolder": "Échec lors de la récupération des sous dossiers de {{path}}",
+  "studies.tree.error.detailsInConsole": "Détails de l'érreur dans la console",
   "variants.createNewVariant": "Créer une nouvelle variante",
   "variants.newVariant": "Nouvelle variante",
   "variants.newCommand": "Ajouter une nouvelle commande",
diff --git a/webapp/src/components/App/Studies/SideNav.tsx b/webapp/src/components/App/Studies/SideNav.tsx
index c0009ce7d2..b966f27fd6 100644
--- a/webapp/src/components/App/Studies/SideNav.tsx
+++ b/webapp/src/components/App/Studies/SideNav.tsx
@@ -16,7 +16,7 @@ import { useNavigate } from "react-router";
 import { Box, Typography, List, ListItem, ListItemText } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { STUDIES_SIDE_NAV_WIDTH } from "../../../theme";
-import StudyTree from "./StudyTree";
+import StudyTree from "@/components/App/Studies/StudyTree";
 import useAppSelector from "../../../redux/hooks/useAppSelector";
 import { getFavoriteStudies } from "../../../redux/selectors";
 
diff --git a/webapp/src/components/App/Studies/StudiesList/index.tsx b/webapp/src/components/App/Studies/StudiesList/index.tsx
index 6d90785471..b8b32f1646 100644
--- a/webapp/src/components/App/Studies/StudiesList/index.tsx
+++ b/webapp/src/components/App/Studies/StudiesList/index.tsx
@@ -33,7 +33,8 @@ import AutoSizer from "react-virtualized-auto-sizer";
 import HomeIcon from "@mui/icons-material/Home";
 import ArrowUpwardIcon from "@mui/icons-material/ArrowUpward";
 import ArrowDownwardIcon from "@mui/icons-material/ArrowDownward";
-import FolderOffIcon from "@mui/icons-material/FolderOff";
+import FolderIcon from "@mui/icons-material/Folder";
+import AccountTreeIcon from "@mui/icons-material/AccountTree";
 import RadarIcon from "@mui/icons-material/Radar";
 import { FixedSizeGrid, GridOnScrollProps } from "react-window";
 import { v4 as uuidv4 } from "uuid";
@@ -61,6 +62,7 @@ import RefreshButton from "../RefreshButton";
 import { scanFolder } from "../../../../services/api/study";
 import useEnqueueErrorSnackbar from "../../../../hooks/useEnqueueErrorSnackbar";
 import ConfirmationDialog from "../../../common/dialogs/ConfirmationDialog";
+import CheckBoxFE from "@/components/common/fieldEditors/CheckBoxFE";
 
 const CARD_TARGET_WIDTH = 500;
 const CARD_HEIGHT = 250;
@@ -88,6 +90,7 @@ function StudiesList(props: StudiesListProps) {
   const [selectedStudies, setSelectedStudies] = useState<string[]>([]);
   const [selectionMode, setSelectionMode] = useState(false);
   const [confirmFolderScan, setConfirmFolderScan] = useState<boolean>(false);
+  const [isRecursiveScan, setIsRecursiveScan] = useState<boolean>(false);
 
   useEffect(() => {
     setFolderList(folder.split("/"));
@@ -156,13 +159,18 @@ function StudiesList(props: StudiesListProps) {
     try {
       // Remove "/root" from the path
       const folder = folderList.slice(1).join("/");
-      await scanFolder(folder);
+      await scanFolder(folder, isRecursiveScan);
       setConfirmFolderScan(false);
+      setIsRecursiveScan(false);
     } catch (e) {
       enqueueErrorSnackbar(t("studies.error.scanFolder"), e as AxiosError);
     }
   };
 
+  const handleRecursiveScan = () => {
+    setIsRecursiveScan(!isRecursiveScan);
+  };
+
   ////////////////////////////////////////////////////////////////
   // Utils
   ////////////////////////////////////////////////////////////////
@@ -249,13 +257,21 @@ function StudiesList(props: StudiesListProps) {
           <Typography mx={2} sx={{ color: "white" }}>
             ({`${studyIds.length} ${t("global.studies").toLowerCase()}`})
           </Typography>
-          <Tooltip title={t("studies.filters.strictfolder") as string}>
-            <IconButton onClick={toggleStrictFolder}>
-              <FolderOffIcon
-                color={strictFolderFilter ? "secondary" : "disabled"}
-              />
-            </IconButton>
-          </Tooltip>
+
+          {strictFolderFilter ? (
+            <Tooltip title={t("studies.filters.strictfolder")}>
+              <IconButton onClick={toggleStrictFolder}>
+                <FolderIcon color="secondary" />
+              </IconButton>
+            </Tooltip>
+          ) : (
+            <Tooltip title={t("studies.filters.showAllDescendants")}>
+              <IconButton onClick={toggleStrictFolder}>
+                <AccountTreeIcon color="secondary" />
+              </IconButton>
+            </Tooltip>
+          )}
+
           {folder !== "root" && (
             <Tooltip title={t("studies.scanFolder") as string}>
               <IconButton onClick={() => setConfirmFolderScan(true)}>
@@ -266,12 +282,20 @@ function StudiesList(props: StudiesListProps) {
           {folder !== "root" && confirmFolderScan && (
             <ConfirmationDialog
               titleIcon={RadarIcon}
-              onCancel={() => setConfirmFolderScan(false)}
+              onCancel={() => {
+                setConfirmFolderScan(false);
+                setIsRecursiveScan(false);
+              }}
               onConfirm={handleFolderScan}
               alert="warning"
               open
             >
               {`${t("studies.scanFolder")} ${folder}?`}
+              <CheckBoxFE
+                label={t("studies.requestDeepScan")}
+                value={isRecursiveScan}
+                onChange={handleRecursiveScan}
+              />
             </ConfirmationDialog>
           )}
         </Box>
diff --git a/webapp/src/components/App/Studies/StudyTree.tsx b/webapp/src/components/App/Studies/StudyTree.tsx
deleted file mode 100644
index 7208caaec4..0000000000
--- a/webapp/src/components/App/Studies/StudyTree.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2024, RTE (https://www.rte-france.com)
- *
- * See AUTHORS.txt
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This file is part of the Antares project.
- */
-
-import { StudyTreeNode } from "./utils";
-import useAppSelector from "../../../redux/hooks/useAppSelector";
-import { getStudiesTree, getStudyFilters } from "../../../redux/selectors";
-import useAppDispatch from "../../../redux/hooks/useAppDispatch";
-import { updateStudyFilters } from "../../../redux/ducks/studies";
-import TreeItemEnhanced from "../../common/TreeItemEnhanced";
-import { SimpleTreeView } from "@mui/x-tree-view/SimpleTreeView";
-import { getParentPaths } from "../../../utils/pathUtils";
-import * as R from "ramda";
-
-function StudyTree() {
-  const folder = useAppSelector((state) => getStudyFilters(state).folder, R.T);
-  const studiesTree = useAppSelector(getStudiesTree);
-  const dispatch = useAppDispatch();
-
-  ////////////////////////////////////////////////////////////////
-  // Event Handlers
-  ////////////////////////////////////////////////////////////////
-
-  const handleTreeItemClick = (itemId: string) => {
-    dispatch(updateStudyFilters({ folder: itemId }));
-  };
-
-  ////////////////////////////////////////////////////////////////
-  // JSX
-  ////////////////////////////////////////////////////////////////
-
-  const buildTree = (children: StudyTreeNode[], parentId?: string) => {
-    return children.map((child) => {
-      const id = parentId ? `${parentId}/${child.name}` : child.name;
-
-      return (
-        <TreeItemEnhanced
-          key={id}
-          itemId={id}
-          label={child.name}
-          onClick={() => handleTreeItemClick(id)}
-        >
-          {buildTree(child.children, id)}
-        </TreeItemEnhanced>
-      );
-    });
-  };
-
-  return (
-    <SimpleTreeView
-      defaultExpandedItems={[...getParentPaths(folder), folder]}
-      defaultSelectedItems={folder}
-      sx={{
-        flexGrow: 1,
-        height: 0,
-        overflowY: "auto",
-        overflowX: "hidden",
-        width: 1,
-        py: 1,
-      }}
-    >
-      {buildTree([studiesTree])}
-    </SimpleTreeView>
-  );
-}
-
-export default StudyTree;
diff --git a/webapp/src/components/App/Studies/StudyTree/__test__/fixtures.ts b/webapp/src/components/App/Studies/StudyTree/__test__/fixtures.ts
new file mode 100644
index 0000000000..a6a4dbc3ad
--- /dev/null
+++ b/webapp/src/components/App/Studies/StudyTree/__test__/fixtures.ts
@@ -0,0 +1,157 @@
+/**
+ * Copyright (c) 2024, RTE (https://www.rte-france.com)
+ *
+ * See AUTHORS.txt
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This file is part of the Antares project.
+ */
+
+export const FIXTURES = {
+  basicTree: {
+    name: "Basic tree with single level",
+    studyTree: {
+      name: "Root",
+      path: "/",
+      children: [
+        { name: "a", path: "/a", children: [] },
+        { name: "b", path: "/b", children: [] },
+      ],
+    },
+    folders: [
+      {
+        name: "folder1",
+        path: "folder1",
+        workspace: "a",
+        parentPath: "/a",
+      },
+    ],
+    expected: {
+      name: "Root",
+      path: "/",
+      children: [
+        {
+          name: "a",
+          path: "/a",
+          children: [{ name: "folder1", path: "/a/folder1", children: [] }],
+        },
+        { name: "b", path: "/b", children: [] },
+      ],
+    },
+  },
+  nestedTree: {
+    name: "Nested tree structure",
+    studyTree: {
+      name: "Root",
+      path: "/",
+      children: [
+        {
+          name: "a",
+          path: "/a",
+          children: [{ name: "suba", path: "/a/suba", children: [] }],
+        },
+      ],
+    },
+    folders: [
+      {
+        name: "folder1",
+        path: "suba/folder1",
+        workspace: "a",
+        parentPath: "/a/suba",
+      },
+    ],
+    expected: {
+      name: "Root",
+      path: "/",
+      children: [
+        {
+          name: "a",
+          path: "/a",
+          children: [
+            {
+              name: "suba",
+              path: "/a/suba",
+              children: [
+                { name: "folder1", path: "/a/suba/folder1", children: [] },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  },
+  duplicateCase: {
+    name: "Tree with potential duplicates",
+    studyTree: {
+      name: "Root",
+      path: "/",
+      children: [
+        {
+          name: "a",
+          path: "/a",
+          children: [{ name: "folder1", path: "/a/folder1", children: [] }],
+        },
+      ],
+    },
+    folders: [
+      {
+        name: "folder1",
+        path: "/folder1",
+        workspace: "a",
+        parentPath: "/a",
+      },
+    ],
+    expected: {
+      name: "Root",
+      path: "/",
+      children: [
+        {
+          name: "a",
+          path: "/a",
+          children: [{ name: "folder1", path: "/a/folder1", children: [] }],
+        },
+      ],
+    },
+  },
+  multipleFolders: {
+    name: "Multiple folders merge",
+    studyTree: {
+      name: "Root",
+      path: "/",
+      children: [{ name: "a", path: "/a", children: [] }],
+    },
+    folders: [
+      {
+        name: "folder1",
+        path: "/folder1",
+        workspace: "a",
+        parentPath: "/a",
+      },
+      {
+        name: "folder2",
+        path: "/folder2",
+        workspace: "a",
+        parentPath: "/a",
+      },
+    ],
+    expected: {
+      name: "Root",
+      path: "/",
+      children: [
+        {
+          name: "a",
+          path: "/a",
+          children: [
+            { name: "folder1", path: "/a/folder1", children: [] },
+            { name: "folder2", path: "/a/folder2", children: [] },
+          ],
+        },
+      ],
+    },
+  },
+};
diff --git a/webapp/src/components/App/Studies/StudyTree/__test__/utils.test.tsx b/webapp/src/components/App/Studies/StudyTree/__test__/utils.test.tsx
new file mode 100644
index 0000000000..87a5419c54
--- /dev/null
+++ b/webapp/src/components/App/Studies/StudyTree/__test__/utils.test.tsx
@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) 2024, RTE (https://www.rte-france.com)
+ *
+ * See AUTHORS.txt
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This file is part of the Antares project.
+ */
+
+import { insertFoldersIfNotExist, insertWorkspacesIfNotExist } from "../utils";
+import { NonStudyFolderDTO, StudyTreeNode } from "../../utils";
+import { FIXTURES } from "./fixtures";
+
+describe("StudyTree Utils", () => {
+  describe("mergeStudyTreeAndFolders", () => {
+    test.each(Object.values(FIXTURES))(
+      "$name",
+      ({ studyTree, folders, expected }) => {
+        const result = insertFoldersIfNotExist(studyTree, folders);
+        expect(result).toEqual(expected);
+      },
+    );
+
+    test("should handle empty study tree", () => {
+      const emptyTree: StudyTreeNode = {
+        name: "Root",
+        path: "/",
+        children: [],
+      };
+      const result = insertFoldersIfNotExist(emptyTree, []);
+      expect(result).toEqual(emptyTree);
+    });
+
+    test("should handle empty folders array", () => {
+      const tree: StudyTreeNode = {
+        name: "Root",
+        path: "/",
+        children: [{ name: "a", path: "/a", children: [] }],
+      };
+      const result = insertFoldersIfNotExist(tree, []);
+      expect(result).toEqual(tree);
+    });
+
+    test("should handle invalid parent paths", () => {
+      const tree: StudyTreeNode = {
+        name: "Root",
+        path: "/",
+        children: [{ name: "a", path: "/a", children: [] }],
+      };
+      const invalidFolder: NonStudyFolderDTO = {
+        name: "invalid",
+        path: "/invalid",
+        workspace: "nonexistent",
+        parentPath: "/nonexistent",
+      };
+      const result = insertFoldersIfNotExist(tree, [invalidFolder]);
+      expect(result).toEqual(tree);
+    });
+
+    test("should handle empty workspaces", () => {
+      const tree: StudyTreeNode = {
+        name: "Root",
+        path: "/",
+        children: [
+          {
+            name: "a",
+            path: "/a",
+            children: [{ name: "suba", path: "/a/suba", children: [] }],
+          },
+        ],
+      };
+      const workspaces: string[] = [];
+      const result = insertWorkspacesIfNotExist(tree, workspaces);
+      expect(result).toEqual(tree);
+    });
+
+    test("should merge workspaces", () => {
+      const tree: StudyTreeNode = {
+        name: "Root",
+        path: "/",
+        children: [
+          {
+            name: "a",
+            path: "/a",
+            children: [{ name: "suba", path: "/a/suba", children: [] }],
+          },
+        ],
+      };
+      const expected: StudyTreeNode = {
+        name: "Root",
+        path: "/",
+        children: [
+          {
+            name: "a",
+            path: "/a",
+            children: [{ name: "suba", path: "/a/suba", children: [] }],
+          },
+          { name: "workspace1", path: "/workspace1", children: [] },
+          { name: "workspace2", path: "/workspace2", children: [] },
+        ],
+      };
+
+      const workspaces: string[] = ["a", "workspace1", "workspace2"];
+      const result = insertWorkspacesIfNotExist(tree, workspaces);
+      expect(result).toEqual(expected);
+    });
+  });
+});
diff --git a/webapp/src/components/App/Studies/StudyTree/index.tsx b/webapp/src/components/App/Studies/StudyTree/index.tsx
new file mode 100644
index 0000000000..510d70134e
--- /dev/null
+++ b/webapp/src/components/App/Studies/StudyTree/index.tsx
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) 2024, RTE (https://www.rte-france.com)
+ *
+ * See AUTHORS.txt
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This file is part of the Antares project.
+ */
+
+import { StudyTreeNode } from ".././utils";
+import useAppSelector from "../../../../redux/hooks/useAppSelector";
+import { getStudiesTree, getStudyFilters } from "../../../../redux/selectors";
+import useAppDispatch from "../../../../redux/hooks/useAppDispatch";
+import { updateStudyFilters } from "../../../../redux/ducks/studies";
+import TreeItemEnhanced from "../../../common/TreeItemEnhanced";
+import { SimpleTreeView } from "@mui/x-tree-view/SimpleTreeView";
+import { getParentPaths } from "../../../../utils/pathUtils";
+import * as R from "ramda";
+import { useState } from "react";
+import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
+import useUpdateEffectOnce from "@/hooks/useUpdateEffectOnce";
+import { fetchAndInsertSubfolders, fetchAndInsertWorkspaces } from "./utils";
+import { useTranslation } from "react-i18next";
+import { toError } from "@/utils/fnUtils";
+
+function StudyTree() {
+  const initialStudiesTree = useAppSelector(getStudiesTree);
+  const [studiesTree, setStudiesTree] = useState(initialStudiesTree);
+  const folder = useAppSelector((state) => getStudyFilters(state).folder, R.T);
+  const enqueueErrorSnackbar = useEnqueueErrorSnackbar();
+  const dispatch = useAppDispatch();
+  const [t] = useTranslation();
+
+  // Initialize folders once we have the tree
+  // we use useUpdateEffectOnce because at first render initialStudiesTree isn't initialized
+  useUpdateEffectOnce(() => {
+    updateTree("root", initialStudiesTree);
+  }, [initialStudiesTree]);
+
+  /**
+   * This function is called at the initialization of the component and when the user clicks on a folder.
+   *
+   * The study tree is built from the studies in the database. There's a scan process that run on the server
+   * to update continuously the studies in the database.
+   *
+   * However this process can take a long time, and the user shouldn't wait for hours before he can see a study he knows is already uploaded.
+   *
+   * Instead of relying on the scan process to update the tree, we'll allow the user to walk into the tree and run a scan process only when he needs to.
+   *
+   * To enable this, we'll fetch the subfolders of a folder when the user clicks on it using the explorer API.
+   *
+   * @param itemId - The id of the item clicked
+   * @param studyTreeNode - The node of the item clicked
+   */
+  async function updateTree(itemId: string, studyTreeNode: StudyTreeNode) {
+    let treeAfterWorkspacesUpdate = studiesTree;
+    let chidrenPaths = studyTreeNode.children.map(
+      (child) => `root${child.path}`,
+    );
+    // If the user clicks on the root folder, we fetch the workspaces and insert them.
+    // Then we fetch the direct subfolders of the workspaces.
+    if (itemId === "root") {
+      try {
+        treeAfterWorkspacesUpdate = await fetchAndInsertWorkspaces(studiesTree);
+        chidrenPaths = treeAfterWorkspacesUpdate.children.map(
+          (child) => `root${child.path}`,
+        );
+      } catch (error) {
+        enqueueErrorSnackbar(
+          "studies.tree.error.failToFetchWorkspace",
+          toError(error),
+        );
+      }
+    } else {
+      // If the user clicks on a folder, we add the path of the clicked folder to the list of paths to fetch.
+      // as well as the path of the children of the clicked folder.
+      // If we don't fetch the subfolders of the children then we won't know if they're themselves folders, which we need
+      // to know to display the little arrow next to the subfolder.
+      // On the other hand, if we fetch only the subfolders of the children, then we won't fetch their "siblings" folder
+      // if one of them is added.
+      chidrenPaths = [studyTreeNode.path].concat(chidrenPaths);
+    }
+
+    const [treeAfterChildrenUpdate, failedPath] =
+      await fetchAndInsertSubfolders(chidrenPaths, treeAfterWorkspacesUpdate);
+    if (failedPath.length > 0) {
+      enqueueErrorSnackbar(
+        t("studies.tree.error.failToFetchFolder", {
+          path: failedPath.join(" "),
+          interpolation: { escapeValue: false },
+        }),
+        t("studies.tree.error.detailsInConsole"),
+      );
+    }
+    setStudiesTree(treeAfterChildrenUpdate);
+  }
+
+  ////////////////////////////////////////////////////////////////
+  // Event Handlers
+  ////////////////////////////////////////////////////////////////
+
+  const handleTreeItemClick = async (
+    itemId: string,
+    studyTreeNode: StudyTreeNode,
+  ) => {
+    dispatch(updateStudyFilters({ folder: itemId }));
+    updateTree(itemId, studyTreeNode);
+  };
+
+  ////////////////////////////////////////////////////////////////
+  // JSX
+  ////////////////////////////////////////////////////////////////
+
+  const buildTree = (children: StudyTreeNode[], parentId?: string) => {
+    return children.map((child) => {
+      const id = parentId ? `${parentId}/${child.name}` : child.name;
+
+      return (
+        <TreeItemEnhanced
+          key={id}
+          itemId={id}
+          label={child.name}
+          onClick={() => handleTreeItemClick(id, child)}
+        >
+          {buildTree(child.children, id)}
+        </TreeItemEnhanced>
+      );
+    });
+  };
+
+  return (
+    <SimpleTreeView
+      defaultExpandedItems={[...getParentPaths(folder), folder]}
+      defaultSelectedItems={folder}
+      sx={{
+        flexGrow: 1,
+        height: 0,
+        width: 1,
+        py: 1,
+        overflowY: "auto",
+        overflowX: "hidden",
+      }}
+    >
+      {buildTree([studiesTree])}
+    </SimpleTreeView>
+  );
+}
+
+export default StudyTree;
diff --git a/webapp/src/components/App/Studies/StudyTree/utils.ts b/webapp/src/components/App/Studies/StudyTree/utils.ts
new file mode 100644
index 0000000000..14c4a5b008
--- /dev/null
+++ b/webapp/src/components/App/Studies/StudyTree/utils.ts
@@ -0,0 +1,208 @@
+/**
+ * Copyright (c) 2024, RTE (https://www.rte-france.com)
+ *
+ * See AUTHORS.txt
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This file is part of the Antares project.
+ */
+
+import { NonStudyFolderDTO, StudyTreeNode } from "../utils";
+import * as api from "../../../../services/api/study";
+
+/**
+ * Add a folder that was returned by the explorer into the study tree view.
+ *
+ * This function doesn't mutate the tree, it returns a new tree with the folder inserted.
+ *
+ * If the folder is already in the tree, the tree returnred will be equal to the tree given to the function.
+ *
+ * @param studiesTree study tree to insert the folder into
+ * @param folder folder to inert into the tree
+ * @returns study tree with the folder inserted if it wasn't already there.
+ * New branch is created if it contain the folder otherwise the branch is left unchanged.
+ */
+function insertFolderIfNotExist(
+  studiesTree: StudyTreeNode,
+  folder: NonStudyFolderDTO,
+): StudyTreeNode {
+  // Early return if folder doesn't belong in this branch
+  if (!folder.parentPath.startsWith(studiesTree.path)) {
+    return studiesTree;
+  }
+
+  // direct child case
+  if (folder.parentPath == studiesTree.path) {
+    const folderExists = studiesTree.children.some(
+      (child) => child.name === folder.name,
+    );
+    if (folderExists) {
+      return studiesTree;
+    }
+    // parent path is the same, but no folder with the same name at this level
+    return {
+      ...studiesTree,
+      children: [
+        ...studiesTree.children,
+        {
+          path: `${folder.parentPath}/${folder.name}`,
+          name: folder.name,
+          children: [],
+        },
+      ],
+    };
+  }
+
+  // not a direct child, but does belong to this branch so recursively walk though the tree
+  return {
+    ...studiesTree,
+    children: studiesTree.children.map((child) =>
+      insertFolderIfNotExist(child, folder),
+    ),
+  };
+}
+
+/**
+ * Insert several folders in the study tree if they don't exist already in the tree.
+ *
+ * This function doesn't mutate the tree, it returns a new tree with the folders inserted
+ *
+ * The folders are inserted in the order they are given.
+ *
+ * @param studiesTree study tree to insert the folder into
+ * @param folders folders to inert into the tree
+ * @param studiesTree study tree to insert the folder into
+ * @param folder folder to inert into the tree
+ * @returns study tree with the folder inserted if it wasn't already there.
+ * New branch is created if it contain the folder otherwise the branch is left unchanged.
+ */
+export function insertFoldersIfNotExist(
+  studiesTree: StudyTreeNode,
+  folders: NonStudyFolderDTO[],
+): StudyTreeNode {
+  return folders.reduce(
+    (tree, folder) => insertFolderIfNotExist(tree, folder),
+    studiesTree,
+  );
+}
+
+/**
+ * Call the explorer api to fetch the subfolders under the given path.
+ *
+ * @param path path of the subfolder to fetch, should sart with root, e.g. root/workspace/folder1
+ * @returns list of subfolders under the given path
+ */
+async function fetchSubfolders(path: string): Promise<NonStudyFolderDTO[]> {
+  if (path === "root") {
+    // Under root there're workspaces not subfolders
+    return [];
+  }
+  // less than 2 parts means we're at the root level
+  const pathParts = path.split("/");
+  if (pathParts.length < 2) {
+    return [];
+  }
+  // path parts should be ["root", workspace, "folder1", ...]
+  const workspace = pathParts[1];
+  const subPath = pathParts.slice(2).join("/");
+  return api.getFolders(workspace, subPath);
+}
+
+/**
+ * Fetch and insert the subfolders under the given paths into the study tree.
+ *
+ * This function is used to fill the study tree when the user clicks on a folder.
+ *
+ * Subfolders are inserted only if they don't exist already in the tree.
+ *
+ * This function doesn't mutate the tree, it returns a new tree with the subfolders inserted
+ *
+ * @param paths list of paths to fetch the subfolders for
+ * @param studiesTree study tree to insert the subfolders into
+ * @returns a tuple with study tree with the subfolders inserted if they weren't already there and path for which
+ * the fetch failed.
+ */
+export async function fetchAndInsertSubfolders(
+  paths: string[],
+  studiesTree: StudyTreeNode,
+): Promise<[StudyTreeNode, string[]]> {
+  const results = await Promise.allSettled(
+    paths.map((path) => fetchSubfolders(path)),
+  );
+
+  return results.reduce<[StudyTreeNode, string[]]>(
+    ([tree, failed], result, index) => {
+      if (result.status === "fulfilled") {
+        return [insertFoldersIfNotExist(tree, result.value), failed];
+      }
+      console.error("Failed to load path:", paths[index], result.reason);
+      return [tree, [...failed, paths[index]]];
+    },
+    [studiesTree, []],
+  );
+}
+
+/**
+ * Insert a workspace into the study tree if it doesn't exist already.
+ *
+ * This function doesn't mutate the tree, it returns a new tree with the workspace inserted.
+ *
+ * @param workspace key of the workspace
+ * @param stydyTree study tree to insert the workspace into
+ * @returns study tree with the empty workspace inserted if it wasn't already there.
+ */
+function insertWorkspaceIfNotExist(
+  stydyTree: StudyTreeNode,
+  workspace: string,
+) {
+  const emptyNode = { name: workspace, path: `/${workspace}`, children: [] };
+  if (stydyTree.children.some((child) => child.name === workspace)) {
+    return stydyTree;
+  }
+  return {
+    ...stydyTree,
+    children: [...stydyTree.children, emptyNode],
+  };
+}
+
+/**
+ * Insert several workspaces into the study tree if they don't exist already in the tree.
+ *
+ * This function doesn't mutate the tree, it returns a new tree with the workspaces inserted.
+ *
+ * The workspaces are inserted in the order they are given.
+ *
+ * @param workspaces workspaces to insert into the tree
+ * @param stydyTree study tree to insert the workspaces into
+ * @returns study tree with the empty workspaces inserted if they weren't already there.
+ */
+export function insertWorkspacesIfNotExist(
+  stydyTree: StudyTreeNode,
+  workspaces: string[],
+): StudyTreeNode {
+  return workspaces.reduce((acc, workspace) => {
+    return insertWorkspaceIfNotExist(acc, workspace);
+  }, stydyTree);
+}
+
+/**
+ * Fetch and insert the workspaces into the study tree.
+ *
+ * Workspaces are inserted only if they don't exist already in the tree.
+ *
+ * This function doesn't mutate the tree, it returns a new tree with the workspaces inserted.
+ *
+ * @param studyTree study tree to insert the workspaces into
+ * @returns study tree with the workspaces inserted if they weren't already there.
+ */
+export async function fetchAndInsertWorkspaces(
+  studyTree: StudyTreeNode,
+): Promise<StudyTreeNode> {
+  const workspaces = await api.getWorkspaces();
+  return insertWorkspacesIfNotExist(studyTree, workspaces);
+}
diff --git a/webapp/src/components/App/Studies/utils.ts b/webapp/src/components/App/Studies/utils.ts
index 3f2ff61564..8117450702 100644
--- a/webapp/src/components/App/Studies/utils.ts
+++ b/webapp/src/components/App/Studies/utils.ts
@@ -20,6 +20,13 @@ export interface StudyTreeNode {
   children: StudyTreeNode[];
 }
 
+export interface NonStudyFolderDTO {
+  name: string;
+  path: string;
+  workspace: string;
+  parentPath: string;
+}
+
 /**
  * Builds a tree structure from a list of study metadata.
  *
diff --git a/webapp/src/redux/ducks/studies.ts b/webapp/src/redux/ducks/studies.ts
index 3b3e8b04d2..9b4603a23f 100644
--- a/webapp/src/redux/ducks/studies.ts
+++ b/webapp/src/redux/ducks/studies.ts
@@ -94,7 +94,7 @@ const initialState = studiesAdapter.getInitialState({
   filters: {
     inputValue: "",
     folder: "root",
-    strictFolder: false,
+    strictFolder: true,
     managed: false,
     archived: false,
     variant: false,
diff --git a/webapp/src/services/api/study.ts b/webapp/src/services/api/study.ts
index 53d4a67925..349134d790 100644
--- a/webapp/src/services/api/study.ts
+++ b/webapp/src/services/api/study.ts
@@ -34,6 +34,11 @@ import { getConfig } from "../config";
 import { convertStudyDtoToMetadata } from "../utils";
 import { FileDownloadTask } from "./downloads";
 import { StudyMapDistrict } from "../../redux/ducks/studyMaps";
+import { NonStudyFolderDTO } from "@/components/App/Studies/utils";
+
+interface Workspace {
+  name: string;
+}
 
 const getStudiesRaw = async (): Promise<Record<string, StudyMetadataDTO>> => {
   const res = await client.get(`/v1/studies`);
@@ -48,6 +53,30 @@ export const getStudies = async (): Promise<StudyMetadata[]> => {
   });
 };
 
+export const getWorkspaces = async (): Promise<string[]> => {
+  const res = await client.get<Workspace[]>(
+    `/v1/private/explorer/_list_workspaces`,
+  );
+  return res.data.map((folder) => folder.name);
+};
+
+/**
+ * Call the explorer API to get the list of folders in a workspace
+ *
+ * @param workspace - workspace name
+ * @param folderPath - path starting from the workspace root (not including the workspace name)
+ * @returns list of folders that are not studies, under the given path
+ */
+export const getFolders = async (
+  workspace: string,
+  folderPath: string,
+): Promise<NonStudyFolderDTO[]> => {
+  const res = await client.get<NonStudyFolderDTO[]>(
+    `/v1/private/explorer/${workspace}/_list_dir?path=${encodeURIComponent(folderPath)}`,
+  );
+  return res.data;
+};
+
 export const getStudyVersions = async (): Promise<string[]> => {
   const res = await client.get("/v1/studies/_versions");
   return res.data;
@@ -434,8 +463,13 @@ export const updateStudyMetadata = async (
   return res.data;
 };
 
-export const scanFolder = async (folderPath: string): Promise<void> => {
-  await client.post(`/v1/watcher/_scan?path=${encodeURIComponent(folderPath)}`);
+export const scanFolder = async (
+  folderPath: string,
+  recursive = false,
+): Promise<void> => {
+  await client.post(
+    `/v1/watcher/_scan?path=${encodeURIComponent(folderPath)}&recursive=${recursive}`,
+  );
 };
 
 export const getStudyLayers = async (uuid: string): Promise<StudyLayer[]> => {

From d8df7e901361405a267f36dff2721a63a8ad16b7 Mon Sep 17 00:00:00 2001
From: MartinBelthle <martin.belthle@rte-france.com>
Date: Thu, 19 Dec 2024 11:49:03 +0100
Subject: [PATCH 25/31] fix(xpansion): fix several issues related to weights
 and constraints (#2273)

---
 .../study/business/xpansion_management.py     | 44 +++++++------
 .../storage/business/test_xpansion_manager.py | 61 +++++++++++++++++--
 2 files changed, 81 insertions(+), 24 deletions(-)

diff --git a/antarest/study/business/xpansion_management.py b/antarest/study/business/xpansion_management.py
index c86dd5cab7..3f19e7c8f3 100644
--- a/antarest/study/business/xpansion_management.py
+++ b/antarest/study/business/xpansion_management.py
@@ -203,7 +203,7 @@ def from_config(cls, config_obj: JSON) -> "GetXpansionSettings":
         try:
             return cls(**config_obj)
         except ValidationError:
-            return cls.construct(**config_obj)
+            return cls.model_construct(**config_obj)
 
 
 @all_optional_model
@@ -270,11 +270,6 @@ def __init__(self) -> None:
         super().__init__(http.HTTPStatus.BAD_REQUEST)
 
 
-class WrongTypeFormat(HTTPException):
-    def __init__(self, message: str) -> None:
-        super().__init__(http.HTTPStatus.BAD_REQUEST, message)
-
-
 class WrongLinkFormatError(HTTPException):
     def __init__(self, message: str) -> None:
         super().__init__(http.HTTPStatus.BAD_REQUEST, message)
@@ -295,11 +290,6 @@ def __init__(self, message: str) -> None:
         super().__init__(http.HTTPStatus.NOT_FOUND, message)
 
 
-class ConstraintsNotFoundError(HTTPException):
-    def __init__(self, message: str) -> None:
-        super().__init__(http.HTTPStatus.NOT_FOUND, message)
-
-
 class FileCurrentlyUsedInSettings(HTTPException):
     def __init__(self, message: str) -> None:
         super().__init__(http.HTTPStatus.CONFLICT, message)
@@ -337,7 +327,10 @@ def create_xpansion_configuration(self, study: Study, zipped_config: t.Optional[
 
             xpansion_settings = XpansionSettings()
             settings_obj = xpansion_settings.model_dump(
-                mode="json", by_alias=True, exclude_none=True, exclude={"sensitivity_config"}
+                mode="json",
+                by_alias=True,
+                exclude_none=True,
+                exclude={"sensitivity_config", "yearly_weights", "additional_constraints"},
             )
             if xpansion_settings.sensitivity_config:
                 sensitivity_obj = xpansion_settings.sensitivity_config.model_dump(
@@ -389,22 +382,33 @@ def update_xpansion_settings(
 
         file_study = self.study_storage_service.get_storage(study).get_raw(study)
 
-        # Specific handling of the additional constraints file:
-        # - If the file name is `None`, it means that the user does not want to select an additional constraints file.
-        # - If the file name is empty, it means that the user wants to deselect the additional constraints file,
-        #   but he does not want to delete it from the expansion configuration folder.
-        # - If the file name is not empty, it means that the user wants to select an additional constraints file.
+        # Specific handling for yearly_weights and additional_constraints:
+        # - If the attributes are given, it means that the user wants to select a file.
         #   It is therefore necessary to check that the file exists.
-        constraints_file = new_xpansion_settings.additional_constraints
-        if constraints_file:
+        # - Else, it means the user want to deselect the additional constraints file,
+        #  but he does not want to delete it from the expansion configuration folder.
+        excludes = {"sensitivity_config"}
+        if constraints_file := new_xpansion_settings.additional_constraints:
             try:
                 constraints_url = ["user", "expansion", "constraints", constraints_file]
                 file_study.tree.get(constraints_url)
             except ChildNotFoundError:
                 msg = f"Additional constraints file '{constraints_file}' does not exist"
                 raise XpansionFileNotFoundError(msg) from None
+        else:
+            excludes.add("additional_constraints")
+
+        if weights_file := new_xpansion_settings.yearly_weights:
+            try:
+                weights_url = ["user", "expansion", "weights", weights_file]
+                file_study.tree.get(weights_url)
+            except ChildNotFoundError:
+                msg = f"Additional weights file '{weights_file}' does not exist"
+                raise XpansionFileNotFoundError(msg) from None
+        else:
+            excludes.add("yearly_weights")
 
-        config_obj = updated_settings.model_dump(mode="json", by_alias=True, exclude={"sensitivity_config"})
+        config_obj = updated_settings.model_dump(mode="json", by_alias=True, exclude=excludes)
         file_study.tree.save(config_obj, ["user", "expansion", "settings"])
 
         if new_xpansion_settings.sensitivity_config:
diff --git a/tests/storage/business/test_xpansion_manager.py b/tests/storage/business/test_xpansion_manager.py
index 5b1f8d1abd..325ddf7e0c 100644
--- a/tests/storage/business/test_xpansion_manager.py
+++ b/tests/storage/business/test_xpansion_manager.py
@@ -127,8 +127,6 @@ def set_up_xpansion_manager(tmp_path: Path) -> t.Tuple[FileStudy, RawStudy, Xpan
                     "log_level": 0,
                     "separation_parameter": 0.5,
                     "batch_size": 96,
-                    "yearly-weights": "",
-                    "additional-constraints": "",
                     "timelimit": int(1e12),
                 },
                 "weights": {},
@@ -228,8 +226,6 @@ def test_update_xpansion_settings(tmp_path: Path) -> None:
         "max_iteration": 123,
         "uc_type": UcType.EXPANSION_FAST,
         "master": Master.INTEGER,
-        "yearly-weights": "",
-        "additional-constraints": "",
         "relaxed_optimality_gap": "1.2%",  # percentage
         "relative_gap": 1e-12,
         "batch_size": 4,
@@ -463,6 +459,63 @@ def test_update_constraints(tmp_path: Path) -> None:
     assert actual_settings.additional_constraints == ""
 
 
+@pytest.mark.unit_test
+def test_update_constraints_via_the_front(tmp_path: Path) -> None:
+    empty_study, study, xpansion_manager = set_up_xpansion_manager(tmp_path)
+    empty_study.tree.save({"user": {"expansion": {"constraints": {"constraints.txt": b"0"}}}})
+
+    # asserts we can update a field without writing the field additional constraint in the file
+    front_settings = UpdateXpansionSettings(master="relaxed")
+    xpansion_manager.update_xpansion_settings(study, front_settings)
+    json_content = empty_study.tree.get(["user", "expansion", "settings"])
+    assert "additional-constraints" not in json_content
+    assert json_content["master"] == "relaxed"
+
+    # asserts the front-end can fill additional constraints
+    new_constraint = {"additional-constraints": "constraints.txt"}
+    front_settings = UpdateXpansionSettings.model_validate(new_constraint)
+    actual_settings = xpansion_manager.update_xpansion_settings(study, front_settings)
+    assert actual_settings.additional_constraints == "constraints.txt"
+    json_content = empty_study.tree.get(["user", "expansion", "settings"])
+    assert json_content["additional-constraints"] == "constraints.txt"
+
+    # asserts the front-end can unselect this constraint by not filling it
+    front_settings = UpdateXpansionSettings()
+    actual_settings = xpansion_manager.update_xpansion_settings(study, front_settings)
+    assert actual_settings.additional_constraints == ""
+    json_content = empty_study.tree.get(["user", "expansion", "settings"])
+    assert "additional-constraints" not in json_content
+
+
+@pytest.mark.unit_test
+def test_update_weights_via_the_front(tmp_path: Path) -> None:
+    # Same test as the one for constraints
+    empty_study, study, xpansion_manager = set_up_xpansion_manager(tmp_path)
+    empty_study.tree.save({"user": {"expansion": {"weights": {"weights.txt": b"0"}}}})
+
+    # asserts we can update a field without writing the field yearly-weights in the file
+    front_settings = UpdateXpansionSettings(master="relaxed")
+    xpansion_manager.update_xpansion_settings(study, front_settings)
+    json_content = empty_study.tree.get(["user", "expansion", "settings"])
+    assert "yearly-weights" not in json_content
+    assert json_content["master"] == "relaxed"
+
+    # asserts the front-end can fill yearly weights
+    new_constraint = {"yearly-weights": "weights.txt"}
+    front_settings = UpdateXpansionSettings.model_validate(new_constraint)
+    actual_settings = xpansion_manager.update_xpansion_settings(study, front_settings)
+    assert actual_settings.yearly_weights == "weights.txt"
+    json_content = empty_study.tree.get(["user", "expansion", "settings"])
+    assert json_content["yearly-weights"] == "weights.txt"
+
+    # asserts the front-end can unselect this weight by not filling it
+    front_settings = UpdateXpansionSettings()
+    actual_settings = xpansion_manager.update_xpansion_settings(study, front_settings)
+    assert actual_settings.yearly_weights == ""
+    json_content = empty_study.tree.get(["user", "expansion", "settings"])
+    assert "yearly-weights" not in json_content
+
+
 @pytest.mark.unit_test
 def test_add_resources(tmp_path: Path) -> None:
     empty_study, study, xpansion_manager = set_up_xpansion_manager(tmp_path)

From 4b68b036d0aa26d04276d140c6746503b2d5b214 Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Fri, 20 Dec 2024 17:10:09 +0100
Subject: [PATCH 26/31] Revert "feat(ui-studies): add on click fetch and
 display list of non studies folder (#2224)"

This reverts commit 763f3707a969da706d3b5b004103a1676e3b02ba.
---
 antarest/study/model.py                       |  17 +-
 antarest/study/storage/explorer_service.py    |   6 +-
 antarest/study/web/explorer_blueprint.py      |   6 +-
 .../explorer_blueprint/test_explorer.py       |   6 +-
 .../storage/business/test_explorer_service.py |  12 +-
 webapp/public/locales/en/main.json            |   5 -
 webapp/public/locales/fr/main.json            |   6 +-
 webapp/src/components/App/Studies/SideNav.tsx |   2 +-
 .../App/Studies/StudiesList/index.tsx         |  44 +---
 .../src/components/App/Studies/StudyTree.tsx  |  77 +++++++
 .../Studies/StudyTree/__test__/fixtures.ts    | 157 -------------
 .../Studies/StudyTree/__test__/utils.test.tsx | 113 ----------
 .../App/Studies/StudyTree/index.tsx           | 154 -------------
 .../components/App/Studies/StudyTree/utils.ts | 208 ------------------
 webapp/src/components/App/Studies/utils.ts    |   7 -
 webapp/src/redux/ducks/studies.ts             |   2 +-
 webapp/src/services/api/study.ts              |  38 +---
 17 files changed, 110 insertions(+), 750 deletions(-)
 create mode 100644 webapp/src/components/App/Studies/StudyTree.tsx
 delete mode 100644 webapp/src/components/App/Studies/StudyTree/__test__/fixtures.ts
 delete mode 100644 webapp/src/components/App/Studies/StudyTree/__test__/utils.test.tsx
 delete mode 100644 webapp/src/components/App/Studies/StudyTree/index.tsx
 delete mode 100644 webapp/src/components/App/Studies/StudyTree/utils.ts

diff --git a/antarest/study/model.py b/antarest/study/model.py
index 207662aeea..b8378aa356 100644
--- a/antarest/study/model.py
+++ b/antarest/study/model.py
@@ -19,7 +19,7 @@
 from pathlib import Path
 
 from antares.study.version import StudyVersion
-from pydantic import BeforeValidator, PlainSerializer, computed_field, field_validator
+from pydantic import BeforeValidator, PlainSerializer, field_validator
 from sqlalchemy import (  # type: ignore
     Boolean,
     Column,
@@ -323,7 +323,7 @@ class StudyFolder:
     groups: t.List[Group]
 
 
-class NonStudyFolderDTO(AntaresBaseModel):
+class NonStudyFolder(AntaresBaseModel):
     """
     DTO used by the explorer to list directories that aren't studies directory, this will be usefull for the front
     so the user can navigate in the hierarchy
@@ -333,19 +333,6 @@ class NonStudyFolderDTO(AntaresBaseModel):
     workspace: str
     name: str
 
-    @computed_field(alias="parentPath")
-    def parent_path(self) -> Path:
-        """
-        This computed field is convenient for the front.
-
-        This field is also aliased as parentPath to match the front-end naming convention.
-
-        Returns: the parent path of the current directory. Starting with the workspace as a root directory (we want /workspafe/folder1/sub... and not workspace/folder1/fsub... ).
-        """
-        workspace_path = Path(f"/{self.workspace}")
-        full_path = workspace_path.joinpath(self.path)
-        return full_path.parent
-
 
 class WorkspaceMetadata(AntaresBaseModel):
     """
diff --git a/antarest/study/storage/explorer_service.py b/antarest/study/storage/explorer_service.py
index fa9ef7fa30..5610f3e5f8 100644
--- a/antarest/study/storage/explorer_service.py
+++ b/antarest/study/storage/explorer_service.py
@@ -14,7 +14,7 @@
 from typing import List
 
 from antarest.core.config import Config
-from antarest.study.model import DEFAULT_WORKSPACE_NAME, NonStudyFolderDTO, WorkspaceMetadata
+from antarest.study.model import DEFAULT_WORKSPACE_NAME, NonStudyFolder, WorkspaceMetadata
 from antarest.study.storage.utils import (
     get_folder_from_workspace,
     get_workspace_from_config,
@@ -33,7 +33,7 @@ def list_dir(
         self,
         workspace_name: str,
         workspace_directory_path: str,
-    ) -> List[NonStudyFolderDTO]:
+    ) -> List[NonStudyFolder]:
         """
         return a list of all directories under workspace_directory_path, that aren't studies.
         """
@@ -44,7 +44,7 @@ def list_dir(
             if child.is_dir() and not is_study_folder(child) and not should_ignore_folder_for_scan(child):
                 # we don't want to expose the full absolute path on the server
                 child_rel_path = child.relative_to(workspace.path)
-                directories.append(NonStudyFolderDTO(path=child_rel_path, workspace=workspace_name, name=child.name))
+                directories.append(NonStudyFolder(path=child_rel_path, workspace=workspace_name, name=child.name))
         return directories
 
     def list_workspaces(
diff --git a/antarest/study/web/explorer_blueprint.py b/antarest/study/web/explorer_blueprint.py
index b453cab787..0981ba5214 100644
--- a/antarest/study/web/explorer_blueprint.py
+++ b/antarest/study/web/explorer_blueprint.py
@@ -18,7 +18,7 @@
 from antarest.core.config import Config
 from antarest.core.jwt import JWTUser
 from antarest.login.auth import Auth
-from antarest.study.model import NonStudyFolderDTO, WorkspaceMetadata
+from antarest.study.model import NonStudyFolder, WorkspaceMetadata
 from antarest.study.storage.explorer_service import Explorer
 
 logger = logging.getLogger(__name__)
@@ -40,13 +40,13 @@ def create_explorer_routes(config: Config, explorer: Explorer) -> APIRouter:
     @bp.get(
         "/explorer/{workspace}/_list_dir",
         summary="For a given directory, list sub directories that aren't studies",
-        response_model=List[NonStudyFolderDTO],
+        response_model=List[NonStudyFolder],
     )
     def list_dir(
         workspace: str,
         path: str,
         current_user: JWTUser = Depends(auth.get_current_user),
-    ) -> List[NonStudyFolderDTO]:
+    ) -> List[NonStudyFolder]:
         """
         Endpoint to list sub directories of a given directory
         Args:
diff --git a/tests/integration/explorer_blueprint/test_explorer.py b/tests/integration/explorer_blueprint/test_explorer.py
index 31990b1781..dbb6f83ebc 100644
--- a/tests/integration/explorer_blueprint/test_explorer.py
+++ b/tests/integration/explorer_blueprint/test_explorer.py
@@ -14,7 +14,7 @@
 import pytest
 from starlette.testclient import TestClient
 
-from antarest.study.model import NonStudyFolderDTO, WorkspaceMetadata
+from antarest.study.model import NonStudyFolder, WorkspaceMetadata
 
 BAD_REQUEST_STATUS_CODE = 400
 # Status code for directory listing with invalid parameters
@@ -65,9 +65,9 @@ def test_explorer(client: TestClient, admin_access_token: str, study_tree: Path)
     )
     res.raise_for_status()
     directories_res = res.json()
-    directories_res = [NonStudyFolderDTO(**d) for d in directories_res]
+    directories_res = [NonStudyFolder(**d) for d in directories_res]
     directorires_expected = [
-        NonStudyFolderDTO(
+        NonStudyFolder(
             path=Path("folder/trash"),
             workspace="ext",
             name="trash",
diff --git a/tests/storage/business/test_explorer_service.py b/tests/storage/business/test_explorer_service.py
index 37a7c0c033..883e79cfca 100644
--- a/tests/storage/business/test_explorer_service.py
+++ b/tests/storage/business/test_explorer_service.py
@@ -15,7 +15,7 @@
 import pytest
 
 from antarest.core.config import Config, StorageConfig, WorkspaceConfig
-from antarest.study.model import DEFAULT_WORKSPACE_NAME, NonStudyFolderDTO, WorkspaceMetadata
+from antarest.study.model import DEFAULT_WORKSPACE_NAME, NonStudyFolder, WorkspaceMetadata
 from antarest.study.storage.explorer_service import Explorer
 
 
@@ -85,7 +85,8 @@ def test_list_dir_empty_string(config_scenario_a: Config):
     result = explorer.list_dir("diese", "")
 
     assert len(result) == 1
-    assert result[0] == NonStudyFolderDTO(path=Path("folder"), workspace="diese", name="folder")
+    workspace_path = config_scenario_a.get_workspace_path(workspace="diese")
+    assert result[0] == NonStudyFolder(path=Path("folder"), workspace="diese", name="folder")
 
 
 @pytest.mark.unit_test
@@ -94,10 +95,11 @@ def test_list_dir_several_subfolders(config_scenario_a: Config):
     result = explorer.list_dir("diese", "folder")
 
     assert len(result) == 3
+    workspace_path = config_scenario_a.get_workspace_path(workspace="diese")
     folder_path = Path("folder")
-    assert NonStudyFolderDTO(path=(folder_path / "subfolder1"), workspace="diese", name="subfolder1") in result
-    assert NonStudyFolderDTO(path=(folder_path / "subfolder2"), workspace="diese", name="subfolder2") in result
-    assert NonStudyFolderDTO(path=(folder_path / "subfolder3"), workspace="diese", name="subfolder3") in result
+    assert NonStudyFolder(path=(folder_path / "subfolder1"), workspace="diese", name="subfolder1") in result
+    assert NonStudyFolder(path=(folder_path / "subfolder2"), workspace="diese", name="subfolder2") in result
+    assert NonStudyFolder(path=(folder_path / "subfolder3"), workspace="diese", name="subfolder3") in result
 
 
 @pytest.mark.unit_test
diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json
index 1f13b6e551..250a75f2e6 100644
--- a/webapp/public/locales/en/main.json
+++ b/webapp/public/locales/en/main.json
@@ -642,9 +642,7 @@
   "studies.studylaunched": "{{studyname}} launched!",
   "studies.copySuffix": "Copy",
   "studies.filters.strictfolder": "Show only direct folder children",
-  "studies.filters.showAllDescendants": "Show all children",
   "studies.scanFolder": "Scan folder",
-  "studies.requestDeepScan": "Recursive scan",
   "studies.moveStudy": "Move",
   "studies.movefolderplaceholder": "Path separated by '/'",
   "studies.importcopy": "Copy to database",
@@ -676,9 +674,6 @@
   "studies.exportOutputFilter": "Export filtered output",
   "studies.selectOutput": "Select an output",
   "studies.variant": "Variant",
-  "studies.tree.error.failToFetchWorkspace": "Failed to load workspaces",
-  "studies.tree.error.failToFetchFolder": "Failed to load subfolders for {{path}}",
-  "studies.tree.error.detailsInConsole": "Details logged in the console",
   "variants.createNewVariant": "Create new variant",
   "variants.newVariant": "New variant",
   "variants.newCommand": "Add new command",
diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json
index 14dbcda923..98d6ee71b9 100644
--- a/webapp/public/locales/fr/main.json
+++ b/webapp/public/locales/fr/main.json
@@ -642,9 +642,7 @@
   "studies.studylaunched": "{{studyname}} lancé(s) !",
   "studies.copySuffix": "Copie",
   "studies.filters.strictfolder": "Afficher uniquement les descendants directs",
-  "studies.filters.showAllDescendants": "Voir les sous-dossiers",
   "studies.scanFolder": "Scanner le dossier",
-  "studies.requestDeepScan": "Scan récursif",
   "studies.moveStudy": "Déplacer",
   "studies.movefolderplaceholder": "Chemin séparé par des '/'",
   "studies.importcopy": "Copier en base",
@@ -675,9 +673,7 @@
   "studies.exportOutput": "Exporter une sortie",
   "studies.exportOutputFilter": "Exporter une sortie filtrée",
   "studies.selectOutput": "Selectionnez une sortie",
-  "studies.tree.error.failToFetchWorkspace": "Échec lors de la récupération de l'espace de travail",
-  "studies.tree.error.failToFetchFolder": "Échec lors de la récupération des sous dossiers de {{path}}",
-  "studies.tree.error.detailsInConsole": "Détails de l'érreur dans la console",
+  "studies.variant": "Variante",
   "variants.createNewVariant": "Créer une nouvelle variante",
   "variants.newVariant": "Nouvelle variante",
   "variants.newCommand": "Ajouter une nouvelle commande",
diff --git a/webapp/src/components/App/Studies/SideNav.tsx b/webapp/src/components/App/Studies/SideNav.tsx
index b966f27fd6..c0009ce7d2 100644
--- a/webapp/src/components/App/Studies/SideNav.tsx
+++ b/webapp/src/components/App/Studies/SideNav.tsx
@@ -16,7 +16,7 @@ import { useNavigate } from "react-router";
 import { Box, Typography, List, ListItem, ListItemText } from "@mui/material";
 import { useTranslation } from "react-i18next";
 import { STUDIES_SIDE_NAV_WIDTH } from "../../../theme";
-import StudyTree from "@/components/App/Studies/StudyTree";
+import StudyTree from "./StudyTree";
 import useAppSelector from "../../../redux/hooks/useAppSelector";
 import { getFavoriteStudies } from "../../../redux/selectors";
 
diff --git a/webapp/src/components/App/Studies/StudiesList/index.tsx b/webapp/src/components/App/Studies/StudiesList/index.tsx
index b8b32f1646..6d90785471 100644
--- a/webapp/src/components/App/Studies/StudiesList/index.tsx
+++ b/webapp/src/components/App/Studies/StudiesList/index.tsx
@@ -33,8 +33,7 @@ import AutoSizer from "react-virtualized-auto-sizer";
 import HomeIcon from "@mui/icons-material/Home";
 import ArrowUpwardIcon from "@mui/icons-material/ArrowUpward";
 import ArrowDownwardIcon from "@mui/icons-material/ArrowDownward";
-import FolderIcon from "@mui/icons-material/Folder";
-import AccountTreeIcon from "@mui/icons-material/AccountTree";
+import FolderOffIcon from "@mui/icons-material/FolderOff";
 import RadarIcon from "@mui/icons-material/Radar";
 import { FixedSizeGrid, GridOnScrollProps } from "react-window";
 import { v4 as uuidv4 } from "uuid";
@@ -62,7 +61,6 @@ import RefreshButton from "../RefreshButton";
 import { scanFolder } from "../../../../services/api/study";
 import useEnqueueErrorSnackbar from "../../../../hooks/useEnqueueErrorSnackbar";
 import ConfirmationDialog from "../../../common/dialogs/ConfirmationDialog";
-import CheckBoxFE from "@/components/common/fieldEditors/CheckBoxFE";
 
 const CARD_TARGET_WIDTH = 500;
 const CARD_HEIGHT = 250;
@@ -90,7 +88,6 @@ function StudiesList(props: StudiesListProps) {
   const [selectedStudies, setSelectedStudies] = useState<string[]>([]);
   const [selectionMode, setSelectionMode] = useState(false);
   const [confirmFolderScan, setConfirmFolderScan] = useState<boolean>(false);
-  const [isRecursiveScan, setIsRecursiveScan] = useState<boolean>(false);
 
   useEffect(() => {
     setFolderList(folder.split("/"));
@@ -159,18 +156,13 @@ function StudiesList(props: StudiesListProps) {
     try {
       // Remove "/root" from the path
       const folder = folderList.slice(1).join("/");
-      await scanFolder(folder, isRecursiveScan);
+      await scanFolder(folder);
       setConfirmFolderScan(false);
-      setIsRecursiveScan(false);
     } catch (e) {
       enqueueErrorSnackbar(t("studies.error.scanFolder"), e as AxiosError);
     }
   };
 
-  const handleRecursiveScan = () => {
-    setIsRecursiveScan(!isRecursiveScan);
-  };
-
   ////////////////////////////////////////////////////////////////
   // Utils
   ////////////////////////////////////////////////////////////////
@@ -257,21 +249,13 @@ function StudiesList(props: StudiesListProps) {
           <Typography mx={2} sx={{ color: "white" }}>
             ({`${studyIds.length} ${t("global.studies").toLowerCase()}`})
           </Typography>
-
-          {strictFolderFilter ? (
-            <Tooltip title={t("studies.filters.strictfolder")}>
-              <IconButton onClick={toggleStrictFolder}>
-                <FolderIcon color="secondary" />
-              </IconButton>
-            </Tooltip>
-          ) : (
-            <Tooltip title={t("studies.filters.showAllDescendants")}>
-              <IconButton onClick={toggleStrictFolder}>
-                <AccountTreeIcon color="secondary" />
-              </IconButton>
-            </Tooltip>
-          )}
-
+          <Tooltip title={t("studies.filters.strictfolder") as string}>
+            <IconButton onClick={toggleStrictFolder}>
+              <FolderOffIcon
+                color={strictFolderFilter ? "secondary" : "disabled"}
+              />
+            </IconButton>
+          </Tooltip>
           {folder !== "root" && (
             <Tooltip title={t("studies.scanFolder") as string}>
               <IconButton onClick={() => setConfirmFolderScan(true)}>
@@ -282,20 +266,12 @@ function StudiesList(props: StudiesListProps) {
           {folder !== "root" && confirmFolderScan && (
             <ConfirmationDialog
               titleIcon={RadarIcon}
-              onCancel={() => {
-                setConfirmFolderScan(false);
-                setIsRecursiveScan(false);
-              }}
+              onCancel={() => setConfirmFolderScan(false)}
               onConfirm={handleFolderScan}
               alert="warning"
               open
             >
               {`${t("studies.scanFolder")} ${folder}?`}
-              <CheckBoxFE
-                label={t("studies.requestDeepScan")}
-                value={isRecursiveScan}
-                onChange={handleRecursiveScan}
-              />
             </ConfirmationDialog>
           )}
         </Box>
diff --git a/webapp/src/components/App/Studies/StudyTree.tsx b/webapp/src/components/App/Studies/StudyTree.tsx
new file mode 100644
index 0000000000..7208caaec4
--- /dev/null
+++ b/webapp/src/components/App/Studies/StudyTree.tsx
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2024, RTE (https://www.rte-france.com)
+ *
+ * See AUTHORS.txt
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This file is part of the Antares project.
+ */
+
+import { StudyTreeNode } from "./utils";
+import useAppSelector from "../../../redux/hooks/useAppSelector";
+import { getStudiesTree, getStudyFilters } from "../../../redux/selectors";
+import useAppDispatch from "../../../redux/hooks/useAppDispatch";
+import { updateStudyFilters } from "../../../redux/ducks/studies";
+import TreeItemEnhanced from "../../common/TreeItemEnhanced";
+import { SimpleTreeView } from "@mui/x-tree-view/SimpleTreeView";
+import { getParentPaths } from "../../../utils/pathUtils";
+import * as R from "ramda";
+
+function StudyTree() {
+  const folder = useAppSelector((state) => getStudyFilters(state).folder, R.T);
+  const studiesTree = useAppSelector(getStudiesTree);
+  const dispatch = useAppDispatch();
+
+  ////////////////////////////////////////////////////////////////
+  // Event Handlers
+  ////////////////////////////////////////////////////////////////
+
+  const handleTreeItemClick = (itemId: string) => {
+    dispatch(updateStudyFilters({ folder: itemId }));
+  };
+
+  ////////////////////////////////////////////////////////////////
+  // JSX
+  ////////////////////////////////////////////////////////////////
+
+  const buildTree = (children: StudyTreeNode[], parentId?: string) => {
+    return children.map((child) => {
+      const id = parentId ? `${parentId}/${child.name}` : child.name;
+
+      return (
+        <TreeItemEnhanced
+          key={id}
+          itemId={id}
+          label={child.name}
+          onClick={() => handleTreeItemClick(id)}
+        >
+          {buildTree(child.children, id)}
+        </TreeItemEnhanced>
+      );
+    });
+  };
+
+  return (
+    <SimpleTreeView
+      defaultExpandedItems={[...getParentPaths(folder), folder]}
+      defaultSelectedItems={folder}
+      sx={{
+        flexGrow: 1,
+        height: 0,
+        overflowY: "auto",
+        overflowX: "hidden",
+        width: 1,
+        py: 1,
+      }}
+    >
+      {buildTree([studiesTree])}
+    </SimpleTreeView>
+  );
+}
+
+export default StudyTree;
diff --git a/webapp/src/components/App/Studies/StudyTree/__test__/fixtures.ts b/webapp/src/components/App/Studies/StudyTree/__test__/fixtures.ts
deleted file mode 100644
index a6a4dbc3ad..0000000000
--- a/webapp/src/components/App/Studies/StudyTree/__test__/fixtures.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) 2024, RTE (https://www.rte-france.com)
- *
- * See AUTHORS.txt
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This file is part of the Antares project.
- */
-
-export const FIXTURES = {
-  basicTree: {
-    name: "Basic tree with single level",
-    studyTree: {
-      name: "Root",
-      path: "/",
-      children: [
-        { name: "a", path: "/a", children: [] },
-        { name: "b", path: "/b", children: [] },
-      ],
-    },
-    folders: [
-      {
-        name: "folder1",
-        path: "folder1",
-        workspace: "a",
-        parentPath: "/a",
-      },
-    ],
-    expected: {
-      name: "Root",
-      path: "/",
-      children: [
-        {
-          name: "a",
-          path: "/a",
-          children: [{ name: "folder1", path: "/a/folder1", children: [] }],
-        },
-        { name: "b", path: "/b", children: [] },
-      ],
-    },
-  },
-  nestedTree: {
-    name: "Nested tree structure",
-    studyTree: {
-      name: "Root",
-      path: "/",
-      children: [
-        {
-          name: "a",
-          path: "/a",
-          children: [{ name: "suba", path: "/a/suba", children: [] }],
-        },
-      ],
-    },
-    folders: [
-      {
-        name: "folder1",
-        path: "suba/folder1",
-        workspace: "a",
-        parentPath: "/a/suba",
-      },
-    ],
-    expected: {
-      name: "Root",
-      path: "/",
-      children: [
-        {
-          name: "a",
-          path: "/a",
-          children: [
-            {
-              name: "suba",
-              path: "/a/suba",
-              children: [
-                { name: "folder1", path: "/a/suba/folder1", children: [] },
-              ],
-            },
-          ],
-        },
-      ],
-    },
-  },
-  duplicateCase: {
-    name: "Tree with potential duplicates",
-    studyTree: {
-      name: "Root",
-      path: "/",
-      children: [
-        {
-          name: "a",
-          path: "/a",
-          children: [{ name: "folder1", path: "/a/folder1", children: [] }],
-        },
-      ],
-    },
-    folders: [
-      {
-        name: "folder1",
-        path: "/folder1",
-        workspace: "a",
-        parentPath: "/a",
-      },
-    ],
-    expected: {
-      name: "Root",
-      path: "/",
-      children: [
-        {
-          name: "a",
-          path: "/a",
-          children: [{ name: "folder1", path: "/a/folder1", children: [] }],
-        },
-      ],
-    },
-  },
-  multipleFolders: {
-    name: "Multiple folders merge",
-    studyTree: {
-      name: "Root",
-      path: "/",
-      children: [{ name: "a", path: "/a", children: [] }],
-    },
-    folders: [
-      {
-        name: "folder1",
-        path: "/folder1",
-        workspace: "a",
-        parentPath: "/a",
-      },
-      {
-        name: "folder2",
-        path: "/folder2",
-        workspace: "a",
-        parentPath: "/a",
-      },
-    ],
-    expected: {
-      name: "Root",
-      path: "/",
-      children: [
-        {
-          name: "a",
-          path: "/a",
-          children: [
-            { name: "folder1", path: "/a/folder1", children: [] },
-            { name: "folder2", path: "/a/folder2", children: [] },
-          ],
-        },
-      ],
-    },
-  },
-};
diff --git a/webapp/src/components/App/Studies/StudyTree/__test__/utils.test.tsx b/webapp/src/components/App/Studies/StudyTree/__test__/utils.test.tsx
deleted file mode 100644
index 87a5419c54..0000000000
--- a/webapp/src/components/App/Studies/StudyTree/__test__/utils.test.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Copyright (c) 2024, RTE (https://www.rte-france.com)
- *
- * See AUTHORS.txt
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This file is part of the Antares project.
- */
-
-import { insertFoldersIfNotExist, insertWorkspacesIfNotExist } from "../utils";
-import { NonStudyFolderDTO, StudyTreeNode } from "../../utils";
-import { FIXTURES } from "./fixtures";
-
-describe("StudyTree Utils", () => {
-  describe("mergeStudyTreeAndFolders", () => {
-    test.each(Object.values(FIXTURES))(
-      "$name",
-      ({ studyTree, folders, expected }) => {
-        const result = insertFoldersIfNotExist(studyTree, folders);
-        expect(result).toEqual(expected);
-      },
-    );
-
-    test("should handle empty study tree", () => {
-      const emptyTree: StudyTreeNode = {
-        name: "Root",
-        path: "/",
-        children: [],
-      };
-      const result = insertFoldersIfNotExist(emptyTree, []);
-      expect(result).toEqual(emptyTree);
-    });
-
-    test("should handle empty folders array", () => {
-      const tree: StudyTreeNode = {
-        name: "Root",
-        path: "/",
-        children: [{ name: "a", path: "/a", children: [] }],
-      };
-      const result = insertFoldersIfNotExist(tree, []);
-      expect(result).toEqual(tree);
-    });
-
-    test("should handle invalid parent paths", () => {
-      const tree: StudyTreeNode = {
-        name: "Root",
-        path: "/",
-        children: [{ name: "a", path: "/a", children: [] }],
-      };
-      const invalidFolder: NonStudyFolderDTO = {
-        name: "invalid",
-        path: "/invalid",
-        workspace: "nonexistent",
-        parentPath: "/nonexistent",
-      };
-      const result = insertFoldersIfNotExist(tree, [invalidFolder]);
-      expect(result).toEqual(tree);
-    });
-
-    test("should handle empty workspaces", () => {
-      const tree: StudyTreeNode = {
-        name: "Root",
-        path: "/",
-        children: [
-          {
-            name: "a",
-            path: "/a",
-            children: [{ name: "suba", path: "/a/suba", children: [] }],
-          },
-        ],
-      };
-      const workspaces: string[] = [];
-      const result = insertWorkspacesIfNotExist(tree, workspaces);
-      expect(result).toEqual(tree);
-    });
-
-    test("should merge workspaces", () => {
-      const tree: StudyTreeNode = {
-        name: "Root",
-        path: "/",
-        children: [
-          {
-            name: "a",
-            path: "/a",
-            children: [{ name: "suba", path: "/a/suba", children: [] }],
-          },
-        ],
-      };
-      const expected: StudyTreeNode = {
-        name: "Root",
-        path: "/",
-        children: [
-          {
-            name: "a",
-            path: "/a",
-            children: [{ name: "suba", path: "/a/suba", children: [] }],
-          },
-          { name: "workspace1", path: "/workspace1", children: [] },
-          { name: "workspace2", path: "/workspace2", children: [] },
-        ],
-      };
-
-      const workspaces: string[] = ["a", "workspace1", "workspace2"];
-      const result = insertWorkspacesIfNotExist(tree, workspaces);
-      expect(result).toEqual(expected);
-    });
-  });
-});
diff --git a/webapp/src/components/App/Studies/StudyTree/index.tsx b/webapp/src/components/App/Studies/StudyTree/index.tsx
deleted file mode 100644
index 510d70134e..0000000000
--- a/webapp/src/components/App/Studies/StudyTree/index.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * Copyright (c) 2024, RTE (https://www.rte-france.com)
- *
- * See AUTHORS.txt
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This file is part of the Antares project.
- */
-
-import { StudyTreeNode } from ".././utils";
-import useAppSelector from "../../../../redux/hooks/useAppSelector";
-import { getStudiesTree, getStudyFilters } from "../../../../redux/selectors";
-import useAppDispatch from "../../../../redux/hooks/useAppDispatch";
-import { updateStudyFilters } from "../../../../redux/ducks/studies";
-import TreeItemEnhanced from "../../../common/TreeItemEnhanced";
-import { SimpleTreeView } from "@mui/x-tree-view/SimpleTreeView";
-import { getParentPaths } from "../../../../utils/pathUtils";
-import * as R from "ramda";
-import { useState } from "react";
-import useEnqueueErrorSnackbar from "@/hooks/useEnqueueErrorSnackbar";
-import useUpdateEffectOnce from "@/hooks/useUpdateEffectOnce";
-import { fetchAndInsertSubfolders, fetchAndInsertWorkspaces } from "./utils";
-import { useTranslation } from "react-i18next";
-import { toError } from "@/utils/fnUtils";
-
-function StudyTree() {
-  const initialStudiesTree = useAppSelector(getStudiesTree);
-  const [studiesTree, setStudiesTree] = useState(initialStudiesTree);
-  const folder = useAppSelector((state) => getStudyFilters(state).folder, R.T);
-  const enqueueErrorSnackbar = useEnqueueErrorSnackbar();
-  const dispatch = useAppDispatch();
-  const [t] = useTranslation();
-
-  // Initialize folders once we have the tree
-  // we use useUpdateEffectOnce because at first render initialStudiesTree isn't initialized
-  useUpdateEffectOnce(() => {
-    updateTree("root", initialStudiesTree);
-  }, [initialStudiesTree]);
-
-  /**
-   * This function is called at the initialization of the component and when the user clicks on a folder.
-   *
-   * The study tree is built from the studies in the database. There's a scan process that run on the server
-   * to update continuously the studies in the database.
-   *
-   * However this process can take a long time, and the user shouldn't wait for hours before he can see a study he knows is already uploaded.
-   *
-   * Instead of relying on the scan process to update the tree, we'll allow the user to walk into the tree and run a scan process only when he needs to.
-   *
-   * To enable this, we'll fetch the subfolders of a folder when the user clicks on it using the explorer API.
-   *
-   * @param itemId - The id of the item clicked
-   * @param studyTreeNode - The node of the item clicked
-   */
-  async function updateTree(itemId: string, studyTreeNode: StudyTreeNode) {
-    let treeAfterWorkspacesUpdate = studiesTree;
-    let chidrenPaths = studyTreeNode.children.map(
-      (child) => `root${child.path}`,
-    );
-    // If the user clicks on the root folder, we fetch the workspaces and insert them.
-    // Then we fetch the direct subfolders of the workspaces.
-    if (itemId === "root") {
-      try {
-        treeAfterWorkspacesUpdate = await fetchAndInsertWorkspaces(studiesTree);
-        chidrenPaths = treeAfterWorkspacesUpdate.children.map(
-          (child) => `root${child.path}`,
-        );
-      } catch (error) {
-        enqueueErrorSnackbar(
-          "studies.tree.error.failToFetchWorkspace",
-          toError(error),
-        );
-      }
-    } else {
-      // If the user clicks on a folder, we add the path of the clicked folder to the list of paths to fetch.
-      // as well as the path of the children of the clicked folder.
-      // If we don't fetch the subfolders of the children then we won't know if they're themselves folders, which we need
-      // to know to display the little arrow next to the subfolder.
-      // On the other hand, if we fetch only the subfolders of the children, then we won't fetch their "siblings" folder
-      // if one of them is added.
-      chidrenPaths = [studyTreeNode.path].concat(chidrenPaths);
-    }
-
-    const [treeAfterChildrenUpdate, failedPath] =
-      await fetchAndInsertSubfolders(chidrenPaths, treeAfterWorkspacesUpdate);
-    if (failedPath.length > 0) {
-      enqueueErrorSnackbar(
-        t("studies.tree.error.failToFetchFolder", {
-          path: failedPath.join(" "),
-          interpolation: { escapeValue: false },
-        }),
-        t("studies.tree.error.detailsInConsole"),
-      );
-    }
-    setStudiesTree(treeAfterChildrenUpdate);
-  }
-
-  ////////////////////////////////////////////////////////////////
-  // Event Handlers
-  ////////////////////////////////////////////////////////////////
-
-  const handleTreeItemClick = async (
-    itemId: string,
-    studyTreeNode: StudyTreeNode,
-  ) => {
-    dispatch(updateStudyFilters({ folder: itemId }));
-    updateTree(itemId, studyTreeNode);
-  };
-
-  ////////////////////////////////////////////////////////////////
-  // JSX
-  ////////////////////////////////////////////////////////////////
-
-  const buildTree = (children: StudyTreeNode[], parentId?: string) => {
-    return children.map((child) => {
-      const id = parentId ? `${parentId}/${child.name}` : child.name;
-
-      return (
-        <TreeItemEnhanced
-          key={id}
-          itemId={id}
-          label={child.name}
-          onClick={() => handleTreeItemClick(id, child)}
-        >
-          {buildTree(child.children, id)}
-        </TreeItemEnhanced>
-      );
-    });
-  };
-
-  return (
-    <SimpleTreeView
-      defaultExpandedItems={[...getParentPaths(folder), folder]}
-      defaultSelectedItems={folder}
-      sx={{
-        flexGrow: 1,
-        height: 0,
-        width: 1,
-        py: 1,
-        overflowY: "auto",
-        overflowX: "hidden",
-      }}
-    >
-      {buildTree([studiesTree])}
-    </SimpleTreeView>
-  );
-}
-
-export default StudyTree;
diff --git a/webapp/src/components/App/Studies/StudyTree/utils.ts b/webapp/src/components/App/Studies/StudyTree/utils.ts
deleted file mode 100644
index 14c4a5b008..0000000000
--- a/webapp/src/components/App/Studies/StudyTree/utils.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * Copyright (c) 2024, RTE (https://www.rte-france.com)
- *
- * See AUTHORS.txt
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This file is part of the Antares project.
- */
-
-import { NonStudyFolderDTO, StudyTreeNode } from "../utils";
-import * as api from "../../../../services/api/study";
-
-/**
- * Add a folder that was returned by the explorer into the study tree view.
- *
- * This function doesn't mutate the tree, it returns a new tree with the folder inserted.
- *
- * If the folder is already in the tree, the tree returnred will be equal to the tree given to the function.
- *
- * @param studiesTree study tree to insert the folder into
- * @param folder folder to inert into the tree
- * @returns study tree with the folder inserted if it wasn't already there.
- * New branch is created if it contain the folder otherwise the branch is left unchanged.
- */
-function insertFolderIfNotExist(
-  studiesTree: StudyTreeNode,
-  folder: NonStudyFolderDTO,
-): StudyTreeNode {
-  // Early return if folder doesn't belong in this branch
-  if (!folder.parentPath.startsWith(studiesTree.path)) {
-    return studiesTree;
-  }
-
-  // direct child case
-  if (folder.parentPath == studiesTree.path) {
-    const folderExists = studiesTree.children.some(
-      (child) => child.name === folder.name,
-    );
-    if (folderExists) {
-      return studiesTree;
-    }
-    // parent path is the same, but no folder with the same name at this level
-    return {
-      ...studiesTree,
-      children: [
-        ...studiesTree.children,
-        {
-          path: `${folder.parentPath}/${folder.name}`,
-          name: folder.name,
-          children: [],
-        },
-      ],
-    };
-  }
-
-  // not a direct child, but does belong to this branch so recursively walk though the tree
-  return {
-    ...studiesTree,
-    children: studiesTree.children.map((child) =>
-      insertFolderIfNotExist(child, folder),
-    ),
-  };
-}
-
-/**
- * Insert several folders in the study tree if they don't exist already in the tree.
- *
- * This function doesn't mutate the tree, it returns a new tree with the folders inserted
- *
- * The folders are inserted in the order they are given.
- *
- * @param studiesTree study tree to insert the folder into
- * @param folders folders to inert into the tree
- * @param studiesTree study tree to insert the folder into
- * @param folder folder to inert into the tree
- * @returns study tree with the folder inserted if it wasn't already there.
- * New branch is created if it contain the folder otherwise the branch is left unchanged.
- */
-export function insertFoldersIfNotExist(
-  studiesTree: StudyTreeNode,
-  folders: NonStudyFolderDTO[],
-): StudyTreeNode {
-  return folders.reduce(
-    (tree, folder) => insertFolderIfNotExist(tree, folder),
-    studiesTree,
-  );
-}
-
-/**
- * Call the explorer api to fetch the subfolders under the given path.
- *
- * @param path path of the subfolder to fetch, should sart with root, e.g. root/workspace/folder1
- * @returns list of subfolders under the given path
- */
-async function fetchSubfolders(path: string): Promise<NonStudyFolderDTO[]> {
-  if (path === "root") {
-    // Under root there're workspaces not subfolders
-    return [];
-  }
-  // less than 2 parts means we're at the root level
-  const pathParts = path.split("/");
-  if (pathParts.length < 2) {
-    return [];
-  }
-  // path parts should be ["root", workspace, "folder1", ...]
-  const workspace = pathParts[1];
-  const subPath = pathParts.slice(2).join("/");
-  return api.getFolders(workspace, subPath);
-}
-
-/**
- * Fetch and insert the subfolders under the given paths into the study tree.
- *
- * This function is used to fill the study tree when the user clicks on a folder.
- *
- * Subfolders are inserted only if they don't exist already in the tree.
- *
- * This function doesn't mutate the tree, it returns a new tree with the subfolders inserted
- *
- * @param paths list of paths to fetch the subfolders for
- * @param studiesTree study tree to insert the subfolders into
- * @returns a tuple with study tree with the subfolders inserted if they weren't already there and path for which
- * the fetch failed.
- */
-export async function fetchAndInsertSubfolders(
-  paths: string[],
-  studiesTree: StudyTreeNode,
-): Promise<[StudyTreeNode, string[]]> {
-  const results = await Promise.allSettled(
-    paths.map((path) => fetchSubfolders(path)),
-  );
-
-  return results.reduce<[StudyTreeNode, string[]]>(
-    ([tree, failed], result, index) => {
-      if (result.status === "fulfilled") {
-        return [insertFoldersIfNotExist(tree, result.value), failed];
-      }
-      console.error("Failed to load path:", paths[index], result.reason);
-      return [tree, [...failed, paths[index]]];
-    },
-    [studiesTree, []],
-  );
-}
-
-/**
- * Insert a workspace into the study tree if it doesn't exist already.
- *
- * This function doesn't mutate the tree, it returns a new tree with the workspace inserted.
- *
- * @param workspace key of the workspace
- * @param stydyTree study tree to insert the workspace into
- * @returns study tree with the empty workspace inserted if it wasn't already there.
- */
-function insertWorkspaceIfNotExist(
-  stydyTree: StudyTreeNode,
-  workspace: string,
-) {
-  const emptyNode = { name: workspace, path: `/${workspace}`, children: [] };
-  if (stydyTree.children.some((child) => child.name === workspace)) {
-    return stydyTree;
-  }
-  return {
-    ...stydyTree,
-    children: [...stydyTree.children, emptyNode],
-  };
-}
-
-/**
- * Insert several workspaces into the study tree if they don't exist already in the tree.
- *
- * This function doesn't mutate the tree, it returns a new tree with the workspaces inserted.
- *
- * The workspaces are inserted in the order they are given.
- *
- * @param workspaces workspaces to insert into the tree
- * @param stydyTree study tree to insert the workspaces into
- * @returns study tree with the empty workspaces inserted if they weren't already there.
- */
-export function insertWorkspacesIfNotExist(
-  stydyTree: StudyTreeNode,
-  workspaces: string[],
-): StudyTreeNode {
-  return workspaces.reduce((acc, workspace) => {
-    return insertWorkspaceIfNotExist(acc, workspace);
-  }, stydyTree);
-}
-
-/**
- * Fetch and insert the workspaces into the study tree.
- *
- * Workspaces are inserted only if they don't exist already in the tree.
- *
- * This function doesn't mutate the tree, it returns a new tree with the workspaces inserted.
- *
- * @param studyTree study tree to insert the workspaces into
- * @returns study tree with the workspaces inserted if they weren't already there.
- */
-export async function fetchAndInsertWorkspaces(
-  studyTree: StudyTreeNode,
-): Promise<StudyTreeNode> {
-  const workspaces = await api.getWorkspaces();
-  return insertWorkspacesIfNotExist(studyTree, workspaces);
-}
diff --git a/webapp/src/components/App/Studies/utils.ts b/webapp/src/components/App/Studies/utils.ts
index 8117450702..3f2ff61564 100644
--- a/webapp/src/components/App/Studies/utils.ts
+++ b/webapp/src/components/App/Studies/utils.ts
@@ -20,13 +20,6 @@ export interface StudyTreeNode {
   children: StudyTreeNode[];
 }
 
-export interface NonStudyFolderDTO {
-  name: string;
-  path: string;
-  workspace: string;
-  parentPath: string;
-}
-
 /**
  * Builds a tree structure from a list of study metadata.
  *
diff --git a/webapp/src/redux/ducks/studies.ts b/webapp/src/redux/ducks/studies.ts
index 9b4603a23f..3b3e8b04d2 100644
--- a/webapp/src/redux/ducks/studies.ts
+++ b/webapp/src/redux/ducks/studies.ts
@@ -94,7 +94,7 @@ const initialState = studiesAdapter.getInitialState({
   filters: {
     inputValue: "",
     folder: "root",
-    strictFolder: true,
+    strictFolder: false,
     managed: false,
     archived: false,
     variant: false,
diff --git a/webapp/src/services/api/study.ts b/webapp/src/services/api/study.ts
index 349134d790..53d4a67925 100644
--- a/webapp/src/services/api/study.ts
+++ b/webapp/src/services/api/study.ts
@@ -34,11 +34,6 @@ import { getConfig } from "../config";
 import { convertStudyDtoToMetadata } from "../utils";
 import { FileDownloadTask } from "./downloads";
 import { StudyMapDistrict } from "../../redux/ducks/studyMaps";
-import { NonStudyFolderDTO } from "@/components/App/Studies/utils";
-
-interface Workspace {
-  name: string;
-}
 
 const getStudiesRaw = async (): Promise<Record<string, StudyMetadataDTO>> => {
   const res = await client.get(`/v1/studies`);
@@ -53,30 +48,6 @@ export const getStudies = async (): Promise<StudyMetadata[]> => {
   });
 };
 
-export const getWorkspaces = async (): Promise<string[]> => {
-  const res = await client.get<Workspace[]>(
-    `/v1/private/explorer/_list_workspaces`,
-  );
-  return res.data.map((folder) => folder.name);
-};
-
-/**
- * Call the explorer API to get the list of folders in a workspace
- *
- * @param workspace - workspace name
- * @param folderPath - path starting from the workspace root (not including the workspace name)
- * @returns list of folders that are not studies, under the given path
- */
-export const getFolders = async (
-  workspace: string,
-  folderPath: string,
-): Promise<NonStudyFolderDTO[]> => {
-  const res = await client.get<NonStudyFolderDTO[]>(
-    `/v1/private/explorer/${workspace}/_list_dir?path=${encodeURIComponent(folderPath)}`,
-  );
-  return res.data;
-};
-
 export const getStudyVersions = async (): Promise<string[]> => {
   const res = await client.get("/v1/studies/_versions");
   return res.data;
@@ -463,13 +434,8 @@ export const updateStudyMetadata = async (
   return res.data;
 };
 
-export const scanFolder = async (
-  folderPath: string,
-  recursive = false,
-): Promise<void> => {
-  await client.post(
-    `/v1/watcher/_scan?path=${encodeURIComponent(folderPath)}&recursive=${recursive}`,
-  );
+export const scanFolder = async (folderPath: string): Promise<void> => {
+  await client.post(`/v1/watcher/_scan?path=${encodeURIComponent(folderPath)}`);
 };
 
 export const getStudyLayers = async (uuid: string): Promise<StudyLayer[]> => {

From ca0582b525fa512ed839464840f8e529ff949d65 Mon Sep 17 00:00:00 2001
From: Hatim Dinia <33469289+hdinia@users.noreply.github.com>
Date: Fri, 20 Dec 2024 17:24:29 +0100
Subject: [PATCH 27/31] feat(ui-debug): add download in original file format 
 (#2277)

---
 webapp/public/locales/en/main.json            |   1 +
 webapp/public/locales/fr/main.json            |   1 +
 .../Singlestudy/explore/Debug/Data/Json.tsx   |  31 ++----
 .../Singlestudy/explore/Debug/Data/Text.tsx   |  17 ++-
 .../explore/Debug/Data/Unsupported.tsx        |  30 +-----
 .../common/Matrix/hooks/useMatrix/index.ts    |   5 +-
 .../Matrix/hooks/useMatrix/useMatrix.test.tsx |   4 +-
 .../common/buttons/DownloadMatrixButton.tsx   |  18 +++-
 .../common/buttons/UploadFileButton.tsx       |   4 +-
 webapp/src/services/api/studies/raw/index.ts  | 100 +++++++++++++++---
 webapp/src/services/api/studies/raw/types.ts  |  11 +-
 11 files changed, 139 insertions(+), 83 deletions(-)

diff --git a/webapp/public/locales/en/main.json b/webapp/public/locales/en/main.json
index 250a75f2e6..7c6a13307a 100644
--- a/webapp/public/locales/en/main.json
+++ b/webapp/public/locales/en/main.json
@@ -44,6 +44,7 @@
   "global.date": "Date",
   "global.general": "General",
   "global.files": "Files",
+  "global.rawFile": "Raw file",
   "global.none": "None",
   "global.upload": "Upload",
   "global.key": "Key",
diff --git a/webapp/public/locales/fr/main.json b/webapp/public/locales/fr/main.json
index 98d6ee71b9..395ed91e7e 100644
--- a/webapp/public/locales/fr/main.json
+++ b/webapp/public/locales/fr/main.json
@@ -44,6 +44,7 @@
   "global.date": "Date",
   "global.general": "Général",
   "global.files": "Fichiers",
+  "global.rawFile": "Fichier brut",
   "global.none": "Aucun",
   "global.upload": "Charger",
   "global.key": "Clé",
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Json.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Json.tsx
index f014626bf5..5df699950b 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Json.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Json.tsx
@@ -21,16 +21,15 @@ import UsePromiseCond from "../../../../../common/utils/UsePromiseCond";
 import type { DataCompProps } from "../utils";
 import DownloadButton from "../../../../../common/buttons/DownloadButton";
 import { downloadFile } from "../../../../../../utils/fileUtils";
-import { useEffect, useState } from "react";
 import { Filename, Flex, Menubar } from "./styles";
 import UploadFileButton from "../../../../../common/buttons/UploadFileButton";
+import { getRawFile } from "@/services/api/studies/raw";
 
 function Json({ filePath, filename, studyId, canEdit }: DataCompProps) {
   const [t] = useTranslation();
   const { enqueueSnackbar } = useSnackbar();
-  const [currentJson, setCurrentJson] = useState<JSONEditorProps["json"]>();
 
-  const res = usePromiseWithSnackbarError(
+  const jsonRes = usePromiseWithSnackbarError(
     () => getStudyData(studyId, filePath, -1),
     {
       errorMessage: t("studies.error.retrieveData"),
@@ -38,37 +37,27 @@ function Json({ filePath, filename, studyId, canEdit }: DataCompProps) {
     },
   );
 
-  useEffect(() => {
-    setCurrentJson(res.data);
-  }, [res.data]);
-
   ////////////////////////////////////////////////////////////////
   // Event Handlers
   ////////////////////////////////////////////////////////////////
 
+  const handleDownload = async () => {
+    const file = await getRawFile({ studyId, path: filePath });
+    downloadFile(file, file.name);
+  };
+
   const handleSave: JSONEditorProps["onSave"] = (json) => {
     return editStudy(json, studyId, filePath);
   };
 
-  const handleSaveSuccessful: JSONEditorProps["onSaveSuccessful"] = (json) => {
-    setCurrentJson(json);
-
+  const handleSaveSuccessful: JSONEditorProps["onSaveSuccessful"] = () => {
     enqueueSnackbar(t("studies.success.saveData"), {
       variant: "success",
     });
   };
 
-  const handleDownload = () => {
-    if (currentJson !== undefined) {
-      downloadFile(
-        JSON.stringify(currentJson, null, 2),
-        filename.endsWith(".json") ? filename : `${filename}.json`,
-      );
-    }
-  };
-
   const handleUploadSuccessful = () => {
-    res.reload();
+    jsonRes.reload();
   };
 
   ////////////////////////////////////////////////////////////////
@@ -77,7 +66,7 @@ function Json({ filePath, filename, studyId, canEdit }: DataCompProps) {
 
   return (
     <UsePromiseCond
-      response={res}
+      response={jsonRes}
       ifFulfilled={(json) => (
         <Flex>
           <Menubar>
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
index 1f7a7f4909..1ee8be74c0 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
@@ -33,6 +33,7 @@ import { Filename, Flex, Menubar } from "./styles";
 import UploadFileButton from "../../../../../common/buttons/UploadFileButton";
 import EmptyView from "@/components/common/page/SimpleContent";
 import GridOffIcon from "@mui/icons-material/GridOff";
+import { getRawFile } from "@/services/api/studies/raw";
 
 SyntaxHighlighter.registerLanguage("xml", xml);
 SyntaxHighlighter.registerLanguage("plaintext", plaintext);
@@ -75,7 +76,7 @@ function Text({
   const { t } = useTranslation();
   const theme = useTheme();
 
-  const res = usePromiseWithSnackbarError(
+  const textRes = usePromiseWithSnackbarError(
     () =>
       getStudyData<string>(studyId, filePath).then((text) =>
         parseContent(text, { filePath, fileType }),
@@ -90,17 +91,13 @@ function Text({
   // Event Handlers
   ////////////////////////////////////////////////////////////////
 
-  const handleDownload = () => {
-    if (res.data) {
-      downloadFile(
-        res.data,
-        filename.endsWith(".txt") ? filename : `${filename}.txt`,
-      );
-    }
+  const handleDownload = async () => {
+    const file = await getRawFile({ studyId, path: filePath });
+    downloadFile(file, file.name);
   };
 
   const handleUploadSuccessful = () => {
-    res.reload();
+    textRes.reload();
   };
 
   ////////////////////////////////////////////////////////////////
@@ -109,7 +106,7 @@ function Text({
 
   return (
     <UsePromiseCond
-      response={res}
+      response={textRes}
       ifFulfilled={(text) => (
         <Flex>
           <Menubar>
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
index e4bcfccc5c..81307a4edf 100644
--- a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
@@ -19,33 +19,19 @@ import { Filename, Flex, Menubar } from "./styles";
 import type { DataCompProps } from "../utils";
 import DownloadButton from "@/components/common/buttons/DownloadButton";
 import UploadFileButton from "@/components/common/buttons/UploadFileButton";
-import usePromiseWithSnackbarError from "@/hooks/usePromiseWithSnackbarError";
-import { getStudyData } from "@/services/api/study";
 import { downloadFile } from "@/utils/fileUtils";
+import { getRawFile } from "@/services/api/studies/raw";
 
 function Unsupported({ studyId, filePath, filename, canEdit }: DataCompProps) {
   const { t } = useTranslation();
 
-  const res = usePromiseWithSnackbarError(
-    () => getStudyData<string>(studyId, filePath),
-    {
-      errorMessage: t("studies.error.retrieveData"),
-      deps: [studyId, filePath],
-    },
-  );
-
   ////////////////////////////////////////////////////////////////
   // Event Handlers
   ////////////////////////////////////////////////////////////////
 
-  const handleDownload = () => {
-    if (res.data) {
-      downloadFile(res.data, filename);
-    }
-  };
-
-  const handleUploadSuccessful = () => {
-    res.reload();
+  const handleDownload = async () => {
+    const file = await getRawFile({ studyId, path: filePath });
+    downloadFile(file, file.name);
   };
 
   ////////////////////////////////////////////////////////////////
@@ -56,13 +42,7 @@ function Unsupported({ studyId, filePath, filename, canEdit }: DataCompProps) {
     <Flex>
       <Menubar>
         <Filename>{filename}</Filename>
-        {canEdit && (
-          <UploadFileButton
-            studyId={studyId}
-            path={filePath}
-            onUploadSuccessful={handleUploadSuccessful}
-          />
-        )}
+        {canEdit && <UploadFileButton studyId={studyId} path={filePath} />}
         <DownloadButton onClick={handleDownload} />
       </Menubar>
       <EmptyView icon={BlockIcon} title={t("study.debug.file.unsupported")} />
diff --git a/webapp/src/components/common/Matrix/hooks/useMatrix/index.ts b/webapp/src/components/common/Matrix/hooks/useMatrix/index.ts
index 6558e764e8..e89f99be12 100644
--- a/webapp/src/components/common/Matrix/hooks/useMatrix/index.ts
+++ b/webapp/src/components/common/Matrix/hooks/useMatrix/index.ts
@@ -39,7 +39,7 @@ import {
 } from "../../shared/utils";
 import useUndo from "use-undo";
 import { GridCellKind } from "@glideapps/glide-data-grid";
-import { importFile } from "../../../../../services/api/studies/raw";
+import { uploadFile } from "../../../../../services/api/studies/raw";
 import { fetchMatrixFn } from "../../../../App/Singlestudy/explore/Modelization/Areas/Hydro/utils";
 import usePrompt from "../../../../../hooks/usePrompt";
 import { Aggregate, Column, Operation } from "../../shared/constants";
@@ -251,7 +251,8 @@ export function useMatrix(
 
   const handleUpload = async (file: File) => {
     try {
-      await importFile({ file, studyId, path: url });
+      await uploadFile({ file, studyId, path: url });
+      // TODO: update the API to return the uploaded file data and remove this
       await fetchMatrix();
     } catch (e) {
       enqueueErrorSnackbar(t("matrix.error.import"), e as Error);
diff --git a/webapp/src/components/common/Matrix/hooks/useMatrix/useMatrix.test.tsx b/webapp/src/components/common/Matrix/hooks/useMatrix/useMatrix.test.tsx
index fc1087a927..e4b61d8587 100644
--- a/webapp/src/components/common/Matrix/hooks/useMatrix/useMatrix.test.tsx
+++ b/webapp/src/components/common/Matrix/hooks/useMatrix/useMatrix.test.tsx
@@ -166,7 +166,7 @@ describe("useMatrix", () => {
   describe("File operations", () => {
     test("should handle file import", async () => {
       const mockFile = new File([""], "test.csv", { type: "text/csv" });
-      vi.mocked(rawStudy.importFile).mockResolvedValue();
+      vi.mocked(rawStudy.uploadFile).mockResolvedValue();
 
       const hook = await setupHook();
 
@@ -174,7 +174,7 @@ describe("useMatrix", () => {
         await hook.result.current.handleUpload(mockFile);
       });
 
-      expect(rawStudy.importFile).toHaveBeenCalledWith({
+      expect(rawStudy.uploadFile).toHaveBeenCalledWith({
         file: mockFile,
         studyId: DATA.studyId,
         path: DATA.url,
diff --git a/webapp/src/components/common/buttons/DownloadMatrixButton.tsx b/webapp/src/components/common/buttons/DownloadMatrixButton.tsx
index 55e0d029c3..b50e3e81da 100644
--- a/webapp/src/components/common/buttons/DownloadMatrixButton.tsx
+++ b/webapp/src/components/common/buttons/DownloadMatrixButton.tsx
@@ -12,13 +12,15 @@
  * This file is part of the Antares project.
  */
 
-import { downloadMatrix } from "../../../services/api/studies/raw";
+import { getMatrixFile, getRawFile } from "../../../services/api/studies/raw";
 import { downloadFile } from "../../../utils/fileUtils";
 import { StudyMetadata } from "../../../common/types";
 import { useTranslation } from "react-i18next";
 import DownloadButton from "./DownloadButton";
 import type { TTableExportFormat } from "@/services/api/studies/raw/types";
 
+type ExportFormat = TTableExportFormat | "raw";
+
 export interface DownloadMatrixButtonProps {
   studyId: StudyMetadata["id"];
   path: string;
@@ -30,7 +32,7 @@ function DownloadMatrixButton(props: DownloadMatrixButtonProps) {
   const { t } = useTranslation();
   const { studyId, path, disabled, label = t("global.export") } = props;
 
-  const options: Array<{ label: string; value: TTableExportFormat }> = [
+  const options: Array<{ label: string; value: ExportFormat }> = [
     { label: "CSV", value: "csv" },
     {
       label: `CSV (${t("global.semicolon").toLowerCase()})`,
@@ -38,20 +40,26 @@ function DownloadMatrixButton(props: DownloadMatrixButtonProps) {
     },
     { label: "TSV", value: "tsv" },
     { label: "XLSX", value: "xlsx" },
+    { label: `${t("global.rawFile")}`, value: "raw" },
   ];
 
   ////////////////////////////////////////////////////////////////
   // Event Handlers
   ////////////////////////////////////////////////////////////////
 
-  const handleDownload = async (format: TTableExportFormat) => {
+  const handleDownload = async (format: ExportFormat) => {
     if (!path) {
       return;
     }
 
+    if (format === "raw") {
+      const file = await getRawFile({ studyId, path });
+      return downloadFile(file, file.name);
+    }
+
     const isXlsx = format === "xlsx";
 
-    const res = await downloadMatrix({
+    const matrixFile = await getMatrixFile({
       studyId,
       path,
       format,
@@ -62,7 +70,7 @@ function DownloadMatrixButton(props: DownloadMatrixButtonProps) {
     const extension = format === "csv (semicolon)" ? "csv" : format;
 
     return downloadFile(
-      res,
+      matrixFile,
       `matrix_${studyId}_${path.replace("/", "_")}.${extension}`,
     );
   };
diff --git a/webapp/src/components/common/buttons/UploadFileButton.tsx b/webapp/src/components/common/buttons/UploadFileButton.tsx
index cc16594be0..872b05b01a 100644
--- a/webapp/src/components/common/buttons/UploadFileButton.tsx
+++ b/webapp/src/components/common/buttons/UploadFileButton.tsx
@@ -21,7 +21,7 @@ import { toError } from "../../../utils/fnUtils";
 import { Accept, useDropzone } from "react-dropzone";
 import { StudyMetadata } from "../../../common/types";
 import { useSnackbar } from "notistack";
-import { importFile } from "../../../services/api/studies/raw";
+import { uploadFile } from "../../../services/api/studies/raw";
 
 type ValidateResult = boolean | null | undefined;
 type Validate = (file: File) => ValidateResult | Promise<ValidateResult>;
@@ -89,7 +89,7 @@ function UploadFileButton(props: UploadFileButtonProps) {
 
       const filePath = typeof path === "function" ? path(fileToUpload) : path;
 
-      await importFile({
+      await uploadFile({
         studyId,
         path: filePath,
         file: fileToUpload,
diff --git a/webapp/src/services/api/studies/raw/index.ts b/webapp/src/services/api/studies/raw/index.ts
index 85524560d5..663877aafc 100644
--- a/webapp/src/services/api/studies/raw/index.ts
+++ b/webapp/src/services/api/studies/raw/index.ts
@@ -15,28 +15,55 @@
 import client from "../../client";
 import type {
   DeleteFileParams,
-  DownloadMatrixParams,
-  ImportFileParams,
+  GetMatrixFileParams,
+  GetRawFileParams,
+  UploadFileParams,
 } from "./types";
 
-export async function downloadMatrix(params: DownloadMatrixParams) {
+/**
+ * Gets a matrix file from a study's raw files.
+ *
+ * @param params - Parameters for getting the matrix
+ * @param params.studyId - Unique identifier of the study
+ * @param params.path - Path to the matrix file
+ * @param params.format - Optional. Export format for the matrix
+ * @param params.header - Optional. Whether to include headers
+ * @param params.index - Optional. Whether to include indices
+ * @returns Promise containing the matrix data as a Blob
+ */
+export async function getMatrixFile(params: GetMatrixFileParams) {
   const { studyId, ...queryParams } = params;
-  const url = `/v1/studies/${studyId}/raw/download`;
-
-  const { data } = await client.get<Blob>(url, {
-    params: queryParams,
-    responseType: "blob",
-  });
 
+  const { data } = await client.get<Blob>(
+    `/v1/studies/${studyId}/raw/download`,
+    {
+      params: queryParams,
+      responseType: "blob",
+    },
+  );
   return data;
 }
 
-export async function importFile(params: ImportFileParams) {
+/**
+ * Uploads a file to a study's raw storage, creating or updating it based on existence.
+ *
+ * !Warning: This endpoint currently uses a non-standard REST structure (/raw) which
+ * may lead to confusion. It handles both create and update operations through PUT,
+ * while directory creation is managed through a separate flag.
+ *
+ * @param params - Parameters for the file upload
+ * @param params.studyId - Unique identifier of the study
+ * @param params.path - Destination path for the file
+ * @param params.file - File content to upload
+ * @param params.createMissing - Optional. Whether to create missing parent directories
+ * @param params.onUploadProgress - Optional. Callback for upload progress updates
+ * @returns Promise that resolves when the upload is complete
+ */
+export async function uploadFile(params: UploadFileParams) {
   const { studyId, file, onUploadProgress, ...queryParams } = params;
-  const url = `/v1/studies/${studyId}/raw`;
   const body = { file };
 
-  await client.putForm<void>(url, body, {
+  await client.putForm(`/v1/studies/${studyId}/raw`, body, {
     params: {
       ...queryParams,
       create_missing: queryParams.createMissing,
@@ -45,9 +72,54 @@ export async function importFile(params: ImportFileParams) {
   });
 }
 
+/**
+ * Deletes a raw file from a study.
+ *
+ * @param params - Parameters for deleting the file
+ * @param params.studyId - Unique identifier of the study
+ * @param params.path - Path to the file to delete
+ * @returns Promise that resolves when the deletion is complete
+ */
 export async function deleteFile(params: DeleteFileParams) {
   const { studyId, path } = params;
-  const url = `/v1/studies/${studyId}/raw`;
+  await client.delete(`/v1/studies/${studyId}/raw`, { params: { path } });
+}
+
+/**
+ * Gets an original raw file from a study with its metadata.
+ *
+ * @param params - Parameters for getting the raw file and name
+ * @param params.studyId - Unique identifier of the study
+ * @param params.path - Path to the file within the study
+ * @returns Promise containing the file data and metadata
+ */
+export async function getRawFile(params: GetRawFileParams) {
+  const { studyId, path } = params;
 
-  await client.delete<void>(url, { params: { path } });
+  const { data, headers } = await client.get<File>(
+    `/v1/studies/${studyId}/raw/original-file`,
+    {
+      params: {
+        path,
+      },
+      responseType: "blob",
+    },
+  );
+
+  // Get the original file name from the response Headers
+  const contentDisposition = headers["content-disposition"];
+  let filename = path.split("/").pop() || "file"; // fallback filename
+
+  if (contentDisposition) {
+    const matches = /filename=([^;]+)/.exec(contentDisposition);
+
+    if (matches?.[1]) {
+      filename = matches[1].replace(/"/g, "").trim();
+    }
+  }
+
+  return new File([data], filename, {
+    type: data.type, // Preserve the MIME type from the Blob
+    lastModified: new Date().getTime(),
+  });
 }
diff --git a/webapp/src/services/api/studies/raw/types.ts b/webapp/src/services/api/studies/raw/types.ts
index 937fd84119..c74958c376 100644
--- a/webapp/src/services/api/studies/raw/types.ts
+++ b/webapp/src/services/api/studies/raw/types.ts
@@ -17,9 +17,10 @@ import type { StudyMetadata } from "../../../../common/types";
 import { O } from "ts-toolbelt";
 import { TableExportFormat } from "./constants";
 
+// Available export formats for matrix tables
 export type TTableExportFormat = O.UnionOf<typeof TableExportFormat>;
 
-export interface DownloadMatrixParams {
+export interface GetMatrixFileParams {
   studyId: StudyMetadata["id"];
   path: string;
   format?: TTableExportFormat;
@@ -27,10 +28,11 @@ export interface DownloadMatrixParams {
   index?: boolean;
 }
 
-export interface ImportFileParams {
+export interface UploadFileParams {
   studyId: StudyMetadata["id"];
   path: string;
   file: File;
+  // Flag to indicate whether to create file and directories if missing
   createMissing?: boolean;
   onUploadProgress?: AxiosRequestConfig["onUploadProgress"];
 }
@@ -39,3 +41,8 @@ export interface DeleteFileParams {
   studyId: StudyMetadata["id"];
   path: string;
 }
+
+export interface GetRawFileParams {
+  studyId: string;
+  path: string;
+}

From c094362e0b1eb907cbbc5e06046d165988e8fb51 Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Mon, 30 Dec 2024 14:43:11 +0100
Subject: [PATCH 28/31] chore: add .nvmrc file containing node version number
 for the app

---
 webapp/.nvmrc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 webapp/.nvmrc

diff --git a/webapp/.nvmrc b/webapp/.nvmrc
new file mode 100644
index 0000000000..3876fd4986
--- /dev/null
+++ b/webapp/.nvmrc
@@ -0,0 +1 @@
+18.16.1

From c68cd50394fb1af435e98188b09bc01b9c1aee6d Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Mon, 30 Dec 2024 14:44:27 +0100
Subject: [PATCH 29/31] chore(vite): update server URL

---
 webapp/vite.config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/vite.config.ts b/webapp/vite.config.ts
index ba4fe1e0f4..71ef9f3906 100644
--- a/webapp/vite.config.ts
+++ b/webapp/vite.config.ts
@@ -16,7 +16,8 @@ import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react-swc";
 import path from "path";
 
-const SERVER_URL = "http://localhost:8080";
+//! Keep '0.0.0.0', because 'localhost' may not working on Mac
+const SERVER_URL = "http://0.0.0.0:8080"; 
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {

From 54a719c6e6c1d48f3b3e564e5279ae144cb22bde Mon Sep 17 00:00:00 2001
From: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
Date: Fri, 3 Jan 2025 11:12:22 +0100
Subject: [PATCH 30/31] fix(ui): fix untranslated message (#2275)

---
 .../src/components/App/Singlestudy/Commands/Edition/index.tsx   | 2 +-
 webapp/vite.config.ts                                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/components/App/Singlestudy/Commands/Edition/index.tsx b/webapp/src/components/App/Singlestudy/Commands/Edition/index.tsx
index 2ef264dc63..f26d44693a 100644
--- a/webapp/src/components/App/Singlestudy/Commands/Edition/index.tsx
+++ b/webapp/src/components/App/Singlestudy/Commands/Edition/index.tsx
@@ -522,7 +522,7 @@ function EditionView(props: Props) {
       ) : (
         <Body sx={{ alignItems: "left" }}>
           <Box height="85%">
-            <EmptyView title="variants.error.noCommands" />
+            <EmptyView title={t("variants.error.noCommands")} />
           </Box>
         </Body>
       )}
diff --git a/webapp/vite.config.ts b/webapp/vite.config.ts
index 71ef9f3906..c3b5b33f2b 100644
--- a/webapp/vite.config.ts
+++ b/webapp/vite.config.ts
@@ -17,7 +17,7 @@ import react from "@vitejs/plugin-react-swc";
 import path from "path";
 
 //! Keep '0.0.0.0', because 'localhost' may not working on Mac
-const SERVER_URL = "http://0.0.0.0:8080"; 
+const SERVER_URL = "http://0.0.0.0:8080";
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {

From 1d83b02e55052753731ba37298acbdea251f8fcb Mon Sep 17 00:00:00 2001
From: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
Date: Fri, 3 Jan 2025 14:37:23 +0100
Subject: [PATCH 31/31] feat(mypy): enforce explicit overrides (#2270)

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
Co-authored-by: belthlemar <martin.belthle@rte-france.com>
---
 antarest/core/cache/business/local_chache.py      |  7 +++++++
 antarest/core/cache/business/redis_cache.py       |  6 ++++++
 antarest/core/configdata/model.py                 |  3 +++
 antarest/core/exceptions.py                       | 11 +++++++++++
 antarest/core/filetransfer/model.py               |  2 ++
 antarest/core/interfaces/eventbus.py              |  9 +++++++++
 antarest/core/logging/utils.py                    |  4 ++++
 antarest/core/requests.py                         |  8 ++++++++
 antarest/core/tasks/model.py                      |  5 +++++
 antarest/core/tasks/service.py                    | 10 ++++++++++
 .../core/utils/fastapi_sqlalchemy/middleware.py   |  2 ++
 antarest/core/utils/utils.py                      |  5 +++++
 antarest/eventbus/business/local_eventbus.py      |  7 +++++++
 antarest/eventbus/business/redis_eventbus.py      |  6 ++++++
 antarest/eventbus/service.py                      |  9 +++++++++
 antarest/front.py                                 |  2 ++
 .../adapters/local_launcher/local_launcher.py     |  5 +++++
 .../adapters/slurm_launcher/slurm_launcher.py     |  4 ++++
 .../extensions/adequacy_patch/extension.py        |  4 ++++
 antarest/launcher/model.py                        |  5 +++++
 antarest/login/model.py                           |  6 ++++++
 antarest/matrixstore/matrix_editor.py             |  3 +++
 antarest/matrixstore/matrix_garbage_collector.py  |  3 +++
 antarest/matrixstore/model.py                     |  7 +++++++
 antarest/matrixstore/service.py                   |  9 +++++++++
 antarest/study/business/enum_ignore_case.py       |  3 +++
 .../study/business/scenario_builder_management.py |  2 ++
 antarest/study/business/table_mode_management.py  |  2 ++
 antarest/study/model.py                           | 11 +++++++++++
 antarest/study/service.py                         |  2 ++
 .../study/storage/abstract_storage_service.py     | 12 ++++++++++++
 antarest/study/storage/auto_archive_service.py    |  3 +++
 antarest/study/storage/df_download.py             |  2 ++
 antarest/study/storage/rawstudy/ini_reader.py     |  5 +++++
 antarest/study/storage/rawstudy/ini_writer.py     |  4 ++++
 .../rawstudy/model/filesystem/bucket_node.py      |  5 +++++
 .../model/filesystem/common/area_matrix_list.py   |  7 +++++++
 .../rawstudy/model/filesystem/common/prepro.py    |  3 +++
 .../rawstudy/model/filesystem/config/area.py      |  3 +++
 .../model/filesystem/config/exceptions.py         |  4 ++++
 .../model/filesystem/config/ini_properties.py     |  3 +++
 .../rawstudy/model/filesystem/config/model.py     |  2 ++
 .../rawstudy/model/filesystem/config/renewable.py |  3 +++
 .../model/filesystem/config/ruleset_matrices.py   |  2 ++
 .../rawstudy/model/filesystem/config/thermal.py   |  5 +++++
 .../rawstudy/model/filesystem/folder_node.py      | 10 ++++++++++
 .../rawstudy/model/filesystem/ini_file_node.py    |  8 ++++++++
 .../rawstudy/model/filesystem/json_file_node.py   |  4 ++++
 .../rawstudy/model/filesystem/lazy_node.py        |  6 ++++++
 .../model/filesystem/matrix/date_serializer.py    | 11 +++++++++++
 .../model/filesystem/matrix/head_writer.py        |  4 ++++
 .../filesystem/matrix/input_series_matrix.py      |  4 ++++
 .../rawstudy/model/filesystem/matrix/matrix.py    |  6 ++++++
 .../filesystem/matrix/output_series_matrix.py     |  7 +++++++
 .../rawstudy/model/filesystem/raw_file_node.py    |  8 ++++++++
 .../model/filesystem/root/filestudytree.py        |  3 +++
 .../model/filesystem/root/input/areas/areas.py    |  2 ++
 .../filesystem/root/input/areas/item/item.py      |  2 ++
 .../model/filesystem/root/input/areas/list.py     |  9 +++++++++
 .../input/bindingconstraints/bindingcontraints.py |  2 ++
 .../root/input/commons/prepro_series.py           |  2 ++
 .../root/input/hydro/allocation/allocation.py     |  2 ++
 .../root/input/hydro/common/capacity/capacity.py  |  2 ++
 .../filesystem/root/input/hydro/common/common.py  |  2 ++
 .../model/filesystem/root/input/hydro/hydro.py    |  2 ++
 .../root/input/hydro/prepro/area/area.py          |  2 ++
 .../filesystem/root/input/hydro/prepro/prepro.py  |  2 ++
 .../root/input/hydro/series/area/area.py          |  3 +++
 .../filesystem/root/input/hydro/series/series.py  |  2 ++
 .../rawstudy/model/filesystem/root/input/input.py |  2 ++
 .../model/filesystem/root/input/link/area/area.py |  2 ++
 .../root/input/link/area/capacities/capacities.py |  2 ++
 .../model/filesystem/root/input/link/link.py      |  2 ++
 .../filesystem/root/input/miscgen/miscgen.py      |  2 ++
 .../filesystem/root/input/renewables/clusters.py  |  3 +++
 .../filesystem/root/input/renewables/renewable.py |  2 ++
 .../filesystem/root/input/renewables/series.py    |  4 ++++
 .../filesystem/root/input/reserves/reserves.py    |  2 ++
 .../root/input/st_storage/clusters/area/area.py   |  2 ++
 .../root/input/st_storage/clusters/clusters.py    |  2 ++
 .../root/input/st_storage/series/area/area.py     |  2 ++
 .../series/area/st_storage/st_storage.py          |  2 ++
 .../root/input/st_storage/series/series.py        |  2 ++
 .../root/input/st_storage/st_storage.py           |  3 +++
 .../root/input/thermal/cluster/area/area.py       |  2 ++
 .../root/input/thermal/cluster/cluster.py         |  2 ++
 .../root/input/thermal/prepro/area/area.py        |  2 ++
 .../input/thermal/prepro/area/thermal/thermal.py  |  2 ++
 .../root/input/thermal/prepro/prepro.py           |  2 ++
 .../root/input/thermal/series/area/area.py        |  2 ++
 .../input/thermal/series/area/thermal/thermal.py  |  2 ++
 .../root/input/thermal/series/series.py           |  2 ++
 .../filesystem/root/input/thermal/thermal.py      |  2 ++
 .../model/filesystem/root/layers/layers.py        |  2 ++
 .../model/filesystem/root/output/output.py        |  2 ++
 .../root/output/simulation/about/about.py         |  2 ++
 .../root/output/simulation/mode/common/area.py    |  2 ++
 .../root/output/simulation/mode/common/areas.py   |  2 ++
 .../simulation/mode/common/binding_const.py       |  2 ++
 .../root/output/simulation/mode/common/link.py    |  2 ++
 .../root/output/simulation/mode/common/links.py   |  4 ++++
 .../root/output/simulation/mode/common/set.py     |  2 ++
 .../root/output/simulation/mode/common/utils.py   |  2 ++
 .../root/output/simulation/mode/economy.py        |  2 ++
 .../root/output/simulation/mode/mcall/grid.py     |  9 +++++++++
 .../root/output/simulation/mode/mcind/mcind.py    |  2 ++
 .../root/output/simulation/simulation.py          |  2 ++
 .../simulation/ts_generator/ts_generator.py       |  5 +++++
 .../output/simulation/ts_numbers/ts_numbers.py    |  2 ++
 .../simulation/ts_numbers/ts_numbers_data.py      |  7 +++++++
 .../output/simulation/xpansion/sensitivity.py     |  2 ++
 .../root/output/simulation/xpansion/xpansion.py   |  2 ++
 .../root/settings/resources/resources.py          |  2 ++
 .../filesystem/root/settings/scenariobuilder.py   |  2 ++
 .../model/filesystem/root/settings/settings.py    |  2 ++
 .../root/settings/simulations/simulations.py      |  2 ++
 .../filesystem/root/user/expansion/sensitivity.py |  3 +++
 .../study/storage/rawstudy/raw_study_service.py   | 12 ++++++++++++
 antarest/study/storage/rawstudy/watcher.py        |  3 +++
 .../variantstudy/business/command_extractor.py    | 13 +++++++++++++
 .../variantstudy/model/command/create_area.py     |  8 ++++++++
 .../model/command/create_binding_constraint.py    |  9 +++++++++
 .../variantstudy/model/command/create_cluster.py  |  8 ++++++++
 .../variantstudy/model/command/create_district.py |  8 ++++++++
 .../variantstudy/model/command/create_link.py     | 13 +++++++++++++
 .../model/command/create_renewables_cluster.py    |  8 ++++++++
 .../model/command/create_st_storage.py            |  8 ++++++++
 .../model/command/create_user_resource.py         |  9 +++++++++
 .../generate_thermal_cluster_timeseries.py        |  8 ++++++++
 .../variantstudy/model/command/remove_area.py     |  9 +++++++++
 .../model/command/remove_binding_constraint.py    |  9 +++++++++
 .../variantstudy/model/command/remove_cluster.py  |  8 ++++++++
 .../variantstudy/model/command/remove_district.py |  9 +++++++++
 .../variantstudy/model/command/remove_link.py     |  8 ++++++++
 .../model/command/remove_renewables_cluster.py    | 11 +++++++++--
 .../model/command/remove_st_storage.py            |  8 ++++++++
 .../model/command/remove_user_resource.py         |  9 +++++++++
 .../variantstudy/model/command/replace_matrix.py  |  8 ++++++++
 .../model/command/update_binding_constraint.py    |  8 ++++++++
 .../variantstudy/model/command/update_comments.py |  9 +++++++++
 .../variantstudy/model/command/update_config.py   |  8 ++++++++
 .../variantstudy/model/command/update_district.py |  9 +++++++++
 .../variantstudy/model/command/update_link.py     |  8 ++++++++
 .../variantstudy/model/command/update_playlist.py |  9 +++++++++
 .../variantstudy/model/command/update_raw_file.py | 10 ++++++++++
 .../model/command/update_scenario_builder.py      |  8 ++++++++
 .../study/storage/variantstudy/model/dbmodel.py   |  4 ++++
 antarest/study/storage/variantstudy/repository.py |  2 ++
 .../storage/variantstudy/variant_study_service.py | 15 +++++++++++++++
 antarest/tools/lib.py                             |  3 +++
 antarest/worker/archive_worker.py                 |  3 +++
 antarest/worker/worker.py                         |  3 +++
 pyproject.toml                                    |  1 +
 153 files changed, 732 insertions(+), 2 deletions(-)

diff --git a/antarest/core/cache/business/local_chache.py b/antarest/core/cache/business/local_chache.py
index e903ff9080..493322b9c6 100644
--- a/antarest/core/cache/business/local_chache.py
+++ b/antarest/core/cache/business/local_chache.py
@@ -15,6 +15,8 @@
 import time
 from typing import Dict, List, Optional
 
+from typing_extensions import override
+
 from antarest.core.config import CacheConfig
 from antarest.core.interfaces.cache import ICache
 from antarest.core.model import JSON
@@ -40,6 +42,7 @@ def __init__(self, config: CacheConfig = CacheConfig()):
             daemon=True,
         )
 
+    @override
     def start(self) -> None:
         self.checker_thread.start()
 
@@ -55,6 +58,7 @@ def checker(self) -> None:
                 for id in to_delete:
                     del self.cache[id]
 
+    @override
     def put(self, id: str, data: JSON, duration: int = 3600) -> None:  # Duration in second
         with self.lock:
             logger.info(f"Adding cache key {id}")
@@ -64,6 +68,7 @@ def put(self, id: str, data: JSON, duration: int = 3600) -> None:  # Duration in
                 duration=duration,
             )
 
+    @override
     def get(self, id: str, refresh_duration: Optional[int] = None) -> Optional[JSON]:
         res = None
         with self.lock:
@@ -76,12 +81,14 @@ def get(self, id: str, refresh_duration: Optional[int] = None) -> Optional[JSON]
                 res = self.cache[id].data
         return res
 
+    @override
     def invalidate(self, id: str) -> None:
         with self.lock:
             logger.info(f"Removing cache key {id}")
             if id in self.cache:
                 del self.cache[id]
 
+    @override
     def invalidate_all(self, ids: List[str]) -> None:
         with self.lock:
             logger.info(f"Removing cache keys {ids}")
diff --git a/antarest/core/cache/business/redis_cache.py b/antarest/core/cache/business/redis_cache.py
index 11eb3fcffd..ee7e30a6d1 100644
--- a/antarest/core/cache/business/redis_cache.py
+++ b/antarest/core/cache/business/redis_cache.py
@@ -14,6 +14,7 @@
 from typing import List, Optional
 
 from redis.client import Redis
+from typing_extensions import override
 
 from antarest.core.interfaces.cache import ICache
 from antarest.core.model import JSON
@@ -31,10 +32,12 @@ class RedisCache(ICache):
     def __init__(self, redis_client: Redis):  # type: ignore
         self.redis = redis_client
 
+    @override
     def start(self) -> None:
         # Assuming the Redis service is already running; no need to start it here.
         pass
 
+    @override
     def put(self, id: str, data: JSON, duration: int = 3600) -> None:
         redis_element = RedisCacheElement(duration=duration, data=data)
         redis_key = f"cache:{id}"
@@ -42,6 +45,7 @@ def put(self, id: str, data: JSON, duration: int = 3600) -> None:
         self.redis.set(redis_key, redis_element.model_dump_json())
         self.redis.expire(redis_key, duration)
 
+    @override
     def get(self, id: str, refresh_timeout: Optional[int] = None) -> Optional[JSON]:
         redis_key = f"cache:{id}"
         result = self.redis.get(redis_key)
@@ -58,10 +62,12 @@ def get(self, id: str, refresh_timeout: Optional[int] = None) -> Optional[JSON]:
         logger.info(f"Cache key {id} not found")
         return None
 
+    @override
     def invalidate(self, id: str) -> None:
         logger.info(f"Removing cache key {id}")
         self.redis.delete(f"cache:{id}")
 
+    @override
     def invalidate_all(self, ids: List[str]) -> None:
         logger.info(f"Removing cache keys {ids}")
         self.redis.delete(*[f"cache:{id}" for id in ids])
diff --git a/antarest/core/configdata/model.py b/antarest/core/configdata/model.py
index 3a4512e44c..faa6589709 100644
--- a/antarest/core/configdata/model.py
+++ b/antarest/core/configdata/model.py
@@ -14,6 +14,7 @@
 from typing import Any, Optional
 
 from sqlalchemy import Column, Integer, String  # type: ignore
+from typing_extensions import override
 
 from antarest.core.persistence import Base
 from antarest.core.serialization import AntaresBaseModel
@@ -30,11 +31,13 @@ class ConfigData(Base):  # type: ignore
     key = Column(String(), primary_key=True)
     value = Column(String(), nullable=True)
 
+    @override
     def __eq__(self, other: Any) -> bool:
         if not isinstance(other, ConfigData):
             return False
         return bool(other.key == self.key and other.value == self.value and other.owner == self.owner)
 
+    @override
     def __repr__(self) -> str:
         return f"key={self.key}, value={self.value}, owner={self.owner}"
 
diff --git a/antarest/core/exceptions.py b/antarest/core/exceptions.py
index d6c392b9cf..722a385b26 100644
--- a/antarest/core/exceptions.py
+++ b/antarest/core/exceptions.py
@@ -15,6 +15,7 @@
 from http import HTTPStatus
 
 from fastapi.exceptions import HTTPException
+from typing_extensions import override
 
 
 class ShouldNotHappenException(Exception):
@@ -81,6 +82,7 @@ def __init__(self, path: str, *area_ids: str):
             detail = f"{self.object_name.title()} {detail}"
         super().__init__(HTTPStatus.NOT_FOUND, detail)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
@@ -127,6 +129,7 @@ def __init__(self, path: str, section_id: str):
         detail = f"{object_name.title()} '{section_id}' not found in '{path}'"
         super().__init__(HTTPStatus.NOT_FOUND, detail)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
@@ -172,6 +175,7 @@ def __init__(self, path: str):
             detail = f"{self.object_name.title()} {detail}"
         super().__init__(HTTPStatus.NOT_FOUND, detail)
 
+    @override
     def __str__(self) -> str:
         return self.detail
 
@@ -227,6 +231,7 @@ def __init__(self, area_id: str, *duplicates: str):
             detail = f"{self.object_name.title()} {detail}"
         super().__init__(HTTPStatus.CONFLICT, detail)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
@@ -397,6 +402,7 @@ def __init__(self, object_id: str, binding_ids: t.Sequence[str], *, object_type:
         )
         super().__init__(HTTPStatus.FORBIDDEN, message)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
@@ -429,6 +435,7 @@ def __init__(self, output_id: str) -> None:
         message = f"Output '{output_id}' not found"
         super().__init__(HTTPStatus.NOT_FOUND, message)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
@@ -463,6 +470,7 @@ def __init__(self, output_id: str, mc_root: str) -> None:
         message = f"The output '{output_id}' sub-folder '{mc_root}' does not exist"
         super().__init__(HTTPStatus.NOT_FOUND, message)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
@@ -552,6 +560,7 @@ def __init__(self, binding_constraint_id: str, *ids: str) -> None:
         }[min(count, 2)]
         super().__init__(HTTPStatus.NOT_FOUND, message)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
@@ -572,6 +581,7 @@ def __init__(self, binding_constraint_id: str, *ids: str) -> None:
         }[min(count, 2)]
         super().__init__(HTTPStatus.CONFLICT, message)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
@@ -589,6 +599,7 @@ def __init__(self, binding_constraint_id: str, term_json: str) -> None:
         )
         super().__init__(HTTPStatus.UNPROCESSABLE_ENTITY, message)
 
+    @override
     def __str__(self) -> str:
         """Return a string representation of the exception."""
         return self.detail
diff --git a/antarest/core/filetransfer/model.py b/antarest/core/filetransfer/model.py
index 6ce194ed19..0a5958d57a 100644
--- a/antarest/core/filetransfer/model.py
+++ b/antarest/core/filetransfer/model.py
@@ -16,6 +16,7 @@
 from typing import Optional
 
 from sqlalchemy import Boolean, Column, DateTime, Integer, String  # type: ignore
+from typing_extensions import override
 
 from antarest.core.persistence import Base
 from antarest.core.serialization import AntaresBaseModel
@@ -81,6 +82,7 @@ def to_dto(self) -> FileDownloadDTO:
             error_message=self.error_message or "",
         )
 
+    @override
     def __repr__(self) -> str:
         return (
             f"(id={self.id},"
diff --git a/antarest/core/interfaces/eventbus.py b/antarest/core/interfaces/eventbus.py
index a60aaf481a..d9075dc49e 100644
--- a/antarest/core/interfaces/eventbus.py
+++ b/antarest/core/interfaces/eventbus.py
@@ -14,6 +14,8 @@
 from enum import StrEnum
 from typing import Any, Awaitable, Callable, List, Optional
 
+from typing_extensions import override
+
 from antarest.core.model import PermissionInfo
 from antarest.core.serialization import AntaresBaseModel
 
@@ -140,21 +142,26 @@ class DummyEventBusService(IEventBus):
     def __init__(self) -> None:
         self.events: List[Event] = []
 
+    @override
     def queue(self, event: Event, queue: str) -> None:
         # Noop
         pass
 
+    @override
     def add_queue_consumer(self, listener: Callable[[Event], Awaitable[None]], queue: str) -> str:
         return ""
 
+    @override
     def remove_queue_consumer(self, listener_id: str) -> None:
         # Noop
         pass
 
+    @override
     def push(self, event: Event) -> None:
         # Noop
         self.events.append(event)
 
+    @override
     def add_listener(
         self,
         listener: Callable[[Event], Awaitable[None]],
@@ -162,10 +169,12 @@ def add_listener(
     ) -> str:
         return ""
 
+    @override
     def remove_listener(self, listener_id: str) -> None:
         # Noop
         pass
 
+    @override
     def start(self, threaded: bool = True) -> None:
         # Noop
         pass
diff --git a/antarest/core/logging/utils.py b/antarest/core/logging/utils.py
index 991f21b846..2fa8c4a040 100644
--- a/antarest/core/logging/utils.py
+++ b/antarest/core/logging/utils.py
@@ -20,6 +20,7 @@
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from starlette.requests import Request
 from starlette.responses import Response
+from typing_extensions import override
 
 from antarest.core.config import Config
 
@@ -39,6 +40,7 @@ class CustomDefaultFormatter(logging.Formatter):
     fields to the log record with a value of `None`.
     """
 
+    @override
     def format(self, record: logging.LogRecord) -> str:
         """
         Formats the specified log record using the custom formatter,
@@ -169,6 +171,7 @@ def configure_logger(config: Config, handler_cls: str = "logging.FileHandler") -
 
 
 class LoggingMiddleware(BaseHTTPMiddleware):
+    @override
     async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -> Response:
         with RequestContext(request):
             response = await call_next(request)
@@ -176,6 +179,7 @@ async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -
 
 
 class ContextFilter(logging.Filter):
+    @override
     def filter(self, record: logging.LogRecord) -> bool:
         request: Optional[Request] = _request.get()
         request_id: Optional[str] = _request_id.get()
diff --git a/antarest/core/requests.py b/antarest/core/requests.py
index d276f79dca..055bbd8cdd 100644
--- a/antarest/core/requests.py
+++ b/antarest/core/requests.py
@@ -18,6 +18,7 @@
 from fastapi import HTTPException
 from markupsafe import escape
 from ratelimit import Rule  # type: ignore
+from typing_extensions import override
 
 from antarest.core.jwt import JWTUser
 
@@ -38,24 +39,30 @@ def __init__(self, data=None, **kwargs) -> None:  # type: ignore
             data = {}
         self.update(data, **kwargs)
 
+    @override
     def __setitem__(self, key: str, value: t.Any) -> None:
         self._store[key.lower()] = (key, value)
 
+    @override
     def __getitem__(self, key: str) -> t.Any:
         return self._store[key.lower()][1]
 
+    @override
     def __delitem__(self, key: str) -> None:
         del self._store[key.lower()]
 
+    @override
     def __iter__(self) -> t.Any:
         return (casedkey for casedkey, mappedvalue in self._store.values())
 
+    @override
     def __len__(self) -> int:
         return len(self._store)
 
     def lower_items(self) -> Generator[Tuple[Any, Any], Any, None]:
         return ((lowerkey, keyval[1]) for (lowerkey, keyval) in self._store.items())
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if isinstance(other, t.Mapping):
             other = CaseInsensitiveDict(other)
@@ -66,6 +73,7 @@ def __eq__(self, other: t.Any) -> bool:
     def copy(self) -> "CaseInsensitiveDict":
         return CaseInsensitiveDict(self._store.values())
 
+    @override
     def __repr__(self) -> str:
         return str(dict(self.items()))
 
diff --git a/antarest/core/tasks/model.py b/antarest/core/tasks/model.py
index 0b414b12c6..a533b73baf 100644
--- a/antarest/core/tasks/model.py
+++ b/antarest/core/tasks/model.py
@@ -18,6 +18,7 @@
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, Sequence, String  # type: ignore
 from sqlalchemy.engine.base import Engine  # type: ignore
 from sqlalchemy.orm import relationship, sessionmaker  # type: ignore
+from typing_extensions import override
 
 from antarest.core.persistence import Base
 from antarest.core.serialization import AntaresBaseModel
@@ -122,11 +123,13 @@ class TaskJobLog(Base):  # type: ignore
     # If the TaskJob is deleted, all attached logs must also be deleted in cascade.
     job: "TaskJob" = relationship("TaskJob", back_populates="logs", uselist=False)
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if not isinstance(other, TaskJobLog):
             return False
         return bool(other.id == self.id and other.message == self.message and other.task_id == self.task_id)
 
+    @override
     def __repr__(self) -> str:
         return f"id={self.id}, message={self.message}, task_id={self.task_id}"
 
@@ -198,6 +201,7 @@ def to_dto(self, with_logs: bool = False) -> TaskDTO:
             progress=self.progress,
         )
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if not isinstance(other, TaskJob):
             return False
@@ -213,6 +217,7 @@ def __eq__(self, other: t.Any) -> bool:
             and other.logs == self.logs
         )
 
+    @override
     def __repr__(self) -> str:
         return (
             f"id={self.id},"
diff --git a/antarest/core/tasks/service.py b/antarest/core/tasks/service.py
index a97a2fedf5..9b7efb8344 100644
--- a/antarest/core/tasks/service.py
+++ b/antarest/core/tasks/service.py
@@ -20,6 +20,7 @@
 
 from fastapi import HTTPException
 from sqlalchemy.orm import Session  # type: ignore
+from typing_extensions import override
 
 from antarest.core.config import Config
 from antarest.core.interfaces.eventbus import Event, EventChannelDirectory, EventType, IEventBus
@@ -108,9 +109,11 @@ def await_task(self, task_id: str, timeout_sec: int = DEFAULT_AWAIT_MAX_TIMEOUT)
 class NoopNotifier(ITaskNotifier):
     """This class is used in tasks when no notification is required."""
 
+    @override
     def notify_message(self, message: str) -> None:
         return
 
+    @override
     def notify_progress(self, progress: int) -> None:
         return
 
@@ -129,12 +132,14 @@ def __init__(self, task_id: str, session: Session, event_bus: IEventBus) -> None
         self.task_id = task_id
         self.event_bus = event_bus
 
+    @override
     def notify_message(self, message: str) -> None:
         task = self.session.query(TaskJob).get(self.task_id)
         if task:
             task.logs.append(TaskJobLog(message=message, task_id=self.task_id))
             self.session.commit()
 
+    @override
     def notify_progress(self, progress: int) -> None:
         self.session.query(TaskJob).filter(TaskJob.id == self.task_id).update({TaskJob.progress: progress})
         self.session.commit()
@@ -215,6 +220,7 @@ def _send_worker_task(logger_: ITaskNotifier) -> TaskResult:
     def check_remote_worker_for_queue(self, task_queue: str) -> bool:
         return any(task_queue in rw.queues for rw in self.remote_workers)
 
+    @override
     def add_worker_task(
         self,
         task_type: TaskType,
@@ -237,6 +243,7 @@ def add_worker_task(
         )
         return str(task.id)
 
+    @override
     def add_task(
         self,
         action: Task,
@@ -328,6 +335,7 @@ def _cancel_task(self, task_id: str, dispatch: bool = False) -> None:
                 )
             )
 
+    @override
     def status_task(
         self,
         task_id: str,
@@ -344,6 +352,7 @@ def status_task(
                 detail=f"Failed to retrieve task {task_id} in db",
             )
 
+    @override
     def list_tasks(self, task_filter: TaskListFilter, request_params: RequestParameters) -> t.List[TaskDTO]:
         return [task.to_dto() for task in self.list_db_tasks(task_filter, request_params)]
 
@@ -353,6 +362,7 @@ def list_db_tasks(self, task_filter: TaskListFilter, request_params: RequestPara
         user = None if request_params.user.is_site_admin() else request_params.user.impersonator
         return self.repo.list(task_filter, user)
 
+    @override
     def await_task(self, task_id: str, timeout_sec: int = DEFAULT_AWAIT_MAX_TIMEOUT) -> None:
         if task_id in self.tasks:
             try:
diff --git a/antarest/core/utils/fastapi_sqlalchemy/middleware.py b/antarest/core/utils/fastapi_sqlalchemy/middleware.py
index 73a073e033..db18bc3efc 100644
--- a/antarest/core/utils/fastapi_sqlalchemy/middleware.py
+++ b/antarest/core/utils/fastapi_sqlalchemy/middleware.py
@@ -10,6 +10,7 @@
 from starlette.requests import Request
 from starlette.responses import Response
 from starlette.types import ASGIApp
+from typing_extensions import override
 
 from antarest.core.utils.fastapi_sqlalchemy.exceptions import MissingSessionError, SessionNotInitialisedError
 
@@ -60,6 +61,7 @@ def __init__(
 
         _Session = sessionmaker(bind=engine, **session_args)
 
+    @override
     async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -> Response:
         with db(commit_on_exit=self.commit_on_exit):
             response = await call_next(request)
diff --git a/antarest/core/utils/utils.py b/antarest/core/utils/utils.py
index 2940db582a..0abe2a6fb4 100644
--- a/antarest/core/utils/utils.py
+++ b/antarest/core/utils/utils.py
@@ -20,6 +20,7 @@
 from pathlib import Path
 
 from fastapi import HTTPException
+from typing_extensions import override
 
 from antarest.core.exceptions import ShouldNotHappenException
 
@@ -33,18 +34,22 @@ class DTO:
     Implement basic method for DTO objects
     """
 
+    @override
     def __hash__(self) -> int:
         return hash(tuple(sorted(self.__dict__.items())))
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         return isinstance(other, type(self)) and self.__dict__ == other.__dict__
 
+    @override
     def __str__(self) -> str:
         return "{}({})".format(
             type(self).__name__,
             ", ".join(["{}={}".format(k, str(self.__dict__[k])) for k in sorted(self.__dict__)]),
         )
 
+    @override
     def __repr__(self) -> str:
         return self.__str__()
 
diff --git a/antarest/eventbus/business/local_eventbus.py b/antarest/eventbus/business/local_eventbus.py
index bfe0e6992d..774278d5e4 100644
--- a/antarest/eventbus/business/local_eventbus.py
+++ b/antarest/eventbus/business/local_eventbus.py
@@ -13,6 +13,8 @@
 import logging
 from typing import Dict, List, Optional
 
+from typing_extensions import override
+
 from antarest.core.interfaces.eventbus import Event
 from antarest.eventbus.business.interfaces import IEventBusBackend
 
@@ -24,20 +26,25 @@ def __init__(self) -> None:
         self.events: List[Event] = []
         self.queues: Dict[str, List[Event]] = {}
 
+    @override
     def push_event(self, event: Event) -> None:
         self.events.append(event)
 
+    @override
     def get_events(self) -> List[Event]:
         return self.events
 
+    @override
     def clear_events(self) -> None:
         self.events.clear()
 
+    @override
     def queue_event(self, event: Event, queue: str) -> None:
         if queue not in self.queues:
             self.queues[queue] = []
         self.queues[queue].append(event)
 
+    @override
     def pull_queue(self, queue: str) -> Optional[Event]:
         if queue in self.queues and len(self.queues[queue]) > 0:
             return self.queues[queue].pop(0)
diff --git a/antarest/eventbus/business/redis_eventbus.py b/antarest/eventbus/business/redis_eventbus.py
index 8bbf6cbc38..db89c7bc68 100644
--- a/antarest/eventbus/business/redis_eventbus.py
+++ b/antarest/eventbus/business/redis_eventbus.py
@@ -14,6 +14,7 @@
 from typing import List, Optional, cast
 
 from redis.client import Redis
+from typing_extensions import override
 
 from antarest.core.interfaces.eventbus import Event
 from antarest.eventbus.business.interfaces import IEventBusBackend
@@ -29,18 +30,22 @@ def __init__(self, redis_client: Redis) -> None:  # type: ignore
         self.pubsub = self.redis.pubsub()
         self.pubsub.subscribe(REDIS_STORE_KEY)
 
+    @override
     def push_event(self, event: Event) -> None:
         self.redis.publish(REDIS_STORE_KEY, event.model_dump_json())
 
+    @override
     def queue_event(self, event: Event, queue: str) -> None:
         self.redis.rpush(queue, event.model_dump_json())
 
+    @override
     def pull_queue(self, queue: str) -> Optional[Event]:
         event = self.redis.lpop(queue)
         if event:
             return cast(Optional[Event], Event.parse_raw(event))
         return None
 
+    @override
     def get_events(self) -> List[Event]:
         messages = []
         try:
@@ -60,6 +65,7 @@ def get_events(self) -> List[Event]:
 
         return events
 
+    @override
     def clear_events(self) -> None:
         # Nothing to do
         pass
diff --git a/antarest/eventbus/service.py b/antarest/eventbus/service.py
index eadf75e8c8..63b519e954 100644
--- a/antarest/eventbus/service.py
+++ b/antarest/eventbus/service.py
@@ -18,6 +18,8 @@
 import uuid
 from typing import Awaitable, Callable, Dict, List, Optional
 
+from typing_extensions import override
+
 from antarest.core.interfaces.eventbus import Event, EventType, IEventBus
 from antarest.eventbus.business.interfaces import IEventBusBackend
 
@@ -39,12 +41,15 @@ def __init__(self, backend: IEventBusBackend, autostart: bool = True) -> None:
         if autostart:
             self.start()
 
+    @override
     def push(self, event: Event) -> None:
         self.backend.push_event(event)
 
+    @override
     def queue(self, event: Event, queue: str) -> None:
         self.backend.queue_event(event, queue)
 
+    @override
     def add_queue_consumer(self, listener: Callable[[Event], Awaitable[None]], queue: str) -> str:
         with self.lock:
             listener_id = str(uuid.uuid4())
@@ -53,12 +58,14 @@ def add_queue_consumer(self, listener: Callable[[Event], Awaitable[None]], queue
             self.consumers[queue][listener_id] = listener
             return listener_id
 
+    @override
     def remove_queue_consumer(self, listener_id: str) -> None:
         with self.lock:
             for queue in self.consumers:
                 if listener_id in self.consumers[queue]:
                     del self.consumers[queue][listener_id]
 
+    @override
     def add_listener(
         self,
         listener: Callable[[Event], Awaitable[None]],
@@ -71,6 +78,7 @@ def add_listener(
                 self.listeners[listener_type][listener_id] = listener
             return listener_id
 
+    @override
     def remove_listener(self, listener_id: str) -> None:
         with self.lock:
             for listener_type in self.listeners:
@@ -130,6 +138,7 @@ def _async_loop(self, new_loop: bool = True) -> None:
         loop = asyncio.new_event_loop() if new_loop else asyncio.get_event_loop()
         loop.run_until_complete(self._run_loop())
 
+    @override
     def start(self, threaded: bool = True) -> None:
         if threaded:
             t = threading.Thread(
diff --git a/antarest/front.py b/antarest/front.py
index 16cd92544f..33314eb3f4 100644
--- a/antarest/front.py
+++ b/antarest/front.py
@@ -30,6 +30,7 @@
 from starlette.responses import FileResponse
 from starlette.staticfiles import StaticFiles
 from starlette.types import ASGIApp
+from typing_extensions import override
 
 from antarest.core.serialization import AntaresBaseModel
 from antarest.core.utils.string import to_camel_case
@@ -76,6 +77,7 @@ def _path_matches_protected_paths(self, path: str) -> bool:
                 return True
         return False
 
+    @override
     async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -> Any:
         """
         Intercepts the incoming request and rewrites the URL path if necessary.
diff --git a/antarest/launcher/adapters/local_launcher/local_launcher.py b/antarest/launcher/adapters/local_launcher/local_launcher.py
index a3ad8fc703..30560977a7 100644
--- a/antarest/launcher/adapters/local_launcher/local_launcher.py
+++ b/antarest/launcher/adapters/local_launcher/local_launcher.py
@@ -23,6 +23,7 @@
 from uuid import UUID
 
 from antares.study.version import SolverVersion
+from typing_extensions import override
 
 from antarest.core.config import Config
 from antarest.core.interfaces.cache import ICache
@@ -73,6 +74,7 @@ def _select_best_binary(self, version: str) -> Path:
             )
         return antares_solver_path
 
+    @override
     def run_study(
         self,
         study_uuid: str,
@@ -195,6 +197,7 @@ def stop_reading_output() -> bool:
             end = True
             shutil.rmtree(tmp_path)
 
+    @override
     def create_update_log(self, job_id: str) -> Callable[[str], None]:
         base_func = super().create_update_log(job_id)
         self.logs[job_id] = ""
@@ -205,6 +208,7 @@ def append_to_log(log_line: str) -> None:
 
         return append_to_log
 
+    @override
     def get_log(self, job_id: str, log_type: LogType) -> Optional[str]:
         if job_id in self.job_id_to_study_id and job_id in self.logs:
             return self.logs[job_id]
@@ -212,6 +216,7 @@ def get_log(self, job_id: str, log_type: LogType) -> Optional[str]:
             return self._get_job_final_output_path(job_id).read_text()
         return None
 
+    @override
     def kill_job(self, job_id: str) -> None:
         if job_id in self.job_id_to_study_id:
             return self.job_id_to_study_id[job_id][2].send_signal(signal.SIGTERM)
diff --git a/antarest/launcher/adapters/slurm_launcher/slurm_launcher.py b/antarest/launcher/adapters/slurm_launcher/slurm_launcher.py
index d4f5c30da8..0506ad5694 100644
--- a/antarest/launcher/adapters/slurm_launcher/slurm_launcher.py
+++ b/antarest/launcher/adapters/slurm_launcher/slurm_launcher.py
@@ -28,6 +28,7 @@
 from antareslauncher.main_option_parser import MainOptionParser, ParserParameters
 from antareslauncher.study_dto import StudyDTO
 from filelock import FileLock
+from typing_extensions import override
 
 from antarest.core.config import Config, NbCoresConfig, SlurmConfig, TimeLimitConfig
 from antarest.core.interfaces.cache import ICache
@@ -589,6 +590,7 @@ def _apply_params(self, launcher_params: LauncherParametersDTO) -> argparse.Name
 
         return self.launcher_args
 
+    @override
     def run_study(
         self,
         study_uuid: str,
@@ -604,6 +606,7 @@ def run_study(
         )
         thread.start()
 
+    @override
     def get_log(self, job_id: str, log_type: LogType) -> t.Optional[str]:
         log_path: t.Optional[Path] = None
         for study in self.data_repo_tinydb.get_list_of_studies():
@@ -621,6 +624,7 @@ async def _listen_to_kill_job(event: Event) -> None:
 
         return _listen_to_kill_job
 
+    @override
     def kill_job(self, job_id: str, dispatch: bool = True) -> None:
         launcher_args = LauncherArgs(self.launcher_args)
         for study in self.data_repo_tinydb.get_list_of_studies():
diff --git a/antarest/launcher/extensions/adequacy_patch/extension.py b/antarest/launcher/extensions/adequacy_patch/extension.py
index bb4d19f323..10f2f28f52 100644
--- a/antarest/launcher/extensions/adequacy_patch/extension.py
+++ b/antarest/launcher/extensions/adequacy_patch/extension.py
@@ -16,6 +16,7 @@
 from typing import Any, Dict, List, cast
 
 import yaml
+from typing_extensions import override
 
 from antarest.core.config import Config
 from antarest.core.model import JSON
@@ -95,9 +96,11 @@ class AdequacyPatchExtension(ILauncherExtension):
     def __init__(self, study_service: StudyService, config: Config):
         self.study_service = study_service
 
+    @override
     def get_name(self) -> str:
         return AdequacyPatchExtension.EXTENSION_NAME
 
+    @override
     def after_export_flat_hook(
         self,
         job_id: str,
@@ -129,6 +132,7 @@ def after_export_flat_hook(
             post_processing_file = Path(__file__).parent / "resources" / "post-processing.R"
         shutil.copy(post_processing_file, study_export_path / "post-processing.R")
 
+    @override
     def before_import_hook(
         self,
         job_id: str,
diff --git a/antarest/launcher/model.py b/antarest/launcher/model.py
index dbd90e3ef4..934b2b5753 100644
--- a/antarest/launcher/model.py
+++ b/antarest/launcher/model.py
@@ -17,6 +17,7 @@
 from pydantic import Field
 from sqlalchemy import Column, DateTime, Enum, ForeignKey, Integer, Sequence, String  # type: ignore
 from sqlalchemy.orm import relationship  # type: ignore
+from typing_extensions import override
 
 from antarest.core.persistence import Base
 from antarest.core.serialization import AntaresBaseModel, from_json
@@ -157,9 +158,11 @@ class JobLog(Base):  # type: ignore
     # that the comparison is based on the database identity of the objects.
     # So, implementing `__eq__` and `__ne__` is not necessary.
 
+    @override
     def __str__(self) -> str:
         return f"Job log #{self.id} {self.log_type}: '{self.message}'"
 
+    @override
     def __repr__(self) -> str:
         return (
             f"<JobLog(id={self.id!r},"
@@ -212,9 +215,11 @@ def to_dto(self) -> JobResultDTO:
     # that the comparison is based on the database identity of the objects.
     # So, implementing `__eq__` and `__ne__` is not necessary.
 
+    @override
     def __str__(self) -> str:
         return f"Job result #{self.id} (study '{self.study_id}'): {self.job_status}"
 
+    @override
     def __repr__(self) -> str:
         return (
             f"<JobResult(id={self.id!r},"
diff --git a/antarest/login/model.py b/antarest/login/model.py
index 11a3bef802..18cc137d76 100644
--- a/antarest/login/model.py
+++ b/antarest/login/model.py
@@ -20,6 +20,7 @@
 from sqlalchemy.exc import IntegrityError  # type: ignore
 from sqlalchemy.ext.hybrid import hybrid_property  # type: ignore
 from sqlalchemy.orm import relationship, sessionmaker  # type: ignore
+from typing_extensions import override
 
 from antarest.core.persistence import Base
 from antarest.core.roles import RoleType
@@ -131,9 +132,11 @@ def get(self) -> str:
     def check(self, pwd: str) -> bool:
         return bcrypt.checkpw(pwd.encode(), self._pwd)
 
+    @override
     def __str__(self) -> str:
         return "*****"
 
+    @override
     def __repr__(self) -> str:
         return self.__str__()
 
@@ -245,6 +248,7 @@ class Bot(Identity):
     owner = Column(Integer, ForeignKey("identities.id", name="bots_owner_fkey"))
     is_author = Column(Boolean(), default=True)
 
+    @override
     def get_impersonator(self) -> int:
         return int(self.id if self.is_author else self.owner)
 
@@ -253,6 +257,7 @@ def get_impersonator(self) -> int:
         "inherit_condition": id == Identity.id,
     }
 
+    @override
     def to_dto(self) -> BotDTO:
         return BotDTO(
             id=self.id,
@@ -286,6 +291,7 @@ def to_dto(self) -> GroupDTO:
     # Implementing a `__eq__` method is superfluous, since the default implementation
     # is to compare the identity of the objects using the primary key.
 
+    @override
     def __repr__(self) -> str:
         return f"Group(id={self.id}, name={self.name})"
 
diff --git a/antarest/matrixstore/matrix_editor.py b/antarest/matrixstore/matrix_editor.py
index 89bb866336..33bf780cab 100644
--- a/antarest/matrixstore/matrix_editor.py
+++ b/antarest/matrixstore/matrix_editor.py
@@ -15,6 +15,7 @@
 from typing import Any, Dict, List, Optional, Tuple
 
 from pydantic import Field, field_validator, model_validator
+from typing_extensions import override
 
 from antarest.core.serialization import AntaresBaseModel
 
@@ -128,6 +129,7 @@ def compute(self, x: Any, use_coords: bool = False) -> Any:
             return x
         return OPERATIONS[self.operation](x, self.value)  # type: ignore
 
+    @override
     def __str__(self) -> str:
         """Returns a string representation used in error messages."""
         return f"['{self.operation}' {self.value}]"
@@ -215,6 +217,7 @@ def validate_coordinates(cls, coordinates: Optional[List[Tuple[int, int]]]) -> O
                 raise ValueError(f"Invalid coordinate {coordinate}:  values must be greater than or equal to 0.")
         return coordinates
 
+    @override
     def __str__(self) -> str:
         """Returns a string representation used in error messages."""
 
diff --git a/antarest/matrixstore/matrix_garbage_collector.py b/antarest/matrixstore/matrix_garbage_collector.py
index eecbf19f96..3d7e513b94 100644
--- a/antarest/matrixstore/matrix_garbage_collector.py
+++ b/antarest/matrixstore/matrix_garbage_collector.py
@@ -16,6 +16,8 @@
 from pathlib import Path
 from typing import List, Set
 
+from typing_extensions import override
+
 from antarest.core.config import Config
 from antarest.core.interfaces.service import IService
 from antarest.core.utils.fastapi_sqlalchemy import db
@@ -119,6 +121,7 @@ def _clean_matrices(self) -> None:
         self._delete_unused_saved_matrices(unused_matrices=unused_matrices)
         stopwatch.log_elapsed(lambda x: logger.info(f"Finished cleaning matrices in {x}s"))
 
+    @override
     def _loop(self) -> None:
         while True:
             try:
diff --git a/antarest/matrixstore/model.py b/antarest/matrixstore/model.py
index 2dccd350ab..a46dad9455 100644
--- a/antarest/matrixstore/model.py
+++ b/antarest/matrixstore/model.py
@@ -16,6 +16,7 @@
 
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String, Table  # type: ignore
 from sqlalchemy.orm import relationship  # type: ignore
+from typing_extensions import override
 
 from antarest.core.persistence import Base
 from antarest.core.serialization import AntaresBaseModel
@@ -41,10 +42,12 @@ class Matrix(Base):  # type: ignore
     height: int = Column(Integer)
     created_at: datetime.datetime = Column(DateTime)
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         """Returns a string representation of the matrix."""
         return f"Matrix(id={self.id}, shape={(self.height, self.width)}, created_at={self.created_at})"
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if not isinstance(other, Matrix):
             return False
@@ -101,10 +104,12 @@ class MatrixDataSetRelation(Base):  # type: ignore
     name: str = Column(String, primary_key=True)
     matrix: Matrix = relationship(Matrix)
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         """Returns a string representation of the matrix."""
         return f"MatrixDataSetRelation(dataset_id={self.dataset_id}, matrix_id={self.matrix_id}, name={self.name})"
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if not isinstance(other, MatrixDataSetRelation):
             return False
@@ -172,6 +177,7 @@ def to_dto(self) -> MatrixDataSetDTO:
             updated_at=str(self.updated_at),
         )
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         """Returns a string representation of the matrix."""
         return (
@@ -183,6 +189,7 @@ def __repr__(self) -> str:  # pragma: no cover
             f" updated_at={self.updated_at})"
         )
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if not isinstance(other, MatrixDataSet):
             return False
diff --git a/antarest/matrixstore/service.py b/antarest/matrixstore/service.py
index c2a8ca5c5d..055fbca413 100644
--- a/antarest/matrixstore/service.py
+++ b/antarest/matrixstore/service.py
@@ -24,6 +24,7 @@
 import py7zr
 from fastapi import UploadFile
 from numpy import typing as npt
+from typing_extensions import override
 
 from antarest.core.config import Config
 from antarest.core.filetransfer.model import FileDownloadTaskDTO
@@ -112,9 +113,11 @@ class SimpleMatrixService(ISimpleMatrixService):
     def __init__(self, matrix_content_repository: MatrixContentRepository):
         super().__init__(matrix_content_repository=matrix_content_repository)
 
+    @override
     def create(self, data: t.Union[t.List[t.List[MatrixData]], npt.NDArray[np.float64]]) -> str:
         return self.matrix_content_repository.save(data)
 
+    @override
     def get(self, matrix_id: str) -> MatrixDTO:
         data = self.matrix_content_repository.get(matrix_id)
         return MatrixDTO.construct(
@@ -126,9 +129,11 @@ def get(self, matrix_id: str) -> MatrixDTO:
             data=data.data,
         )
 
+    @override
     def exists(self, matrix_id: str) -> bool:
         return self.matrix_content_repository.exists(matrix_id)
 
+    @override
     def delete(self, matrix_id: str) -> None:
         self.matrix_content_repository.delete(matrix_id)
 
@@ -165,6 +170,7 @@ def _from_dto(dto: MatrixDTO) -> t.Tuple[Matrix, MatrixContent]:
 
         return matrix, content
 
+    @override
     def create(self, data: t.Union[t.List[t.List[MatrixData]], npt.NDArray[np.float64]]) -> str:
         """
         Creates a new matrix object with the specified data.
@@ -372,6 +378,7 @@ def delete_dataset(self, id: str, params: RequestParameters) -> str:
         self.repo_dataset.delete(id)
         return id
 
+    @override
     def get(self, matrix_id: str) -> t.Optional[MatrixDTO]:
         """
         Get a matrix object from the database and the matrix content repository.
@@ -397,6 +404,7 @@ def get(self, matrix_id: str) -> t.Optional[MatrixDTO]:
             data=content.data,
         )
 
+    @override
     def exists(self, matrix_id: str) -> bool:
         """
         Check if a matrix object exists in both the matrix content repository and the database.
@@ -409,6 +417,7 @@ def exists(self, matrix_id: str) -> bool:
         """
         return self.matrix_content_repository.exists(matrix_id) and self.repo.exists(matrix_id)
 
+    @override
     def delete(self, matrix_id: str) -> None:
         """
         Delete a matrix object from the matrix content repository and the database.
diff --git a/antarest/study/business/enum_ignore_case.py b/antarest/study/business/enum_ignore_case.py
index 9d0bcf3396..56a06fabc1 100644
--- a/antarest/study/business/enum_ignore_case.py
+++ b/antarest/study/business/enum_ignore_case.py
@@ -13,6 +13,8 @@
 import enum
 import typing
 
+from typing_extensions import override
+
 
 class EnumIgnoreCase(enum.StrEnum):
     """
@@ -35,6 +37,7 @@ class EnumIgnoreCase(enum.StrEnum):
     """
 
     @classmethod
+    @override
     def _missing_(cls, value: object) -> typing.Optional["EnumIgnoreCase"]:
         if isinstance(value, str):
             for member in cls:
diff --git a/antarest/study/business/scenario_builder_management.py b/antarest/study/business/scenario_builder_management.py
index ce8834fbeb..71a7833cee 100644
--- a/antarest/study/business/scenario_builder_management.py
+++ b/antarest/study/business/scenario_builder_management.py
@@ -14,6 +14,7 @@
 import typing as t
 
 import typing_extensions as te
+from typing_extensions import override
 
 from antarest.study.business.utils import execute_or_add_commands
 from antarest.study.model import Study
@@ -66,6 +67,7 @@ class ScenarioType(enum.StrEnum):
     HYDRO_FINAL_LEVEL = "hydroFinalLevels"
     HYDRO_GENERATION_POWER = "hydroGenerationPower"
 
+    @override
     def __str__(self) -> str:
         """Return the string representation of the enum value."""
         return self.value
diff --git a/antarest/study/business/table_mode_management.py b/antarest/study/business/table_mode_management.py
index e7a12b0289..f5824d0296 100644
--- a/antarest/study/business/table_mode_management.py
+++ b/antarest/study/business/table_mode_management.py
@@ -16,6 +16,7 @@
 import numpy as np
 import pandas as pd
 from antares.study.version import StudyVersion
+from typing_extensions import override
 
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.core.model import JSON
@@ -61,6 +62,7 @@ class TableModeType(EnumIgnoreCase):
     BINDING_CONSTRAINT = "binding-constraints"
 
     @classmethod
+    @override
     def _missing_(cls, value: object) -> t.Optional["EnumIgnoreCase"]:
         if isinstance(value, str):
             # handle aliases of old table types
diff --git a/antarest/study/model.py b/antarest/study/model.py
index b8378aa356..9aed7c852a 100644
--- a/antarest/study/model.py
+++ b/antarest/study/model.py
@@ -31,6 +31,7 @@
     String,
 )
 from sqlalchemy.orm import relationship  # type: ignore
+from typing_extensions import override
 
 from antarest.core.exceptions import ShouldNotHappenException
 from antarest.core.model import PublicMode
@@ -103,10 +104,12 @@ class StudyGroup(Base):  # type:ignore
     group_id: str = Column(String(36), ForeignKey("groups.id", ondelete="CASCADE"), index=True, nullable=False)
     study_id: str = Column(String(36), ForeignKey("study.id", ondelete="CASCADE"), index=True, nullable=False)
 
+    @override
     def __str__(self) -> str:  # pragma: no cover
         cls_name = self.__class__.__name__
         return f"[{cls_name}] study_id={self.study_id}, group={self.group_id}"
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         cls_name = self.__class__.__name__
         study_id = self.study_id
@@ -129,10 +132,12 @@ class StudyTag(Base):  # type:ignore
     study_id: str = Column(String(36), ForeignKey("study.id", ondelete="CASCADE"), index=True, nullable=False)
     tag_label: str = Column(String(40), ForeignKey("tag.label", ondelete="CASCADE"), index=True, nullable=False)
 
+    @override
     def __str__(self) -> str:  # pragma: no cover
         cls_name = self.__class__.__name__
         return f"[{cls_name}] study_id={self.study_id}, tag={self.tag}"
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         cls_name = self.__class__.__name__
         study_id = self.study_id
@@ -158,9 +163,11 @@ class Tag(Base):  # type:ignore
 
     studies: t.List["Study"] = relationship("Study", secondary=StudyTag.__table__, back_populates="tags")
 
+    @override
     def __str__(self) -> str:  # pragma: no cover
         return t.cast(str, self.label)
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         cls_name = self.__class__.__name__
         label = self.label
@@ -194,6 +201,7 @@ class StudyAdditionalData(Base):  # type:ignore
     horizon = Column(String)
     patch = Column(String(), index=True, nullable=True)
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if not super().__eq__(other):
             return False
@@ -244,6 +252,7 @@ class Study(Base):  # type: ignore
 
     __mapper_args__ = {"polymorphic_identity": "study", "polymorphic_on": type}
 
+    @override
     def __str__(self) -> str:
         cls = self.__class__.__name__
         return (
@@ -258,6 +267,7 @@ def __str__(self) -> str:
             f" groups={[str(u) + ',' for u in self.groups]}"
         )
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if not isinstance(other, Study):
             return False
@@ -299,6 +309,7 @@ class RawStudy(Study):
         "polymorphic_identity": "rawstudy",
     }
 
+    @override
     def __eq__(self, other: t.Any) -> bool:
         if not super().__eq__(other):
             return False
diff --git a/antarest/study/service.py b/antarest/study/service.py
index 3e198addb3..d394056f95 100644
--- a/antarest/study/service.py
+++ b/antarest/study/service.py
@@ -30,6 +30,7 @@
 from fastapi import HTTPException, UploadFile
 from markupsafe import escape
 from starlette.responses import FileResponse, Response
+from typing_extensions import override
 
 from antarest.core.config import Config
 from antarest.core.exceptions import (
@@ -212,6 +213,7 @@ class TaskProgressRecorder(ICommandListener):
     def __init__(self, notifier: ITaskNotifier) -> None:
         self.notifier = notifier
 
+    @override
     def notify_progress(self, progress: int) -> None:
         return self.notifier.notify_progress(progress)
 
diff --git a/antarest/study/storage/abstract_storage_service.py b/antarest/study/storage/abstract_storage_service.py
index 3b4c002597..f845eab757 100644
--- a/antarest/study/storage/abstract_storage_service.py
+++ b/antarest/study/storage/abstract_storage_service.py
@@ -18,6 +18,8 @@
 from pathlib import Path
 from uuid import uuid4
 
+from typing_extensions import override
+
 from antarest.core.config import Config
 from antarest.core.exceptions import BadOutputError, StudyOutputNotFoundError
 from antarest.core.interfaces.cache import CacheConstants, ICache
@@ -63,6 +65,7 @@ def __init__(
         self.patch_service = patch_service
         self.cache = cache
 
+    @override
     def patch_update_study_metadata(
         self,
         study: T,
@@ -82,6 +85,7 @@ def patch_update_study_metadata(
         remove_from_cache(self.cache, study.id)
         return self.get_study_information(study)
 
+    @override
     def get_study_information(
         self,
         study: T,
@@ -129,6 +133,7 @@ def get_study_information(
             tags=[tag.label for tag in study.tags],
         )
 
+    @override
     def get(
         self,
         metadata: T,
@@ -170,6 +175,7 @@ def get(
         del study
         return data
 
+    @override
     def get_file(
         self,
         metadata: T,
@@ -194,6 +200,7 @@ def get_file(
 
         return file_node.get_file_content()
 
+    @override
     def get_study_sim_result(
         self,
         study: T,
@@ -243,6 +250,7 @@ def get_study_sim_result(
                     )
         return results
 
+    @override
     def import_output(
         self,
         metadata: T,
@@ -302,6 +310,7 @@ def import_output(
 
         return output_full_name
 
+    @override
     def export_study(self, metadata: T, target: Path, outputs: bool = True) -> Path:
         """
         Export and compress the study inside a 7zip file.
@@ -326,6 +335,7 @@ def export_study(self, metadata: T, target: Path, outputs: bool = True) -> Path:
             )
         return target
 
+    @override
     def export_output(self, metadata: T, output_id: str, target: Path) -> None:
         """
         Export and compresses study inside zip
@@ -358,6 +368,7 @@ def _read_additional_data_from_files(self, file_study: FileStudy) -> StudyAdditi
         study_additional_data = StudyAdditionalData(horizon=horizon, author=author, patch=patch.model_dump_json())
         return study_additional_data
 
+    @override
     def archive_study_output(self, study: T, output_id: str) -> bool:
         try:
             archive_dir(
@@ -375,6 +386,7 @@ def archive_study_output(self, study: T, output_id: str) -> bool:
             )
             return False
 
+    @override
     def unarchive_study_output(self, study: T, output_id: str, keep_src_zip: bool) -> bool:
         if not (Path(study.path) / "output" / f"{output_id}{ArchiveFormat.ZIP}").exists():
             logger.warning(
diff --git a/antarest/study/storage/auto_archive_service.py b/antarest/study/storage/auto_archive_service.py
index 8dbf6c3de0..5efd2dda1c 100644
--- a/antarest/study/storage/auto_archive_service.py
+++ b/antarest/study/storage/auto_archive_service.py
@@ -15,6 +15,8 @@
 import time
 import typing as t
 
+from typing_extensions import override
+
 from antarest.core.config import Config
 from antarest.core.exceptions import TaskAlreadyRunning
 from antarest.core.interfaces.service import IService
@@ -90,6 +92,7 @@ def _try_archive_studies(self) -> None:
                 params=RequestParameters(DEFAULT_ADMIN_USER),
             )
 
+    @override
     def _loop(self) -> None:
         while True:
             try:
diff --git a/antarest/study/storage/df_download.py b/antarest/study/storage/df_download.py
index 97882e2d2e..f1c4b80a3f 100644
--- a/antarest/study/storage/df_download.py
+++ b/antarest/study/storage/df_download.py
@@ -17,6 +17,7 @@
 import pandas as pd
 from fastapi import HTTPException
 from starlette.responses import FileResponse
+from typing_extensions import override
 
 from antarest.core.filetransfer.model import FileDownloadNotFound
 from antarest.core.filetransfer.service import FileTransferManager
@@ -33,6 +34,7 @@ class TableExportFormat(EnumIgnoreCase):
     CSV = "csv"
     CSV_SEMICOLON = "csv (semicolon)"
 
+    @override
     def __str__(self) -> str:
         """Return the format as a string for display."""
         return self.value.title()
diff --git a/antarest/study/storage/rawstudy/ini_reader.py b/antarest/study/storage/rawstudy/ini_reader.py
index fd3bac2dea..e51d9c9672 100644
--- a/antarest/study/storage/rawstudy/ini_reader.py
+++ b/antarest/study/storage/rawstudy/ini_reader.py
@@ -16,6 +16,8 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
 
+from typing_extensions import override
+
 from antarest.core.model import JSON
 
 
@@ -168,6 +170,7 @@ def __init__(self, special_keys: t.Sequence[str] = (), section_name: str = "sett
         # Current option name used during paring
         self._curr_option = ""
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         """Return a string representation of the object."""
         cls = self.__class__.__name__
@@ -176,6 +179,7 @@ def __repr__(self) -> str:  # pragma: no cover
         section_name = getattr(self, "_section_name", "settings")
         return f"{cls}(special_keys={special_keys!r}, section_name={section_name!r})"
 
+    @override
     def read(self, path: t.Any, **kwargs: t.Any) -> JSON:
         if isinstance(path, (Path, str)):
             try:
@@ -321,6 +325,7 @@ class SimpleKeyValueReader(IniReader):
     Simple INI reader for "settings.ini" file which has no section.
     """
 
+    @override
     def read(self, path: t.Any, **kwargs: t.Any) -> JSON:
         """
         Parse `.ini` file which has no section to JSON object.
diff --git a/antarest/study/storage/rawstudy/ini_writer.py b/antarest/study/storage/rawstudy/ini_writer.py
index f72f9b2197..d4ba73cf5d 100644
--- a/antarest/study/storage/rawstudy/ini_writer.py
+++ b/antarest/study/storage/rawstudy/ini_writer.py
@@ -15,6 +15,8 @@
 import typing as t
 from pathlib import Path
 
+from typing_extensions import override
+
 from antarest.core.model import JSON
 
 
@@ -24,6 +26,7 @@ def __init__(self, special_keys: t.Optional[t.List[str]] = None) -> None:
         self.special_keys = special_keys
 
     # noinspection SpellCheckingInspection
+    @override
     def optionxform(self, optionstr: str) -> str:
         return optionstr
 
@@ -89,6 +92,7 @@ class SimpleKeyValueWriter(IniWriter):
     Simple key/value INI writer.
     """
 
+    @override
     def write(self, data: JSON, path: Path) -> None:
         """
         Write `.ini` file from JSON content
diff --git a/antarest/study/storage/rawstudy/model/filesystem/bucket_node.py b/antarest/study/storage/rawstudy/model/filesystem/bucket_node.py
index ad10455b2e..3def015763 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/bucket_node.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/bucket_node.py
@@ -12,6 +12,8 @@
 
 import typing as t
 
+from typing_extensions import override
+
 from antarest.core.model import JSON, SUB_JSON
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -54,6 +56,7 @@ def _get_registered_file_by_key(self, key: str) -> t.Optional[RegisteredFile]:
     def _get_registered_file_by_filename(self, filename: str) -> t.Optional[RegisteredFile]:
         return next((rf for rf in self.registered_files if rf.filename == filename), None)
 
+    @override
     def save(
         self,
         data: SUB_JSON,
@@ -93,6 +96,7 @@ def _save(self, data: SUB_JSON, key: str) -> None:
         elif isinstance(data, dict):
             BucketNode(self.context, self.config.next_file(key)).save(data)
 
+    @override
     def build(self) -> TREE:
         if not self.config.path.is_dir():
             return {}
@@ -110,6 +114,7 @@ def build(self) -> TREE:
 
         return children
 
+    @override
     def check_errors(
         self,
         data: JSON,
diff --git a/antarest/study/storage/rawstudy/model/filesystem/common/area_matrix_list.py b/antarest/study/storage/rawstudy/model/filesystem/common/area_matrix_list.py
index 0cff5af838..e4022a3600 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/common/area_matrix_list.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/common/area_matrix_list.py
@@ -12,6 +12,8 @@
 
 import typing as t
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
@@ -66,6 +68,7 @@ def __init__(
         self.matrix_class = matrix_class
         self.additional_matrix_params = additional_matrix_params or {}
 
+    @override
     def build(self) -> TREE:
         """
         Builds the folder structure and creates child nodes representing each matrix file.
@@ -100,6 +103,7 @@ def __init__(
         self.area = area
         self.matrix_class = matrix_class
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "ror": self.matrix_class(self.context, self.config.next_file("ror.txt")),
@@ -118,6 +122,7 @@ def __init__(
         super().__init__(context, config)
         self.matrix_class = matrix_class
 
+    @override
     def build(self) -> TREE:
         """Builds the folder structure and creates child nodes representing each matrix file."""
         return {
@@ -138,6 +143,7 @@ def __init__(
         self.area = area
         self.matrix_class = matrix_class
 
+    @override
     def build(self) -> TREE:
         # Note that cluster IDs are case-insensitive, but series IDs are in lower case.
         # For instance, if your cluster ID is "Base", then the series ID will be "base".
@@ -185,6 +191,7 @@ def __init__(
         self.klass = klass
         self.matrix_class = matrix_class
 
+    @override
     def build(self) -> TREE:
         folders = [d.name for d in self.config.path.iterdir() if d.is_dir()]
         children: TREE = {
diff --git a/antarest/study/storage/rawstudy/model/filesystem/common/prepro.py b/antarest/study/storage/rawstudy/model/filesystem/common/prepro.py
index 1813760f13..b18d53b81d 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/common/prepro.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/common/prepro.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -44,6 +45,7 @@ def __init__(self, context: ContextServer, config: FileStudyTreeConfig):
 
 
 class PreproArea(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "conversion": InputSeriesMatrix(self.context, self.config.next_file("conversion.txt")),
@@ -56,6 +58,7 @@ def build(self) -> TREE:
 
 
 class InputPrepro(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {a: PreproArea(self.context, self.config.next_file(a)) for a in self.config.area_names()}
         children["correlation"] = PreproCorrelation(self.context, self.config.next_file("correlation.ini"))
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/area.py b/antarest/study/storage/rawstudy/model/filesystem/config/area.py
index 74d15e5b55..db83868816 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/area.py
@@ -17,6 +17,7 @@
 import typing as t
 
 from pydantic import Field, field_validator, model_validator
+from typing_extensions import override
 
 from antarest.study.business.enum_ignore_case import EnumIgnoreCase
 from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import (
@@ -185,6 +186,7 @@ def _validate_color_rgb(cls, v: t.Any) -> str:
     def _validate_colors(cls, values: t.MutableMapping[str, t.Any]) -> t.Mapping[str, t.Any]:
         return validate_colors(values)
 
+    @override
     def to_config(self) -> t.Dict[str, t.Any]:
         """
         Convert the object to a dictionary for writing to a configuration file:
@@ -342,6 +344,7 @@ def _validate_layers(cls, values: t.MutableMapping[str, t.Any]) -> t.Mapping[str
 
         return values
 
+    @override
     def to_config(self) -> t.Dict[str, t.Dict[str, t.Any]]:
         """
         Convert the object to a dictionary for writing to a configuration file:
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/exceptions.py b/antarest/study/storage/rawstudy/model/filesystem/config/exceptions.py
index 936f7f76e2..3a903d9cf4 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/exceptions.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/exceptions.py
@@ -13,6 +13,8 @@
 from pathlib import Path
 from typing import cast
 
+from typing_extensions import override
+
 
 class BaseConfigError(Exception):
     """Base class of the configuration errors."""
@@ -30,6 +32,7 @@ def output_path(self) -> Path:
     def reason(self) -> str:
         return cast(str, self.args[1])
 
+    @override
     def __str__(self) -> str:
         output_path = self.output_path
         reason = self.reason
@@ -48,6 +51,7 @@ def xpansion_json(self) -> Path:
     def reason(self) -> str:
         return cast(str, self.args[1])
 
+    @override
     def __str__(self) -> str:
         xpansion_json = self.xpansion_json
         reason = self.reason
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/ini_properties.py b/antarest/study/storage/rawstudy/model/filesystem/config/ini_properties.py
index c5c3c83950..abbf6fb77b 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/ini_properties.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/ini_properties.py
@@ -12,6 +12,8 @@
 
 import typing as t
 
+from typing_extensions import override
+
 from antarest.core.serialization import AntaresBaseModel, from_json, to_json
 
 
@@ -52,6 +54,7 @@ def to_config(self) -> t.Dict[str, t.Any]:
         return config
 
     @classmethod
+    @override
     def construct(cls, _fields_set: t.Optional[t.Set[str]] = None, **values: t.Any) -> "IniProperties":
         """
         Construct a new model instance from a dict of values, replacing aliases with real field names.
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/model.py b/antarest/study/storage/rawstudy/model/filesystem/config/model.py
index 938cddaba3..bd35498e38 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/model.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/model.py
@@ -16,6 +16,7 @@
 
 from antares.study.version import StudyVersion
 from pydantic import Field, model_validator
+from typing_extensions import override
 
 from antarest.core.serialization import AntaresBaseModel
 from antarest.core.utils.utils import DTO
@@ -47,6 +48,7 @@ class EnrModelling(EnumIgnoreCase):
     AGGREGATED = "aggregated"
     CLUSTERS = "clusters"
 
+    @override
     def __str__(self) -> str:
         """Return the string representation of the enum value."""
         return self.value
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/renewable.py b/antarest/study/storage/rawstudy/model/filesystem/config/renewable.py
index dcd7e6f16c..d9f4f9897e 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/renewable.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/renewable.py
@@ -14,6 +14,7 @@
 
 from antares.study.version import StudyVersion
 from pydantic import Field
+from typing_extensions import override
 
 from antarest.study.business.enum_ignore_case import EnumIgnoreCase
 from antarest.study.model import STUDY_VERSION_8_1
@@ -54,10 +55,12 @@ class RenewableClusterGroup(EnumIgnoreCase):
     OTHER3 = "other res 3"
     OTHER4 = "other res 4"
 
+    @override
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}.{self.name}"
 
     @classmethod
+    @override
     def _missing_(cls, value: object) -> t.Optional["RenewableClusterGroup"]:
         """
         Retrieves the default group or the matched group when an unknown value is encountered.
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/ruleset_matrices.py b/antarest/study/storage/rawstudy/model/filesystem/config/ruleset_matrices.py
index 6ed47a3e17..ca9ff2e724 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/ruleset_matrices.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/ruleset_matrices.py
@@ -15,6 +15,7 @@
 import numpy as np
 import pandas as pd
 import typing_extensions as te
+from typing_extensions import override
 
 SCENARIO_TYPES = {
     "l": "load",
@@ -107,6 +108,7 @@ def __init__(
         self.scenarios: _ScenarioMapping = {}
         self._setup()
 
+    @override
     def __str__(self) -> str:
         lines = []
         for symbol, scenario_type in self.scenario_types.items():
diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/thermal.py b/antarest/study/storage/rawstudy/model/filesystem/config/thermal.py
index 5093c9c289..78794052f9 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/config/thermal.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/config/thermal.py
@@ -14,6 +14,7 @@
 
 from antares.study.version import StudyVersion
 from pydantic import Field, ValidationError
+from typing_extensions import override
 
 from antarest.study.business.enum_ignore_case import EnumIgnoreCase
 from antarest.study.storage.rawstudy.model.filesystem.config.cluster import ClusterProperties
@@ -35,6 +36,7 @@ class LocalTSGenerationBehavior(EnumIgnoreCase):
     FORCE_NO_GENERATION = "force no generation"
     FORCE_GENERATION = "force generation"
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         return f"{self.__class__.__name__}.{self.name}"
 
@@ -48,6 +50,7 @@ class LawOption(EnumIgnoreCase):
     UNIFORM = "uniform"
     GEOMETRIC = "geometric"
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         return f"{self.__class__.__name__}.{self.name}"
 
@@ -69,10 +72,12 @@ class ThermalClusterGroup(EnumIgnoreCase):
     OTHER3 = "other 3"
     OTHER4 = "other 4"
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         return f"{self.__class__.__name__}.{self.name}"
 
     @classmethod
+    @override
     def _missing_(cls, value: object) -> t.Optional["ThermalClusterGroup"]:
         """
         Retrieves the default group or the matched group when an unknown value is encountered.
diff --git a/antarest/study/storage/rawstudy/model/filesystem/folder_node.py b/antarest/study/storage/rawstudy/model/filesystem/folder_node.py
index 974c2acdfa..c8b3604e88 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/folder_node.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/folder_node.py
@@ -14,6 +14,8 @@
 import typing as t
 from abc import ABC, abstractmethod
 
+from typing_extensions import override
+
 from antarest.core.exceptions import ChildNotFoundError, PathIsAFolderError
 from antarest.core.model import JSON, SUB_JSON
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
@@ -114,6 +116,7 @@ def _get(
         else:
             return self._expand_get(depth, formatted, get_node)
 
+    @override
     def get(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -125,6 +128,7 @@ def get(
         assert not isinstance(output, INode)
         return output
 
+    @override
     def get_node(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -133,6 +137,7 @@ def get_node(
         assert isinstance(output, INode)
         return output
 
+    @override
     def save(
         self,
         data: SUB_JSON,
@@ -151,6 +156,7 @@ def save(
             for key in data:
                 children[key].save(data[key])
 
+    @override
     def delete(self, url: t.Optional[t.List[str]] = None) -> None:
         if url and url != [""]:
             children = self.build()
@@ -160,6 +166,7 @@ def delete(self, url: t.Optional[t.List[str]] = None) -> None:
         elif self.config.path.exists():
             shutil.rmtree(self.config.path)
 
+    @override
     def check_errors(
         self,
         data: JSON,
@@ -183,10 +190,12 @@ def check_errors(
                     errors += children[key].check_errors(data[key], raising=raising)
             return errors
 
+    @override
     def normalize(self) -> None:
         for child in self.build().values():
             child.normalize()
 
+    @override
     def denormalize(self) -> None:
         for child in self.build().values():
             child.denormalize()
@@ -217,6 +226,7 @@ def extract_child(self, children: TREE, url: t.List[str]) -> t.Tuple[t.List[str]
                 raise FilterError("Filter selection has different classes")
         return names, sub_url
 
+    @override
     def get_file_content(self) -> OriginalFile:
         relative_path = self.config.path.relative_to(self.config.study_path).as_posix()
         raise PathIsAFolderError(f"Node at {relative_path} is a folder node.")
diff --git a/antarest/study/storage/rawstudy/model/filesystem/ini_file_node.py b/antarest/study/storage/rawstudy/model/filesystem/ini_file_node.py
index 55a8645ab6..dda7a2a6c0 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/ini_file_node.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/ini_file_node.py
@@ -23,6 +23,7 @@
 import py7zr
 import pydantic_core
 from filelock import FileLock
+from typing_extensions import override
 
 from antarest.core.exceptions import ShouldNotHappenException
 from antarest.core.model import JSON, SUB_JSON
@@ -168,6 +169,7 @@ def _get_filtering_kwargs(self, url: t.List[str]) -> t.Dict[str, str]:
         else:
             return {}
 
+    @override
     def get(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -179,6 +181,7 @@ def get(
         assert not isinstance(output, INode)
         return output
 
+    @override
     def get_node(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -187,6 +190,7 @@ def get_node(
         assert isinstance(output, INode)
         return output
 
+    @override
     def save(self, data: SUB_JSON, url: t.Optional[t.List[str]] = None) -> None:
         self._assert_not_in_zipped_file()
         url = url or []
@@ -212,6 +216,7 @@ def save(self, data: SUB_JSON, url: t.Optional[t.List[str]] = None) -> None:
             self.writer.write(info, self.path)
 
     @log_warning
+    @override
     def delete(self, url: t.Optional[t.List[str]] = None) -> None:
         """
         Deletes the specified section or key from the INI file,
@@ -274,6 +279,7 @@ def delete(self, url: t.Optional[t.List[str]] = None) -> None:
 
         self.writer.write(data, self.path)
 
+    @override
     def check_errors(
         self,
         data: JSON,
@@ -292,9 +298,11 @@ def check_errors(
 
         return errors
 
+    @override
     def normalize(self) -> None:
         pass  # no external store in this node
 
+    @override
     def denormalize(self) -> None:
         pass  # no external store in this node
 
diff --git a/antarest/study/storage/rawstudy/model/filesystem/json_file_node.py b/antarest/study/storage/rawstudy/model/filesystem/json_file_node.py
index 54333e2c4b..ca877e9fd6 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/json_file_node.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/json_file_node.py
@@ -14,6 +14,8 @@
 import typing as t
 from pathlib import Path
 
+from typing_extensions import override
+
 from antarest.core.model import JSON
 from antarest.core.serialization import from_json, to_json
 from antarest.study.storage.rawstudy.ini_reader import IReader
@@ -28,6 +30,7 @@ class JsonReader(IReader):
     JSON file reader.
     """
 
+    @override
     def read(self, path: t.Any, **kwargs: t.Any) -> JSON:
         content: t.Union[str, bytes]
 
@@ -59,6 +62,7 @@ class JsonWriter(IniWriter):
     JSON file writer.
     """
 
+    @override
     def write(self, data: JSON, path: Path) -> None:
         with open(path, "wb") as fh:
             fh.write(to_json(data))
diff --git a/antarest/study/storage/rawstudy/model/filesystem/lazy_node.py b/antarest/study/storage/rawstudy/model/filesystem/lazy_node.py
index 296f3efc13..d442d9d732 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/lazy_node.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/lazy_node.py
@@ -16,6 +16,8 @@
 from pathlib import Path
 from zipfile import ZipFile
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
 from antarest.study.storage.rawstudy.model.filesystem.inode import G, INode, S, V
@@ -92,6 +94,7 @@ def _get(
         else:
             return self.load(url, depth, expanded, formatted)
 
+    @override
     def get(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -103,6 +106,7 @@ def get(
         assert not isinstance(output, INode)
         return output
 
+    @override
     def get_node(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -111,6 +115,7 @@ def get_node(
         assert isinstance(output, INode)
         return output
 
+    @override
     def delete(self, url: t.Optional[t.List[str]] = None) -> None:
         self._assert_url_end(url)
         if self.get_link_path().exists():
@@ -122,6 +127,7 @@ def get_link_path(self) -> Path:
         path = self.config.path.parent / (self.config.path.name + ".link")
         return path
 
+    @override
     def save(self, data: t.Union[str, bytes, S], url: t.Optional[t.List[str]] = None) -> None:
         self._assert_not_in_zipped_file()
         self._assert_url_end(url)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/matrix/date_serializer.py b/antarest/study/storage/rawstudy/model/filesystem/matrix/date_serializer.py
index 2b8c431085..ef856c5f91 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/matrix/date_serializer.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/matrix/date_serializer.py
@@ -17,6 +17,7 @@
 from typing import Hashable, List, Sequence, Tuple, cast
 
 import pandas as pd
+from typing_extensions import override
 
 
 class IDateMatrixSerializer(ABC):
@@ -80,6 +81,7 @@ class HourlyMatrixSerializer(IDateMatrixSerializer):
     Class implementation for hourly index
     """
 
+    @override
     def build_date(self, index: pd.Index[str]) -> pd.DataFrame:
         def _map(row: str) -> Tuple[str, int, str, str, str]:
             m, d, h = re.split(r"[\s/]", row)
@@ -99,6 +101,7 @@ def _map(row: str) -> Tuple[str, int, str, str, str]:
 
         return pd.concat([headers, matrix], axis=0)
 
+    @override
     def extract_date(self, df: pd.DataFrame) -> Tuple[pd.Index[str], pd.DataFrame]:
         # Extract left part with date
         df_date = df.iloc[:, 2:5]
@@ -118,6 +121,7 @@ class DailyMatrixSerializer(IDateMatrixSerializer):
     Class implementation for daily index
     """
 
+    @override
     def build_date(self, index: pd.Index[str]) -> pd.DataFrame:
         def _map(row: str) -> Tuple[str, int, str, str]:
             m, d = row.split("/")
@@ -137,6 +141,7 @@ def _map(row: str) -> Tuple[str, int, str, str]:
 
         return pd.concat([headers, matrix], axis=0)
 
+    @override
     def extract_date(self, df: pd.DataFrame) -> Tuple[pd.Index[str], pd.DataFrame]:
         # Extract left part with date
         df_date = df.iloc[:, 2:4]
@@ -156,6 +161,7 @@ class WeeklyMatrixSerializer(IDateMatrixSerializer):
     Class implementation for weekly index
     """
 
+    @override
     def build_date(self, index: pd.Index[str]) -> pd.DataFrame:
         matrix = pd.DataFrame({0: [""] * index.size, 1: index.values})
 
@@ -169,6 +175,7 @@ def build_date(self, index: pd.Index[str]) -> pd.DataFrame:
 
         return pd.concat([headers, matrix], axis=0)
 
+    @override
     def extract_date(self, df: pd.DataFrame) -> Tuple[pd.Index[str], pd.DataFrame]:
         # Extract left part with date
         df_date = df.iloc[:, 1:2]
@@ -186,6 +193,7 @@ class MonthlyMatrixSerializer(IDateMatrixSerializer):
     Class implementation for monthly index
     """
 
+    @override
     def build_date(self, index: pd.Index[str]) -> pd.DataFrame:
         matrix = pd.DataFrame(
             {
@@ -205,6 +213,7 @@ def build_date(self, index: pd.Index[str]) -> pd.DataFrame:
 
         return pd.concat([headers, matrix], axis=0)
 
+    @override
     def extract_date(self, df: pd.DataFrame) -> Tuple[pd.Index[str], pd.DataFrame]:
         # Extract left part with date
         df_date = df.iloc[:, 2:3]
@@ -224,6 +233,7 @@ class AnnualMatrixSerializer(IDateMatrixSerializer):
     Class implementation for annual index
     """
 
+    @override
     def build_date(self, index: pd.Index[str]) -> pd.DataFrame:
         return pd.DataFrame(
             [
@@ -234,6 +244,7 @@ def build_date(self, index: pd.Index[str]) -> pd.DataFrame:
             ]
         )
 
+    @override
     def extract_date(self, df: pd.DataFrame) -> Tuple[pd.Index[str], pd.DataFrame]:
         # Extract left part with date
         df_date = df.iloc[:, 1:2]
diff --git a/antarest/study/storage/rawstudy/model/filesystem/matrix/head_writer.py b/antarest/study/storage/rawstudy/model/filesystem/matrix/head_writer.py
index 5909f69ba7..7c8d2fd588 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/matrix/head_writer.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/matrix/head_writer.py
@@ -12,6 +12,8 @@
 
 from abc import ABC, abstractmethod
 
+from typing_extensions import override
+
 
 class HeadWriter(ABC):
     """
@@ -43,6 +45,7 @@ def __init__(self, area: str, data_type: str, freq: str):
 \tVARIABLES\tBEGIN\tEND
 """
 
+    @override
     def build(self, var: int, end: int, start: int = 1) -> str:
         return self.head + f"\t{var}\t{start}\t{end}\n\n"
 
@@ -57,5 +60,6 @@ def __init__(self, src: str, dest: str, freq: str):
 {dest.upper()}\tVARIABLES\tBEGIN\tEND
 """
 
+    @override
     def build(self, var: int, end: int, start: int = 1) -> str:
         return self.head + f"\t{var}\t{start}\t{end}\n\n"
diff --git a/antarest/study/storage/rawstudy/model/filesystem/matrix/input_series_matrix.py b/antarest/study/storage/rawstudy/model/filesystem/matrix/input_series_matrix.py
index ec9d04a2a9..d2ac83c19c 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/matrix/input_series_matrix.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/matrix/input_series_matrix.py
@@ -19,6 +19,7 @@
 import pandas as pd
 from numpy import typing as npt
 from pandas.errors import EmptyDataError
+from typing_extensions import override
 
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.core.model import JSON
@@ -89,6 +90,7 @@ def parse_as_dataframe(self, file_path: t.Optional[Path] = None) -> pd.DataFrame
                 final_matrix = pd.DataFrame(self.default_empty)
             return final_matrix
 
+    @override
     def parse_as_json(self, file_path: t.Optional[Path] = None) -> JSON:
         df = self.parse_as_dataframe(file_path)
         stopwatch = StopWatch()
@@ -96,6 +98,7 @@ def parse_as_json(self, file_path: t.Optional[Path] = None) -> JSON:
         stopwatch.log_elapsed(lambda x: logger.info(f"Matrix to dict in {x}s"))
         return data
 
+    @override
     def check_errors(
         self,
         data: JSON,
@@ -128,6 +131,7 @@ def copy_file(self, target: str) -> None:
         target_path.unlink(missing_ok=True)
         shutil.copy(self._infer_path(), target_path)
 
+    @override
     def get_file_content(self) -> OriginalFile:
         suffix = self.config.path.suffix
         filename = self.config.path.name
diff --git a/antarest/study/storage/rawstudy/model/filesystem/matrix/matrix.py b/antarest/study/storage/rawstudy/model/filesystem/matrix/matrix.py
index 6af089a8a5..7897715f92 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/matrix/matrix.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/matrix/matrix.py
@@ -17,6 +17,7 @@
 from typing import List, Optional, Union, cast
 
 import pandas as pd
+from typing_extensions import override
 
 from antarest.core.model import JSON
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
@@ -64,6 +65,7 @@ def __init__(
         LazyNode.__init__(self, context, config)
         self.freq = freq
 
+    @override
     def get_lazy_content(
         self,
         url: Optional[List[str]] = None,
@@ -72,6 +74,7 @@ def get_lazy_content(
     ) -> str:
         return f"matrixfile://{self.config.path.name}"
 
+    @override
     def normalize(self) -> None:
         # noinspection SpellCheckingInspection
         """
@@ -95,6 +98,7 @@ def normalize(self) -> None:
             self.get_link_path().write_text(self.context.resolver.build_matrix_uri(uuid))
             self.config.path.unlink()
 
+    @override
     def denormalize(self) -> None:
         """
         Read the matrix ID from the matrix link, retrieve the original matrix
@@ -114,6 +118,7 @@ def denormalize(self) -> None:
         self.dump(matrix)
         self.get_link_path().unlink()
 
+    @override
     def load(
         self,
         url: Optional[List[str]] = None,
@@ -140,6 +145,7 @@ def parse_as_json(self, file_path: Optional[Path] = None) -> JSON:
         """
         raise NotImplementedError()
 
+    @override
     def dump(
         self,
         data: Union[bytes, JSON],
diff --git a/antarest/study/storage/rawstudy/model/filesystem/matrix/output_series_matrix.py b/antarest/study/storage/rawstudy/model/filesystem/matrix/output_series_matrix.py
index 52c9867b2f..c3b66d1245 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/matrix/output_series_matrix.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/matrix/output_series_matrix.py
@@ -16,6 +16,7 @@
 
 import pandas as pd
 from pandas import DataFrame
+from typing_extensions import override
 
 from antarest.core.exceptions import ChildNotFoundError, MustNotModifyOutputException
 from antarest.core.model import JSON
@@ -56,6 +57,7 @@ def __init__(
         self.head_writer = head_writer
         self.freq = freq
 
+    @override
     def get_lazy_content(
         self,
         url: Optional[List[str]] = None,
@@ -106,6 +108,7 @@ def parse(
         matrix = self.parse_dataframe(file_path, tmp_dir)
         return cast(JSON, matrix.to_dict(orient="split"))
 
+    @override
     def check_errors(
         self,
         data: JSON,
@@ -119,6 +122,7 @@ def check_errors(
             errors.append(f"Output Series Matrix f{self.config.path} not exists")
         return errors
 
+    @override
     def load(
         self,
         url: Optional[List[str]] = None,
@@ -148,12 +152,15 @@ def load(
                 f"Output file '{self.config.path.name}' not found in study {self.config.study_id}"
             ) from e
 
+    @override
     def dump(self, data: Union[bytes, JSON], url: Optional[List[str]] = None) -> None:
         raise MustNotModifyOutputException(self.config.path.name)
 
+    @override
     def normalize(self) -> None:
         pass  # no external store in this node
 
+    @override
     def denormalize(self) -> None:
         pass  # no external store in this node
 
diff --git a/antarest/study/storage/rawstudy/model/filesystem/raw_file_node.py b/antarest/study/storage/rawstudy/model/filesystem/raw_file_node.py
index c92f3d9152..7752e93e0c 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/raw_file_node.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/raw_file_node.py
@@ -13,6 +13,8 @@
 import logging
 from typing import List, Optional
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
 from antarest.study.storage.rawstudy.model.filesystem.lazy_node import LazyNode
@@ -28,6 +30,7 @@ class RawFileNode(LazyNode[bytes, bytes, str]):
     def __init__(self, context: ContextServer, config: FileStudyTreeConfig):
         LazyNode.__init__(self, config=config, context=context)
 
+    @override
     def get_lazy_content(
         self,
         url: Optional[List[str]] = None,
@@ -36,6 +39,7 @@ def get_lazy_content(
     ) -> str:
         return f"file://{self.config.path.name}"
 
+    @override
     def load(
         self,
         url: Optional[List[str]] = None,
@@ -56,10 +60,12 @@ def load(
 
         return bytes
 
+    @override
     def dump(self, data: bytes, url: Optional[List[str]] = None) -> None:
         self.config.path.parent.mkdir(exist_ok=True, parents=True)
         self.config.path.write_bytes(data)
 
+    @override
     def check_errors(self, data: str, url: Optional[List[str]] = None, raising: bool = False) -> List[str]:
         if not self.config.path.exists():
             msg = f"{self.config.path} not exist"
@@ -68,8 +74,10 @@ def check_errors(self, data: str, url: Optional[List[str]] = None, raising: bool
             return [msg]
         return []
 
+    @override
     def normalize(self) -> None:
         pass  # no external store in this node
 
+    @override
     def denormalize(self) -> None:
         pass  # no external store in this node
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/filestudytree.py b/antarest/study/storage/rawstudy/model/filesystem/root/filestudytree.py
index bfef345ccc..409c8aac7f 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/filestudytree.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/filestudytree.py
@@ -12,6 +12,8 @@
 
 import logging
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
 from antarest.study.storage.rawstudy.model.filesystem.root.desktop import Desktop
@@ -31,6 +33,7 @@ class FileStudyTree(FolderNode):
     Top level node of antares tree structure
     """
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "Desktop": Desktop(self.context, self.config.next_file("Desktop.ini")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/areas.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/areas.py
index 7dadadcc87..c9dd2b4e41 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/areas.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/areas.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -23,6 +24,7 @@ class InputAreas(FolderNode):
     def __init__(self, context: ContextServer, config: FileStudyTreeConfig):
         super().__init__(context, config, ["list", "sets"])
 
+    @override
     def build(self) -> TREE:
         children: TREE = {a: InputAreasItem(self.context, self.config.next_file(a)) for a in self.config.area_names()}
         children["list"] = InputAreasList(self.context, self.config.next_file("list.txt"))
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/item/item.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/item/item.py
index 5ea6ad808a..822e3f80a3 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/item/item.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/item/item.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.model import STUDY_VERSION_8_3
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
@@ -21,6 +22,7 @@
 
 
 class InputAreasItem(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "ui": InputAreasUi(self.context, self.config.next_file("ui.ini")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/list.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/list.py
index 04564300c6..cdc26f097e 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/list.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/areas/list.py
@@ -12,6 +12,8 @@
 
 import typing as t
 
+from typing_extensions import override
+
 from antarest.core.utils.archives import extract_lines_from_archive
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -21,9 +23,11 @@
 
 
 class InputAreasList(INode[t.List[str], t.List[str], t.List[str]]):
+    @override
     def normalize(self) -> None:
         pass  # no external store in this node
 
+    @override
     def denormalize(self) -> None:
         pass  # no external store in this node
 
@@ -31,6 +35,7 @@ def __init__(self, context: ContextServer, config: FileStudyTreeConfig):
         super().__init__(config)
         self.context = context
 
+    @override
     def get_node(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -40,6 +45,7 @@ def get_node(
     ) -> INode[t.List[str], t.List[str], t.List[str]]:
         return self
 
+    @override
     def get(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -53,14 +59,17 @@ def get(
             lines = self.config.path.read_text().split("\n")
         return [l.strip() for l in lines if l.strip()]
 
+    @override
     def save(self, data: t.List[str], url: t.Optional[t.List[str]] = None) -> None:
         self._assert_not_in_zipped_file()
         self.config.path.write_text("\n".join(data))
 
+    @override
     def delete(self, url: t.Optional[t.List[str]] = None) -> None:
         if self.config.path.exists():
             self.config.path.unlink()
 
+    @override
     def check_errors(
         self,
         data: t.List[str],
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/bindingconstraints/bindingcontraints.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/bindingconstraints/bindingcontraints.py
index 28dba53eb5..fedaa47d54 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/bindingconstraints/bindingcontraints.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/bindingconstraints/bindingcontraints.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.binding_constraint import (
     OPERATOR_MATRICES_MAP,
@@ -41,6 +42,7 @@ class BindingConstraints(FolderNode):
     configuration and matrices.
     """
 
+    @override
     def build(self) -> TREE:
         cfg = self.config
         frequency_mapping = {
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/commons/prepro_series.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/commons/prepro_series.py
index 277e2311be..74c99bf04b 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/commons/prepro_series.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/commons/prepro_series.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.common.area_matrix_list import AreaMatrixList
 from antarest.study.storage.rawstudy.model.filesystem.common.prepro import InputPrepro
@@ -51,6 +52,7 @@ def __init__(self, context: ContextServer, config: FileStudyTreeConfig, prefix:
         super().__init__(context, config)
         self.prefix = prefix
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "prepro": InputPrepro(self.context, self.config.next_file("prepro")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/allocation/allocation.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/allocation/allocation.py
index 0714f710a5..afa09c4c0e 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/allocation/allocation.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/allocation/allocation.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -16,6 +17,7 @@
 
 
 class InputHydroAllocation(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputHydroAllocationArea(self.context, self.config.next_file(f"{a}.ini"), area=a)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/capacity/capacity.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/capacity/capacity.py
index 56eeceadd2..33a6e999e7 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/capacity/capacity.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/capacity/capacity.py
@@ -13,6 +13,7 @@
 from typing import List, TypedDict
 
 from antares.study.version import StudyVersion
+from typing_extensions import override
 
 from antarest.study.model import STUDY_VERSION_6_5
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
@@ -59,6 +60,7 @@ class MatrixInfo(TypedDict, total=False):
 
 
 class InputHydroCommonCapacity(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         for info in MATRICES_INFO:
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/common.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/common.py
index 46715ff6b7..d89d80014a 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/common.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/common/common.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -18,6 +19,7 @@
 
 
 class InputHydroCommon(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {"capacity": InputHydroCommonCapacity(self.context, self.config.next_file("capacity"))}
         return children
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/hydro.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/hydro.py
index c1c3d2984a..f5e021ce61 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/hydro.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/hydro.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -20,6 +21,7 @@
 
 
 class InputHydro(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "allocation": InputHydroAllocation(self.context, self.config.next_file("allocation")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/prepro/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/prepro/area/area.py
index 13d504d1c0..bdd8ac80db 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/prepro/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/prepro/area/area.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -19,6 +20,7 @@
 
 
 class InputHydroPreproArea(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "energy": InputSeriesMatrix(self.context, self.config.next_file("energy.txt")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/prepro/prepro.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/prepro/prepro.py
index 93104392f3..ba884200d5 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/prepro/prepro.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/prepro/prepro.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.common.prepro import PreproCorrelation
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
@@ -17,6 +18,7 @@
 
 
 class InputHydroPrepro(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputHydroPreproArea(self.context, self.config.next_file(a)) for a in self.config.area_names()
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/series/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/series/area/area.py
index 792fb9335f..4c6ada156a 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/series/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/series/area/area.py
@@ -12,6 +12,8 @@
 
 from typing import Any, Dict
 
+from typing_extensions import override
+
 from antarest.study.model import STUDY_VERSION_6_5, STUDY_VERSION_8_6
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE, INode
@@ -25,6 +27,7 @@
 
 
 class InputHydroSeriesArea(FolderNode):
+    @override
     def build(self) -> TREE:
         study_version = self.config.version
         freq = MatrixFrequency.DAILY if study_version >= STUDY_VERSION_6_5 else MatrixFrequency.MONTHLY
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/series/series.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/series/series.py
index 0a92743b2b..bb22eab408 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/series/series.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/hydro/series/series.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -16,6 +17,7 @@
 
 
 class InputHydroSeries(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputHydroSeriesArea(self.context, self.config.next_file(a)) for a in self.config.area_names()
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/input.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/input.py
index 1c19358baf..429831b818 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/input.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/input.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.model import STUDY_VERSION_8_1, STUDY_VERSION_8_6
 from antarest.study.storage.rawstudy.model.filesystem.config.model import EnrModelling
@@ -33,6 +34,7 @@ class Input(FolderNode):
     Handle the input folder which contains all the input data of the study.
     """
 
+    @override
     def build(self) -> TREE:
         config = self.config
 
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/link/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/link/area/area.py
index a67fbf6dfc..1eefe1d53c 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/link/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/link/area/area.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.model import STUDY_VERSION_8_2
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
@@ -32,6 +33,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         children: TREE
         ctx = self.context
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/link/area/capacities/capacities.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/link/area/capacities/capacities.py
index cb86c24c89..aabc88f5f4 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/link/area/capacities/capacities.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/link/area/capacities/capacities.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -27,6 +28,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         for area_to in self.config.get_links(self.area):
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/link/link.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/link/link.py
index e12f804f9a..d94faabe71 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/link/link.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/link/link.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -16,6 +17,7 @@
 
 
 class InputLink(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputLinkArea(self.context, self.config.next_file(a), area=a) for a in self.config.area_names()
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/miscgen/miscgen.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/miscgen/miscgen.py
index 0590793e5c..213c9b9632 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/miscgen/miscgen.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/miscgen/miscgen.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -17,6 +18,7 @@
 
 
 class InputMiscGen(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             f"miscgen-{a}": InputSeriesMatrix(
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/clusters.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/clusters.py
index d1be73eff4..5f82229251 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/clusters.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/clusters.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -46,11 +47,13 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         return {"list": ClusteredRenewableClusterConfig(self.context, self.config.next_file("list.ini"), self.area)}
 
 
 class ClusteredRenewableAreaCluster(FolderNode):
+    @override
     def build(self) -> TREE:
         return {
             area: ClusteredRenewableCluster(self.context, self.config.next_file(area), area)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/renewable.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/renewable.py
index e9b7181a19..aa6e9bd94b 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/renewable.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/renewable.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -19,6 +20,7 @@
 
 
 class ClusteredRenewables(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "clusters": ClusteredRenewableAreaCluster(self.context, self.config.next_file("clusters")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/series.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/series.py
index cf323c311d..91aa09642d 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/series.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/renewables/series.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -19,6 +20,7 @@
 
 
 class ClusteredRenewableSeries(FolderNode):
+    @override
     def build(self) -> TREE:
         series_config = self.config.next_file("series.txt")
         children: TREE = {
@@ -41,6 +43,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         # Note that cluster IDs may not be in lower case, but series IDs are.
         series_ids = map(str.lower, self.config.get_renewable_ids(self.area))
@@ -52,6 +55,7 @@ def build(self) -> TREE:
 
 
 class ClusteredRenewableAreaSeries(FolderNode):
+    @override
     def build(self) -> TREE:
         return {
             area: ClusteredRenewableClusterSeries(self.context, self.config.next_file(area), area)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/reserves/reserves.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/reserves/reserves.py
index 6c558e115c..7b9b89c982 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/reserves/reserves.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/reserves/reserves.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -17,6 +18,7 @@
 
 
 class InputReserves(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputSeriesMatrix(
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/clusters/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/clusters/area/area.py
index e77b3e16a2..375a8d64fa 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/clusters/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/clusters/area/area.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -29,6 +30,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         # Each area has a folder containing a file named "list.ini"
         # If the area does not have any short term storage cluster, the file is empty.
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/clusters/clusters.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/clusters/clusters.py
index ea2c055bed..3723410414 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/clusters/clusters.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/clusters/clusters.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -17,6 +18,7 @@
 
 class InputSTStorageClusters(FolderNode):
     # Each area has it own folder named after the area id.
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputSTStorageArea(self.context, self.config.next_file(a), area=a) for a in self.config.area_names()
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/area/area.py
index 3a24f37dc6..3acba900a1 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/area/area.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -29,6 +30,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             st_storage_id: InputSTStorageAreaStorage(self.context, self.config.next_file(st_storage_id))
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/area/st_storage/st_storage.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/area/st_storage/st_storage.py
index a531bd4bee..c2a2a4a19a 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/area/st_storage/st_storage.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/area/st_storage/st_storage.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -17,6 +18,7 @@
 
 
 class InputSTStorageAreaStorage(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "pmax_injection": InputSeriesMatrix(
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/series.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/series.py
index 32aebb3351..3c071bfcd8 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/series.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/series/series.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -20,6 +21,7 @@
 class InputSTStorageSeries(FolderNode):
     # For each short-term storage, a time-series matrix is created after the name of the cluster.
     # This matrix is created inside the folder's area corresponding to the cluster.
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputSTStorageSeriesArea(self.context, self.config.next_file(a), area=a)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/st_storage.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/st_storage.py
index b70e60381f..4ce2fcbe9c 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/st_storage.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/st_storage/st_storage.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -21,6 +22,8 @@
 class InputSTStorage(FolderNode):
     # Short-term storage objects are introduced in the v8.6 of AntaresSimulator.
     # This new object simplifies the previously complex modeling of short-term storage such as batteries or STEPs.
+
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "clusters": InputSTStorageClusters(self.context, self.config.next_file("clusters")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/cluster/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/cluster/area/area.py
index 6fefc8ca31..e97c5d07ae 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/cluster/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/cluster/area/area.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -29,6 +30,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "list": InputThermalClustersAreaList(self.context, self.config.next_file("list.ini"), self.area)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/cluster/cluster.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/cluster/cluster.py
index d30376d3b3..77ec2e705f 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/cluster/cluster.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/cluster/cluster.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -18,6 +19,7 @@
 
 
 class InputThermalClusters(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputThermalClustersArea(self.context, self.config.next_file(a), area=a)
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/area.py
index a804f5dbae..8d4fb248b8 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/area.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -29,6 +30,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             series_id: InputThermalPreproAreaThermal(self.context, self.config.next_file(series_id))
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/thermal/thermal.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/thermal/thermal.py
index 1beeb19797..dc57ee3c4a 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/thermal/thermal.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/area/thermal/thermal.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -26,6 +27,7 @@ class InputThermalPreproAreaThermal(FolderNode):
     - `modulation.txt` (matrix): Modulation matrix (hourly)
     """
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "data": InputSeriesMatrix(self.context, self.config.next_file("data.txt"), freq=MatrixFrequency.DAILY),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/prepro.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/prepro.py
index a9e3c19db6..bf75f6ad07 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/prepro.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/prepro/prepro.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -16,6 +17,7 @@
 
 
 class InputThermalPrepro(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputThermalPreproArea(self.context, self.config.next_file(a), area=a) for a in self.config.area_names()
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/area/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/area/area.py
index 33d3bf15b1..c87e73a108 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/area/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/area/area.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -29,6 +30,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         # Note that cluster IDs are case-insensitive, but series IDs are in lower case.
         # For instance, if your cluster ID is "Base", then the series ID will be "base".
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/area/thermal/thermal.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/area/thermal/thermal.py
index 8d765a2c16..b18dde23a7 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/area/thermal/thermal.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/area/thermal/thermal.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -18,6 +19,7 @@
 
 
 class InputThermalSeriesAreaThermal(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "series": InputSeriesMatrix(
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/series.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/series.py
index 44bb37d4b4..fc639c99d9 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/series.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/series/series.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -16,6 +17,7 @@
 
 
 class InputThermalSeries(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             a: InputThermalSeriesArea(self.context, self.config.next_file(a), area=a) for a in self.config.area_names()
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/thermal.py b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/thermal.py
index d5ee6cc7b1..dcdcd5dc70 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/thermal.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/input/thermal/thermal.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -19,6 +20,7 @@
 
 
 class InputThermal(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "clusters": InputThermalClusters(self.context, self.config.next_file("clusters")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/layers/layers.py b/antarest/study/storage/rawstudy/model/filesystem/root/layers/layers.py
index 086475e021..9f40e3fc6d 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/layers/layers.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/layers/layers.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -16,6 +17,7 @@
 
 
 class Layers(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {"layers": LayersIni(self.context, self.config.next_file("layers.ini"))}
         return children
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/output.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/output.py
index b45cc32c22..f33ed11bb8 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/output.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/output.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.bucket_node import BucketNode
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
@@ -17,6 +18,7 @@
 
 
 class Output(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             str(s.get_file()): OutputSimulation(
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/about/about.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/about/about.py
index bf2ce89c37..35cffab3db 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/about/about.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/about/about.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -20,6 +21,7 @@
 
 
 class OutputSimulationAbout(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "areas": RawFileNode(self.context, self.config.next_file("areas.txt")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/area.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/area.py
index 0b97fa5735..398ec9bf4e 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/area.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/area.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -28,6 +29,7 @@ def __init__(
         super().__init__(context, config)
         self.area = area
 
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         freq: MatrixFrequency
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/areas.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/areas.py
index 5dcac4d82e..4c1a14cdff 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/areas.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/areas.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -30,6 +31,7 @@ def __init__(
     ) -> None:
         super().__init__(context, config)
 
+    @override
     def build(self) -> TREE:
         areas = set()
         sets = set()
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/binding_const.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/binding_const.py
index 662cef5af6..e956da727b 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/binding_const.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/binding_const.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -19,6 +20,7 @@
 
 
 class OutputSimulationBindingConstraintItem(FolderNode):
+    @override
     def build(self) -> TREE:
         existing_files = [d.stem.replace("binding-constraints-", "") for d in self.config.path.iterdir()]
         children: TREE = {
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/link.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/link.py
index b5f0b15dcb..81922bc9c9 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/link.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/link.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -30,6 +31,7 @@ def __init__(
         self.area = area
         self.link = link
 
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         freq: MatrixFrequency
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/links.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/links.py
index 9d1109ee5f..b7d4ad1d70 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/links.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/links.py
@@ -12,6 +12,8 @@
 
 import typing as t
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
@@ -33,6 +35,7 @@ def __init__(
         self.area_from = area_from
         self.link_names = link_names
 
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         for link_name in self.link_names:
@@ -51,6 +54,7 @@ def __init__(
     ):
         super().__init__(context, config)
 
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         links = [d.stem for d in self.config.path.iterdir()]
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/set.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/set.py
index 4c8a624a5c..11076e977c 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/set.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/set.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -28,6 +29,7 @@ def __init__(
         super().__init__(context, config)
         self.set = set
 
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         freq: MatrixFrequency
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/utils.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/utils.py
index f8f940fd28..d5d6b6495c 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/utils.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/common/utils.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -34,6 +35,7 @@
 
 
 class OutputSimulationModeCommon(FolderNode):
+    @override
     def build(self) -> TREE:
         if not self.config.output_path:
             return {}
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/economy.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/economy.py
index a7da7fa642..c39642589e 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/economy.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/economy.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig, Simulation
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -32,6 +33,7 @@ def __init__(
         super().__init__(context, config)
         self.simulation = simulation
 
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         if self.simulation.by_year:
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/mcall/grid.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/mcall/grid.py
index 943de12ef2..374b4fc6a1 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/mcall/grid.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/mcall/grid.py
@@ -13,6 +13,7 @@
 import typing as t
 
 import pandas as pd
+from typing_extensions import override
 
 from antarest.core.exceptions import MustNotModifyOutputException
 from antarest.core.model import JSON
@@ -24,6 +25,7 @@
 
 
 class OutputSimulationModeMcAllGrid(FolderNode):
+    @override
     def build(self) -> TREE:
         files = [d.stem for d in self.config.path.iterdir()]
         children: TREE = {}
@@ -37,6 +39,7 @@ class OutputSynthesis(LazyNode[JSON, bytes, bytes]):
     def __init__(self, context: ContextServer, config: FileStudyTreeConfig):
         super().__init__(context, config)
 
+    @override
     def get_lazy_content(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -45,6 +48,7 @@ def get_lazy_content(
     ) -> str:
         return f"matrix://{self.config.path.name}"  # prefix used by the front to parse the back-end response
 
+    @override
     def load(
         self,
         url: t.Optional[t.List[str]] = None,
@@ -59,9 +63,11 @@ def load(
         del output["index"]
         return t.cast(JSON, output)
 
+    @override
     def dump(self, data: bytes, url: t.Optional[t.List[str]] = None) -> None:
         raise MustNotModifyOutputException(self.config.path.name)
 
+    @override
     def check_errors(self, data: str, url: t.Optional[t.List[str]] = None, raising: bool = False) -> t.List[str]:
         if not self.config.path.exists():
             msg = f"{self.config.path} not exist"
@@ -70,9 +76,11 @@ def check_errors(self, data: str, url: t.Optional[t.List[str]] = None, raising:
             return [msg]
         return []
 
+    @override
     def normalize(self) -> None:
         pass  # shouldn't be normalized as it's an output file
 
+    @override
     def denormalize(self) -> None:
         pass  # shouldn't be denormalized as it's an output file
 
@@ -81,6 +89,7 @@ class DigestSynthesis(OutputSynthesis):
     def __init__(self, context: ContextServer, config: FileStudyTreeConfig):
         super().__init__(context, config)
 
+    @override
     def load(
         self,
         url: t.Optional[t.List[str]] = None,
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/mcind/mcind.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/mcind/mcind.py
index e6cac924ea..ea1c5d2c58 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/mcind/mcind.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/mode/mcind/mcind.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig, Simulation
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -29,6 +30,7 @@ def __init__(
         super().__init__(context, config)
         self.simulation = simulation
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             f"{scn:05d}": OutputSimulationModeCommon(self.context, self.config.next_file(f"{scn:05d}"))
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/simulation.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/simulation.py
index 129b05f147..12ecb930d9 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/simulation.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/simulation.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig, Simulation
 from antarest.study.storage.rawstudy.model.filesystem.context import ContextServer
@@ -42,6 +43,7 @@ def __init__(
         super().__init__(context, config)
         self.simulation = simulation
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "about-the-study": OutputSimulationAbout(self.context, self.config.next_file("about-the-study")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_generator/ts_generator.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_generator/ts_generator.py
index 73e0ae6ed0..b99307d01d 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_generator/ts_generator.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_generator/ts_generator.py
@@ -12,6 +12,8 @@
 
 from typing import Any, Callable
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.common.area_matrix_list import (
     AreaMatrixList,
     AreaMultipleMatrixList,
@@ -26,6 +28,7 @@
 
 
 class OutputSimulationTsGeneratorSimpleMatrixList(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "mc-0": AreaMatrixList(self.context, self.config.next_file("mc-0")),
@@ -54,6 +57,7 @@ def __init__(
         super().__init__(context, config)
         self.klass = klass
 
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "mc-0": AreaMultipleMatrixList(
@@ -67,6 +71,7 @@ def build(self) -> TREE:
 
 
 class OutputSimulationTsGenerator(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         for output_type in ["load", "solar", "wind"]:
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_numbers/ts_numbers.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_numbers/ts_numbers.py
index 2d5f9d729b..4c84635f4a 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_numbers/ts_numbers.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_numbers/ts_numbers.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.common.area_matrix_list import (
     AreaMatrixList,
@@ -68,6 +69,7 @@ class OutputSimulationTsNumbers(FolderNode):
            └── turbinage.txt
     """
 
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         for output_type in ["hydro", "load", "solar", "wind"]:
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_numbers/ts_numbers_data.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_numbers/ts_numbers_data.py
index 670a6526ca..45512a2af2 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_numbers/ts_numbers_data.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/ts_numbers/ts_numbers_data.py
@@ -13,6 +13,8 @@
 import logging
 from typing import List, Optional, Union
 
+from typing_extensions import override
+
 from antarest.core.model import JSON
 from antarest.study.storage.rawstudy.model.filesystem.lazy_node import LazyNode
 
@@ -20,6 +22,7 @@
 
 
 class TsNumbersVector(LazyNode[List[int], List[int], JSON]):
+    @override
     def load(
         self,
         url: Optional[List[str]] = None,
@@ -44,6 +47,7 @@ def load(
         logger.warning(f"Missing file {self.config.path}")
         return []
 
+    @override
     def dump(
         self,
         data: Union[str, bytes, List[int]],
@@ -55,6 +59,7 @@ def dump(
             for d in data:
                 fh.write(f"{d}\n")
 
+    @override
     def check_errors(
         self,
         data: JSON,
@@ -63,10 +68,12 @@ def check_errors(
     ) -> List[str]:
         return []
 
+    @override
     def normalize(self) -> None:
         # this is not normalizable
         pass
 
+    @override
     def denormalize(self) -> None:
         # this is not normalizable
         pass
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/xpansion/sensitivity.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/xpansion/sensitivity.py
index 6e3e5a4ee5..8383dbbcad 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/xpansion/sensitivity.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/xpansion/sensitivity.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -17,6 +18,7 @@
 
 
 class Sensitivity(FolderNode):
+    @override
     def build(self) -> TREE:
         return {
             "out": JsonFileNode(self.context, self.config.next_file("sensitivity_out.json")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/xpansion/xpansion.py b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/xpansion/xpansion.py
index 9635e8be82..2815bac089 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/xpansion/xpansion.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/output/simulation/xpansion/xpansion.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -16,6 +17,7 @@
 
 
 class Xpansion(FolderNode):
+    @override
     def build(self) -> TREE:
         return {
             "out": JsonFileNode(self.context, self.config.next_file("out.json")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/settings/resources/resources.py b/antarest/study/storage/rawstudy/model/filesystem/root/settings/resources/resources.py
index 347d90f609..4ff236f7be 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/settings/resources/resources.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/settings/resources/resources.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -16,6 +17,7 @@
 
 
 class Resources(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {"study": RawFileNode(self.context, self.config.next_file("study.ico"))}
         return children
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/settings/scenariobuilder.py b/antarest/study/storage/rawstudy/model/filesystem/root/settings/scenariobuilder.py
index bf0501d531..f1960d9984 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/settings/scenariobuilder.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/settings/scenariobuilder.py
@@ -14,6 +14,7 @@
 import typing as t
 
 import typing_extensions as te
+from typing_extensions import override
 
 from antarest.study.model import (
     STUDY_VERSION_8,
@@ -124,6 +125,7 @@ def _populate_hydro_generation_power_rules(self, rules: _Rules) -> None:
         for area_id in self.config.areas:
             rules[f"hgp,{area_id},0"] = _TSNumber
 
+    @override
     def _get_filtering_kwargs(self, url: t.List[str]) -> t.Dict[str, str]:
         # If the URL contains 2 elements, we can filter the options based on the generator type.
         if len(url) == 2:
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/settings/settings.py b/antarest/study/storage/rawstudy/model/filesystem/root/settings/settings.py
index 61d32f6012..f63b7cb69d 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/settings/settings.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/settings/settings.py
@@ -9,6 +9,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
@@ -20,6 +21,7 @@
 
 
 class Settings(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {
             "resources": Resources(self.context, self.config.next_file("resources")),
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/settings/simulations/simulations.py b/antarest/study/storage/rawstudy/model/filesystem/root/settings/simulations/simulations.py
index 5a8e832e11..64e074623e 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/settings/simulations/simulations.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/settings/simulations/simulations.py
@@ -9,12 +9,14 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
 
 
 class SettingsSimulations(FolderNode):
+    @override
     def build(self) -> TREE:
         children: TREE = {}
         return children
diff --git a/antarest/study/storage/rawstudy/model/filesystem/root/user/expansion/sensitivity.py b/antarest/study/storage/rawstudy/model/filesystem/root/user/expansion/sensitivity.py
index da42e73c64..2a2ea7c9c3 100644
--- a/antarest/study/storage/rawstudy/model/filesystem/root/user/expansion/sensitivity.py
+++ b/antarest/study/storage/rawstudy/model/filesystem/root/user/expansion/sensitivity.py
@@ -12,12 +12,15 @@
 
 from typing import List
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.folder_node import FolderNode
 from antarest.study.storage.rawstudy.model.filesystem.inode import TREE
 from antarest.study.storage.rawstudy.model.filesystem.json_file_node import JsonFileNode
 
 
 class SensitivityConfig(FolderNode):
+    @override
     def build(self) -> TREE:
         types = {"epsilon": float, "capex": bool, "projection": List[str]}
         return {
diff --git a/antarest/study/storage/rawstudy/raw_study_service.py b/antarest/study/storage/rawstudy/raw_study_service.py
index e90b9b33ed..11572d6710 100644
--- a/antarest/study/storage/rawstudy/raw_study_service.py
+++ b/antarest/study/storage/rawstudy/raw_study_service.py
@@ -20,6 +20,7 @@
 from uuid import uuid4
 
 from antares.study.version import StudyVersion
+from typing_extensions import override
 
 from antarest.core.config import Config
 from antarest.core.exceptions import StudyDeletionNotAllowed
@@ -142,6 +143,7 @@ def update_name_and_version_from_raw_meta(self, metadata: RawStudy) -> bool:
             )
             return False
 
+    @override
     def exists(self, study: RawStudy) -> bool:
         """
         Check if the study exists in the filesystem.
@@ -158,6 +160,7 @@ def exists(self, study: RawStudy) -> bool:
         path = self.get_study_path(study)
         return path.joinpath("study.antares").is_file()
 
+    @override
     def get_raw(
         self,
         metadata: RawStudy,
@@ -177,12 +180,14 @@ def get_raw(
         study_path = self.get_study_path(metadata)
         return self.study_factory.create_from_fs(study_path, metadata.id, output_dir, use_cache=use_cache)
 
+    @override
     def get_synthesis(self, metadata: RawStudy, params: t.Optional[RequestParameters] = None) -> FileStudyTreeConfigDTO:
         self._check_study_exists(metadata)
         study_path = self.get_study_path(metadata)
         study = self.study_factory.create_from_fs(study_path, metadata.id)
         return FileStudyTreeConfigDTO.from_build_config(study.config)
 
+    @override
     def create(self, metadata: RawStudy) -> RawStudy:
         """
         Create a new empty study based on the given metadata.
@@ -216,6 +221,7 @@ def create(self, metadata: RawStudy) -> RawStudy:
 
         return metadata
 
+    @override
     def copy(
         self,
         src_meta: RawStudy,
@@ -273,6 +279,7 @@ def copy(
 
         return dest_study
 
+    @override
     def delete(self, metadata: RawStudy) -> None:
         """
         Delete study
@@ -290,6 +297,7 @@ def delete(self, metadata: RawStudy) -> None:
         else:
             raise StudyDeletionNotAllowed(metadata.id)
 
+    @override
     def delete_output(self, metadata: RawStudy, output_name: str) -> None:
         """
         Delete output folder
@@ -338,6 +346,7 @@ def import_study(self, metadata: RawStudy, stream: t.BinaryIO) -> Study:
         metadata.path = str(study_path)
         return metadata
 
+    @override
     def export_study_flat(
         self,
         metadata: RawStudy,
@@ -379,6 +388,7 @@ def check_errors(
         study = self.study_factory.create_from_fs(path, metadata.id)
         return study.tree.check_errors(study.tree.get())
 
+    @override
     def set_reference_output(self, study: RawStudy, output_id: str, status: bool) -> None:
         self.patch_service.set_reference_output(study, output_id, status)
         remove_from_cache(self.cache, study.id)
@@ -422,6 +432,7 @@ def find_archive_path(self, study: RawStudy) -> Path:
                 return path
         raise FileNotFoundError(f"Study {study.id} archiving process is corrupted (no archive file found).")
 
+    @override
     def get_study_path(self, metadata: Study) -> Path:
         """
         Get study path
@@ -435,6 +446,7 @@ def get_study_path(self, metadata: Study) -> Path:
             return self.find_archive_path(metadata)
         return Path(metadata.path)
 
+    @override
     def initialize_additional_data(self, raw_study: RawStudy) -> bool:
         try:
             study = self.study_factory.create_from_fs(
diff --git a/antarest/study/storage/rawstudy/watcher.py b/antarest/study/storage/rawstudy/watcher.py
index 3166bbe40f..75541c009b 100644
--- a/antarest/study/storage/rawstudy/watcher.py
+++ b/antarest/study/storage/rawstudy/watcher.py
@@ -19,6 +19,7 @@
 from typing import List, Optional
 
 from filelock import FileLock
+from typing_extensions import override
 
 from antarest.core.config import Config
 from antarest.core.interfaces.service import IService
@@ -70,6 +71,7 @@ def __init__(
         self.should_stop = False
         self.allowed_to_start = not config.storage.watcher_lock or Watcher._get_lock(config.storage.watcher_lock_delay)
 
+    @override
     def start(self, threaded: bool = True) -> None:
         self.should_stop = False
         if self.allowed_to_start:
@@ -97,6 +99,7 @@ def _get_lock(lock_delay: int) -> bool:
                 logger.info("Watcher doesn't get lock")
                 return False
 
+    @override
     def _loop(self) -> None:
         try:
             logger.info(
diff --git a/antarest/study/storage/variantstudy/business/command_extractor.py b/antarest/study/storage/variantstudy/business/command_extractor.py
index 0f034f8a37..dbac37aff9 100644
--- a/antarest/study/storage/variantstudy/business/command_extractor.py
+++ b/antarest/study/storage/variantstudy/business/command_extractor.py
@@ -15,6 +15,7 @@
 import typing as t
 
 import numpy as np
+from typing_extensions import override
 
 from antarest.core.model import JSON
 from antarest.core.utils.utils import StopWatch
@@ -67,6 +68,7 @@ def __init__(self, matrix_service: ISimpleMatrixService, patch_service: PatchSer
             patch_service=self.patch_service,
         )
 
+    @override
     def extract_area(self, study: FileStudy, area_id: str) -> t.Tuple[t.List[ICommand], t.List[ICommand]]:
         stopwatch = StopWatch()
         study_tree = study.tree
@@ -147,6 +149,7 @@ def extract_area(self, study: FileStudy, area_id: str) -> t.Tuple[t.List[IComman
         stopwatch.log_elapsed(lambda x: logger.info(f"Hydro command extraction done in {x}s"))
         return study_commands, links_commands
 
+    @override
     def extract_link(
         self,
         study: FileStudy,
@@ -249,12 +252,15 @@ def _extract_cluster(self, study: FileStudy, area_id: str, cluster_id: str, rene
             )
         return study_commands
 
+    @override
     def extract_cluster(self, study: FileStudy, area_id: str, thermal_id: str) -> t.List[ICommand]:
         return self._extract_cluster(study, area_id, thermal_id, False)
 
+    @override
     def extract_renewables_cluster(self, study: FileStudy, area_id: str, renewables_id: str) -> t.List[ICommand]:
         return self._extract_cluster(study, area_id, renewables_id, True)
 
+    @override
     def extract_hydro(self, study: FileStudy, area_id: str) -> t.List[ICommand]:
         study_tree = study.tree
         commands = [
@@ -316,6 +322,7 @@ def extract_hydro(self, study: FileStudy, area_id: str) -> t.List[ICommand]:
 
         return commands
 
+    @override
     def extract_district(self, study: FileStudy, district_id: str) -> t.List[ICommand]:
         study_commands: t.List[ICommand] = []
         study_config = study.config
@@ -337,6 +344,7 @@ def extract_district(self, study: FileStudy, district_id: str) -> t.List[IComman
         )
         return study_commands
 
+    @override
     def extract_comments(self, study: FileStudy) -> t.List[ICommand]:
         study_tree = study.tree
         content = t.cast(bytes, study_tree.get(["settings", "comments"]))
@@ -347,6 +355,7 @@ def extract_comments(self, study: FileStudy) -> t.List[ICommand]:
             )
         ]
 
+    @override
     def extract_binding_constraint(
         self,
         study: FileStudy,
@@ -400,6 +409,7 @@ def extract_binding_constraint(
 
         return [create_cmd]
 
+    @override
     def generate_update_config(self, study_tree: FileStudyTree, url: t.List[str]) -> ICommand:
         data = study_tree.get(url)
         return UpdateConfig(
@@ -409,6 +419,7 @@ def generate_update_config(self, study_tree: FileStudyTree, url: t.List[str]) ->
             study_version=study_tree.config.version,
         )
 
+    @override
     def generate_update_raw_file(self, study_tree: FileStudyTree, url: t.List[str]) -> ICommand:
         data = study_tree.get(url)
         return UpdateRawFile(
@@ -418,6 +429,7 @@ def generate_update_raw_file(self, study_tree: FileStudyTree, url: t.List[str])
             study_version=study_tree.config.version,
         )
 
+    @override
     def generate_update_comments(
         self,
         study_tree: FileStudyTree,
@@ -443,6 +455,7 @@ def generate_update_playlist(
             study_version=study_tree.config.version,
         )
 
+    @override
     def generate_replace_matrix(
         self,
         study_tree: FileStudyTree,
diff --git a/antarest/study/storage/variantstudy/model/command/create_area.py b/antarest/study/storage/variantstudy/model/command/create_area.py
index 1eefb00d1a..d05cc931d4 100644
--- a/antarest/study/storage/variantstudy/model/command/create_area.py
+++ b/antarest/study/storage/variantstudy/model/command/create_area.py
@@ -13,6 +13,7 @@
 import typing as t
 
 from pydantic import Field
+from typing_extensions import override
 
 from antarest.core.model import JSON
 from antarest.study.model import STUDY_VERSION_6_5, STUDY_VERSION_8_1, STUDY_VERSION_8_3, STUDY_VERSION_8_6
@@ -74,6 +75,7 @@ class CreateArea(ICommand):
     #  or if we don't want to support this feature.
     metadata: t.Dict[str, str] = Field(default_factory=dict, description="Area metadata: country and tag list")
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         if self.command_context.generator_matrix_constants is None:
             raise ValueError()
@@ -102,6 +104,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
             {"area_id": area_id},
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         config = study_data.config
 
@@ -287,21 +290,26 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.CREATE_AREA.value, args={"area_name": self.area_name}, study_version=self.study_version
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.area_name)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, CreateArea):
             return False
         return self.area_name == other.area_name
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return []
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/create_binding_constraint.py b/antarest/study/storage/variantstudy/model/command/create_binding_constraint.py
index 93a65ff25a..b41fb2dd93 100644
--- a/antarest/study/storage/variantstudy/model/command/create_binding_constraint.py
+++ b/antarest/study/storage/variantstudy/model/command/create_binding_constraint.py
@@ -17,6 +17,7 @@
 import numpy as np
 from antares.study.version import StudyVersion
 from pydantic import Field, field_validator, model_validator
+from typing_extensions import override
 
 from antarest.core.model import LowerCaseStr
 from antarest.core.serialization import AntaresBaseModel
@@ -221,6 +222,7 @@ class AbstractBindingConstraintCommand(OptionalProperties, BindingConstraintMatr
 
     coeffs: t.Optional[t.Dict[str, t.List[float]]] = None
 
+    @override
     def to_dto(self) -> CommandDTO:
         json_command = self.model_dump(mode="json", exclude={"command_context"})
         args = {}
@@ -248,6 +250,7 @@ def to_dto(self) -> CommandDTO:
             action=self.command_name.value, args=args, version=self.version, study_version=self.study_version
         )
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         matrix_service = self.command_context.matrix_service
         return [
@@ -416,6 +419,7 @@ class CreateBindingConstraint(AbstractBindingConstraintCommand):
     # Properties of the `CREATE_BINDING_CONSTRAINT` command:
     name: str
 
+    @override
     def _apply_config(self, study_data_config: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         bd_id = transform_name_to_id(self.name)
         group = self.group or DEFAULT_GROUP
@@ -431,6 +435,7 @@ def _apply_config(self, study_data_config: FileStudyTreeConfig) -> t.Tuple[Comma
         )
         return CommandOutput(status=True), {}
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         binding_constraints = study_data.tree.get(["input", "bindingconstraints", "bindingconstraints"])
         new_key = str(len(binding_constraints))
@@ -449,14 +454,17 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         )
         return super().apply_binding_constraint(study_data, binding_constraints, new_key, bd_id)
 
+    @override
     def to_dto(self) -> CommandDTO:
         dto = super().to_dto()
         dto.args["name"] = self.name  # type: ignore
         return dto
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.name)
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         from antarest.study.storage.variantstudy.model.command.update_binding_constraint import UpdateBindingConstraint
 
@@ -492,6 +500,7 @@ def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
 
         return [UpdateBindingConstraint.model_validate(args)]
 
+    @override
     def match(self, other: "ICommand", equal: bool = False) -> bool:
         if not isinstance(other, self.__class__):
             return False
diff --git a/antarest/study/storage/variantstudy/model/command/create_cluster.py b/antarest/study/storage/variantstudy/model/command/create_cluster.py
index 779d85ee3c..de4eb70ffc 100644
--- a/antarest/study/storage/variantstudy/model/command/create_cluster.py
+++ b/antarest/study/storage/variantstudy/model/command/create_cluster.py
@@ -13,6 +13,7 @@
 import typing as t
 
 from pydantic import Field, model_validator
+from typing_extensions import override
 
 from antarest.core.model import JSON, LowerCaseStr
 from antarest.core.utils.utils import assert_this
@@ -73,6 +74,7 @@ def validate_model(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
 
         return values
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         # Search the Area in the configuration
         if self.area_id not in study_data.areas:
@@ -107,6 +109,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
             {"cluster_id": cluster.id},
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         output, data = self._apply_config(study_data.config)
         if not output.status:
@@ -144,6 +147,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=self.command_name.value,
@@ -157,6 +161,7 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(
             self.command_name.value
@@ -166,6 +171,7 @@ def match_signature(self) -> str:
             + self.cluster_name
         )
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, CreateCluster):
             return False
@@ -181,6 +187,7 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
             and self.modulation == other.modulation
         )
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         other = t.cast(CreateCluster, other)
         from antarest.study.storage.variantstudy.model.command.replace_matrix import ReplaceMatrix
@@ -220,6 +227,7 @@ def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
             )
         return commands
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         matrices: t.List[str] = []
         if self.prepro:
diff --git a/antarest/study/storage/variantstudy/model/command/create_district.py b/antarest/study/storage/variantstudy/model/command/create_district.py
index e8ed7f69d9..668ace46f1 100644
--- a/antarest/study/storage/variantstudy/model/command/create_district.py
+++ b/antarest/study/storage/variantstudy/model/command/create_district.py
@@ -14,6 +14,7 @@
 from typing import Any, Dict, List, Optional, Tuple, cast
 
 from pydantic import field_validator
+from typing_extensions import override
 
 from antarest.core.model import LowerCaseStr
 from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
@@ -50,6 +51,7 @@ class CreateDistrict(ICommand):
     output: bool = True
     comments: str = ""
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         district_id = transform_name_to_id(self.name)
         if district_id in study_data.sets:
@@ -75,6 +77,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput,
             "item_key": item_key,
         }
 
+    @override
     def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = None) -> CommandOutput:
         output, data = self._apply_config(study_data.config)
         if not output.status:
@@ -94,6 +97,7 @@ def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = N
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.CREATE_DISTRICT.value,
@@ -107,9 +111,11 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.name)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, CreateDistrict):
             return False
@@ -124,6 +130,7 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
             and self.comments == other.comments
         )
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         other = cast(CreateDistrict, other)
         district_id = transform_name_to_id(self.name)
@@ -147,5 +154,6 @@ def _create_diff(self, other: "ICommand") -> List["ICommand"]:
             )
         ]
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/create_link.py b/antarest/study/storage/variantstudy/model/command/create_link.py
index 1e46c20bf1..134491ce8c 100644
--- a/antarest/study/storage/variantstudy/model/command/create_link.py
+++ b/antarest/study/storage/variantstudy/model/command/create_link.py
@@ -14,6 +14,7 @@
 
 from antares.study.version import StudyVersion
 from pydantic import ValidationInfo, field_validator, model_validator
+from typing_extensions import override
 
 from antarest.core.exceptions import LinkValidationError
 from antarest.core.utils.utils import assert_this
@@ -65,6 +66,7 @@ def validate_areas(self) -> "AbstractLinkCommand":
 
         return self
 
+    @override
     def to_dto(self) -> CommandDTO:
         args = {
             "area1": self.area1,
@@ -76,6 +78,7 @@ def to_dto(self) -> CommandDTO:
                 args[attr] = strip_matrix_protocol(value)
         return CommandDTO(action=self.command_name.value, args=args, study_version=self.study_version)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, self.__class__):
             return False
@@ -90,11 +93,13 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
             and self.indirect == other.indirect
         )
 
+    @override
     def match_signature(self) -> str:
         return str(
             self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.area1 + MATCH_SIGNATURE_SEPARATOR + self.area2
         )
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         other = cast(AbstractLinkCommand, other)
 
@@ -123,6 +128,7 @@ def _create_diff(self, other: "ICommand") -> List["ICommand"]:
             )
         return commands
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         list_matrices = []
         for attr in MATRIX_ATTRIBUTES:
@@ -200,6 +206,7 @@ def _create_link_in_config(self, area_from: str, area_to: str, study_data: FileS
             ],
         )
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         if self.area1 not in study_data.areas:
             return (
@@ -254,6 +261,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput,
             {"area_from": area_from, "area_to": area_to},
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = None) -> CommandOutput:
         version = study_data.config.version
         output, data = self._apply_config(study_data.config)
@@ -283,17 +291,22 @@ def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = N
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return super().to_dto()
 
+    @override
     def match_signature(self) -> str:
         return super().match_signature()
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         return super().match(other, equal)
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         return super()._create_diff(other)
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         return super().get_inner_matrices()
diff --git a/antarest/study/storage/variantstudy/model/command/create_renewables_cluster.py b/antarest/study/storage/variantstudy/model/command/create_renewables_cluster.py
index 6c0c6381c8..057791ca10 100644
--- a/antarest/study/storage/variantstudy/model/command/create_renewables_cluster.py
+++ b/antarest/study/storage/variantstudy/model/command/create_renewables_cluster.py
@@ -13,6 +13,7 @@
 import typing as t
 
 from pydantic import model_validator
+from typing_extensions import override
 
 from antarest.core.model import JSON, LowerCaseStr
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, EnrModelling, FileStudyTreeConfig
@@ -53,6 +54,7 @@ def validate_model(cls, values: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
         values["parameters"] = create_renewable_properties(values["study_version"], **args)
         return values
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         if EnrModelling(study_data.enr_modelling) != EnrModelling.CLUSTERS:
             # Since version 8.1 of the solver, we can use renewable clusters
@@ -100,6 +102,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
             {"cluster_id": cluster.id},
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         output, data = self._apply_config(study_data.config)
         if not output.status:
@@ -127,6 +130,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=self.command_name.value,
@@ -138,6 +142,7 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(
             self.command_name.value
@@ -147,6 +152,7 @@ def match_signature(self) -> str:
             + self.cluster_name
         )
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, CreateRenewablesCluster):
             return False
@@ -157,6 +163,7 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
         other_params = other.parameters.model_dump(mode="json", by_alias=True)
         return simple_match and self_params == other_params
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         other = t.cast(CreateRenewablesCluster, other)
         from antarest.study.storage.variantstudy.model.command.update_config import UpdateConfig
@@ -175,5 +182,6 @@ def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
             )
         return commands
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/create_st_storage.py b/antarest/study/storage/variantstudy/model/command/create_st_storage.py
index 8d15d5c625..42a3e66253 100644
--- a/antarest/study/storage/variantstudy/model/command/create_st_storage.py
+++ b/antarest/study/storage/variantstudy/model/command/create_st_storage.py
@@ -14,6 +14,7 @@
 
 import numpy as np
 from pydantic import Field, ValidationInfo, model_validator
+from typing_extensions import override
 
 from antarest.core.model import JSON, LowerCaseStr
 from antarest.matrixstore.model import MatrixData
@@ -170,6 +171,7 @@ def validate_matrices(cls, values: t.Union[t.Dict[str, t.Any], ValidationInfo])
             new_values[field] = cls.validate_field(new_values.get(field, None), new_values, field)
         return new_values
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         """
         Applies configuration changes to the study data: add the short-term storage in the storages list.
@@ -229,6 +231,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
             {"storage_id": storage_id},
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         """
         Applies the study data to update storage configurations and saves the changes.
@@ -263,6 +266,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         """
         Converts the current object to a Data Transfer Object (DTO)
@@ -281,6 +285,7 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         """Returns the command signature."""
         return str(
@@ -291,6 +296,7 @@ def match_signature(self) -> str:
             + self.storage_id
         )
 
+    @override
     def match(self, other: "ICommand", equal: bool = False) -> bool:
         """
         Checks if the current instance matches another `ICommand` object.
@@ -310,6 +316,7 @@ def match(self, other: "ICommand", equal: bool = False) -> bool:
         else:
             return self.area_id == other.area_id and self.storage_id == other.storage_id
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         """
         Creates a list of commands representing the differences between
@@ -350,6 +357,7 @@ def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
             )
         return commands
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         """
         Retrieves the list of matrix IDs.
diff --git a/antarest/study/storage/variantstudy/model/command/create_user_resource.py b/antarest/study/storage/variantstudy/model/command/create_user_resource.py
index a62fd1f8b0..0afb321e54 100644
--- a/antarest/study/storage/variantstudy/model/command/create_user_resource.py
+++ b/antarest/study/storage/variantstudy/model/command/create_user_resource.py
@@ -12,6 +12,8 @@
 import typing as t
 from enum import StrEnum
 
+from typing_extensions import override
+
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.core.model import JSON
 from antarest.core.serialization import AntaresBaseModel
@@ -50,9 +52,11 @@ class CreateUserResource(ICommand):
 
     data: CreateUserResourceData
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         return CommandOutput(status=True, message="ok"), {}
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         url = [item for item in self.data.path.split("/") if item]
         study_tree = study_data.tree
@@ -74,6 +78,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
             return CommandOutput(status=False, message=f"the given resource already exists: {self.data.path}")
         return CommandOutput(status=True, message="ok")
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=self.command_name.value,
@@ -81,6 +86,7 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(
             self.command_name.value
@@ -90,13 +96,16 @@ def match_signature(self) -> str:
             + self.data.resource_type.value
         )
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, CreateUserResource):
             return False
         return self.data.path == other.data.path and self.data.resource_type == other.data.resource_type
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/generate_thermal_cluster_timeseries.py b/antarest/study/storage/variantstudy/model/command/generate_thermal_cluster_timeseries.py
index e6e4bf17a1..9f8631b608 100644
--- a/antarest/study/storage/variantstudy/model/command/generate_thermal_cluster_timeseries.py
+++ b/antarest/study/storage/variantstudy/model/command/generate_thermal_cluster_timeseries.py
@@ -21,6 +21,7 @@
 from antares.tsgen.duration_generator import ProbabilityLaw
 from antares.tsgen.random_generator import MersenneTwisterRNG
 from antares.tsgen.ts_generator import OutageGenerationParameters, ThermalCluster, TimeseriesGenerator
+from typing_extensions import override
 
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.config.thermal import LocalTSGenerationBehavior
@@ -47,9 +48,11 @@ class GenerateThermalClusterTimeSeries(ICommand):
     command_name: CommandName = CommandName.GENERATE_THERMAL_CLUSTER_TIMESERIES
     version: int = 1
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> OutputTuple:
         return CommandOutput(status=True, message="Nothing to do"), {}
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         study_path = study_data.config.study_path
         with tempfile.TemporaryDirectory(suffix=TS_GEN_SUFFIX, prefix=TS_GEN_PREFIX, dir=study_path.parent) as path:
@@ -141,22 +144,27 @@ def _build_timeseries(
                     e.args = (f"Area {area_id}, cluster {thermal.id.lower()}: " + e.args[0],)
                     raise
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(action=self.command_name.value, args={}, study_version=self.study_version)
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value)
 
+    @override
     def match(self, other: "ICommand", equal: bool = False) -> bool:
         # Only used inside the cli app that no one uses I believe.
         if not isinstance(other, GenerateThermalClusterTimeSeries):
             return False
         return True
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         # Only used inside the cli app that no one uses I believe.
         raise NotImplementedError()
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         # This is used to get used matrices and not remove them inside the garbage collector loop.
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/remove_area.py b/antarest/study/storage/variantstudy/model/command/remove_area.py
index af536c37df..4d7c33e922 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_area.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_area.py
@@ -14,6 +14,8 @@
 import logging
 import typing as t
 
+from typing_extensions import override
+
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.core.model import JSON
 from antarest.study.model import (
@@ -64,6 +66,7 @@ def _remove_area_from_sets_in_config(self, study_data_config: FileStudyTreeConfi
                     set_.areas.remove(self.id)
                     study_data_config.sets[id_] = set_
 
+    @override
     def _apply_config(self, study_data_config: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         del study_data_config.areas[self.id]
 
@@ -223,6 +226,7 @@ def _remove_area_from_scenario_builder(self, study_data: FileStudy) -> None:
         study_data.tree.save(rulesets, ["settings", "scenariobuilder"])
 
     # noinspection SpellCheckingInspection
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         study_data.tree.delete(["input", "areas", self.id])
         study_data.tree.delete(["input", "hydro", "common", "capacity", f"maxpower_{self.id}"])
@@ -281,6 +285,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.REMOVE_AREA.value,
@@ -290,14 +295,18 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.id)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         return isinstance(other, RemoveArea) and self.id == other.id
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return []
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/remove_binding_constraint.py b/antarest/study/storage/variantstudy/model/command/remove_binding_constraint.py
index 916ba5ea70..55dd971133 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_binding_constraint.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_binding_constraint.py
@@ -12,6 +12,8 @@
 
 from typing import Any, Dict, List, Optional, Tuple
 
+from typing_extensions import override
+
 from antarest.core.model import JSON
 from antarest.study.model import STUDY_VERSION_8_7
 from antarest.study.storage.rawstudy.model.filesystem.config.binding_constraint import DEFAULT_GROUP
@@ -35,6 +37,7 @@ class RemoveBindingConstraint(ICommand):
     # Properties of the `REMOVE_BINDING_CONSTRAINT` command:
     id: str
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         if self.id not in [bind.id for bind in study_data.bindings]:
             return (
@@ -44,6 +47,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput,
         study_data.bindings.remove(next(iter([bind for bind in study_data.bindings if bind.id == self.id])))
         return CommandOutput(status=True), {}
 
+    @override
     def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = None) -> CommandOutput:
         if self.id not in [bind.id for bind in study_data.config.bindings]:
             return CommandOutput(status=False, message=f"Binding constraint not found: '{self.id}'")
@@ -76,6 +80,7 @@ def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = N
 
         return self._apply_config(study_data.config)[0]
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.REMOVE_BINDING_CONSTRAINT.value,
@@ -85,16 +90,20 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.id)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, RemoveBindingConstraint):
             return False
         return self.id == other.id
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         return []
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/remove_cluster.py b/antarest/study/storage/variantstudy/model/command/remove_cluster.py
index b64bbdfc39..396d0d5d7b 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_cluster.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_cluster.py
@@ -13,6 +13,7 @@
 import typing as t
 
 from pydantic import Field
+from typing_extensions import override
 
 from antarest.core.model import LowerCaseStr
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
@@ -43,6 +44,7 @@ class RemoveCluster(ICommand):
     area_id: str
     cluster_id: LowerCaseStr = Field(description="Cluster ID", pattern=r"[a-z0-9_(),& -]+")
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         """
         Applies configuration changes to the study data: remove the thermal clusters from the storages list.
@@ -101,6 +103,7 @@ def _remove_cluster_from_scenario_builder(self, study_data: FileStudy) -> None:
 
         study_data.tree.save(rulesets, ["settings", "scenariobuilder"])
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         """
         Applies the study data to update thermal cluster configurations and saves the changes:
@@ -142,6 +145,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         # deleting the files and folders.
         return self._apply_config(study_data.config)[0]
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=self.command_name.value,
@@ -149,6 +153,7 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(
             self.command_name.value
@@ -158,14 +163,17 @@ def match_signature(self) -> str:
             + self.area_id
         )
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, RemoveCluster):
             return False
         return self.cluster_id == other.cluster_id and self.area_id == other.area_id
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return []
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
 
diff --git a/antarest/study/storage/variantstudy/model/command/remove_district.py b/antarest/study/storage/variantstudy/model/command/remove_district.py
index 9e842d9872..2b675aed3f 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_district.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_district.py
@@ -12,6 +12,8 @@
 
 from typing import Any, Dict, List, Optional, Tuple
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
@@ -36,15 +38,18 @@ class RemoveDistrict(ICommand):
 
     id: str
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         del study_data.sets[self.id]
         return CommandOutput(status=True, message=self.id), dict()
 
+    @override
     def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = None) -> CommandOutput:
         output, _ = self._apply_config(study_data.config)
         study_data.tree.delete(["input", "areas", "sets", self.id])
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.REMOVE_DISTRICT.value,
@@ -54,16 +59,20 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.id)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, RemoveDistrict):
             return False
         return self.id == other.id
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         return []
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/remove_link.py b/antarest/study/storage/variantstudy/model/command/remove_link.py
index 9b372e906f..668c5ff2b9 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_link.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_link.py
@@ -13,6 +13,7 @@
 import typing as t
 
 from pydantic import field_validator, model_validator
+from typing_extensions import override
 
 from antarest.study.model import STUDY_VERSION_8_2
 from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import transform_name_to_id
@@ -91,6 +92,7 @@ def _check_link_exists(self, study_cfg: FileStudyTreeConfig) -> OutputTuple:
 
         return CommandOutput(status=bool(data), message=message), data
 
+    @override
     def _apply_config(self, study_cfg: FileStudyTreeConfig) -> OutputTuple:
         """
         Update the study configuration by removing the link between the source and target areas.
@@ -126,6 +128,7 @@ def _remove_link_from_scenario_builder(self, study_data: FileStudy) -> None:
 
         study_data.tree.save(rulesets, ["settings", "scenariobuilder"])
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         """
         Update the configuration and the study data by removing the link between the source and target areas.
@@ -152,6 +155,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return self._apply_config(study_data.config)[0]
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.REMOVE_LINK.value,
@@ -159,17 +163,21 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         sep = MATCH_SIGNATURE_SEPARATOR
         return f"{self.command_name.value}{sep}{self.area1}{sep}{self.area2}"
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, RemoveLink):
             return False
         return self.area1 == other.area1 and self.area2 == other.area2
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return []
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/remove_renewables_cluster.py b/antarest/study/storage/variantstudy/model/command/remove_renewables_cluster.py
index 592b75bfbb..8e62dabbfa 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_renewables_cluster.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_renewables_cluster.py
@@ -12,10 +12,10 @@
 
 import typing as t
 
-from pydantic import Field, field_validator
+from pydantic import Field
+from typing_extensions import override
 
 from antarest.core.model import LowerCaseStr
-from antarest.study.storage.rawstudy.model.filesystem.config.field_validators import validate_id_against_name
 from antarest.study.storage.rawstudy.model.filesystem.config.model import Area, FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
@@ -41,6 +41,7 @@ class RemoveRenewablesCluster(ICommand):
     area_id: str
     cluster_id: LowerCaseStr = Field(description="Cluster ID", pattern=r"[a-z0-9_(),& -]+")
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         """
         Applies configuration changes to the study data: remove the renewable clusters from the storages list.
@@ -97,6 +98,7 @@ def _remove_cluster_from_scenario_builder(self, study_data: FileStudy) -> None:
 
         study_data.tree.save(rulesets, ["settings", "scenariobuilder"])
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         """
         Applies the study data to update renewable cluster configurations and saves the changes:
@@ -135,6 +137,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         # deleting the files and folders.
         return self._apply_config(study_data.config)[0]
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=self.command_name.value,
@@ -142,6 +145,7 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(
             self.command_name.value
@@ -151,13 +155,16 @@ def match_signature(self) -> str:
             + self.area_id
         )
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, RemoveRenewablesCluster):
             return False
         return self.cluster_id == other.cluster_id and self.area_id == other.area_id
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return []
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/remove_st_storage.py b/antarest/study/storage/variantstudy/model/command/remove_st_storage.py
index f27ebc5a58..3d10466793 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_st_storage.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_st_storage.py
@@ -13,6 +13,7 @@
 import typing as t
 
 from pydantic import Field
+from typing_extensions import override
 
 from antarest.core.model import LowerCaseStr
 from antarest.study.model import STUDY_VERSION_8_6
@@ -44,6 +45,7 @@ class RemoveSTStorage(ICommand):
     area_id: str = Field(description="Area ID", pattern=r"[a-z0-9_(),& -]+")
     storage_id: LowerCaseStr = Field(description="Short term storage ID", pattern=r"[a-z0-9_(),& -]+")
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         """
         Applies configuration changes to the study data: remove the storage from the storages list.
@@ -101,6 +103,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
             {},
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         """
         Applies the study data to update storage configurations and saves the changes:
@@ -130,6 +133,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         # deleting the files and folders.
         return self._apply_config(study_data.config)[0]
 
+    @override
     def to_dto(self) -> CommandDTO:
         """
         Converts the current object to a Data Transfer Object (DTO)
@@ -144,6 +148,7 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         """Returns the command signature."""
         return str(
@@ -154,13 +159,16 @@ def match_signature(self) -> str:
             + self.storage_id
         )
 
+    @override
     def match(self, other: "ICommand", equal: bool = False) -> bool:
         # always perform a deep comparison, as there are no parameters
         # or matrices, so that shallow and deep comparisons are identical.
         return self.__eq__(other)
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return []
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/remove_user_resource.py b/antarest/study/storage/variantstudy/model/command/remove_user_resource.py
index 4f24041589..f873ec2d10 100644
--- a/antarest/study/storage/variantstudy/model/command/remove_user_resource.py
+++ b/antarest/study/storage/variantstudy/model/command/remove_user_resource.py
@@ -12,6 +12,8 @@
 
 import typing as t
 
+from typing_extensions import override
+
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.core.serialization import AntaresBaseModel
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
@@ -43,9 +45,11 @@ class RemoveUserResource(ICommand):
 
     data: RemoveUserResourceData
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         return CommandOutput(status=True, message="ok"), {}
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         url = [item for item in self.data.path.split("/") if item]
         study_tree = study_data.tree
@@ -62,6 +66,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return CommandOutput(status=True, message="ok")
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=self.command_name.value,
@@ -69,16 +74,20 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.data.path)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, RemoveUserResource):
             return False
         return self.data.path == other.data.path
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/replace_matrix.py b/antarest/study/storage/variantstudy/model/command/replace_matrix.py
index b26dd717f1..c796c47ce2 100644
--- a/antarest/study/storage/variantstudy/model/command/replace_matrix.py
+++ b/antarest/study/storage/variantstudy/model/command/replace_matrix.py
@@ -13,6 +13,7 @@
 import typing as t
 
 from pydantic import Field, ValidationInfo, field_validator
+from typing_extensions import override
 
 from antarest.core.exceptions import ChildNotFoundError
 from antarest.core.model import JSON
@@ -49,6 +50,7 @@ class ReplaceMatrix(ICommand):
     def matrix_validator(cls, matrix: t.Union[t.List[t.List[MatrixData]], str], values: ValidationInfo) -> str:
         return validate_matrix(matrix, values.data)
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         return (
             CommandOutput(
@@ -58,6 +60,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
             {},
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         if self.target[0] == "@":
             self.target = AliasDecoder.decode(self.target, study_data)
@@ -89,6 +92,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         output, _ = self._apply_config(study_data.config)
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.REPLACE_MATRIX.value,
@@ -99,9 +103,11 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.target)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, ReplaceMatrix):
             return False
@@ -109,9 +115,11 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
             return self.target == other.target and self.matrix == other.matrix
         return self.target == other.target
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         assert_this(isinstance(self.matrix, str))
         return [strip_matrix_protocol(self.matrix)]
diff --git a/antarest/study/storage/variantstudy/model/command/update_binding_constraint.py b/antarest/study/storage/variantstudy/model/command/update_binding_constraint.py
index 5f0f134494..6c247b4c05 100644
--- a/antarest/study/storage/variantstudy/model/command/update_binding_constraint.py
+++ b/antarest/study/storage/variantstudy/model/command/update_binding_constraint.py
@@ -12,6 +12,8 @@
 
 import typing as t
 
+from typing_extensions import override
+
 from antarest.core.model import JSON
 from antarest.study.model import STUDY_VERSION_8_7
 from antarest.study.storage.rawstudy.model.filesystem.config.binding_constraint import (
@@ -112,6 +114,7 @@ class UpdateBindingConstraint(AbstractBindingConstraintCommand):
     # Properties of the `UPDATE_BINDING_CONSTRAINT` command:
     id: str
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         index = next(i for i, bc in enumerate(study_data.bindings) if bc.id == self.id)
         existing_constraint = study_data.bindings[index]
@@ -151,6 +154,7 @@ def _find_binding_config(self, binding_constraints: t.Mapping[str, JSON]) -> t.O
                 return str(index), binding_config
         return None
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         binding_constraints = study_data.tree.get(["input", "bindingconstraints", "bindingconstraints"])
 
@@ -200,6 +204,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return super().apply_binding_constraint(study_data, binding_constraints, index, self.id, old_groups=old_groups)
 
+    @override
     def to_dto(self) -> CommandDTO:
         matrices = ["values"] + [m.value for m in TermMatrices]
         matrix_service = self.command_context.matrix_service
@@ -214,12 +219,15 @@ def to_dto(self) -> CommandDTO:
             action=self.command_name.value, args=json_command, version=self.version, study_version=self.study_version
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.id)
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return [other]
 
+    @override
     def match(self, other: "ICommand", equal: bool = False) -> bool:
         if not isinstance(other, self.__class__):
             return False
diff --git a/antarest/study/storage/variantstudy/model/command/update_comments.py b/antarest/study/storage/variantstudy/model/command/update_comments.py
index 108363a3a3..b5300d171c 100644
--- a/antarest/study/storage/variantstudy/model/command/update_comments.py
+++ b/antarest/study/storage/variantstudy/model/command/update_comments.py
@@ -12,6 +12,8 @@
 
 from typing import Any, Dict, List, Optional, Tuple
 
+from typing_extensions import override
+
 from antarest.core.model import JSON
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
@@ -37,6 +39,7 @@ class UpdateComments(ICommand):
 
     comments: str
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         return (
             CommandOutput(
@@ -46,6 +49,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput,
             dict(),
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = None) -> CommandOutput:
         replace_comment_data: JSON = {"settings": {"comments": self.comments.encode("utf-8")}}
 
@@ -54,6 +58,7 @@ def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = N
         output, _ = self._apply_config(study_data.config)
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.UPDATE_COMMENTS.value,
@@ -63,16 +68,20 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, UpdateComments):
             return False
         return not equal or (self.comments == other.comments and equal)
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/update_config.py b/antarest/study/storage/variantstudy/model/command/update_config.py
index 258c64e80d..ef054383f0 100644
--- a/antarest/study/storage/variantstudy/model/command/update_config.py
+++ b/antarest/study/storage/variantstudy/model/command/update_config.py
@@ -13,6 +13,7 @@
 import typing as t
 
 import typing_extensions as te
+from typing_extensions import override
 
 from antarest.core.model import JSON
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
@@ -54,6 +55,7 @@ class UpdateConfig(ICommand):
     target: str
     data: _Data
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         # The renewable-generation-modelling parameter must be reflected in the config
         if self.target.startswith("settings"):
@@ -64,6 +66,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutpu
 
         return CommandOutput(status=True, message="ok"), {}
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         url = self.target.split("/")
         tree_node = study_data.tree.get_node(url)
@@ -78,6 +81,7 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         output, _ = self._apply_config(study_data.config)
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.UPDATE_CONFIG.value,
@@ -88,9 +92,11 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.target)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, UpdateConfig):
             return False
@@ -99,8 +105,10 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
             return simple_match
         return simple_match and self.data == other.data
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/update_district.py b/antarest/study/storage/variantstudy/model/command/update_district.py
index 2819e822a8..5d0b706484 100644
--- a/antarest/study/storage/variantstudy/model/command/update_district.py
+++ b/antarest/study/storage/variantstudy/model/command/update_district.py
@@ -12,6 +12,8 @@
 
 from typing import Any, Dict, List, Optional, Tuple
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.variantstudy.model.command.common import CommandName, CommandOutput
@@ -41,6 +43,7 @@ class UpdateDistrict(ICommand):
     output: Optional[bool] = None
     comments: Optional[str] = None
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         base_set = study_data.sets[self.id]
         if self.id not in study_data.sets:
@@ -67,6 +70,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput,
             "item_key": item_key,
         }
 
+    @override
     def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = None) -> CommandOutput:
         output, data = self._apply_config(study_data.config)
         if not output.status:
@@ -90,6 +94,7 @@ def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = N
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.UPDATE_DISTRICT.value,
@@ -103,9 +108,11 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.id)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, UpdateDistrict):
             return False
@@ -120,8 +127,10 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
             and self.comments == other.comments
         )
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/update_link.py b/antarest/study/storage/variantstudy/model/command/update_link.py
index ceab38ed56..16a13fa7e3 100644
--- a/antarest/study/storage/variantstudy/model/command/update_link.py
+++ b/antarest/study/storage/variantstudy/model/command/update_link.py
@@ -11,6 +11,8 @@
 # This file is part of the Antares project.
 import typing as t
 
+from typing_extensions import override
+
 from antarest.study.business.model.link_model import LinkInternal
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
@@ -32,6 +34,7 @@ class UpdateLink(AbstractLinkCommand):
     command_name: CommandName = CommandName.UPDATE_LINK
     version: int = 1
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> OutputTuple:
         return (
             CommandOutput(
@@ -41,6 +44,7 @@ def _apply_config(self, study_data: FileStudyTreeConfig) -> OutputTuple:
             {},
         )
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         version = study_data.config.version
 
@@ -65,14 +69,18 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
 
         return output
 
+    @override
     def to_dto(self) -> CommandDTO:
         return super().to_dto()
 
+    @override
     def match_signature(self) -> str:
         return super().match_signature()
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return super()._create_diff(other)
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return super().get_inner_matrices()
diff --git a/antarest/study/storage/variantstudy/model/command/update_playlist.py b/antarest/study/storage/variantstudy/model/command/update_playlist.py
index 7840019672..3c19b9a2f4 100644
--- a/antarest/study/storage/variantstudy/model/command/update_playlist.py
+++ b/antarest/study/storage/variantstudy/model/command/update_playlist.py
@@ -12,6 +12,8 @@
 
 from typing import Any, Dict, List, Optional, Tuple
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.rawstudy.model.helpers import FileStudyHelpers
@@ -40,6 +42,7 @@ class UpdatePlaylist(ICommand):
     weights: Optional[Dict[int, float]] = None
     reverse: bool = False
 
+    @override
     def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = None) -> CommandOutput:
         FileStudyHelpers.set_playlist(
             study_data,
@@ -50,9 +53,11 @@ def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = N
         )
         return CommandOutput(status=True)
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         return CommandOutput(status=True), {}
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.UPDATE_PLAYLIST.value,
@@ -65,9 +70,11 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return CommandName.UPDATE_PLAYLIST.name
 
+    @override
     def match(self, other: "ICommand", equal: bool = False) -> bool:
         if not isinstance(other, UpdatePlaylist):
             return False
@@ -80,8 +87,10 @@ def match(self, other: "ICommand", equal: bool = False) -> bool:
             )
         return True
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/update_raw_file.py b/antarest/study/storage/variantstudy/model/command/update_raw_file.py
index 4090b5ead1..97446dadcc 100644
--- a/antarest/study/storage/variantstudy/model/command/update_raw_file.py
+++ b/antarest/study/storage/variantstudy/model/command/update_raw_file.py
@@ -13,6 +13,8 @@
 import base64
 from typing import Any, Dict, List, Optional, Tuple
 
+from typing_extensions import override
+
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
 from antarest.study.storage.rawstudy.model.filesystem.factory import FileStudy
 from antarest.study.storage.rawstudy.model.filesystem.raw_file_node import RawFileNode
@@ -39,6 +41,7 @@ class UpdateRawFile(ICommand):
     target: str
     b64Data: str
 
+    @override
     def __repr__(self) -> str:
         cls = self.__class__.__name__
         target = self.target
@@ -48,9 +51,11 @@ def __repr__(self) -> str:
         except (ValueError, TypeError):
             return f"{cls}(target={target!r}, b64Data={self.b64Data!r})"
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> Tuple[CommandOutput, Dict[str, Any]]:
         return CommandOutput(status=True, message="ok"), {}
 
+    @override
     def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = None) -> CommandOutput:
         url = self.target.split("/")
         tree_node = study_data.tree.get_node(url)
@@ -63,6 +68,7 @@ def _apply(self, study_data: FileStudy, listener: Optional[ICommandListener] = N
         study_data.tree.save(base64.decodebytes(self.b64Data.encode("utf-8")), url)
         return CommandOutput(status=True, message="ok")
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=self.command_name.value,
@@ -70,9 +76,11 @@ def to_dto(self) -> CommandDTO:
             study_version=self.study_version,
         )
 
+    @override
     def match_signature(self) -> str:
         return str(self.command_name.value + MATCH_SIGNATURE_SEPARATOR + self.target)
 
+    @override
     def match(self, other: ICommand, equal: bool = False) -> bool:
         if not isinstance(other, UpdateRawFile):
             return False
@@ -81,8 +89,10 @@ def match(self, other: ICommand, equal: bool = False) -> bool:
             return simple_match
         return simple_match and self.b64Data == other.b64Data
 
+    @override
     def _create_diff(self, other: "ICommand") -> List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/command/update_scenario_builder.py b/antarest/study/storage/variantstudy/model/command/update_scenario_builder.py
index 89b12b5e51..4328bcf1fe 100644
--- a/antarest/study/storage/variantstudy/model/command/update_scenario_builder.py
+++ b/antarest/study/storage/variantstudy/model/command/update_scenario_builder.py
@@ -13,6 +13,7 @@
 import typing as t
 
 import numpy as np
+from typing_extensions import override
 
 from antarest.core.requests import CaseInsensitiveDict
 from antarest.study.storage.rawstudy.model.filesystem.config.model import FileStudyTreeConfig
@@ -54,6 +55,7 @@ class UpdateScenarioBuilder(ICommand):
 
     data: t.Union[t.Dict[str, t.Any], t.Mapping[str, t.Any], t.MutableMapping[str, t.Any]]
 
+    @override
     def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] = None) -> CommandOutput:
         """
         Apply the command to the study data.
@@ -95,17 +97,21 @@ def _apply(self, study_data: FileStudy, listener: t.Optional[ICommandListener] =
         study_data.tree.save(curr_cfg, url)  # type: ignore
         return CommandOutput(status=True)
 
+    @override
     def _apply_config(self, study_data: FileStudyTreeConfig) -> t.Tuple[CommandOutput, t.Dict[str, t.Any]]:
         return CommandOutput(status=True), {}
 
+    @override
     def to_dto(self) -> CommandDTO:
         return CommandDTO(
             action=CommandName.UPDATE_SCENARIO_BUILDER.value, args={"data": self.data}, study_version=self.study_version
         )
 
+    @override
     def match_signature(self) -> str:
         return CommandName.UPDATE_SCENARIO_BUILDER.value
 
+    @override
     def match(self, other: "ICommand", equal: bool = False) -> bool:
         if not isinstance(other, UpdateScenarioBuilder):
             return False
@@ -113,8 +119,10 @@ def match(self, other: "ICommand", equal: bool = False) -> bool:
             return self.data == other.data
         return True
 
+    @override
     def _create_diff(self, other: "ICommand") -> t.List["ICommand"]:
         return [other]
 
+    @override
     def get_inner_matrices(self) -> t.List[str]:
         return []
diff --git a/antarest/study/storage/variantstudy/model/dbmodel.py b/antarest/study/storage/variantstudy/model/dbmodel.py
index 180b7105ef..b855a75cf9 100644
--- a/antarest/study/storage/variantstudy/model/dbmodel.py
+++ b/antarest/study/storage/variantstudy/model/dbmodel.py
@@ -17,6 +17,7 @@
 
 from sqlalchemy import Column, DateTime, ForeignKey, Integer, String  # type: ignore
 from sqlalchemy.orm import relationship  # type: ignore
+from typing_extensions import override
 
 from antarest.core.persistence import Base
 from antarest.core.serialization import from_json
@@ -43,6 +44,7 @@ class VariantStudySnapshot(Base):  # type: ignore
         "polymorphic_identity": "variant_study_snapshot",
     }
 
+    @override
     def __str__(self) -> str:
         return f"[Snapshot] id={self.id}, created_at={self.created_at}"
 
@@ -82,6 +84,7 @@ def to_dto(self) -> CommandDTO:
             updated_at=self.updated_at,
         )
 
+    @override
     def __str__(self) -> str:
         return (
             f"CommandBlock(id={self.id!r},"
@@ -125,6 +128,7 @@ class VariantStudy(Study):
         cascade="all, delete, delete-orphan",
     )
 
+    @override
     def __str__(self) -> str:
         return super().__str__() + f", snapshot={self.snapshot}"
 
diff --git a/antarest/study/storage/variantstudy/repository.py b/antarest/study/storage/variantstudy/repository.py
index fc4fcc3809..a090b84c5a 100644
--- a/antarest/study/storage/variantstudy/repository.py
+++ b/antarest/study/storage/variantstudy/repository.py
@@ -13,6 +13,7 @@
 import typing as t
 
 from sqlalchemy.orm import Session, joinedload  # type: ignore
+from typing_extensions import override
 
 from antarest.core.interfaces.cache import ICache
 from antarest.core.utils.fastapi_sqlalchemy import db
@@ -37,6 +38,7 @@ def __init__(self, cache_service: ICache, session: t.Optional[Session] = None):
         super().__init__(cache_service)
         self._session = session
 
+    @override
     @property
     def session(self) -> Session:
         """
diff --git a/antarest/study/storage/variantstudy/variant_study_service.py b/antarest/study/storage/variantstudy/variant_study_service.py
index 75154dae95..82fed1d98e 100644
--- a/antarest/study/storage/variantstudy/variant_study_service.py
+++ b/antarest/study/storage/variantstudy/variant_study_service.py
@@ -24,6 +24,7 @@
 from antares.study.version import StudyVersion
 from fastapi import HTTPException
 from filelock import FileLock
+from typing_extensions import override
 
 from antarest.core.config import Config
 from antarest.core.exceptions import (
@@ -532,6 +533,7 @@ def _get_variants_parents(self, id: str, params: RequestParameters) -> t.List[St
 
         return output_list
 
+    @override
     def get(
         self,
         metadata: VariantStudy,
@@ -561,6 +563,7 @@ def get(
             use_cache=use_cache,
         )
 
+    @override
     def get_file(
         self,
         metadata: VariantStudy,
@@ -870,6 +873,7 @@ def get_study_task(self, study_id: str, params: RequestParameters) -> TaskDTO:
             return self.task_service.status_task(task_id=task_id, request_params=params, with_logs=True)
         raise StudyValidationError(f"Variant study '{study_id}' has no generation task")
 
+    @override
     def create(self, study: VariantStudy) -> VariantStudy:
         """
         Create an empty new study.
@@ -879,6 +883,7 @@ def create(self, study: VariantStudy) -> VariantStudy:
         """
         raise NotImplementedError()
 
+    @override
     def exists(self, metadata: VariantStudy) -> bool:
         """
         Check if the study snapshot exists and is up-to-date.
@@ -894,6 +899,7 @@ def exists(self, metadata: VariantStudy) -> bool:
             and (self.get_study_path(metadata) / "study.antares").is_file()
         )
 
+    @override
     def copy(
         self,
         src_meta: VariantStudy,
@@ -991,6 +997,7 @@ def _get_snapshot_last_executed_command_index(
             return last_executed_command_index if last_executed_command_index >= 0 else None
         return None
 
+    @override
     def get_raw(
         self,
         metadata: VariantStudy,
@@ -1015,6 +1022,7 @@ def get_raw(
             use_cache=use_cache,
         )
 
+    @override
     def get_study_sim_result(self, study: VariantStudy) -> t.List[StudySimResultDTO]:
         """
         Get global result information
@@ -1025,6 +1033,7 @@ def get_study_sim_result(self, study: VariantStudy) -> t.List[StudySimResultDTO]
         self._safe_generation(study, timeout=600)
         return super().get_study_sim_result(study=study)
 
+    @override
     def set_reference_output(self, metadata: VariantStudy, output_id: str, status: bool) -> None:
         """
         Set an output to the reference output of a study
@@ -1037,6 +1046,7 @@ def set_reference_output(self, metadata: VariantStudy, output_id: str, status: b
         self.patch_service.set_reference_output(metadata, output_id, status)
         remove_from_cache(self.cache, metadata.id)
 
+    @override
     def delete(self, metadata: VariantStudy) -> None:
         """
         Delete study
@@ -1049,6 +1059,7 @@ def delete(self, metadata: VariantStudy) -> None:
             shutil.rmtree(study_path)
             remove_from_cache(self.cache, metadata.id)
 
+    @override
     def delete_output(self, metadata: VariantStudy, output_id: str) -> None:
         """
         Delete a simulation output
@@ -1062,6 +1073,7 @@ def delete_output(self, metadata: VariantStudy, output_id: str) -> None:
         shutil.rmtree(output_path, ignore_errors=True)
         remove_from_cache(self.cache, metadata.id)
 
+    @override
     def get_study_path(self, metadata: Study) -> Path:
         """
         Get study path
@@ -1073,6 +1085,7 @@ def get_study_path(self, metadata: Study) -> Path:
         """
         return Path(metadata.path) / SNAPSHOT_RELATIVE_PATH
 
+    @override
     def export_study_flat(
         self,
         metadata: VariantStudy,
@@ -1096,6 +1109,7 @@ def export_study_flat(
             output_src_path,
         )
 
+    @override
     def get_synthesis(
         self,
         metadata: VariantStudy,
@@ -1118,6 +1132,7 @@ def get_synthesis(
 
         raise VariantGenerationError(f"Error during light generation of {metadata.id}")
 
+    @override
     def initialize_additional_data(self, variant_study: VariantStudy) -> bool:
         try:
             if self.exists(variant_study):
diff --git a/antarest/tools/lib.py b/antarest/tools/lib.py
index a8cef7e371..03d59a1949 100644
--- a/antarest/tools/lib.py
+++ b/antarest/tools/lib.py
@@ -22,6 +22,7 @@
 import numpy as np
 from antares.study.version import StudyVersion
 from httpx import Client
+from typing_extensions import override
 
 from antarest.core.cache.business.local_chache import LocalCache
 from antarest.core.config import CacheConfig
@@ -76,6 +77,7 @@ def __init__(
         self.session = session
         self.host = host
 
+    @override
     def apply_commands(
         self,
         commands: List[CommandDTO],
@@ -139,6 +141,7 @@ def render_template(self, study_version: StudyVersion = NEW_DEFAULT_STUDY_VERSIO
             sets_ini = self.output_path.joinpath("input/areas/sets.ini")
             sets_ini.write_bytes(b"")
 
+    @override
     def apply_commands(self, commands: List[CommandDTO], matrices_dir: Path) -> GenerationResultInfoDTO:
         stopwatch = StopWatch()
         matrix_content_repository = MatrixContentRepository(
diff --git a/antarest/worker/archive_worker.py b/antarest/worker/archive_worker.py
index 6ce01acf85..23bcd3aa69 100644
--- a/antarest/worker/archive_worker.py
+++ b/antarest/worker/archive_worker.py
@@ -13,6 +13,8 @@
 import logging
 from pathlib import Path
 
+from typing_extensions import override
+
 from antarest.core.config import Config
 from antarest.core.interfaces.eventbus import IEventBus
 from antarest.core.serialization import AntaresBaseModel
@@ -57,6 +59,7 @@ def __init__(
             [f"{ArchiveWorker.TASK_TYPE}_{workspace}"],
         )
 
+    @override
     def _execute_task(self, task_info: WorkerTaskCommand) -> TaskResult:
         logger.info(f"Executing task {task_info.model_dump_json()}")
         try:
diff --git a/antarest/worker/worker.py b/antarest/worker/worker.py
index f73dd551f0..6de459efbb 100644
--- a/antarest/worker/worker.py
+++ b/antarest/worker/worker.py
@@ -16,6 +16,8 @@
 from concurrent.futures import Future, ThreadPoolExecutor
 from typing import Any, Dict, List, Union
 
+from typing_extensions import override
+
 from antarest.core.interfaces.eventbus import Event, EventType, IEventBus
 from antarest.core.interfaces.service import IService
 from antarest.core.model import PermissionInfo, PublicMode
@@ -99,6 +101,7 @@ def __init__(
             thread_name_prefix="worker_task_",
         )
 
+    @override
     def _loop(self) -> None:
         for task_type in self.accept:
             self.event_bus.add_queue_consumer(self._listen_for_tasks, task_type)
diff --git a/pyproject.toml b/pyproject.toml
index 6073d80770..3b3b9a3849 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -39,6 +39,7 @@ exclude = "antarest/fastapi_jwt_auth/*"
 strict = true
 files = "antarest"
 plugins = "pydantic.mypy"
+enable_error_code = "explicit-override"
 
 [[tool.mypy.overrides]]
 module = ["antarest/fastapi_jwt_auth.*"]