LightSim2Grid 0.8.1__tar.gz → 0.8.2__tar.gz

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2/LightSim2Grid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LightSim2Grid
-Version: 0.8.1
+Version: 0.8.2
 Summary: LightSim2Grid implements a c++ backend targeting the Grid2Op platform.
 Home-page: https://github.com/BDonnot/lightsim2grid/
 Author: Benjamin Donnot
@@ -50,7 +50,7 @@ Requires-Dist: numba; extra == "recommended"
 Provides-Extra: test
 Requires-Dist: grid2op>=1.6.4; extra == "test"
 Requires-Dist: numba; extra == "test"
-Requires-Dist: pandapower>=2.8.0; extra == "test"
+Requires-Dist: pandapower>=2.14.0; extra == "test"
 Requires-Dist: packaging; extra == "test"
 Requires-Dist: pypowsybl; extra == "test"
 
@@ -130,12 +130,13 @@ Since version 0.5.3, lightsim2grid is can be installed like most python packages
 `python -m pip install lightsim2grid`
 
 It includes faster grid2op backend and the `SuiteSparse` faster `KLU` solver, even on windows. This is definitely the 
-easiest method to install lightsim2grid on your system and have it running without too much issues.
+easiest method to install lightsim2grid on your system and have it running.
 
 Note though that these packages have been compiled on a different platform that the one you are using. You might still
