From 84114f9d97dcc5f3ce5f3f8173f09b358d3a63b1 Mon Sep 17 00:00:00 2001
From: Oliver Lindemann <lindemann09@googlemail.com>
Date: Thu, 21 Nov 2024 20:35:13 +0100
Subject: [PATCH] minior

---
 .gitignore                    |  2 +-
 pynsn/__init__.py             |  2 +-
 pynsn/collections/__init__.py |  2 +-
 pynsn/rnd/_distributions.py   |  2 +-
 pynsn/typing.py               |  4 +++-
 testing.py                    | 31 -------------------------------
 6 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 testing.py

diff --git a/.gitignore b/.gitignore
index b67c6cb..9b1b9c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,7 +49,7 @@ venv/
 */.ipynb_checkpoints/
 examples/pynsn
 
-test-*
+test*
 *.json
 *.svg
 *.png
diff --git a/pynsn/__init__.py b/pynsn/__init__.py
index 74e327b..7894971 100644
--- a/pynsn/__init__.py
+++ b/pynsn/__init__.py
@@ -18,10 +18,10 @@
 
 from . import defaults
 from . import exceptions
-from . import typing
 from ._shapes import (Point2D, Dot, Rectangle, Picture, Ellipse, PolygonShape,
                       Colour)
 from ._stimulus import (NSNStimulus, NSNStimulusPair, VP)
 from . import rnd
 from .rnd._factory import StimulusFactory
 from . import fit
+from . import typing  # must be important as last model
diff --git a/pynsn/collections/__init__.py b/pynsn/collections/__init__.py
index 0a34c2c..90b2e37 100644
--- a/pynsn/collections/__init__.py
+++ b/pynsn/collections/__init__.py
@@ -1,3 +1,3 @@
-from ._coll_stim import CollectionStimuli, AbstractCollection
+from ._coll_stim import CollectionStimuli
 from ._coll_stim_pairs import CollectionStimulusPairs
 from . import fit
diff --git a/pynsn/rnd/_distributions.py b/pynsn/rnd/_distributions.py
index d8405e2..4a9592f 100644
--- a/pynsn/rnd/_distributions.py
+++ b/pynsn/rnd/_distributions.py
@@ -38,7 +38,7 @@ def sample(self, n: int) -> NDArray:
 
         """
 
-    def pyplot_samples(self, n=100000):
+    def pyplot_samples(self, n=100000):  # FIXME to plot
         """Creating a visualization of the distribution with ``matplotlib.pyplot``
 
         Args:
diff --git a/pynsn/typing.py b/pynsn/typing.py
index 9bf6918..f6fe3dc 100644
--- a/pynsn/typing.py
+++ b/pynsn/typing.py
@@ -2,7 +2,7 @@
 
 # pylint: disable=W0611
 
-from ._shapes.abc_shapes import (AbstractCircularShape, AbstractPoint, Numeric,
+from ._shapes.abc_shapes import (AbstractCircularShape, Numeric,
                                  AbstractShape, Coord2DLike, AttributeType)
 from ._shapes.colour import ColourLike, RGBType
 from ._stimulus.convex_hull import ConvexHull
@@ -14,3 +14,5 @@
                                  AbstractContinuousDistr, CategoricalLike, ConstantLike)
 from .rnd._distributions_2d import Abstract2dDistr
 from .rnd._random_shape import AbstractRndShape, DistributionLike
+
+from .collections._abc_coll import AbstractCollection, ListNSNStimuli, ListNSNStimPairs
diff --git a/testing.py b/testing.py
deleted file mode 100644
index a7a1bd2..0000000
--- a/testing.py
+++ /dev/null
@@ -1,31 +0,0 @@
-
-import timeit
-import numpy as np
-import matplotlib.pyplot as plt
-from pynsn import rnd
-import pynsn
-a = range(10)
-index = (8, 4, 2)
-new = []
-for c, s in enumerate(a):
-    if c not in index:
-        new.append(s)
-print(a)
-print(new)
-exit()
-
-
-start = timeit.timeit()
-
-d = rnd.Uniform2D(x_minmax=(-100, 100),
-                     y_minmax=(20, 50))
-
-s = d.sample(1)
-print(s)
-
-# d.pyplot_samples()
-
-# plt.show()
-
-# d = random.Uniform2D(x_minmax=(50, 55), y_minmax=(-100, 100),
-#                     radial_radius=6)