machinevision-toolbox-python 0.9.4__py3-none-any.whl → 0.9.7__py3-none-any.whl

{machinevision_toolbox_python-0.9.4.dist-info → machinevision_toolbox_python-0.9.7.dist-info}/METADATA

@@ -1,29 +1,31 @@
 Metadata-Version: 2.1
 Name: machinevision-toolbox-python
-Version: 0.9.4
-Summary: A machine vision for education and research
-Home-page: https://github.com/petercorke/machinevision-toolbox-python
-Author: Peter Corke and Dorian Tsai
-License: MIT
+Version: 0.9.7
+Summary: Python tools for machine vision - education and research
+Author: Dorian Tsai
+Author-email: Peter Corke <rvc@petercorke.com>
+Project-URL: Homepage, https://github.com/petercorke/machinevision-toolbox-python
+Project-URL: Bug Tracker, https://github.com/pypa/sampleproject/issues
 Project-URL: Documentation, https://petercorke.github.io/machinevision-toolbox-python
 Project-URL: Source, https://github.com/petercorke/machinevision-toolbox-python
-Project-URL: Tracker, https://github.com/petercorke/machinevision-toolbox-python/issues
-Project-URL: Coverage, https://codecov.io/gh/petercorke/machinevision-toolbox-python
-Keywords: python machine-vision computer-vision multiview-geometry features color blobs
+Keywords: machine vision,computer vision,multiview geometry,stereo vision,bundle adjustment,visual servoing,image features,color,blobs,morphology,image segmentation,opencv,open3d
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy
+Requires-Dist: numpy >=1.17.4
 Requires-Dist: scipy
 Requires-Dist: matplotlib
 Requires-Dist: opencv-python
+Requires-Dist: open3d
 Requires-Dist: opencv-contrib-python
 Requires-Dist: spatialmath-python
 Requires-Dist: pgraph-python
@@ -31,13 +33,16 @@ Requires-Dist: ansitable
 Requires-Dist: mvtb-data
 Provides-Extra: dev
 Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: pytest-cov ; extra == 'dev'
+Requires-Dist: coverage ; extra == 'dev'
 Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: pyyaml ; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: sphinx ; extra == 'docs'
+Requires-Dist: recommonmark ; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
 Requires-Dist: sphinx-autorun ; extra == 'docs'
+Requires-Dist: sphinxcontrib-jsmath ; extra == 'docs'
+Requires-Dist: sphinx-markdown-tables ; extra == 'docs'
+Requires-Dist: sphinx-favicon ; extra == 'docs'
 
 # Machine Vision Toolbox for Python
 
