Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
### Enhancements

* Support `fac` in LEAN formula generation
* Improve LEAN formula generation for `pow`
* Generalize LEAN formula generation for `pow`
* Use multi-line output for PARI/GP formulas

## v25.11.2

Expand Down
11 changes: 10 additions & 1 deletion src/form/pari.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,16 @@ std::string PariFormula::toString() const {
}
return buf.str();
} else {
return main_formula.toString("; ", true);
// Get all function definitions in the formula to determine output format
auto functions =
FormulaUtil::getDefinitions(main_formula, Expression::Type::FUNCTION);
if (functions.size() > 1) {
// Multiple functions: use newline separator and no brackets
return main_formula.toString("\n", false);
} else {
// Single function: use semicolon separator with brackets (original behavior)
return main_formula.toString("; ", true);
}
}
}

Expand Down
6 changes: 4 additions & 2 deletions tests/formula/pari-function.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
A000023: a(n) = if(n==3,-2,if(n==2,2,if(n==1,-1,if(n==0,1,local(l1=a(n-1)); (n-1)*(2*a(n-2)+l1)-l1))))
A000027: a(n) = n
A000032: a(n) = if(n==2,3,if(n==1,1,if(n==0,2,a(n-1)+a(n-2))))
A000058: (a(n) = b(n)+1); (b(n) = if(n==0,1,local(l1=b(n-1)); l1*(l1+1)))
A000058: a(n) = b(n)+1
b(n) = if(n==0,1,local(l1=b(n-1)); l1*(l1+1))
A000247: a(n) = 2^n-n-2
A001715: (a(n) = truncate(b(n)/6)); (b(n) = if(n==0,1,n*b(n-1)))
A001715: a(n) = truncate(b(n)/6)
b(n) = if(n==0,1,n*b(n-1))