minior

.gitignore

@@ -49,7 +49,7 @@ venv/
 */.ipynb_checkpoints/
 examples/pynsn
 
-test-*
+test*
 *.json
 *.svg
 *.png

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

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

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:

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