@@ -51,9 +56,8 @@ Requires-Dist: sphinx-autorun ; extra == 'docs'
 [![Powered by Open3D](https://raw.githubusercontent.com/petercorke/machinevision-toolbox-python/master/.github/svg/open3d_powered.svg)](https://open3d.org)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-[![Build Status](https://github.com/petercorke/spatialmath-python/workflows/build/badge.svg?branch=master)](https://github.com/petercorke/machinevisiontoolbox-python/actions?query=workflow%3Abuild)
+[![Build Status](https://github.com/petercorke/machinevision-toolbox-python/workflows/Test-master/badge.svg?branch=master)](https://github.com/petercorke/machinevision-toolbox-python/actions?query=workflow%3Abuild)
 [![Coverage](https://codecov.io/gh/petercorke/machinevision-toolbox-python/branch/master/graph/badge.svg)](https://codecov.io/gh/petercorke/machinevision-toolbox-python)
-[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/petercorke/machinevision-toolbox-python.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/petercorke/machinevision-toolbox-python/context:python)
 [![PyPI - Downloads](https://img.shields.io/pypi/dw/machinevision-toolbox-python)](https://pypistats.org/packages/machinevision-toolbox-python)
 
 <!-- [![GitHub stars](https://img.shields.io/github/stars/petercorke/machinevision-toolbox-python.svg?style=social&label=Star)](https://GitHub.com/petercorke/machinevision-toolbox-python/stargazers/) -->
@@ -123,7 +127,6 @@ Install the current code base from GitHub and pip install a link to that cloned
 from machinevisiontoolbox import Image
 mona = Image.Read("monalisa.png")
 mona.disp()
-mona.smooth(sigma=5).disp()
 ```
 
 ![Mona Lisa image](https://github.com/petercorke/machinevision-toolbox-python/raw/master/figs/mona.png)

machinevision_toolbox_python-0.9.7.dist-info/RECORD

@@ -0,0 +1,42 @@
+machinevisiontoolbox/BagOfWords.py,sha256=kHAt6P5Tz5iWpP9N-fcdL3KTwimBqxu9QQ1WRs04Lzc,19680
+machinevisiontoolbox/BundleAdjust.py,sha256=syBFkXwJcRWpNr0k6gu-J3shzH0ozbgOgwaZp844fqk,36081
+machinevisiontoolbox/Camera.py,sha256=tRlRB7t9uBLe586-AfD9DoEXMNfOjwKIasok4jHjy7Y,135063
+machinevisiontoolbox/ImageBlobs.py,sha256=WXrSw1udWTk3IqnFBrWUOQuIvQSep9on1aisM3M6WZ8,49166
+machinevisiontoolbox/ImageColor.py,sha256=V4T_fs0EvFJegAQrNr-3pR7rg7Dye00g2V3JVEK4oOA,17111
+machinevisiontoolbox/ImageConstants.py,sha256=osFF83O2AxKkQffNGBUjUoupRYfcZtRndeWaOPO6GpY,13307
+machinevisiontoolbox/ImageCore.py,sha256=wOj7z1Eg252751x6gbjVJdzMfyr0qCNNe5r_xqFi080,79464
+machinevisiontoolbox/ImageIO.py,sha256=412vI_OTvVvWcD5BFdc5GS-GUCkNnr4I86UDEehE70I,20600
+machinevisiontoolbox/ImageLineFeatures.py,sha256=IlWSZOrvLnzvLx1vf4GuXb4Icpj214jz9FCDleguV9s,9104
+machinevisiontoolbox/ImageMorph.py,sha256=oe4Tk_4TM96gExHAzdEb1UdOVgih-3U_Ylpm0r6Xrzw,23789
+machinevisiontoolbox/ImageMultiview.py,sha256=wQWcq2Er-EzNNQ7_0mZRuID9VFh4rCjXPxZ-yMiQ-W4,14703
+machinevisiontoolbox/ImagePointFeatures.py,sha256=zMDyRwJxlytgGIa25PMOTZk85v9LSX2zn7OpZC1Tsfg,76218
+machinevisiontoolbox/ImageProcessing.py,sha256=GOWBAXQyTkgzhkJuTysBLbo0xEzLMqi73A_TfCG5L8g,37975
+machinevisiontoolbox/ImageRegionFeatures.py,sha256=2eLwHnDLK8BpmkshrthpYrlaN7G6I-q8N6ioE8OC0Ig,22175
+machinevisiontoolbox/ImageReshape.py,sha256=uStEtnnyVzqfC3rJCDWRo-nm1JjxvgMd9MrIFI94kZc,45673
+machinevisiontoolbox/ImageSpatial.py,sha256=zTsA2puUDPHjU5ISHY6LyVaeby3vWJcqubduGNOxb8I,64761
+machinevisiontoolbox/ImageWholeFeatures.py,sha256=Zgrt-xnncTY0WhqJtTqB8JbwJSroEpK-9HRaKVdGeMw,27698
+machinevisiontoolbox/PointCloud.py,sha256=4m_G4_elZei_VZ84PPs-i5ceUwOXhcuZ9-1xRZdNDDA,18286
+machinevisiontoolbox/Sources.py,sha256=gU_JJMEYiMhvPZkMODKSdsDUZPjwncu5U_yEkXY4nOE,28615
+machinevisiontoolbox/VisualServo.py,sha256=PlHCz_jbvV1JFfDrePQQ7cP94Wr5nliulHtYEMGwJtw,59294
+machinevisiontoolbox/__init__.py,sha256=tYSGLnUl2s2XY-H3Y3YfcyjGFVzpTIqrhAW7yDQ4yZg,1257
+machinevisiontoolbox/camera_derivatives.py,sha256=uChdvsXC-25Cg7-xH7tIbxe3tcxxJGQ_nslSiCvnL88,17557
+machinevisiontoolbox/fiducial.py,sha256=syC7iIz95nYBTr_njo4ZzLXOyAdAIqoAZq_wRVhyUHQ,1374
+machinevisiontoolbox/newcameras.py,sha256=iQ8Fduiub4Clh1JIEVvQTXZVqXrmgzf0Y5iMPGTOW-w,1225
+machinevisiontoolbox/base/__init__.py,sha256=ZEkTMuSMrmY04iOhhAPlb3YhteGuqQEcIF6l9mim5K8,1446
+machinevisiontoolbox/base/color.py,sha256=syipdtbxUrHXFl0288HLMpY31khdCYcGeDwCoMj-MMk,54593
+machinevisiontoolbox/base/data.py,sha256=s-A_BGuGpmft_3A_nr-kMow0repLJnXPFQah24aYbXM,5421
+machinevisiontoolbox/base/esttheta.py,sha256=pYFguhXwo9FoaH0sRAXxrcEkECYttDPnHWBi1YMfISY,2323
+machinevisiontoolbox/base/findpeaks.py,sha256=e0dcG6ZqHMwpzRFQrZH9-OITzhspi6Lq1TZoS37IPQY,10377
+machinevisiontoolbox/base/graphics.py,sha256=WkqJPLKzZvSIJE5tFQ07Fa5dK8gBmJxGEvCwmxkVtrU,24663
+machinevisiontoolbox/base/imageio.py,sha256=zaURDEM5JUDATDYd0o3EcEdHQ7OYXQw1rOwU02Cz-aU,37425
+machinevisiontoolbox/base/meshgrid.py,sha256=JYuZaw33ZJZQqqSxW8W7jLwr9iGzuXLUa3UKSlb51oQ,2350
+machinevisiontoolbox/base/shapes.py,sha256=2FmjeuDnehNF5ZmssFDawmblDpKhuVUI3CmXCcILJxg,9926
+machinevisiontoolbox/base/types.py,sha256=3znb81yTFb7sLrgjgt0P5q5wZa9_iRZGw_hWbINhCxc,4716
+machinevisiontoolbox/blocks/__init__.py,sha256=CH3psChJdDh3cnqDlZGf76C-TLFOKHJlQjBXSz8dnbY,104
+machinevisiontoolbox/blocks/camera.py,sha256=qWT_LoDFcZkCAlRqQkRDzX0fr4EvkEgdtGo0QPoO_8s,9776
+machinevisiontoolbox/blocks/test_blocks.py,sha256=qBU-gE1Q67CtBatX2t-tnJ7ALYNfacAj3yZt3ZgY-J8,1572
+machinevision_toolbox_python-0.9.7.dist-info/LICENSE,sha256=niCzY_CzbIMKuUZlUkGimjrKp0vkLAtcwFmoSuSKrdw,1068
+machinevision_toolbox_python-0.9.7.dist-info/METADATA,sha256=7aa8EnpO12J1c_YGxoz8zQlJvNaSvGh-GrKlLp2h3Rg,19553
+machinevision_toolbox_python-0.9.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+machinevision_toolbox_python-0.9.7.dist-info/top_level.txt,sha256=HC0K-k55L-H_l8QzNMmP1_vLgBkdTrsM0Kj_rjRrulo,21
+machinevision_toolbox_python-0.9.7.dist-info/RECORD,,

{machinevision_toolbox_python-0.9.4.dist-info → machinevision_toolbox_python-0.9.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

machinevisiontoolbox/BagOfWords.py

@@ -7,7 +7,6 @@ import cv2 as cv
 
 # TODO: remove top N% and bottom M% of words by frequency
 class BagOfWords:
-
     def __init__(self, images, k=2_000, nstopwords=0, attempts=1, seed=None):
         r"""
         Bag of words class
@@ -22,8 +21,8 @@ class BagOfWords:
         :type attempts: int, optional
 
         Bag of words is a powerful feature-based method for matching images
-        from widely different viewpoints. 
-        
+        from widely different viewpoints.
+
         This class creates a bag of words from a sequence of images or a set of
         point features.  In the former case, the features will have an ``.id``
         equal to the index of the image in the sequence.  For the latter case,
@@ -45,12 +44,12 @@ class BagOfWords:
         of image features is assigned labels from the ``.centroids`` any with a
         label greater that ``.nstopwords`` is a stop word and can be discarded.
 
-        :reference: 
+        :reference:
             - Video Google: a text retrieval approach to object matching in videos
-              J.Sivic and A.Zisserman, 
-              in Proc. Ninth IEEE Int. Conf. on Computer Vision, 
+              J.Sivic and A.Zisserman,
+              in Proc. Ninth IEEE Int. Conf. on Computer Vision,
               pp.1470-1477, Oct. 2003.
-            - Robotics, Vision & Control for Python, Section 12.4.2, 
+            - Robotics, Vision & Control for Python, Section 12.4.2,
                 P. Corke, Springer 2023.
 
         :seealso: :meth:`recall` :meth:`~machinevisiontoolbox.ImagePointFeatures.BaseFeature2D`
@@ -73,7 +72,7 @@ class BagOfWords:
 
         self._images = images
 
-        # save the image id's 
+        # save the image id's
         self._image_id = np.r_[features.id]
         self._nimages = self._image_id.max() + 1
         self._features = features
@@ -87,12 +86,13 @@ class BagOfWords:
             cv.setRNGSeed(seed)
 
         ret, labels, centroids = cv.kmeans(
-                        data=features._descriptor, 
-                        K=k,
-                        bestLabels=None,
-                        criteria=criteria,
-                        attempts=attempts,
-                        flags=cv.KMEANS_RANDOM_CENTERS)
+            data=features._descriptor,
+            K=k,
+            bestLabels=None,
+            criteria=criteria,
+            attempts=attempts,
+            flags=cv.KMEANS_RANDOM_CENTERS,
+        )
 
         self._k = k
 
@@ -128,7 +128,7 @@ class BagOfWords:
         idf = np.log(N / ni)
 
         M = []
-        
+
         for i in range(self.nimages):
             # number of words in this image
             nd = W[:, i].sum()
@@ -136,13 +136,13 @@ class BagOfWords:
             # word occurrence frequency
             nid = W[:, i]
 
-            with np.errstate(divide='ignore', invalid='ignore'):
+            with np.errstate(divide="ignore", invalid="ignore"):
                 v = nid / nd * idf
 
             v[~np.isfinite(v)] = 0
             M.append(v)
 
-        self._word_freq_vectors =  np.column_stack(M)
+        self._word_freq_vectors = np.column_stack(M)
         self._idf = idf
 
     def wwfv(self, i=None):
@@ -298,7 +298,7 @@ class BagOfWords:
         return s
 
     def _remove_stopwords(self, verbose=True):
-        #BagOfWords.remove_stop Remove stop words
+        # BagOfWords.remove_stop Remove stop words
         #
         # B.remove_stop(N) removes the N most frequent words (the stop words)
         # from the self.  All remaining words are renumbered so that the word
@@ -314,10 +314,12 @@ class BagOfWords:
 
         # unique_words will be [0,k)
         index = np.argsort(-freq)  # sort descending order
-        stopwords = unique_words[index[:self.nstopwords]]  # array of stop words
+        stopwords = unique_words[index[: self.nstopwords]]  # array of stop words
 
         stopfeatures = freq[stopwords].sum()
-        print(f"Removing {stopfeatures} features ({stopfeatures/len(self.words) * 100:.1f}%) associated with {self.nstopwords} most frequent words")
+        print(
+            f"Removing {stopfeatures} features ({stopfeatures/len(self.words) * 100:.1f}%) associated with {self.nstopwords} most frequent words"
+        )
 
         k = np.full(index.shape, False, dtype=bool)
         k[stopwords] = True
@@ -334,7 +336,7 @@ class BagOfWords:
         words = np.array([mapdict[w] for w in self.words])
 
         self._labels = words
-        
+
         # only retain the non stop words
         keep = words < self.nstopwords
         self._words = words[keep]
@@ -353,7 +355,7 @@ class BagOfWords:
         :return: confusion matrix
         :rtype: ndarray(M,N)
 
-        The array has rows corresponding to the images in ``self`` and 
+        The array has rows corresponding to the images in ``self`` and
         columns corresponding to the images in ``other``.
 
         :seealso: :meth:`.closest`
@@ -361,16 +363,18 @@ class BagOfWords:
         if isinstance(arg, np.ndarray):
             wwfv = arg
             sim = np.empty((wwfv.shape[1], self.nimages))
-            
+
             for j, vj in enumerate(wwfv.T):
                 for i in range(self.nimages):
                     vi = self.wwfv(i)
 
-                    with np.errstate(divide='ignore', invalid='ignore'):
-                        sim[j, i] = np.dot(vi.ravel(), vj) / (np.linalg.norm(vi) * np.linalg.norm(vj))
+                    with np.errstate(divide="ignore", invalid="ignore"):
+                        sim[j, i] = np.dot(vi.ravel(), vj) / (
+                            np.linalg.norm(vi) * np.linalg.norm(vj)
+                        )
         else:
             images = arg
-            if not hasattr(images, '__iter__'):
+            if not hasattr(images, "__iter__"):
                 # if not iterable like a FileCollection or VideoFile turn the image
                 # into a list of 1
                 images = [images]
@@ -378,7 +382,7 @@ class BagOfWords:
             # similarity has bag index as column, query index as row
             sim = np.empty((len(images), self.nimages))
             for j, image in enumerate(images):
-                features = image.SIFT(id='image')
+                features = image.SIFT(id="image")
 
                 # assign features to given cluster centroids
                 # the elements of matches are:
@@ -393,11 +397,11 @@ class BagOfWords:
 
                 # word occurrence frequency
                 nid = BagOfWords._word_freq_vector(words, self.k - self.nstopwords)
-            
+
                 # number of words in this image
                 nd = nid.sum()
 
-                with np.errstate(divide='ignore', invalid='ignore'):
+                with np.errstate(divide="ignore", invalid="ignore"):
                     v2 = nid / nd * self._idf
 
                 v2[~np.isfinite(v2)] = 0
@@ -405,9 +409,11 @@ class BagOfWords:
                 for i in range(self.nimages):
                     v1 = self.wwfv(i).ravel()
 
-                    with np.errstate(divide='ignore', invalid='ignore'):
-                        sim[j, i] = np.dot(v1, v2) / (np.linalg.norm(v1) * np.linalg.norm(v2))
-        
+                    with np.errstate(divide="ignore", invalid="ignore"):
+                        sim[j, i] = np.dot(v1, v2) / (
+                            np.linalg.norm(v1) * np.linalg.norm(v2)
+                        )
+
         if sim.shape[0] == 1:
             sim = sim[0, :]
         return sim
@@ -464,7 +470,7 @@ class BagOfWords:
         the frequency of the corresponding word across all images.
         """
 
-        #BagOfWords.wordfreq Word frequency statistics
+        # BagOfWords.wordfreq Word frequency statistics
         #
         # [W,N] = B.wordfreq[] is a vector of word labels W and the corresponding
         # elements of N are the number of occurrences of that word.
@@ -485,7 +491,7 @@ class BagOfWords:
         """
         s = S[:, i]
         index = np.argsort(-s)
-        
+
         return index, s[index]
 
     def contains(self, word):
@@ -500,15 +506,16 @@ class BagOfWords:
         :seealso: :meth:`exemplars`
         """
         return np.unique(self._image_id[self.words == word])
-            
 
-    def exemplars(self, word, images=None, maxperimage=2, columns=10, max=None, width=50, **kwargs):
+    def exemplars(
+        self, word, images=None, maxperimage=2, columns=10, max=None, width=50, **kwargs
+    ):
         """
         Composite image containing exemplars of specified word
 
         :param word: visual word label
         :type word: int
-        :param images: the set of images corresponding to this bag, only 
+        :param images: the set of images corresponding to this bag, only
             required if the bag was constructed from features not images.
         :param maxperimage: maximum number of exemplars drawn from any one image, defaults to 2
         :type maxperimage: int, optional
@@ -523,8 +530,8 @@ class BagOfWords:
 
         Produces a grid of examples of a particular visual word.
 
-        :seealso: :meth:`contains` 
-            :meth:`~machinevisiontoolbox.ImagePointFeatures.BaseFeature2D.support` 
+        :seealso: :meth:`contains`
+            :meth:`~machinevisiontoolbox.ImagePointFeatures.BaseFeature2D.support`
             :meth:`~machinevisiontoolbox.Image.Tile`
         """
         from machinevisiontoolbox import Image
@@ -545,6 +552,7 @@ class BagOfWords:
 
         return Image.Tile(exemplars, columns=columns, **kwargs)
 
+
 if __name__ == "__main__":
 
     import numpy as np
@@ -554,7 +562,7 @@ if __name__ == "__main__":
 
     cv.setRNGSeed(0)
 
-    images = ImageCollection('campus/*.png', mono=True)
+    images = ImageCollection("campus/*.png", mono=True)
 
     features = []
     for image in images:
@@ -570,7 +578,6 @@ if __name__ == "__main__":
 
     Image.Tile(ex, columns=20).disp(plain=True)
 
-
     feature = features[108]
     print(feature)
 
@@ -600,7 +607,7 @@ if __name__ == "__main__":
 
     sim_8 = bag.similarity(images[8]).ravel()
     print(sim_8)
-    k = np.argsort(-sim_8);
+    k = np.argsort(-sim_8)
     print(np.c_[sim_8[k], k])
 
     ss = []
@@ -608,13 +615,13 @@ if __name__ == "__main__":
         ss.append(images[k[i]])
     Image.Tile(ss, columns=2).disp()
 
-    holdout = ImageCollection("campus/holdout/*.png", mono=True);
+    holdout = ImageCollection("campus/holdout/*.png", mono=True)
 
     sim = bag.similarity(holdout)
 
     sim_2 = bag.similarity(holdout[2]).ravel()
     print(sim_2)
-    k = np.argsort(-sim_2);
+    k = np.argsort(-sim_2)
     print(np.c_[sim_2[k], k])
 
     ss = [holdout[2]]
@@ -623,7 +630,3 @@ if __name__ == "__main__":
     Image.Tile(ss, columns=2).disp()
 
     Image(sim).disp(block=True)
-
-
-
-