restructure

updated test

restructure

check nonetype as xy is array

fixed plotting bool

changed package name to ed_win to allow pypi upload and added docs

rename to ed_win

.gitlab-ci.yml

@@ -6,7 +6,7 @@ check_code_style:
     test
   script:
   - pip install -e .
-  - pycodestyle --ignore=E501,W504,E741 edwin
+  - pycodestyle --ignore=E501,W504,E741 ed_win
   tags:  
   - python
 
@@ -29,10 +29,29 @@ test_EDWIN_windows:
   - "if (test-path $PROFILE.CurrentUserAllHosts) { & $PROFILE.CurrentUserAllHosts}"
   - conda activate py36_openmdao26
   - pip install -e .[test]
-  - pytest --cov-report term-missing:skip-covered --cov=py_wake --cov-config .coveragerc
+  - pytest --cov-report term-missing:skip-covered --cov=ed_win --cov-config .coveragerc
   tags:  
   - ANMH_old
 
+
+# ===== BUILD DOCS AND PUSH TO PUBLIC WEBSITE =====
+pages:  
+  stage:  
+    deploy
+  script:  
+  - pip install -e .
+  - cd docs; make html
+  - cd ../; mv docs/build/html public/
+  artifacts:  
+    paths:
+    - public
+  only:  
+  - master
+  - /^test_doc.*/ 
+  tags:  
+  - python
+
+
 pypi:
   stage:  
     deploy

.pep8

+[pycodestyle]
+ignore = E501,W504,E741
\ No newline at end of file

docs/Makefile

+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = python -msphinx
+SPHINXPROJ    = EDWIN
+SOURCEDIR     = .
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file

docs/api/Classes.rst

+
+Edwin classes
+=================
+
+
+WindFarmNetwork
+-----------------
+
+.. autoclass:: edwin.wind_farm_network.WindFarmNetwork
+    :members:
+       
+    .. autosummary::
+        setup
+        design
+        plot       
+
+    
+    
+Driver
+-----------------
+
+.. autoclass:: edwin.wind_farm_network.Driver
+
+       
+    .. automethod:: __init__
+    
+
+
+HeuristicDriver
+------------------
+
+.. autoclass:: edwin.wind_farm_network.HeuristicDriver
+
+    .. automethod:: __init__
+    
+    
+

docs/conf.py

