Commits

Burcin Erocal  committed edcfb07

Trivial rebase to Pynac 0.2.6.

  • Participants
  • Parent commits ad6aef6

Comments (0)

Files changed (2)

File trac9880_pynac_order_burcin_original.patch

 # User Burcin Erocal <burcin@erocal.org>
 # Date 1284298206 -7200
 # Node ID a8d8d201814186823ebc1204f5acf55e0b8b5b91
-# Parent 41ea76d3ae6ef015b7a71e26081f274c4b52858b
+# Parent 5f14c0386822d8c7448bae2577f3966d3dd35902
 Revert the changes to the original comparison functions of GiNaC and use the
 new comparison functions only in the printing of add and mul objects.
 
 +++ b/ginac/expairseq.cpp
 @@ -33,6 +33,7 @@
  #include "indexed.h"
- #include "constant.h"
  #include "infinity.h"
+ #include "compiler.h"
 +#include "order.h"
  
  #include <iostream>
  	return 0; // equal
  #endif // EXPAIRSEQ_USE_HASHTAB
  }
-@@ -1170,6 +1172,17 @@
+@@ -1185,6 +1187,17 @@
  	std::sort(seq.begin(), seq.end(), expair_rest_is_less());
  }
  
 diff --git a/ginac/function.cpp b/ginac/function.cpp
 --- a/ginac/function.cpp
 +++ b/ginac/function.cpp
-@@ -1193,6 +1193,7 @@
+@@ -1196,6 +1196,7 @@
  	return result;
  }
  
  int function::compare(const basic& other) const
  {
  	static const tinfo_t function_id = find_tinfo_key("function");
-@@ -1210,6 +1211,7 @@
+@@ -1213,6 +1214,7 @@
  		return 1;
  	}
  }
  
  int function::compare_same_type(const basic & other) const
  {
-@@ -1222,6 +1224,7 @@
+@@ -1225,6 +1227,7 @@
  		return exprseq::compare_same_type(o);
  }
  
  #include <limits>
 -#include <cmath>
  #include <sstream>
- 
- namespace GiNaC {
-@@ -258,7 +258,9 @@
+ #ifdef DO_GINAC_ASSERT
+ #  include <typeinfo>
+@@ -261,7 +261,9 @@
  
  	// Separate factors into those with negative numeric exponent
  	// and all others
  	exvector neg_powers, others;
  	while (it != itend) {
  		GINAC_ASSERT(is_exactly_a<numeric>(it->coeff));
-@@ -1134,6 +1136,7 @@
+@@ -1142,6 +1144,7 @@
  	return tdegree;
  }
  
  int mul::compare(const basic& other) const
  {
  	static const tinfo_t function_id = find_tinfo_key("function");
-@@ -1156,96 +1159,12 @@
+@@ -1164,96 +1167,12 @@
  		return (typeid_this<typeid_other ? -1 : 1);
  	}
  }
 diff --git a/ginac/power.cpp b/ginac/power.cpp
 --- a/ginac/power.cpp
 +++ b/ginac/power.cpp
-@@ -897,39 +897,6 @@
+@@ -900,39 +900,6 @@
  	}
  }
  
  int power::compare_same_type(const basic & other) const
  {
  	GINAC_ASSERT(is_exactly_a<power>(other));
-@@ -939,11 +906,7 @@
+@@ -942,11 +909,7 @@
  	if (cmpval)
  		return cmpval;
  	else
 diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
 --- a/ginac/symbol.cpp
 +++ b/ginac/symbol.cpp
-@@ -280,6 +280,7 @@
+@@ -283,6 +283,7 @@
  		return _ex1;
  }
  
  int symbol::compare(const basic& other) const
  {
  	static const tinfo_t pow_id = find_tinfo_key("power");
-@@ -302,26 +303,14 @@
+@@ -305,26 +306,14 @@
  		return (typeid_this<typeid_other ? -1 : 1);
  	}
  }

File trac_9880-cleanup.patch

 # HG changeset patch
-# Parent 6710d4a52d769c58e621fcedc3f17679879125ed
+# Parent 3da59f712e0232e109b89c5eb0855109ddd96e5e
 Clean up new order functions. Rename to print_order_*.
 Make numerics and constants print first again, as in sqrt(2)*x.
 
 +++ b/ginac/expairseq.cpp
 @@ -33,7 +33,6 @@
  #include "indexed.h"
- #include "constant.h"
  #include "infinity.h"
+ #include "compiler.h"
 -#include "order.h"
  
  #include <iostream>
  #include <algorithm>
-@@ -1172,17 +1171,6 @@
+@@ -1187,17 +1186,6 @@
  	std::sort(seq.begin(), seq.end(), expair_rest_is_less());
  }
  
 diff --git a/ginac/mul.cpp b/ginac/mul.cpp
 --- a/ginac/mul.cpp
 +++ b/ginac/mul.cpp
-@@ -1509,6 +1509,17 @@
+@@ -1517,6 +1517,17 @@
  	}
  }