Merge branch 'dev' of github.com:openego/eDisGo into dev

openego · Sep 7, 2017 · f9a76c1 · f9a76c1
2 parents fc3f186 + 7ccb55f
commit f9a76c1
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/edisgo/grid/network.py b/edisgo/grid/network.py
@@ -85,47 +85,45 @@ def _load_equipment_data(self):
                                         comment='#',
                                         index_col='name',
                                         delimiter=',',
-                                        decimal='.',
-                                        converters={'s_nom': lambda x: float(x)})
+                                        decimal='.'
+                                        )
+
 
         equipment_mv_parameters_lines = self._config['equipment']['equipment_mv_parameters_lines']
         data['MV_lines'] = pd.read_csv(path.join(package_path, equipment_dir,
                                                  equipment_mv_parameters_lines),
                                        comment='#',
                                        index_col='name',
                                        delimiter=',',
-                                       decimal='.',
-                                       converters={'I_max_th': lambda x: float(x),
-                                                   'U_n': lambda x: float(x)})
+                                       decimal='.'
+                                       )
 
         equipment_mv_parameters_cables = self._config['equipment']['equipment_mv_parameters_cables']
         data['MV_cables'] = pd.read_csv(path.join(package_path, equipment_dir,
                                                   equipment_mv_parameters_cables),
                                         comment='#',
                                         index_col='name',
                                         delimiter=',',
-                                        decimal='.',
-                                        converters={'I_max_th': lambda x: float(x),
-                                                    'U_n': lambda x: float(x)})
+                                        decimal='.'
+                                        )
 
         equipment_lv_parameters_cables = self._config['equipment']['equipment_lv_parameters_cables']
         data['LV_cables'] = pd.read_csv(path.join(package_path, equipment_dir,
                                                   equipment_lv_parameters_cables),
                                         comment='#',
                                         index_col='name',
                                         delimiter=',',
-                                        decimal='.',
-                                        converters={'I_max_th': lambda x: float(x),
-                                                    'U_n': lambda x: float(x)})
+                                        decimal='.'
+                                        )
 
         equipment_lv_parameters_trafos = self._config['equipment']['equipment_lv_parameters_trafos']
         data['LV_trafos'] = pd.read_csv(path.join(package_path, equipment_dir,
                                                   equipment_lv_parameters_trafos),
                                         comment='#',
                                         index_col='name',
                                         delimiter=',',
-                                        decimal='.',
-                                        converters={'s_nom': lambda x: float(x)})
+                                        decimal='.'
+                                        )
 
         return data