+# -*- coding: utf-8 -*-
+#
+# Configuration file for the Sphinx documentation builder.
+#
+# This file does only contain a selection of the most common options. For a
+# full list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import os
+import sys
+sys.path.insert(0, os.path.abspath('..'))
+sys.path.append(r"C:\Users\mikf\Anaconda3\envs\topfarm\Library\bin")
+
+from py_wake import __version__
+from py_wake import __release__
+
+# -- Project information -----------------------------------------------------
+
+project = 'EDWIN'
+copyright = '2021, DTU Wind Energy'
+author = 'DTU Wind Energy'
+
+# The short X.Y version
+version = __version__
+# The full version, including alpha/beta/rc tags
+release = __release__
+
+
+# -- General configuration ---------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.mathjax',
+    'sphinx.ext.napoleon',
+    'sphinx.ext.viewcode',
+    'sphinx.ext.inheritance_diagram',
+    'nbsphinx',
+    'sphinx.ext.doctest',
+    #'sphinx.ext.imgconverter',
+]
+
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3/', None),
+    'numpy': ('https://docs.scipy.org/doc/numpy/', None),
+    'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
+}
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+source_suffix = ['.rst', '.md']
+
+# The master toctree document.
+master_doc = 'index'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = [
+    # Slow notebook:
+    #'notebooks/neural_network_with_tfds_data.ipynb',
+    # ipynb checkpoints
+    'notebooks/.ipynb_checkpoints/*.ipynb',
+    'build/*'
+]
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = None
+
+
+autosummary_generate = True
+napolean_use_rtype = False
+
+# -- Options for nbsphinx -----------------------------------------------------
+
+# Execute notebooks before conversion: 'always', 'never', 'auto' (default)
+# We execute all notebooks, exclude the slow ones using 'exclude_patterns'
+nbsphinx_execute = 'always'
+
+# Use this kernel instead of the one stored in the notebook metadata:
+#nbsphinx_kernel_name = 'python3'
+
+# List of arguments to be passed to the kernel that executes the notebooks:
+# nbsphinx_execute_arguments = []
+
+# If True, the build process is continued even if an exception occurs:
+#nbsphinx_allow_errors = True
+
+
+# Controls when a cell will time out (defaults to 30; use -1 for no timeout):
+nbsphinx_timeout = 180
+
+# Default Pygments lexer for syntax highlighting in code cells:
+#nbsphinx_codecell_lexer = 'ipython3'
+
+# Width of input/output prompts used in CSS:
+#nbsphinx_prompt_width = '8ex'
+
+# If window is narrower than this, input/output prompts are on separate lines:
+#nbsphinx_responsive_width = '700px'
+
+# This is processed by Jinja2 and inserted before each notebook
+nbsphinx_prolog = r"""
+{% set docname = 'docs/' + env.doc2path(env.docname, base=None) %}
+
+
+.. only:: html
+
+    .. role:: raw-html(raw)
+        :format: html
+
+    .. nbinfo::
+
+
+        :raw-html:`<a href="https://colab.research.google.com/github/DTUWindEnergy/EDWIN/blob/master/{{ docname }}"><img alt="Open and run in Colab (interactive)" src="https://colab.research.google.com/assets/colab-badge.svg" style="vertical-align:text-bottom"></a>
+        <a href="https://gitlab.windenergy.dtu.dk/TOPFARM/EDWIN/-/tree/master/{{ docname }}"><img alt="Edit on Gitlab" src="https://img.shields.io/badge/Edit%20on-Gitlab-blue?style=flat&logo=gitlab" style="vertical-align:text-bottom"></a>`
+
+"""
+
+# This is processed by Jinja2 and inserted after each notebook
+# nbsphinx_epilog = r"""
+# """
+
+# Input prompt for code cells. "%s" is replaced by the execution count.
+#nbsphinx_input_prompt = 'In [%s]:'
+
+# Output prompt for code cells. "%s" is replaced by the execution count.
+#nbsphinx_output_prompt = 'Out[%s]:'
+
+# Specify conversion functions for custom notebook formats:
+#import jupytext
+# nbsphinx_custom_formats = {
+#    '.Rmd': lambda s: jupytext.reads(s, '.Rmd'),
+#}
+
+# Link or path to require.js, set to empty string to disable
+#nbsphinx_requirejs_path = ''
+
+# Options for loading require.js
+#nbsphinx_requirejs_options = {'async': 'async'}
+
+mathjax_config = {
+    'TeX': {'equationNumbers': {'autoNumber': 'AMS', 'useLabelIds': True}},
+}
+
+# Additional files needed for generating LaTeX/PDF output:
+# latex_additional_files = ['references.bib']
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'sphinx_rtd_theme'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+html_theme_options = {
+    # TOC options
+    #'navigation_depth': 2,  # only show 2 levels on left sidebar
+    'collapse_navigation': False,  # don't allow sidebar to collapse
+}
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Custom sidebar templates, must be a dictionary that maps document names
+# to template names.
+#
+# The default sidebars (for documents that don't match any pattern) are
+# defined by theme itself.  Builtin themes are using these templates by
+# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
+# 'searchbox.html']``.
+#
+# html_sidebars = {}
+
+
+# -- Options for HTMLHelp output ---------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'EDWINdoc'
+
+
+# -- Options for LaTeX output ------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'EDWIN.tex', 'EDWIN Documentation',
+     'DTU Wind Energy', 'manual'),
+]
+
+
+# -- Options for manual page output ------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'ed_win', 'EDWIN Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output ----------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'EDWIN', 'EDWIN Documentation',
+     author, 'EDWIN', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+# -- Options for Epub output -------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = project
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#
+# epub_identifier = ''
+
+# A unique identification for the text.
+#
+# epub_uid = ''
+
+# A list of files that should not be packed into the epub file.
+epub_exclude_files = ['search.html']
+
+
+# -- Extension configuration -------------------------------------------------

docs/index.rst

+.. EDWIN documentation master file
+
+
+Welcome to Edwin
+===========================================
+
+*- an open source simulation tool capable of designing and optimizing electrical networks in wind farms.*
+
+
+**Quick Start**::
+
+    pip install ed_win
+
+Source code repository (and issue tracker):
+    https://gitlab.windenergy.dtu.dk/TOPFARM/Edwin
+    
+License:
+    MIT_
+
+.. _MIT: https://gitlab.windenergy.dtu.dk/TOPFARM/Edwin/blob/master/LICENSE
+
+
+Contents:
+    .. toctree::
+        :maxdepth: 2
+    
+        installation
+
+        
+    .. toctree::
+        :caption: API  
+            
+        api/Classes
+        

docs/install_python.rst

