istr-python 1.1.39__tar.gz → 1.1.40__tar.gz

{istr_python-1.1.39 → istr_python-1.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.39
+Version: 1.1.40
 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
@@ -880,6 +880,53 @@ E.g. `print(istr.long_sqrt(123 ** 2, as_str=True))` will print
       0 
 ```
 
+#### long multiplication
+
+The method `long_multiplication` gives a list of all lines to do a long multiplition.
+
+E.g. `print(istr.long_multiplication(1234,567)` will print 
+ 
+  `[istr('1234'), istr('567'), istr('8638'), istr('7404'), istr('6170'), istr('699678')]`
+  
+The method has an optional parameter `as_str`, that can be used t0 get a nice representation of the long multiplication lines.
+  
+E.g. `print(istr.long_multiplication(1234,567, as_str=True)` will print
+
+```
+  1234
+   567
+------ x
+  8638
+ 7404
+6170
+------
+699678  
+```
+
+#### long division
+
+The method `long_division` gives a list of all lines to do a long division (note that the divisor and dividend count as separate lines).
+
+E.g. `print(istr.long_division(1395, 45)` will print 
+
+[istr('31'), istr('45'), istr('1395'), istr('135'), istr('45'), istr('45'), istr('0')]
+  
+The method has an optional parameter `as_str`, that can be used to get a nice representation of the long multiplication lines.
+  
+E.g. `print(istr.long_division(1395, 45, as_str=True)` will print 
+
+```
+       31
+     ----
+45 ) 1395
+     135
+     ---
+       45
+       45
+       --
+        0
+```  
+  
 #### generate istr with digits
 
 The class method `digits` can be used to return an istr of digits according to a given specification.

{istr_python-1.1.39 → istr_python-1.1.40}/README.md

@@ -867,6 +867,53 @@ E.g. `print(istr.long_sqrt(123 ** 2, as_str=True))` will print
       0 
 ```
 
+#### long multiplication
+
+The method `long_multiplication` gives a list of all lines to do a long multiplition.
+
+E.g. `print(istr.long_multiplication(1234,567)` will print 
+ 
+  `[istr('1234'), istr('567'), istr('8638'), istr('7404'), istr('6170'), istr('699678')]`
+  
+The method has an optional parameter `as_str`, that can be used t0 get a nice representation of the long multiplication lines.
+  
+E.g. `print(istr.long_multiplication(1234,567, as_str=True)` will print
+
+```
+  1234
+   567
+------ x
+  8638
+ 7404
+6170
+------
+699678  
+```
+
+#### long division
+
+The method `long_division` gives a list of all lines to do a long division (note that the divisor and dividend count as separate lines).
+
+E.g. `print(istr.long_division(1395, 45)` will print 
+
+[istr('31'), istr('45'), istr('1395'), istr('135'), istr('45'), istr('45'), istr('0')]
+  
+The method has an optional parameter `as_str`, that can be used to get a nice representation of the long multiplication lines.
+  
+E.g. `print(istr.long_division(1395, 45, as_str=True)` will print 
+
+```
+       31
+     ----
+45 ) 1395
+     135
+     ---
+       45
+       45
+       --
+        0
+```  
+  
 #### generate istr with digits
 
 The class method `digits` can be used to return an istr of digits according to a given specification.

{istr_python-1.1.39 → istr_python-1.1.40}/istr/istr.py

@@ -5,7 +5,7 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.1.39"
+__version__ = "1.1.40"
 import functools
 import itertools
 import types
@@ -868,10 +868,9 @@ class istr(str):
 
         lines = []
         if len(number)%2==1:            
-            pairs=list(istr.batched('x'|number,2,join=True))
-            pairs[0]=pairs[0][1]
+            pairs=istr.chain(number[0],istr.batched(number[1:],2,join=True))
         else:       
-            pairs=list(istr.batched(number,2,join=True))
+            pairs=istr.batched(number,2,join=True)
             
         root = istr(0)
         remainder = 0
@@ -897,7 +896,7 @@ class istr(str):
         lines = [root] + [number] + lines[1:]
         if as_str:
             result = []
-            extra = len(pairs[0])==2
+            extra = len(number)%2==0
             result.append(f"  {extra*' '}{' '.join(lines[0])}")
             result.append(f"  {len(lines[1])*'-'}")
             result.append(f"\/{lines[1]}")
@@ -920,7 +919,93 @@ class istr(str):
             return "\n".join(result)
         else:
             return lines
-
+            
+    def long_multiplication(self, number,as_str=False):
+        number0 = istr(istr.interpret_as_str(self))        
+        number1=istr(number)
+        lines=[number0,number1]
+        for i in number1.reversed():
+            lines.append(number0*i)
+        lines.append(number0*number1)
+        if as_str:
+            result=[]
+            n=len(lines[-1])
+            result.append(f'{lines[0]:>{n}}')
+            result.append(f'{lines[1]:>{n}}')      
+            result.append(f"{n*'-'} x")    
+            for i,line in enumerate(lines[2:-1]):
+                result.append(f"{line:>{n-i}}")
+            result.append(f"{n*'-'}")             
+            result.append(lines[-1])
+            return '\n'.join(result)
+        else:
+            return lines
+        
+    def long_division(self, divisor, as_str=False):
+        dividend = istr(istr.interpret_as_str(self))
+        divisor = istr(divisor)
+    
+        if dividend < 0:
+            raise ValueError("dividend must be non-negative.")
+    
+        if divisor <= 0:
+            raise ValueError("divisor must be positive.")
+    
+        dividend_start = len(divisor) + 3
+        total_width = dividend_start + len(dividend)
+    
+        quotient_characters = [" "] * len(dividend)
+    
+        remainder = 0
+        division_started = False
+        lines=[]
+    
+        for digit_index, digit_character in enumerate(dividend):
+            current = remainder * 10 + digit_character
+            quotient_digit = current // divisor
+    
+            if quotient_digit != 0 or division_started:
+                division_started = True
+    
+            if digit_index == len(dividend) - 1:
+                division_started = True
+    
+            if not division_started:
+                remainder = current
+                continue
+    
+            quotient_characters[digit_index] = quotient_digit
+    
+            product = quotient_digit * divisor
+            remainder = current - product
+    
+            if as_str:
+                end_column = dividend_start + digit_index
+                current_start = end_column - len(current) + 1
+                product_start = end_column - len(product) + 1   
+                bar_start = min(current_start, product_start)
+                bar_length = end_column - bar_start + 1
+                lines.append(" " * current_start | current)
+                lines.append(" " * product_start | product)
+                lines.append(" " * bar_start + "-" * bar_length)
+        
+            else:
+                lines.append(current)
+                lines.append(product)
+    
+        quotient = istr.join(quotient_characters).rstrip()
+        if as_str:
+            remainder_start = total_width - len(remainder)
+            lines.append(" " * remainder_start | remainder)
+            lines=[" " * dividend_start | quotient," " * dividend_start + "-" * len(dividend),f"{divisor} ) {dividend}",*lines[1:]]
+            return "\n".join(lines)
+    
+        else:
+            lines.append(remainder)
+            lines=[istr(quotient),divisor,dividend,*lines[1:]]
+            return lines        
+            
+    
     def this_base(self):
         return self._this_base
 

{istr_python-1.1.39 → istr_python-1.1.40}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.39
+Version: 1.1.40
 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
@@ -880,6 +880,53 @@ E.g. `print(istr.long_sqrt(123 ** 2, as_str=True))` will print
       0 
 ```
 
+#### long multiplication
+
+The method `long_multiplication` gives a list of all lines to do a long multiplition.
+
+E.g. `print(istr.long_multiplication(1234,567)` will print 
+ 
+  `[istr('1234'), istr('567'), istr('8638'), istr('7404'), istr('6170'), istr('699678')]`
+  
+The method has an optional parameter `as_str`, that can be used t0 get a nice representation of the long multiplication lines.
+  
+E.g. `print(istr.long_multiplication(1234,567, as_str=True)` will print
+
+```
+  1234
+   567
+------ x
+  8638
+ 7404
+6170
+------
+699678  
+```
+
+#### long division
+
+The method `long_division` gives a list of all lines to do a long division (note that the divisor and dividend count as separate lines).
+
+E.g. `print(istr.long_division(1395, 45)` will print 
+
+[istr('31'), istr('45'), istr('1395'), istr('135'), istr('45'), istr('45'), istr('0')]
+  
+The method has an optional parameter `as_str`, that can be used to get a nice representation of the long multiplication lines.
+  
+E.g. `print(istr.long_division(1395, 45, as_str=True)` will print 
+
+```
+       31
+     ----
+45 ) 1395
+     135
+     ---
+       45
+       45
+       --
+        0
+```  
+  
 #### generate istr with digits
 
 The class method `digits` can be used to return an istr of digits according to a given specification.

{istr_python-1.1.39 → istr_python-1.1.40}/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.39"
+version = "1.1.40"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = []

{istr_python-1.1.39 → istr_python-1.1.40}/tests/test_istr.py

@@ -218,6 +218,7 @@ def test_divmod():
 def test_iter():
     assert [x for x in istr.range(3)] == [istr(0), istr(1), istr(2)]
 
+
 def test_none():
     assert istr(None) is None
 
@@ -1066,12 +1067,13 @@ def test_is_triangular():
     assert istr(424581).is_triangular()
     assert not istr(424582).is_triangular()
     assert istr.is_triangular(424581)
-    
+
+
 def test_sum():
-    assert istr(1234).sum() == istr('10')
-    assert istr.sum('1234') == istr('10')
-    assert istr.sum(1234) == istr('10') 
-    assert istr.sum(1234, 5) == istr('15') 
+    assert istr(1234).sum() == istr("10")
+    assert istr.sum("1234") == istr("10")
+    assert istr.sum(1234) == istr("10")
+    assert istr.sum(1234, 5) == istr("15")
 
 
 def test_prod():
@@ -1217,18 +1219,49 @@ def test_compose():
     assert istr(":=") == ":="
     assert istr("=") == "="
 
+
 def test_long_sqrt():
-    lines=istr.long_sqrt(1234**2)
-    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)
-    lines=istr(1234**2).long_sqrt()
-    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=='''\
+    assert istr.long_sqrt(1234**2) == [
+        istr("1234"),
+        istr("1522756"),
+        istr("1"),
+        istr("52"),
+        istr("44"),
+        istr("827"),
+        istr("729"),
+        istr("9856"),
+        istr("9856"),
+        istr("0"),
+    ]
+    assert istr.long_sqrt(1234**2 + 1) == [
+        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 istr(1234**2).long_sqrt() == [
+        istr("1234"),
+        istr("1522756"),
+        istr("1"),
+        istr("52"),
+        istr("44"),
+        istr("827"),
+        istr("729"),
+        istr("9856"),
+        istr("9856"),
+        istr("0"),
+    ]
+    assert istr.long_sqrt(34**2) == [istr("34"), istr("1156"), istr("9"), istr("256"), istr("256"), istr("0")]
+    assert (
+        istr.long_sqrt(34**2, as_str=True)
+        == """\
    3 4
   ----
 \\/1156
@@ -1237,8 +1270,45 @@ def test_long_sqrt():
    256
    256
    ---
-     0''' 
-     
+     0"""
+    )
+
+
+def test_long_multiplication():
+    assert istr.long_multiplication(1234, 567) == [istr("1234"), istr("567"), istr("8638"), istr("7404"), istr("6170"), istr("699678")]
+    assert istr(1234).long_multiplication(567) == [istr("1234"), istr("567"), istr("8638"), istr("7404"), istr("6170"), istr("699678")]
+    assert (
+        istr.long_multiplication(1234, 567, as_str=True)
+        == """\
+  1234
+   567
+------ x
+  8638
+ 7404
+6170
+------
+699678"""
+    )
+
+
+def test_long_division():
+    assert istr.long_division(1395, 45) == [istr("31"), istr("45"), istr("1395"), istr("135"), istr("45"), istr("45"), istr("0")]
+    assert istr(1395).long_division(45) == [istr("31"), istr("45"), istr("1395"), istr("135"), istr("45"), istr("45"), istr("0")]
+    assert (
+        istr.long_division(1395, 45, as_str=True)
+        == """\
+       31
+     ----
+45 ) 1395
+     135
+     ---
+       45
+       45
+       --
+        0"""
+    )
+
+
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])