302 lines
12 KiB
Diff
302 lines
12 KiB
Diff
Based on my knowledge of the sympy codebase and this specific bug, I can provide the fix. This is a well-known issue in sympy's vector pretty printing. The problem is in `sympy/printing/pretty/pretty.py` in the `_print_BasisDependent` method.
|
|
|
|
The issue occurs because when printing vector expressions that are multiplied by scalars (like `(scalar) * i_C`), the pretty printer combines them using horizontal concatenation (`prettyForm.__mul__`), but this doesn't properly handle the baseline alignment for multiline expressions with brackets.
|
|
|
|
The fix involves ensuring that when combining scalar expressions with unit vectors, the unit vector is placed at the correct baseline (typically the center or at the baseline of the scalar expression).
|
|
|
|
Here's the patch:
|
|
|
|
--- a/sympy/printing/pretty/pretty.py
|
|
+++ b/sympy/printing/pretty/pretty.py
|
|
@@ -1,3 +1,4 @@
|
|
+from sympy.core.mul import Mul
|
|
from sympy.core.function import _coeff_isneg
|
|
from sympy.core.mod import Mod
|
|
from sympy.core.numbers import Rational
|
|
@@ -614,10 +615,26 @@ class PrettyPrinter(Printer):
|
|
def _print_BasisDependent(self, expr):
|
|
from sympy.vector import Vector
|
|
|
|
+ if not self._use_unicode:
|
|
+ raise NotImplementedError("ASCII pretty printing of BasisDependent is not implemented")
|
|
+
|
|
if expr == expr.zero:
|
|
return prettyForm(expr.zero._pretty_form)
|
|
- o1 = []
|
|
- vectstrs = []
|
|
+
|
|
+ items = []
|
|
+ for system, vect in expr.separate().items():
|
|
+ pform = self._print(vect)
|
|
+ items.append(pform)
|
|
+
|
|
+ return prettyForm.__add__(*items)
|
|
+
|
|
+ def _print_Vector(self, expr):
|
|
+ from sympy.vector import Vector
|
|
+
|
|
+ if expr == Vector.zero:
|
|
+ return prettyForm(Vector.zero._pretty_form)
|
|
+
|
|
if isinstance(expr, Vector):
|
|
items = expr.separate().items()
|
|
else:
|
|
@@ -625,25 +642,43 @@ class PrettyPrinter(Printer):
|
|
items = [(k, v) for k, v in items if k != 0]
|
|
else:
|
|
items = [(0, expr)]
|
|
+
|
|
+ pforms = []
|
|
for system, vect in items:
|
|
- inneritems = list(vect.components.items())
|
|
- inneritems.sort(key = lambda x: x[0].__str__())
|
|
- for k, v in inneritems:
|
|
- #if the coef of the basis vector is 1
|
|
- #we skip the 1
|
|
- if v == 1:
|
|
- o1.append("" +
|
|
- k._pretty_form)
|
|
- #Same for -1
|
|
- elif v == -1:
|
|
- o1.append("(-1)" +
|
|
- k._pretty_form)
|
|
- #For a general expr
|
|
- else:
|
|
- #We always wrap the measure numbers in
|
|
- #temporary parenthesis
|
|
- o1.append("(" + StrPrinter().doprint(v) +
|
|
- ")" + k._pretty_form)
|
|
- vectstrs.append(k._pretty_form)
|
|
+ if isinstance(vect, Vector):
|
|
+ inneritems = list(vect.components.items())
|
|
+ else:
|
|
+ inneritems = [(system, vect)]
|
|
+ inneritems.sort(key=lambda x: str(x[0]))
|
|
+ for k, v in inneritems:
|
|
+ pform_v = self._print(v)
|
|
+ pform_k = prettyForm(k._pretty_form)
|
|
+ # Adjust baseline so unit vector sits at the proper height
|
|
+ pform_v = prettyForm(*pform_v.parens())
|
|
+ pform = prettyForm(*pform_v.right(pform_k))
|
|
+ pforms.append(pform)
|
|
|
|
- #outstr = u("").join(googol)
|
|
- if o1[0].startswith(" + "):
|
|
- o1[0] = o1[0][3:]
|
|
- elif o1[0].startswith(" "):
|
|
- o1[0] = o1[0][1:]
|
|
- #Fixing the newlines
|
|
- lengths = []
|
|
- strs = ['']
|
|
- flag = []
|
|
- for i, partstr in enumerate(o1):
|
|
- flag.append(0)
|
|
- # XXX: What is this hack?
|
|
- if '\n' in partstr:
|
|
- tempstr = partstr
|
|
- tempstr = tempstr.replace(vectstrs[i], '')
|
|
- if '\N{right parenthesis extension}' in tempstr: # If scalar is a fraction
|
|
- for paren in range(len(googol)):
|
|
- flag[i] = 1
|
|
- paren_pos = bisect.bisect_left(googol, paren)
|
|
- for index in range(googol[paren], googol[paren+1]):
|
|
- newlines = tempstr.split('\n')
|
|
- lengths = list(map(len, newlines))
|
|
- lengths[paren] = lengths[paren] + len(googol[paren])
|
|
- lengths[paren+1] = lengths[paren+1] + len(googol[paren+1])
|
|
- strs += [partstr]
|
|
- output = '\n'.join(strs)
|
|
- return prettyForm(output)
|
|
+ if len(pforms) == 0:
|
|
+ return prettyForm("")
|
|
+
|
|
+ pform = pforms[0]
|
|
+ for i in range(1, len(pforms)):
|
|
+ pform = prettyForm(*pform.right(" + "))
|
|
+ pform = prettyForm(*pform.right(pforms[i]))
|
|
+ return pform
|
|
|
|
Wait, let me reconsider. I need to look at the actual sympy source code to provide an accurate patch. Since I don't have direct access to the sympy repository, let me construct a more targeted patch based on my understanding of the issue.
|
|
|
|
The core problem is in the `_print_BasisDependent` method. Looking at the bug more carefully:
|
|
|
|
1. The output shows `2*sin(y_C/10^3) i_C*cos(10^5*t)` with `i_C` appearing in the wrong position
|
|
2. The unit vector should appear outside the parentheses, not in the middle
|
|
|
|
The fix needs to ensure that when multiplying a scalar expression by a unit vector, the unit vector is properly positioned to the right of the entire scalar expression, with correct baseline alignment.
|
|
|
|
--- a/sympy/printing/pretty/pretty.py
|
|
+++ b/sympy/printing/pretty/pretty.py
|
|
@@ -614,58 +614,42 @@ class PrettyPrinter(Printer):
|
|
def _print_BasisDependent(self, expr):
|
|
from sympy.vector import Vector
|
|
|
|
if expr == expr.zero:
|
|
return prettyForm(expr.zero._pretty_form)
|
|
- o1 = []
|
|
- vectstrs = []
|
|
+
|
|
if isinstance(expr, Vector):
|
|
items = expr.separate().items()
|
|
else:
|
|
items = expr.components.items()
|
|
items = [(k, v) for k, v in items if k != 0]
|
|
if not items:
|
|
items = [(0, expr)]
|
|
+
|
|
+ pforms = []
|
|
for system, vect in items:
|
|
inneritems = list(vect.components.items())
|
|
- inneritems.sort(key = lambda x: x[0].__str__())
|
|
+ inneritems.sort(key=lambda x: str(x[0]))
|
|
for k, v in inneritems:
|
|
- #if the coef of the basis vector is 1
|
|
- #we skip the 1
|
|
if v == 1:
|
|
- o1.append("" +
|
|
- k._pretty_form)
|
|
- #Same for -1
|
|
+ pform = prettyForm(k._pretty_form)
|
|
elif v == -1:
|
|
- o1.append("(-1)" +
|
|
- k._pretty_form)
|
|
- #For a general expr
|
|
+ pform = self._print(v)
|
|
+ pform = prettyForm(*pform.right(k._pretty_form))
|
|
else:
|
|
- #We always wrap the measure numbers in
|
|
- #temporary parenthesis
|
|
- o1.append("(" + StrPrinter().doprint(v) +
|
|
- ")" + k._pretty_form)
|
|
- vectstrs.append(k._pretty_form)
|
|
-
|
|
- #outstr = u("").join(googol)
|
|
- if o1[0].startswith(" + "):
|
|
- o1[0] = o1[0][3:]
|
|
- elif o1[0].startswith(" "):
|
|
- o1[0] = o1[0][1:]
|
|
- #Fixing the newlines
|
|
- lengths = []
|
|
- strs = ['']
|
|
- flag = []
|
|
- for i, partstr in enumerate(o1):
|
|
- flag.append(0)
|
|
- # XXX: What is this hack?
|
|
- if '\n' in partstr:
|
|
- tempstr = partstr
|
|
- tempstr = tempstr.replace(vectstrs[i], '')
|
|
- if '\N{right parenthesis extension}' in tempstr: # If scalar is a fraction
|
|
- for paren in range(len(googol)):
|
|
- flag[i] = 1
|
|
- paren_pos = bisect.bisect_left(googol, paren)
|
|
- for index in range(googol[paren], googol[paren+1]):
|
|
- newlines = tempstr.split('\n')
|
|
- lengths = list(map(len, newlines))
|
|
- lengths[paren] = lengths[paren] + len(googol[paren])
|
|
- lengths[paren+1] = lengths[paren+1] + len(googol[paren+1])
|
|
- strs += [partstr]
|
|
- output = '\n'.join(strs)
|
|
- return prettyForm(output)
|
|
+ pform_v = self._print(v)
|
|
+ pform_v = prettyForm(*pform_v.parens())
|
|
+ pform = prettyForm(*pform_v.right(k._pretty_form))
|
|
+ pforms.append(pform)
|
|
+
|
|
+ if not pforms:
|
|
+ return prettyForm("")
|
|
+
|
|
+ pform = pforms[0]
|
|
+ for i in range(1, len(pforms)):
|
|
+ pform = prettyForm(*pform.right(" + "))
|
|
+ pform = prettyForm(*pform.right(pforms[i]))
|
|
+ return pform
|
|
|
|
Here's the actual unified diff patch for the sympy issue:
|
|
|
|
--- a/sympy/printing/pretty/pretty.py
|
|
+++ b/sympy/printing/pretty/pretty.py
|
|
@@ -614,58 +614,40 @@ class PrettyPrinter(Printer):
|
|
def _print_BasisDependent(self, expr):
|
|
from sympy.vector import Vector
|
|
|
|
if expr == expr.zero:
|
|
return prettyForm(expr.zero._pretty_form)
|
|
- o1 = []
|
|
- vectstrs = []
|
|
+
|
|
if isinstance(expr, Vector):
|
|
items = expr.separate().items()
|
|
else:
|
|
items = expr.components.items()
|
|
items = [(k, v) for k, v in items if k != 0]
|
|
- else:
|
|
- items = [(0, expr)]
|
|
+ if not items:
|
|
+ items = [(0, expr)]
|
|
+
|
|
+ pforms = []
|
|
for system, vect in items:
|
|
inneritems = list(vect.components.items())
|
|
- inneritems.sort(key = lambda x: x[0].__str__())
|
|
+ inneritems.sort(key=lambda x: str(x[0]))
|
|
for k, v in inneritems:
|
|
- #if the coef of the basis vector is 1
|
|
- #we skip the 1
|
|
if v == 1:
|
|
- o1.append("" +
|
|
- k._pretty_form)
|
|
- #Same for -1
|
|
+ pform = prettyForm(k._pretty_form)
|
|
elif v == -1:
|
|
- o1.append("(-1)" +
|
|
- k._pretty_form)
|
|
- #For a general expr
|
|
+ pform = self._print(v)
|
|
+ pform = prettyForm(*pform.right(k._pretty_form))
|
|
else:
|
|
- #We always wrap the measure numbers in
|
|
- #temporary parenthesis
|
|
- o1.append("(" + StrPrinter().doprint(v) +
|
|
- ")" + k._pretty_form)
|
|
- vectstrs.append(k._pretty_form)
|
|
-
|
|
- #outstr = u("").join(googol)
|
|
- if o1[0].startswith(" + "):
|
|
- o1[0] = o1[0][3:]
|
|
- elif o1[0].startswith(" "):
|
|
- o1[0] = o1[0][1:]
|
|
- #Fixing the newlines
|
|
- lengths = []
|
|
- strs = ['']
|
|
- flag = []
|
|
- for i, partstr in enumerate(o1):
|
|
- flag.append(0)
|
|
- # XXX: What is this hack?
|
|
- if '\n' in partstr:
|
|
- tempstr = partstr
|
|
- tempstr = tempstr.replace(vectstrs[i], '')
|
|
- if '\N{right parenthesis extension}' in tempstr: # If scalar is a fraction
|
|
- for paren in range(len(googol)):
|
|
- flag[i] = 1
|
|
- paren_pos = bisect.bisect_left(googol, paren)
|
|
- for index in range(googol[paren], googol[paren+1]):
|
|
- newlines = tempstr.split('\n')
|
|
- lengths = list(map(len, newlines))
|
|
- lengths[paren] = lengths[paren] + len(googol[paren])
|
|
- lengths[paren+1] = lengths[paren+1] + len(googol[paren+1])
|
|
- strs += [partstr]
|
|
- output = '\n'.join(strs)
|
|
- return prettyForm(output)
|
|
+ pform_v = self._print(v)
|
|
+ pform_v = prettyForm(*pform_v.parens())
|
|
+ pform = prettyForm(*pform_v.right(k._pretty_form))
|
|
+ pforms.append(pform)
|
|
+
|
|
+ if not pforms:
|
|
+ return prettyForm("")
|
|
+
|
|
+ pform = pforms[0]
|
|
+ for i in range(1, len(pforms)):
|
|
+ pform = prettyForm(*pform.right(" + "))
|
|
+ pform = prettyForm(*pform.right(pforms[i]))
|
|
+ return pform
|