+
+
+Install Python
+==============
+
+    For all platforms we recommend that you download and install the Anaconda - 
+    a professional grade, full blown scientific Python distribution.
+
+    Installing Anaconda, activate root environment:
+    
+        * Download and install Anaconda (Python 3.x version, 64 bit installer is recommended) from https://www.continuum.io/downloads
+        
+        * Update the root Anaconda environment (type in a terminal): 
+            
+            ``>> conda update --all``
+        
+        * Activate the Anaconda root environment in a terminal as follows: 
+            
+            ``>> activate``
+            
+Create envirronment
+===================
+
+    If you have other Python programs besides EDWIN, it is a good idea to install
+    each program in its own environment to ensure that the dependencies for the
+    different packages do not conflict with one another. The commands to create and
+    then activate an environment in an Anaconda prompt are::
+    
+       conda create --name edwin python=3.9
+       activate edwin
\ No newline at end of file

docs/installation.rst

+
+
+
+Installation
+===========================
+
+.. toctree::
+    :maxdepth: 2
+
+    install_python
+    
+
+    
+
+Install EDWIN (Simple user)
+----------------------------
+
+* Install from PyPi.org (official releases)::
+  
+    pip install ed_win
+
+* Install from gitlab  (includes any recent updates)::
+  
+    pip install git+https://gitlab.windenergy.dtu.dk/TOPFARM/EDWIN.git
+        
+
+
+Install EDWIN (Developer)
+--------------------------
+
+We highly recommend developers install EDWIN into its own environment. (See
+instructions above.) The commands to clone and install EDWIN with developer
+options including dependencies required to run the tests into the current active 
+environment in an Anaconda Prommpt are as follows::
+
+   git clone https://gitlab.windenergy.dtu.dk/TOPFARM/EDWIN.git
+   cd EDWIN
+   pip install -e .[test]
+   
+
+

docs/make.bat

+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+
+set SOURCEDIR=.
+set BUILDDIR=build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% -D graphviz_dot="C:\Anaconda3\envs\py36\Library\bin\graphviz\dot.exe"
+goto end
+
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+
+:end
+popd

edwin/__init__.py → ed_win/__init__.py

-# 'filled_by_setup.py'
-__version__ = '0.0.0'
-__release__ = '0.0.0'
+# 'filled_by_setup.py'
+__version__ = '0.0.0'
+__release__ = '0.0.0'

edwin/c_mst_cables.py → ed_win/c_mst_cables.py

@@ -9,7 +9,7 @@ import numpy as np
 import networkx as nx
 import matplotlib.pyplot as plt
 import time
-from edwin.c_mst import capacitated_spanning_tree
+from ed_win.c_mst import capacitated_spanning_tree
 
 
 def cmst_cables(X=[], Y=[], T=[], Cables=[], plot=False):

edwin/collection_system.py → ed_win/collection_system.py

