Commit f7d5535d authored by lars.quentin's avatar lars.quentin 💬
Browse files

Merge branch '29-clear-up-master-branch' into 'master'

Resolve "Clear up master branch"

Closes #29

See merge request !6
parents 067702c6 081af197
......@@ -4,8 +4,7 @@ import matplotlib.pyplot as plt
import threading as th
import shapely.geometry as sg
from abc import ABC, abstractmethod
from scipy.special import comb
from typing import Tuple, Callable, Union, Any
from typing import Tuple, Callable, Union
from curvepy.utilities import csv_read
......
......@@ -2,7 +2,7 @@ import numpy as np
import scipy.special as scs
import sympy as sy
import sys as s
from src.utilities import csv_read
from curvepy.utilities import csv_read
from typing import Tuple, Callable, Union
from functools import reduce
......
"""
To be removed once we reach a stable state
"""
\ No newline at end of file
import pprint
import random
import numpy as np
from typing import List, Set, Dict, Tuple, Iterable
from typing import Set, Dict, Tuple, Iterable
from scipy.spatial import Delaunay
import matplotlib.pyplot as plt
......
import numpy as np
from typing import List, Tuple
import itertools
import matplotlib.pyplot as plt
import random as rd
from scipy.spatial import Delaunay
......
import numpy as np
from math import sqrt
from typing import Tuple, List, Dict, Optional
PointIndex = int
......
from plistlib import Data
import numpy as np
from mpl_toolkits.mplot3d import Axes3D
from typing import Tuple, Callable
from typing import Callable
import functools
import matplotlib.pyplot as plt
import sys
......
......@@ -6,7 +6,7 @@ from PyQt5.QtWidgets import QMainWindow, QApplication, QPushButton, QWidget, QTa
QGridLayout, QSlider, QGroupBox, QLabel, QFileDialog, QFrame, QSizePolicy
from PyQt5.QtCore import Qt, pyqtSlot
from PyQt5 import QtGui
import utilities as u
import curvepy.utilities as u
class MyMainApp(QMainWindow):
......
......@@ -5,7 +5,7 @@ from typing import List, Tuple, Any
from scipy.spatial import Delaunay
import matplotlib.pyplot as plt
from curvepy.reference_implementation import Delaunay2D
from curvepy.dev.reference_implementation import Delaunay2D
Point2D = Tuple[float, float]
Edge2D = Tuple[Point2D, Point2D]
......
numpy==1.19.1
numpy~=1.19.1
matplotlib~=3.3.3
Shapely~=1.7.1
scipy~=1.5.4
sympy~=1.6.2
PyQt5~=5.15.2
\ No newline at end of file
PyQt5~=5.15.2
hypothesis~=6.14.0
pytest~=6.2.4
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment