Merge pull request #36 from dioph/gmean

provides own gmean implementation

elegant/core.py

@@ -1,9 +1,13 @@
 import networkx as nx
 import numpy as np
-from scipy.stats.mstats import gmean
 
 from .methods import newton_raphson, short
 
+
+def gmean(arr):
+    return np.prod(arr) ** (1 / len(arr))
+
+
 NAME = "Elegant"
 
 CORR = np.exp(-.25)
@@ -23,8 +27,6 @@
 SYMBOL_TO_PY = {STAR_SYMBOL: STAR, EARTH_SYMBOL: EARTH, DELTA_SYMBOL: DELTA}
 
 
-# ToDo defasagem dos trafos
-
 class Bus(object):
     def __init__(self, bus_id, v=1.0, delta=0.0, pg=0.0, qg=0.0, pl=0.0, ql=0.0,
                  xd=np.inf, iTPG=None, iSLG=None, iDLGb=None, iDLGc=None, iLL=None,

requirements.txt

@@ -3,4 +3,3 @@ networkx
 numpy
 pylatex
 PyQt5
-scipy

setup.py

@@ -22,7 +22,7 @@
     url="https://github.com/dioph/elegant",
     packages=["elegant"],
     entry_points={"console_scripts": ['elegant=elegant.interface:main']},
-    install_requires=["networkx", "numpy", "scipy"],
+    install_requires=["networkx", "numpy"],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",