-get some benefit (in terms of performances) to install it from your on your machine.
+get some benefit (in terms of performances) to install it from your on your machine with the proper compilations flags (
+see section [6.1 Customization of the compilation](#Customization-of-the-compilation) for more information)
 
-Pypi packages are available for linux, windows and macos with python versions: 
+Pypi packages are available for linux (`x86_64` cpu architecture), windows (`x86_64` cpu architecture) and macos (`x86_64` cpu architecture) with python versions: 
 
 - 3.7
 - 3.8
@@ -144,8 +145,17 @@ Pypi packages are available for linux, windows and macos with python versions:
 - 3.11 (lightsim2grid >= 0.7.1)
 - 3.12 (lightsim2grid >= 0.7.5)
 
+
+As from version 0.8.2, we also distribute windows `arm64` and macos `arm64` binaries of lightsim2grid that can be installed
+directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
+
+
 **NB** on some version of MacOs (thanks Apple !), especially the one using M1 or M2 chip, lightsim2grid is only available
-on pypi starting from version 0.7.3
+on pypi starting from version 0.7.3 We attempted to deliver arm64 lightsim2grid version but we could not test them. So if you 
+want a reliable working and tested version of lightsim2grid on newest version of macos (with M1 or M2 chips for example) please
+use lightsim2grid >= 0.8.2
+
+**NB** we do not currently build any 32 bits lightsim2grid libraries.
 
 ## Installation (from source, for more advanced user)
 
@@ -278,7 +288,7 @@ For example: `export PATH_NICSLU=/home/user/Documents/cktso`
 
 #### Enable 03 optimization
 By default, at least on ubuntu, only the "-O2" compiler flags is used. To use the O3 optimization flag, you need
-to specify the `__O3_OPTIM` environment variable: `set __O3_OPTIM=1` before the compilation (so before
+to specify the `__O3_OPTIM` environment variable: `set __O3_OPTIM=1` (or `$Env:__O3_OPTIM=1` in powershell) before the compilation (so before
 `python3 setup.py build` or `python -m pip install -e .`)
 
 This compilation argument will increase the compilation time, but will make the package faster.

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/LightSim2Grid.egg-info/requires.txt

@@ -25,6 +25,6 @@ numba
 [test]
 grid2op>=1.6.4
 numba
-pandapower>=2.8.0
+pandapower>=2.14.0
 packaging
 pypowsybl

{LightSim2Grid-0.8.1/LightSim2Grid.egg-info → lightsim2grid-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LightSim2Grid
-Version: 0.8.1
+Version: 0.8.2
 Summary: LightSim2Grid implements a c++ backend targeting the Grid2Op platform.
 Home-page: https://github.com/BDonnot/lightsim2grid/
 Author: Benjamin Donnot
@@ -50,7 +50,7 @@ Requires-Dist: numba; extra == "recommended"
 Provides-Extra: test
 Requires-Dist: grid2op>=1.6.4; extra == "test"
 Requires-Dist: numba; extra == "test"
-Requires-Dist: pandapower>=2.8.0; extra == "test"
+Requires-Dist: pandapower>=2.14.0; extra == "test"
 Requires-Dist: packaging; extra == "test"
 Requires-Dist: pypowsybl; extra == "test"
 
@@ -130,12 +130,13 @@ Since version 0.5.3, lightsim2grid is can be installed like most python packages
 `python -m pip install lightsim2grid`
 
 It includes faster grid2op backend and the `SuiteSparse` faster `KLU` solver, even on windows. This is definitely the 
-easiest method to install lightsim2grid on your system and have it running without too much issues.
+easiest method to install lightsim2grid on your system and have it running.
 
 Note though that these packages have been compiled on a different platform that the one you are using. You might still
-get some benefit (in terms of performances) to install it from your on your machine.
+get some benefit (in terms of performances) to install it from your on your machine with the proper compilations flags (
+see section [6.1 Customization of the compilation](#Customization-of-the-compilation) for more information)
 
-Pypi packages are available for linux, windows and macos with python versions: 
+Pypi packages are available for linux (`x86_64` cpu architecture), windows (`x86_64` cpu architecture) and macos (`x86_64` cpu architecture) with python versions: 
 
 - 3.7
 - 3.8
@@ -144,8 +145,17 @@ Pypi packages are available for linux, windows and macos with python versions:
 - 3.11 (lightsim2grid >= 0.7.1)
 - 3.12 (lightsim2grid >= 0.7.5)
 
+
+As from version 0.8.2, we also distribute windows `arm64` and macos `arm64` binaries of lightsim2grid that can be installed
+directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
+
+
 **NB** on some version of MacOs (thanks Apple !), especially the one using M1 or M2 chip, lightsim2grid is only available
-on pypi starting from version 0.7.3
+on pypi starting from version 0.7.3 We attempted to deliver arm64 lightsim2grid version but we could not test them. So if you 
+want a reliable working and tested version of lightsim2grid on newest version of macos (with M1 or M2 chips for example) please
+use lightsim2grid >= 0.8.2
+
+**NB** we do not currently build any 32 bits lightsim2grid libraries.
 
 ## Installation (from source, for more advanced user)
 
@@ -278,7 +288,7 @@ For example: `export PATH_NICSLU=/home/user/Documents/cktso`
 
 #### Enable 03 optimization
 By default, at least on ubuntu, only the "-O2" compiler flags is used. To use the O3 optimization flag, you need
-to specify the `__O3_OPTIM` environment variable: `set __O3_OPTIM=1` before the compilation (so before
+to specify the `__O3_OPTIM` environment variable: `set __O3_OPTIM=1` (or `$Env:__O3_OPTIM=1` in powershell) before the compilation (so before
 `python3 setup.py build` or `python -m pip install -e .`)
 
 This compilation argument will increase the compilation time, but will make the package faster.

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/README.md

@@ -74,12 +74,13 @@ Since version 0.5.3, lightsim2grid is can be installed like most python packages
 `python -m pip install lightsim2grid`
 
 It includes faster grid2op backend and the `SuiteSparse` faster `KLU` solver, even on windows. This is definitely the 
-easiest method to install lightsim2grid on your system and have it running without too much issues.
+easiest method to install lightsim2grid on your system and have it running.
 
 Note though that these packages have been compiled on a different platform that the one you are using. You might still
-get some benefit (in terms of performances) to install it from your on your machine.
+get some benefit (in terms of performances) to install it from your on your machine with the proper compilations flags (
+see section [6.1 Customization of the compilation](#Customization-of-the-compilation) for more information)
 
-Pypi packages are available for linux, windows and macos with python versions: 
+Pypi packages are available for linux (`x86_64` cpu architecture), windows (`x86_64` cpu architecture) and macos (`x86_64` cpu architecture) with python versions: 
 
 - 3.7
 - 3.8
@@ -88,8 +89,17 @@ Pypi packages are available for linux, windows and macos with python versions:
 - 3.11 (lightsim2grid >= 0.7.1)
 - 3.12 (lightsim2grid >= 0.7.5)
 
+
+As from version 0.8.2, we also distribute windows `arm64` and macos `arm64` binaries of lightsim2grid that can be installed
+directly with pip too (requires python >= 3.8 for macos and python >= 3.9 for windows). We do not currently produce `arm64` (`aarch64`) linux binaries because it takes too long to build. If you really want them, let us know and we'll see what we can do.
+
+
 **NB** on some version of MacOs (thanks Apple !), especially the one using M1 or M2 chip, lightsim2grid is only available
-on pypi starting from version 0.7.3
+on pypi starting from version 0.7.3 We attempted to deliver arm64 lightsim2grid version but we could not test them. So if you 
+want a reliable working and tested version of lightsim2grid on newest version of macos (with M1 or M2 chips for example) please
+use lightsim2grid >= 0.8.2
+
+**NB** we do not currently build any 32 bits lightsim2grid libraries.
 
 ## Installation (from source, for more advanced user)
 
@@ -222,7 +232,7 @@ For example: `export PATH_NICSLU=/home/user/Documents/cktso`
 
 #### Enable 03 optimization
 By default, at least on ubuntu, only the "-O2" compiler flags is used. To use the O3 optimization flag, you need
-to specify the `__O3_OPTIM` environment variable: `set __O3_OPTIM=1` before the compilation (so before
+to specify the `__O3_OPTIM` environment variable: `set __O3_OPTIM=1` (or `$Env:__O3_OPTIM=1` in powershell) before the compilation (so before
 `python3 setup.py build` or `python -m pip install -e .`)
 
 This compilation argument will increase the compilation time, but will make the package faster.

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/lightsim2grid/__init__.py

@@ -5,7 +5,8 @@
 # you can obtain one at http://mozilla.org/MPL/2.0/.
 # SPDX-License-Identifier: MPL-2.0
 # This file is part of LightSim2grid, LightSim2grid implements a c++ backend targeting the Grid2Op platform.
-__version__ = "0.8.1"
+
+__version__ = "0.8.2"
 
 __all__ = ["newtonpf", "SolverType", "ErrorType", "solver", "compilation_options"]
 
@@ -19,7 +20,7 @@ try:
 except ImportError as exc_:
     # grid2op is not installed, the Backend will not be available
     pass
-    print(f"LightSimBackend import error: {exc_}")
+    # print(f"LightSimBackend import error: {exc_}")
 
 try:
     from lightsim2grid.physical_law_checker import PhysicalLawChecker
@@ -27,7 +28,7 @@ try:
 except ImportError as exc_:
     # grid2op is not installed, the PhysicalLawChecker will not be available
     pass
-    print(f"PhysicalLawChecker import error: {exc_}")
+    # print(f"PhysicalLawChecker import error: {exc_}")
 
 try:
     from lightsim2grid.timeSerie import TimeSerie
@@ -36,7 +37,7 @@ try:
 except ImportError as exc_:
     # grid2op is not installed, the TimeSeries module will not be available
     pass
-    print(f"TimeSerie import error: {exc_}")
+    # print(f"TimeSerie import error: {exc_}")
 
 try:
     from lightsim2grid.contingencyAnalysis import ContingencyAnalysis
@@ -45,7 +46,7 @@ try:
 except ImportError as exc_:
     # grid2op is not installed, the SecurtiyAnalysis module will not be available
     pass
-    print(f"ContingencyAnalysis import error: {exc_}")
+    # print(f"ContingencyAnalysis import error: {exc_}")
     
 try:
     from lightsim2grid.rewards import *
@@ -53,4 +54,4 @@ try:
 except ImportError as exc_:
     # grid2op is not installed, the SecurtiyAnalysis module will not be available
     pass
-    print(f"rewards import error: {exc_}")
+    # print(f"rewards import error: {exc_}")

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/lightsim2grid/gridmodel/from_pypowsybl.py

@@ -10,6 +10,7 @@ import warnings
 import numpy as np
 import pandas as pd
 import pypowsybl as pypo
+from typing import Union
 
 from lightsim2grid_cpp import GridModel
 
@@ -36,7 +37,7 @@ def _aux_get_bus(bus_df, df, conn_key="connected", bus_key="bus_id"):
 
 
 def init(net : pypo.network,
-         gen_slack_id: int = None,
+         gen_slack_id: Union[int, str] = None,
          slack_bus_id: int = None,
          sn_mva = 100.,
          sort_index=True,
@@ -260,7 +261,17 @@ def init(net : pypo.network,
     elif gen_slack_id is not None:
         if slack_bus_id is not None:
             raise RuntimeError(f"You provided both gen_slack_id and slack_bus_id which is not possible.")
-        model.add_gen_slackbus(gen_slack_id, 1.)
+        
+        if isinstance(gen_slack_id, str):
+            gen_slack_id_int = int((df_gen.index == gen_slack_id).nonzero()[0][0])
+        else:
+            try:
+                gen_slack_id_int = int(gen_slack_id)
+            except Exception:
+                raise RuntimeError("'slack_bus_id' should be either an int or a generator names")
+            if gen_slack_id_int != gen_slack_id:
+                raise RuntimeError("'slack_bus_id' should be either an int or a generator names")
+        model.add_gen_slackbus(gen_slack_id_int, 1.)
     elif slack_bus_id is not None:
         gen_bus = np.array([el.bus_id for el in model.get_generators()])
         gen_is_conn_slack = gen_bus == model._orig_to_ls[slack_bus_id]

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/lightsim2grid/lightSimBackend.py

@@ -556,7 +556,7 @@ class LightSimBackend(Backend):
         grid_tmp = pypow_net.load(full_path)
         gen_slack_id = None
         if "gen_slack_id" in loader_kwargs:
-            gen_slack_id = int(loader_kwargs["gen_slack_id"])
+            gen_slack_id = loader_kwargs["gen_slack_id"]
         self._grid, subs_id = init_pypow(grid_tmp, gen_slack_id=gen_slack_id, sort_index=True, return_sub_id=True)
         (buses_sub_id, gen_sub, load_sub, (lor_sub, tor_sub), (lex_sub, tex_sub), batt_sub, sh_sub, hvdc_sub_from_id, hvdc_sub_to_id) = subs_id
         self.__nb_bus_before = len(self._grid.get_bus_vn_kv())

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/lightsim2grid/newtonpf/newtonpf.py

@@ -39,7 +39,7 @@ def _get_valid_solver(options, Ybus):
     else:
         solver = KLUSolverSingleSlack() if KLU_solver_available else SparseLUSolverSingleSlack()
 
-    if ~sparse.isspmatrix_csc(Ybus):
+    if not sparse.isspmatrix_csc(Ybus):
         Ybus = sparse.csc_matrix(Ybus)
 
     if not Ybus.has_canonical_format:

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/setup.py

@@ -14,7 +14,7 @@ import warnings
 from pybind11.setup_helpers import Pybind11Extension, build_ext
 
 
-__version__ = "0.8.1"
+__version__ = "0.8.2"
 KLU_SOLVER_AVAILABLE = False
 
 # Try to link against SuiteSparse (if available)
@@ -357,7 +357,7 @@ pkgs = {
         "test": [
             "grid2op>=1.6.4",
             "numba",
-            "pandapower>=2.8.0",
+            "pandapower>=2.14.0",  # interface changed for pandapower, not backward compatible
             "packaging", 
             "pypowsybl"
         ]

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/ChooseSolver.h

@@ -276,6 +276,20 @@ class ChooseSolver
             return res;
         }
 
+        RealMat get_lodf(const Eigen::SparseMatrix<cplx_type> & dcYbus,
+                         const IntVect & from_bus,
+                         const IntVect & to_bus){
+                if(_solver_type != SolverType::DC && 
+                   _solver_type != SolverType::KLUDC && 
+                   _solver_type != SolverType::NICSLUDC &&
+                   _solver_type != SolverType::CKTSODC){
+                throw std::runtime_error("ChooseSolver::get_lodf: cannot get ptdf for a solver that is not DC.");
+                }
+            auto p_solver = get_prt_solver("get_lodf", true);
+            const auto & res =  p_solver -> get_lodf(dcYbus, from_bus, to_bus);
+            return res;
+        }
+
         void tell_solver_control(const SolverControl & solver_control){
             auto p_solver = get_prt_solver("tell_solver_control", false);
             p_solver -> tell_solver_control(solver_control);
@@ -306,6 +320,12 @@ class ChooseSolver
             return p_solver -> get_timers_jacobian();
         }
 
+        TimerPTDFLODFType get_timers_ptdf_lodf() const
+        {
+            const BaseAlgo * p_solver = get_prt_solver("get_timers_ptdf_lodf", true);
+            return p_solver -> get_timers_ptdf_lodf();
+        }
+
         ErrorType get_error() const{
             auto p_solver = get_prt_solver("get_error", true);
             return p_solver -> get_error();

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/GridModel.cpp

@@ -920,6 +920,17 @@ RealMat GridModel::get_ptdf(){
     return _dc_solver.get_ptdf(Ybus_dc_);
 }
 
+RealMat GridModel::get_lodf(){
+    if(Ybus_dc_.size() == 0){
+        throw std::runtime_error("GridModel::get_lodf: Cannot get the ptdf without having first computed a DC powerflow.");
+    }
+    IntVect from_bus(powerlines_.nb() + trafos_.nb());
+    IntVect to_bus(powerlines_.nb() + trafos_.nb());
+    from_bus << powerlines_.get_bus_from(), trafos_.get_bus_from();
+    to_bus << powerlines_.get_bus_to(), trafos_.get_bus_to();
+    return _dc_solver.get_lodf(Ybus_dc_, from_bus, to_bus);
+}
+
 Eigen::SparseMatrix<real_type> GridModel::get_Bf(){
     if(Ybus_dc_.size() == 0){
         throw std::runtime_error("GridModel::get_Bf: Cannot get the Bf matrix without having first computed a DC powerflow.");
@@ -986,23 +997,23 @@ void GridModel::remove_gen_slackbus(int gen_id){
 }
 
 /** GRID2OP SPECIFIC REPRESENTATION **/
-void GridModel::update_bus_status(int nb_bus_before,
-                                  Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, 2, Eigen::RowMajor> > active_bus)
-{
-    for(int bus_id = 0; bus_id < active_bus.rows(); ++bus_id)
-    {
-        if(active_bus(bus_id, 0)){
-            reactivate_bus(bus_id);
-        }else{
-            deactivate_bus(bus_id);
-        }
-        if(active_bus(bus_id, 1)){
-            reactivate_bus(bus_id + nb_bus_before);
-        }else{
-            deactivate_bus(bus_id + nb_bus_before);
-        }
-    }
-}
+// void GridModel::update_bus_status(int nb_bus_before,
+//                                   Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, 2, Eigen::RowMajor> > active_bus)
+// {
+//     for(int bus_id = 0; bus_id < active_bus.rows(); ++bus_id)
+//     {
+//         if(active_bus(bus_id, 0)){
+//             reactivate_bus(bus_id);
+//         }else{
+//             deactivate_bus(bus_id);
+//         }
+//         if(active_bus(bus_id, 1)){
+//             reactivate_bus(bus_id + nb_bus_before);
+//         }else{
+//             deactivate_bus(bus_id + nb_bus_before);
+//         }
+//     }
+// }
 
 void GridModel::update_gens_p(Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, Eigen::RowMajor> > has_changed,
                               Eigen::Ref<Eigen::Array<float, Eigen::Dynamic, Eigen::RowMajor> > new_values)

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/GridModel.h

@@ -303,6 +303,8 @@ class GridModel : public GenericContainer
                        real_type tol  // not used for DC
                        );
         RealMat get_ptdf();
+        RealMat get_lodf();
+        
         Eigen::SparseMatrix<real_type> get_Bf();
 
         // ac powerflow
@@ -558,10 +560,13 @@ class GridModel : public GenericContainer
         real_type get_computation_time() const{ return _solver.get_computation_time();}
         real_type get_dc_computation_time() const{ return _dc_solver.get_computation_time();}
 
+    // private:
+    //     using GenericContainer::update_bus_status;  // to silence clang warnings (overload-virtual)
+    // public:
+    //     void update_bus_status(int nb_bus_before,
+    //                            Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, 2, Eigen::RowMajor> > active_bus);
         // part dedicated to grid2op backend, optimized for grid2op data representation (for speed)
         // this is not recommended to use it outside of its intended usage within grid2op !
-        void update_bus_status(int nb_bus_before,
-                               Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, 2, Eigen::RowMajor> > active_bus);
         void update_gens_p(Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, Eigen::RowMajor> > has_changed,
                            Eigen::Ref<Eigen::Array<float, Eigen::Dynamic, Eigen::RowMajor> > new_values);
         void update_sgens_p(Eigen::Ref<Eigen::Array<bool, Eigen::Dynamic, Eigen::RowMajor> > has_changed,
@@ -659,10 +664,16 @@ class GridModel : public GenericContainer
         }
 
         //for FDPF
+    private:
+        using GenericContainer::fillBp_Bpp;  // silence clang warning overload-virtual
+    public:
         void fillBp_Bpp(Eigen::SparseMatrix<real_type> & Bp, 
                         Eigen::SparseMatrix<real_type> & Bpp, 
                         FDPFMethod xb_or_bx) const;
 
+    private:
+        using GenericContainer::fillBf_for_PTDF;  // silence clang warning overload-virtual
+    public:
         void fillBf_for_PTDF(Eigen::SparseMatrix<real_type> & Bf, bool transpose=false) const;
 
         Eigen::SparseMatrix<real_type> debug_get_Bp_python(FDPFMethod xb_or_bx){
@@ -714,6 +725,9 @@ class GridModel : public GenericContainer
                             const Eigen::VectorXi & slack_bus_id_me,
                             Eigen::VectorXi & slack_bus_id_solver
                         );
+    private:
+        using GenericContainer::fillYbus;  // to silence the overload-virtual warning in clang
+    protected:
         void fillYbus(Eigen::SparseMatrix<cplx_type> & res, bool ac, const std::vector<int>& id_me_to_solver);
         void fillSbus_me(CplxVect & res, bool ac, const std::vector<int>& id_me_to_solver);
         void fillpv_pq(const std::vector<int>& id_me_to_solver,

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/batch_algorithm/BaseBatchSolverSynch.h

@@ -53,6 +53,7 @@ class BaseBatchSolverSynch
             }
 
         BaseBatchSolverSynch(const BaseBatchSolverSynch&) = delete;
+        virtual ~BaseBatchSolverSynch() = default;  // to avoid warning about overload virtual
     
         // solver "control"
         void change_solver(const SolverType & type){

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/element_container/DCLineContainer.cpp

@@ -66,8 +66,8 @@ void DCLineContainer::init(const Eigen::VectorXi & branch_from_id,
 void DCLineContainer::nb_line_end(std::vector<int> & res) const
 {
     const Eigen::Index nb = from_gen_.nb();
-    const auto & bus_or_id = get_bus_id_or();
-    const auto & bus_ex_id = get_bus_id_ex();
+    const auto & bus_or_id = get_bus_from();
+    const auto & bus_ex_id = get_bus_to();
     for(Eigen::Index i = 0; i < nb; ++i){
         if(!status_[i]) continue;
         auto bus_or = bus_or_id(i);
@@ -81,8 +81,8 @@ void DCLineContainer::nb_line_end(std::vector<int> & res) const
 void DCLineContainer::disconnect_if_not_in_main_component(std::vector<bool> & busbar_in_main_component)
 {
     const Eigen::Index nb = from_gen_.nb();
-    const auto & bus_or_id = get_bus_id_or();
-    const auto & bus_ex_id = get_bus_id_ex(); 
+    const auto & bus_or_id = get_bus_from();
+    const auto & bus_ex_id = get_bus_to(); 
     SolverControl unused_solver_control;
     for(Eigen::Index i = 0; i < nb; ++i){
         if(!status_[i]) continue;

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/element_container/DCLineContainer.h

@@ -289,8 +289,6 @@ class DCLineContainer : public GenericContainer
     }
 
     const std::vector<bool>& get_status() const {return status_;}
-    const Eigen::VectorXi & get_bus_id_or() const {return from_gen_.get_bus_id();}
-    const Eigen::VectorXi & get_bus_id_ex() const {return to_gen_.get_bus_id();}
     
     tuple3d get_or_res() const {return from_gen_.get_res();}
     tuple3d get_ex_res() const {return to_gen_.get_res();}
@@ -299,6 +297,8 @@ class DCLineContainer : public GenericContainer
     
     Eigen::Ref<const RealVect> get_theta_or() const {return from_gen_.get_theta();}
     Eigen::Ref<const RealVect> get_theta_ex() const {return to_gen_.get_theta();}
+    Eigen::Ref<const Eigen::VectorXi> get_bus_from() const {return from_gen_.get_bus_id();}
+    Eigen::Ref<const Eigen::VectorXi> get_bus_to() const {return to_gen_.get_bus_id();}
 
     protected:
         // it is modeled as 2 generators that are "linked" together

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/element_container/GeneratorContainer.h

@@ -328,7 +328,7 @@ class GeneratorContainer: public GenericContainer
     Eigen::Ref<const RealVect> get_theta() const {return res_theta_;}
 
     const std::vector<bool>& get_status() const {return status_;}
-    const Eigen::VectorXi & get_bus_id() const {return bus_id_;}
+    Eigen::Ref<const Eigen::VectorXi> get_bus_id() const {return bus_id_;}
 
     void cout_v(){
         for(const auto & el : vm_pu_){

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/element_container/GenericContainer.cpp

@@ -29,38 +29,25 @@ void GenericContainer::_get_amps(RealVect & a, const RealVect & p, const RealVec
 }
 
 void GenericContainer::_reactivate(int el_id, std::vector<bool> & status){
-    bool val = status.at(el_id);
-    status.at(el_id) = true;  //TODO why it's needed to do that again
+    _check_in_range(static_cast<std::vector<bool>::size_type>(el_id),
+                    status,
+                    "_reactivate");
+    status[el_id] = true;  //TODO why it's needed to do that again
 }
 
 void GenericContainer::_deactivate(int el_id, std::vector<bool> & status){
-    bool val = status.at(el_id);
-    status.at(el_id) = false;  //TODO why it's needed to do that again
+    _check_in_range(static_cast<std::vector<bool>::size_type>(el_id),
+                    status,
+                    "_deactivate");
+    status[el_id] = false;
 }
 
 void GenericContainer::_change_bus(int el_id, int new_bus_me_id, Eigen::VectorXi & el_bus_ids, SolverControl & solver_control, int nb_bus){
     // bus id here "me_id" and NOT "solver_id"
     // throw error: object id does not exist
-    if(el_id >= el_bus_ids.size())
-    {
-        // TODO DEBUG MODE: only check in debug mode
-        std::ostringstream exc_;
-        exc_ << "GenericContainer::_change_bus: Cannot change the bus of element with id ";
-        exc_ << el_id;
-        exc_ << " while the grid counts ";
-        exc_ << el_bus_ids.size();
-        exc_ << " such elements (id too high)";
-        throw std::out_of_range(exc_.str());
-    }
-    if(el_id < 0)
-    {
-        // TODO DEBUG MODE: only check in debug mode
-        std::ostringstream exc_;
-        exc_ << "GenericContainer::_change_bus: Cannot change the bus of element with id ";
-        exc_ << el_id;
-        exc_ << " (id should be >= 0)";
-        throw std::out_of_range(exc_.str());
-    }
+    _check_in_range(static_cast<Eigen::Index>(el_id),
+                    el_bus_ids,
+                    "_change_bus");
 
     // throw error: bus id does not exist
     if(new_bus_me_id >= nb_bus)
@@ -98,8 +85,11 @@ void GenericContainer::_change_bus(int el_id, int new_bus_me_id, Eigen::VectorXi
 
 int GenericContainer::_get_bus(int el_id, const std::vector<bool> & status_, const Eigen::VectorXi & bus_id_) const
 {
+    _check_in_range(static_cast<std::vector<bool>::size_type>(el_id),
+                    status_,
+                    "_get_bus");
     int res;
-    bool val = status_.at(el_id);  // also check if the el_id is out of bound
+    bool val = status_[el_id];  // also check if the el_id is out of bound
     if(!val) res = _deactivated_bus_id;
     else{
         res = bus_id_(el_id);

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/element_container/GenericContainer.h

@@ -116,6 +116,34 @@ class GenericContainer : public BaseConstants
         std::vector<std::string> names_;
 
     protected:
+        template<typename Cont, typename FunName, typename IntType>
+        // todo automatically "unwrap" IntType to be either cont::size_type for stl container and
+        // Eigen::Index for Eigen containers
+        void _check_in_range(IntType el_id, const Cont& cont, FunName fun_name="") const
+        {
+            // TODO debug mode: only in debug mode
+            if(el_id >= cont.size())
+            {
+                // TODO DEBUG MODE: only check in debug mode
+                std::ostringstream exc_;
+                exc_ << "GenericContainer::"<<fun_name<<": Cannot access element with id";
+                exc_ << el_id;
+                exc_ << " while the grid counts ";
+                exc_ << cont.size();
+                exc_ << " such elements (id too high)";
+                throw std::out_of_range(exc_.str());
+            }
+            if(el_id < 0)
+            {
+                // TODO DEBUG MODE: only check in debug mode
+                std::ostringstream exc_;
+                exc_ << "GenericContainer::"<< fun_name <<" Cannot change the bus of element with id ";
+                exc_ << el_id;
+                exc_ << " (id should be >= 0)";
+                throw std::out_of_range(exc_.str());
+            }
+        }
+
         /**
         activation / deactivation of elements
         **/

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/element_container/LoadContainer.h

@@ -181,7 +181,7 @@ class LoadContainer : public GenericContainer
     
     Eigen::Ref<const RealVect> get_theta() const {return res_theta_;}
     const std::vector<bool>& get_status() const {return status_;}
-    const Eigen::VectorXi & get_bus_id() const {return bus_id_;}
+    Eigen::Ref<const Eigen::VectorXi> get_bus_id() const {return bus_id_;}
 
     protected:
         // physical properties

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/element_container/SGenContainer.h

@@ -201,7 +201,7 @@ class SGenContainer: public GenericContainer
     tuple4d get_res_full() const {return tuple4d(res_p_, res_q_, res_v_, res_theta_);}
     Eigen::Ref<const RealVect> get_theta() const {return res_theta_;}
     const std::vector<bool>& get_status() const {return status_;}
-    const Eigen::VectorXi & get_bus_id() const {return bus_id_;}
+    Eigen::Ref<const Eigen::VectorXi> get_bus_id() const {return bus_id_;}
 
     protected:
         // physical properties

{LightSim2Grid-0.8.1 → lightsim2grid-0.8.2}/src/element_container/ShuntContainer.h

@@ -185,6 +185,7 @@ class ShuntContainer : public GenericContainer
     tuple4d get_res_full() const {return tuple4d(res_p_, res_q_, res_v_, res_theta_);}
     
     Eigen::Ref<const RealVect> get_theta() const {return res_theta_;}
+    Eigen::Ref<const Eigen::VectorXi> get_bus_id() const {return bus_id_;}
     const std::vector<bool>& get_status() const {return status_;}
 
     protected: