istr-python 1.1.37.post0__tar.gz → 1.1.38.post0__tar.gz

{istr_python-1.1.37.post0 → istr_python-1.1.38.post0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.37.post0
+Version: 1.1.38.post0
 Summary: istr - strings you can count on
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/istr
@@ -858,7 +858,27 @@ Note that this method has the advantage that it can accept an istr as index, in
 The method `long_sqrt` gives a list of  the lines of a long square root. Both the result (root) and the original number, possibly with a trailing 0 are returned, along with the calculated values.
   E.g. `istr.long_sqrt(123 ** 2)` results in
 
-`[istr('123'), istr('015129'), istr('1'), istr('51'), istr('44'), istr('729'), istr('729'), istr('0')]`
+`[istr('123'), istr('15129'), istr('1'), istr('51'), istr('44'), istr('729'), istr('729'), istr('0')]`
+
+Note the final `istr('0')` is included to support also long square roots that are not perfect.
+
+The method `long_sqrt`has an optional parameter `as_str`, that can be used to get a nice string representation of the long square root lines.
+
+E.g. `print(istr.long_sqrt(123 ** 2, as_str=True))` will print
+```
+  1 2 3
+  -----
+\/15129
+  1
+  -
+   51
+   44
+   --
+    729
+    729
+    ---
+      0 
+```
 
 #### generate istr with digits
 

{istr_python-1.1.37.post0 → istr_python-1.1.38.post0}/README.md

@@ -845,7 +845,27 @@ Note that this method has the advantage that it can accept an istr as index, in
 The method `long_sqrt` gives a list of  the lines of a long square root. Both the result (root) and the original number, possibly with a trailing 0 are returned, along with the calculated values.
   E.g. `istr.long_sqrt(123 ** 2)` results in
 
-`[istr('123'), istr('015129'), istr('1'), istr('51'), istr('44'), istr('729'), istr('729'), istr('0')]`
+`[istr('123'), istr('15129'), istr('1'), istr('51'), istr('44'), istr('729'), istr('729'), istr('0')]`
+
+Note the final `istr('0')` is included to support also long square roots that are not perfect.
+
+The method `long_sqrt`has an optional parameter `as_str`, that can be used to get a nice string representation of the long square root lines.
+
+E.g. `print(istr.long_sqrt(123 ** 2, as_str=True))` will print
+```
+  1 2 3
+  -----
+\/15129
+  1
+  -
+   51
+   44
+   --
+    729
+    729
+    ---
+      0 
+```
 
 #### generate istr with digits
 

{istr_python-1.1.37.post0 → istr_python-1.1.38.post0}/istr/istr.py

@@ -5,7 +5,7 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.1.37"
+__version__ = "1.1.38"
 import functools
 import itertools
 import types
@@ -841,8 +841,8 @@ class istr(str):
 
     def prod(self, *, start=1):
         return math.prod(self, start=istr(start))
-        
-    def sum(self, / , start=0):
+
+    def sum(self, /, start=0):
         return sum(istr(self), start=int(start))
 
     @classmethod
@@ -855,42 +855,71 @@ class istr(str):
     def enumerate(cls, iterable, start=0):
         for i, value in enumerate(iterable, int(start)):
             yield cls(i), value
-            
-    def long_sqrt(self):
+
+    def long_sqrt(self, as_str=False):
         """
         this function does long squre root and returns all the lines to be written.
         (modified from a ChatGPT code suggestion)
-        returns root, number (possibly with an extra 0) and the lines below the number, all istr-ed
+        returns root, number and the lines below the number, all istr-ed
+        if as_str is True, a formatted output will be returned
         """
-        number=istr(istr.interpret_as_str(self))
-        lines = []
 
-        if len(number)%2==1:
-            number = "0" | number
-    
-        pairs=list(istr.batched(number,2,join=True))
+        number = istr(istr.interpret_as_str(self))
+
+        lines = []
+        if len(number)%2==1:            
+            pairs=list(istr.batched('x'|number,2,join=True))
+            pairs[0]=pairs[0][1]
+        else:       
+            pairs=list(istr.batched(number,2,join=True))
+            
         root = istr(0)
         remainder = 0
-    
+
         for pair in pairs:
             dividend = remainder * 100 + pair
-    
+
             x = 0
             for d in range(10):
                 if (20 * root + d) * d <= dividend:
                     x = d
                 else:
                     break
-    
+
             trial = (20 * root + x) * x
             remainder = dividend - trial
-    
+
             root = root * 10 + x
             lines.append(dividend)
             lines.append(trial)
+
         lines.append(remainder)
-        return [root]+[number]+ lines[1:]  # ignore the first dividend
-                
+        lines = [root] + [number] + lines[1:]
+        if as_str:
+            result = []
+            extra = len(pairs[0])==2
+            result.append(f"  {extra*' '}{' '.join(lines[0])}")
+            result.append(f"  {len(lines[1])*'-'}")
+            result.append(f"\/{lines[1]}")
+
+            last_len=len(lines[2])
+            for i, line in enumerate(lines):
+
+                if i >= 2:
+                    if i == len(lines) - 1:
+                        n = i - 2 + extra
+                    else:
+                        n = i + extra
+
+                    if i % 2 == 0:
+                        result.append(f" {line:>{n}}")
+                        result.append(f" {last_len*'-':>{n}}")
+                    else:
+                        result.append(f" {line:>{n+1}}")
+                        last_len=len(line)
+            return "\n".join(result)
+        else:
+            return lines
 
     def this_base(self):
         return self._this_base

{istr_python-1.1.37.post0 → istr_python-1.1.38.post0}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.37.post0
+Version: 1.1.38.post0
 Summary: istr - strings you can count on
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/istr
@@ -858,7 +858,27 @@ Note that this method has the advantage that it can accept an istr as index, in
 The method `long_sqrt` gives a list of  the lines of a long square root. Both the result (root) and the original number, possibly with a trailing 0 are returned, along with the calculated values.
   E.g. `istr.long_sqrt(123 ** 2)` results in
 
-`[istr('123'), istr('015129'), istr('1'), istr('51'), istr('44'), istr('729'), istr('729'), istr('0')]`
+`[istr('123'), istr('15129'), istr('1'), istr('51'), istr('44'), istr('729'), istr('729'), istr('0')]`
+
+Note the final `istr('0')` is included to support also long square roots that are not perfect.
+
+The method `long_sqrt`has an optional parameter `as_str`, that can be used to get a nice string representation of the long square root lines.
+
+E.g. `print(istr.long_sqrt(123 ** 2, as_str=True))` will print
+```
+  1 2 3
+  -----
+\/15129
+  1
+  -
+   51
+   44
+   --
+    729
+    729
+    ---
+      0 
+```
 
 #### generate istr with digits
 

{istr_python-1.1.37.post0 → istr_python-1.1.38.post0}/pyproject.toml

@@ -10,7 +10,7 @@ authors = [
     { name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com" },
 ]
 description = "istr - strings you can count on"
-version = "1.1.37.post0"
+version = "1.1.38.post0"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = []

{istr_python-1.1.37.post0 → istr_python-1.1.38.post0}/tests/test_istr.py

@@ -1219,12 +1219,26 @@ def test_compose():
 
 def test_long_sqrt():
     lines=istr.long_sqrt(1234**2)
-    assert lines==[istr('1234'), istr('01522756'), istr('1'), istr('52'), istr('44'), istr('827'), istr('729'), istr('9856'), istr('9856'), istr('0')]
+    assert lines==[istr('1234'), istr('1522756'), istr('1'), istr('52'), istr('44'), istr('827'), istr('729'), istr('9856'), istr('9856'), istr('0')]
+    lines=istr.long_sqrt(1234**2+1)
+    assert lines==[istr('1234'), istr('1522757'), istr('1'), istr('52'), istr('44'), istr('827'), istr('729'), istr('9857'), istr('9856'), istr('1')]
     lines=istr.long_sqrt(1234**2+1)
-    assert lines==[istr('1234'), istr('01522757'), istr('1'), istr('52'), istr('44'), istr('827'), istr('729'), istr('9857'), istr('9856'), istr('1')]
     lines=istr(1234**2).long_sqrt()
-    assert lines==[istr('1234'), istr('01522756'), istr('1'), istr('52'), istr('44'), istr('827'), istr('729'), istr('9856'), istr('9856'), istr('0')]    
-    
+    assert lines==[istr('1234'), istr('1522756'), istr('1'), istr('52'), istr('44'), istr('827'), istr('729'), istr('9856'), istr('9856'), istr('0')]    
+    lines=istr.long_sqrt(34**2)
+    assert lines==[istr('34'), istr('1156'), istr('9'), istr('256'), istr('256'), istr('0')]
+    lines=istr.long_sqrt(34**2,as_str=True)
+    assert lines=='''\
+   3 4
+  ----
+\\/1156
+   9
+   -
+   256
+   256
+   ---
+     0''' 
+     
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])