UnitValues 0.1.1__tar.gz → 0.1.2__tar.gz

{unitvalues-0.1.1/src/UnitValues.egg-info → unitvalues-0.1.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: UnitValues
-Version: 0.1.1
-Summary: A small package for using units in Python. Allows for computation with dimensioned qauntities and allows you to convert between different units. Do anything you would do with regular floats or integers in Python except now with units. I think you'll find this implementation more elegant then most other unit packages.
+Version: 0.1.2
+Summary: A small package for using units in Python. Allows for computation with dimensioned qauntities and allows you to convert between different units. Do anything you would do with regular floats or integers in Python except now with units. Package is compatible with NumPy, SciPy + Pandas are in the works. I think you'll find this implementation more elegant then most other unit packages.
 Author-email: Brody Howard <brody.howard@mail.utoronto.ca>
 Project-URL: Homepage, https://github.com/BroRocket/unitvalue/
 Project-URL: Issues, https://github.com/BroRocket/unitvalue/issues
@@ -11,10 +11,11 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy>=1.23.2
 
-# UnitValue Package
+# UnitValues Package
 ## Introduction
-The UnitValue package is designed to allow easy manipulation and conversion of numerical values associated with units. It currently supports both Imperial and Metric systems and includes commonly used units, with the flexibility to add more units as needed. It works with numpy as well.
+The UnitValue package is designed to allow easy manipulation and conversion of numerical values associated with units. It currently supports both Imperial and Metric systems and includes commonly used units, with the flexibility to add more units as needed. It works with numpy as well, empowering you to use units in your numpy arrays and funciton calls.
 
 This package is ideal for applications that require precise unit conversions and tracking of units alongside numerical values.
 

{unitvalues-0.1.1 → unitvalues-0.1.2}/README.md

@@ -1,6 +1,6 @@
-# UnitValue Package
+# UnitValues Package
 ## Introduction
-The UnitValue package is designed to allow easy manipulation and conversion of numerical values associated with units. It currently supports both Imperial and Metric systems and includes commonly used units, with the flexibility to add more units as needed. It works with numpy as well.
+The UnitValue package is designed to allow easy manipulation and conversion of numerical values associated with units. It currently supports both Imperial and Metric systems and includes commonly used units, with the flexibility to add more units as needed. It works with numpy as well, empowering you to use units in your numpy arrays and funciton calls.
 
 This package is ideal for applications that require precise unit conversions and tracking of units alongside numerical values.
 

{unitvalues-0.1.1 → unitvalues-0.1.2}/pyproject.toml

@@ -1,12 +1,16 @@
 [project]
 name = "UnitValues"
-version = "0.1.1"
+version = "0.1.2"
+dependencies = [
+  "numpy>=1.23.2"
+]
+requires-python = ">=3.8"
 authors = [
   { name="Brody Howard", email="brody.howard@mail.utoronto.ca" },
 ]
-description = "A small package for using units in Python. Allows for computation with dimensioned qauntities and allows you to convert between different units. Do anything you would do with regular floats or integers in Python except now with units. I think you'll find this implementation more elegant then most other unit packages."
+description = "A small package for using units in Python. Allows for computation with dimensioned qauntities and allows you to convert between different units. Do anything you would do with regular floats or integers in Python except now with units. Package is compatible with NumPy, SciPy + Pandas are in the works. I think you'll find this implementation more elegant then most other unit packages."
 readme = "README.md"
-requires-python = ">=3.8"
+
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",

{unitvalues-0.1.1 → unitvalues-0.1.2/src/UnitValues.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: UnitValues
-Version: 0.1.1
-Summary: A small package for using units in Python. Allows for computation with dimensioned qauntities and allows you to convert between different units. Do anything you would do with regular floats or integers in Python except now with units. I think you'll find this implementation more elegant then most other unit packages.
+Version: 0.1.2
+Summary: A small package for using units in Python. Allows for computation with dimensioned qauntities and allows you to convert between different units. Do anything you would do with regular floats or integers in Python except now with units. Package is compatible with NumPy, SciPy + Pandas are in the works. I think you'll find this implementation more elegant then most other unit packages.
 Author-email: Brody Howard <brody.howard@mail.utoronto.ca>
 Project-URL: Homepage, https://github.com/BroRocket/unitvalue/
 Project-URL: Issues, https://github.com/BroRocket/unitvalue/issues
@@ -11,10 +11,11 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy>=1.23.2
 
-# UnitValue Package
+# UnitValues Package
 ## Introduction
-The UnitValue package is designed to allow easy manipulation and conversion of numerical values associated with units. It currently supports both Imperial and Metric systems and includes commonly used units, with the flexibility to add more units as needed. It works with numpy as well.
+The UnitValue package is designed to allow easy manipulation and conversion of numerical values associated with units. It currently supports both Imperial and Metric systems and includes commonly used units, with the flexibility to add more units as needed. It works with numpy as well, empowering you to use units in your numpy arrays and funciton calls.
 
 This package is ideal for applications that require precise unit conversions and tracking of units alongside numerical values.
 

{unitvalues-0.1.1 → unitvalues-0.1.2}/src/UnitValues.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 src/UnitValues.egg-info/PKG-INFO
 src/UnitValues.egg-info/SOURCES.txt
 src/UnitValues.egg-info/dependency_links.txt
+src/UnitValues.egg-info/requires.txt
 src/UnitValues.egg-info/top_level.txt
 src/unitvalue/__init__.py
 src/unitvalue/units.py

unitvalues-0.1.2/src/UnitValues.egg-info/requires.txt

@@ -0,0 +1 @@
+numpy>=1.23.2

{unitvalues-0.1.1 → unitvalues-0.1.2}/src/unitvalue/units.py

@@ -323,10 +323,13 @@ class UnitValue:
                 return self.value * m.value
                     
             return UnitValue(None, None, new_unit, self.value * m.value)
-        elif isinstance(m, (int, float, np.ndarray)):
+        elif isinstance(m, (int, float)):
             return UnitValue(self.__system, self.__dimension, self.__unit, self.value * m)
         else:
-            return NotImplemented
+            try: 
+                return self * float(m) # checking if whatever the type is if it can be converted to float and then used 
+            except:
+                return NotImplemented
             
     def __rmul__(self, m) -> 'UnitValue':
         return self.__mul__(m)
@@ -365,10 +368,13 @@ class UnitValue:
                 return self.value / d.value
                     
             return UnitValue(None, None, new_unit, self.value / d.value)
-        elif isinstance(d, (int, float, np.ndarray)):
+        elif isinstance(d, (int, float)):
             return UnitValue(self.__system, self.__dimension, self.__unit, self.value / d)
         else:
-            return NotImplemented
+            try: 
+                return self / float(d) 
+            except:
+                return NotImplemented
         
     def __rtruediv__(self, d) -> 'UnitValue':
         """
@@ -404,7 +410,7 @@ class UnitValue:
                 return d.value / self.value
                     
             return UnitValue(None, None, new_unit, d.value / self.value)
-        elif isinstance(d, (int, float, np.ndarray)):
+        elif isinstance(d, (int, float)):
             
             units = {}
             self.__process_unit(self.__unit, units, -1)
@@ -429,7 +435,10 @@ class UnitValue:
             new_unit = numer + denom
             return UnitValue(None, None, new_unit, d / self.value)
         else:
-            return NotImplemented
+            try: 
+                return  float(d) / self
+            except:
+                return NotImplemented
 
     def __pow__(self, p)  -> 'UnitValue':
         """
@@ -466,7 +475,10 @@ class UnitValue:
             return UnitValue(None, None, new_unit, self.value ** p)
 
         else:
-            raise NotImplementedError(f"Raising to the power with type {type(p)} not supported")
+            try: 
+                return self ** float(p) 
+            except:
+                return NotImplemented
 
     def __add__(self, a)  -> 'UnitValue':
         """
@@ -480,11 +492,14 @@ class UnitValue:
             self.convert_base_metric()
             a.convert_base_metric()
             return UnitValue(self.__system, self.__dimension, self.__unit, self.value + a.value)
-        
-        elif isinstance(a, (int, float, np.ndarray)):
+        elif isinstance(a, (int, float)):
+            warnings.warn("Adding unitless value to quantity with units")
             return UnitValue(self.__system, self.__dimension, self.__unit, self.value + a)
         else:
-            return NotImplemented
+            try: 
+                return self + float(a) 
+            except:
+                return NotImplemented
         
     def __radd__(self, a)  -> 'UnitValue':
         return self.__add__(a)
@@ -501,16 +516,36 @@ class UnitValue:
             self.convert_base_metric()
             s.convert_base_metric()
             return UnitValue(self.__system, self.__dimension, self.__unit, self.value - s.value)
-        elif isinstance(s, (int, float, np.ndarray)):
+        elif isinstance(s, (int, float)):
+            warnings.warn("Subtracting unitless value to quantity with units")
             return UnitValue(self.__system, self.__dimension, self.__unit, self.value - s) 
-        else: 
-            return NotImplemented
+        else:
+            try: 
+                return self - float(s) 
+            except:
+                return NotImplemented
         
     def __rsub__(self, s)  -> 'UnitValue':
         return -self.__sub__(s)
 
     def __neg__(self):
         return UnitValue(self.__system, self.__dimension, self.__unit, -self.value)
+    
+    def __mod__(self, other) -> int:
+        if isinstance(other, UnitValue):
+            return self.value % other.value
+        elif isinstance(other, (int, float)):
+            return self.value % other
+        else:
+            return NotImplemented
+        
+    def __rmod__(self, other) -> int:
+        if isinstance(other, UnitValue):
+            return  other.value % self.value
+        elif isinstance(other, (int, float)):
+            return other % self.value
+        else:
+            return NotImplemented
 
     def __abs__(self):
         """
@@ -599,17 +634,47 @@ class UnitValue:
         Handle NumPy ufunc (universal function) operations for UnitValue objects.
         """
         out = kwargs.get('out', ())
-        inputs = [i.value if isinstance(i, UnitValue) else i for i in inputs]
-        
-        result = getattr(ufunc, method)(*inputs, **kwargs)
         
-        if method == 'reduce':
-            return UnitValue(self.__system, self.__dimension, self.__unit, result)
-        elif method == 'outer':
-            return np.vectorize(lambda x: UnitValue(self.__system, self.__dimension, self.__unit, x))(result)
-        else:
-            return UnitValue(self.__system, self.__dimension, self.__unit, result)
+        if method == "__call__":
+            if isinstance(inputs[0], np.ndarray):
+                inputs = [inputs[0], inputs[1]]
+                for ind, element in enumerate(inputs[0]):
+                    inputs[0][ind] = ufunc(element, inputs[1], **kwargs)
+                return inputs[0]
+            elif isinstance(inputs[1], np.ndarray):
+                inputs = [inputs[0], inputs[1]]
+                for ind, element in enumerate(inputs[1]):
+                    inputs[1][ind] = ufunc(inputs[0], element, **kwargs)
+                return inputs[1]
+            else:
+                if ufunc == np.add:
+                    return inputs[0] + inputs[1]
+                elif ufunc == np.subtract:
+                    return inputs[0] - inputs[1]
+                elif ufunc == np.multiply:
+                    return inputs[0] * inputs[1]
+                elif ufunc == np.divide:
+                    return inputs[0] / inputs[1]
+                elif ufunc == np.power:
+                    return inputs[0] ** inputs[1]
+                elif ufunc == np.mod:
+                    return inputs[0] % inputs[1]
     
+    def __array_function__(self, func, types, *args, **kwargs):
+        if func is np.concatenate:
+            unit_cache = []
+            for arr in args[0]:
+                unit_cache += [item.get_unit if isinstance(item, UnitValue) else None for item in arr]
+                for i in range(len(arr)):
+                    arr[i] = arr[i].value if isinstance(arr[i], UnitValue) else arr[i]
+            new_array = np.concatenate(args[0], **kwargs)
+            for ind, unit in enumerate(unit_cache):
+                if unit is not None:
+                    new_array[ind] = self.create_unit(unit, new_array[ind])
+            return new_array
+        else:
+            return NotImplemented
+
     def __convert_system(self, unit: str = "") -> None:
         self.value *= UnitValue.UNITS[self.__system][self.__dimension][self.__unit] 
         self.__system = "IMPERIAL" if self.__system == "METRIC" else "METRIC"
@@ -772,5 +837,4 @@ class UnitValue:
     @property
     def get_system(self) -> str:
         return self.__system
-    
-print(UnitValue.available_units())
+