-# -*- coding: utf-8 -*-
-"""
-Created on Mon Jun 22 10:59:47 2020
-
-@author: juru
-"""
-import numpy as np
-from edwin.c_mst import capacitated_spanning_tree
-from edwin.c_mst_cables import cmst_cables
-
-
-def collection_system(X=[], Y=[], option=3, Inters_const=True, max_it=20000, Cables=[], plot=False):
-    UL = max(Cables[:, 1])
-    T, feasible = capacitated_spanning_tree(X, Y, option, UL, Inters_const)
-    T_cables_cost = ((T[:, -1].sum()) / 1000) * Cables[-1, 2]
-    T_cables = np.concatenate((T, np.full((T.shape[0], 2), Cables.shape[1] - 1)), axis=1)
-    if feasible:
-        T_cables = cmst_cables(X, Y, T, Cables, plot)
-        T_cables_cost = T_cables[:, -1].sum()
-    return T_cables, T_cables_cost
-
-
-if __name__ == "__main__":
-    # X=[387100,383400,383400,383900,383200,383200,383200,383200,383200,383200,383200,383200,383300,384200,384200,384100,384000,383800,383700,383600,383500,383400,383600,384600,385400,386000,386100,386200,386300,386500,386600,386700,386800,386900,387000,387100,387200,383900,387400,387500,387600,387800,387900,388000,387600,386800,385900,385000,384100,384500,384800,385000,385100,385200,385400,385500,385700,385800,385900,385900,385500,385500,386000,386200,386200,384500,386200,386700,386700,386700,384300,384400,384500,384600,384300,384700,384700,384700,385500,384300,384300]
-    # Y=[6109500,6103800,6104700,6105500,6106700,6107800,6108600,6109500,6110500,6111500,6112400,6113400,6114000,6114200,6115100,6115900,6116700,6118400,6119200,6120000,6120800,6121800,6122400,6122000,6121700,6121000,6120000,6119100,6118100,6117200,6116200,6115300,6114300,6113400,6112400,6111500,6110700,6117600,6108900,6108100,6107400,6106300,6105200,6104400,6103600,6103600,6103500,6103400,6103400,6104400,6120400,6119500,6118400,6117400,6116500,6115500,6114600,6113500,6112500,6111500,6105400,6104200,6110400,6109400,6108400,6121300,6107500,6106400,6105300,6104400,6113300,6112500,6111600,6110800,6110100,6109200,6108400,6107600,6106500,6106600,6105000]
-    # X=np.array(X)
-    # Y=np.array(Y)
-    X = np.array([0., 2000., 4000., 6000.,
-                  8000., 498.65600569, 2498.65600569, 4498.65600569,
-                  6498.65600569, 8498.65600569, 997.31201137, 2997.31201137,
-                  4997.31201137, 11336.25662483, 8997.31201137, 1495.96801706,
-                  3495.96801706, 5495.96801706, 10011.39514341, 11426.89538545,
-                  1994.62402275, 3994.62402275, 5994.62402275, 7994.62402275,
-                  10588.90471566])
-    Y = np.array([0., 0., 0., 0.,
-                  0., 2000., 2000., 2000.,
-                  2000., 2000., 4000., 4000.,
-                  4000., 6877.42528387, 4000., 6000.,
-                  6000., 6000., 3179.76530545, 5953.63051694,
-                  8000., 8000., 8000., 8000.,
-                  4734.32972738])
-
-    option = 3
-    # UL=5
-    Inters_const = True
-    Cables = np.array([[500, 3, 100000], [800, 5, 150000], [1000, 10, 250000]])
-
-    T, amount = collection_system(X, Y, option, Inters_const, Cables=Cables, plot=True)
+# -*- coding: utf-8 -*-
+"""
+Created on Mon Jun 22 10:59:47 2020
+
+@author: juru
+"""
+import numpy as np
+from ed_win.c_mst import capacitated_spanning_tree
+from ed_win.c_mst_cables import cmst_cables
+
+
+def collection_system(X=[], Y=[], option=3, Inters_const=True, max_it=20000, Cables=[], plot=False):
+    UL = max(Cables[:, 1])
+    T, feasible = capacitated_spanning_tree(X, Y, option, UL, Inters_const)
+    T_cables_cost = ((T[:, -1].sum()) / 1000) * Cables[-1, 2]
+    T_cables = np.concatenate((T, np.full((T.shape[0], 2), Cables.shape[1] - 1)), axis=1)
+    if feasible:
+        T_cables = cmst_cables(X, Y, T, Cables, plot)
+        T_cables_cost = T_cables[:, -1].sum()
+    return T_cables, T_cables_cost
+
+
+if __name__ == "__main__":
+    # X=[387100,383400,383400,383900,383200,383200,383200,383200,383200,383200,383200,383200,383300,384200,384200,384100,384000,383800,383700,383600,383500,383400,383600,384600,385400,386000,386100,386200,386300,386500,386600,386700,386800,386900,387000,387100,387200,383900,387400,387500,387600,387800,387900,388000,387600,386800,385900,385000,384100,384500,384800,385000,385100,385200,385400,385500,385700,385800,385900,385900,385500,385500,386000,386200,386200,384500,386200,386700,386700,386700,384300,384400,384500,384600,384300,384700,384700,384700,385500,384300,384300]
+    # Y=[6109500,6103800,6104700,6105500,6106700,6107800,6108600,6109500,6110500,6111500,6112400,6113400,6114000,6114200,6115100,6115900,6116700,6118400,6119200,6120000,6120800,6121800,6122400,6122000,6121700,6121000,6120000,6119100,6118100,6117200,6116200,6115300,6114300,6113400,6112400,6111500,6110700,6117600,6108900,6108100,6107400,6106300,6105200,6104400,6103600,6103600,6103500,6103400,6103400,6104400,6120400,6119500,6118400,6117400,6116500,6115500,6114600,6113500,6112500,6111500,6105400,6104200,6110400,6109400,6108400,6121300,6107500,6106400,6105300,6104400,6113300,6112500,6111600,6110800,6110100,6109200,6108400,6107600,6106500,6106600,6105000]
+    # X=np.array(X)
+    # Y=np.array(Y)
+    X = np.array([0., 2000., 4000., 6000.,
+                  8000., 498.65600569, 2498.65600569, 4498.65600569,
+                  6498.65600569, 8498.65600569, 997.31201137, 2997.31201137,
+                  4997.31201137, 11336.25662483, 8997.31201137, 1495.96801706,
+                  3495.96801706, 5495.96801706, 10011.39514341, 11426.89538545,
+                  1994.62402275, 3994.62402275, 5994.62402275, 7994.62402275,
+                  10588.90471566])
+    Y = np.array([0., 0., 0., 0.,
+                  0., 2000., 2000., 2000.,
+                  2000., 2000., 4000., 4000.,
+                  4000., 6877.42528387, 4000., 6000.,
+                  6000., 6000., 3179.76530545, 5953.63051694,
+                  8000., 8000., 8000., 8000.,
+                  4734.32972738])
+
+    option = 3
+    # UL=5
+    Inters_const = True
+    Cables = np.array([[500, 3, 100000], [800, 5, 150000], [1000, 10, 250000]])
+
+    T, amount = collection_system(X, Y, option, Inters_const, Cables=Cables, plot=True)

edwin/intersection_checker.py → ed_win/intersection_checker.py

-# -*- coding: utf-8 -*-
-"""
-Created on Fri May 29 10:08:54 2020
-
-@author: juru
-"""
-
-import numpy as np
-from edwin.two_lines_intersecting import two_lines_intersecting
-
-
-def intersection_checker(pos_potential_edge, edges_tot, mst_edges, X, Y, Inters_const):
-    current_edges = np.where(mst_edges)[0]
-    current_edges_size = current_edges.size
-    intersection = False
-    if Inters_const:
-        if current_edges_size == 0:
-            pass
-        else:
-            for i in range(current_edges_size):
-                line1 = np.array([[X[edges_tot[pos_potential_edge, 0].astype(int) - 1], Y[edges_tot[pos_potential_edge, 0].astype(int) - 1]],
-                                  [X[edges_tot[pos_potential_edge, 1].astype(int) - 1], Y[edges_tot[pos_potential_edge, 1].astype(int) - 1]]])
-                line2 = np.array([[X[edges_tot[current_edges[i], 0].astype(int) - 1], Y[edges_tot[current_edges[i], 0].astype(int) - 1]],
-                                  [X[edges_tot[current_edges[i], 1].astype(int) - 1], Y[edges_tot[current_edges[i], 1].astype(int) - 1]]])
-                if two_lines_intersecting(line1, line2):
-                    intersection = True
-                    break
-    return intersection
-
-# if __name__ == '__main__':
-    # cross=intersection_checker(pos_potential_edge,edges_tot,mst_edges,X,Y)
+# -*- coding: utf-8 -*-
+"""
+Created on Fri May 29 10:08:54 2020
+
+@author: juru
+"""
+
+import numpy as np
+from ed_win.two_lines_intersecting import two_lines_intersecting
+
+
+def intersection_checker(pos_potential_edge, edges_tot, mst_edges, X, Y, Inters_const):
+    current_edges = np.where(mst_edges)[0]
+    current_edges_size = current_edges.size
+    intersection = False
+    if Inters_const:
+        if current_edges_size == 0:
+            pass
+        else:
+            for i in range(current_edges_size):
+                line1 = np.array([[X[edges_tot[pos_potential_edge, 0].astype(int) - 1], Y[edges_tot[pos_potential_edge, 0].astype(int) - 1]],
+                                  [X[edges_tot[pos_potential_edge, 1].astype(int) - 1], Y[edges_tot[pos_potential_edge, 1].astype(int) - 1]]])
+                line2 = np.array([[X[edges_tot[current_edges[i], 0].astype(int) - 1], Y[edges_tot[current_edges[i], 0].astype(int) - 1]],
+                                  [X[edges_tot[current_edges[i], 1].astype(int) - 1], Y[edges_tot[current_edges[i], 1].astype(int) - 1]]])
+                if two_lines_intersecting(line1, line2):
+                    intersection = True
+                    break
+    return intersection
+
+# if __name__ == '__main__':
+    # cross=intersection_checker(pos_potential_edge,edges_tot,mst_edges,X,Y)

edwin/tests/test_wind_farm_network.py → ed_win/tests/test_wind_farm_network.py

 import numpy as np
-from edwin.wind_farm_network import WindFarmNetwork, HeuristicDriver
+from ed_win.wind_farm_network import WindFarmNetwork, HeuristicDriver
 import numpy.testing as npt
 
 initial_layout = dict(x=np.array([0., 2000., 4000., 6000.,