Handle Diagonal objects with symbolic (as opposed to numeric) indices.

Author: kpeeters

cmake/version.cmake

@@ -1,7 +1,7 @@
 set(CADABRA_VERSION_MAJOR 2)
 set(CADABRA_VERSION_MINOR 3)
 set(CADABRA_VERSION_PATCH 6)
-set(CADABRA_VERSION_TWEAK 4)
+set(CADABRA_VERSION_TWEAK 5)
 set(COPYRIGHT_YEARS "2001-2021")
 math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
 find_program(GIT git PATHS ${GIT_DIR})

core/Cleanup.cc

@@ -798,6 +798,12 @@ namespace cadabra {
 				ret=true;
 				zero(it->multiplier);
 				}
+		if(!(c1->is_rational() && c2->is_rational())) {
+			if(subtree_compare(0, c1, c2)!=0) {
+				ret=true;
+				zero(it->multiplier);
+				}
+			}
 
 		return ret;
 		}

tests/canonicalise.cdb

@@ -830,3 +830,14 @@ def test55():
    print("Test 55 passed")
 
 test55()
+
+def test56():
+   __cdbkernel__=create_scope()
+   {t,r}::Coordinate;
+   {a,b}::Indices(values={t,r},position=fixed);
+   A_{a b}::Diagonal;
+   ex:=A_{t r} + A_{r r} + A_{r t} + A_{t t};
+   assert(str(ex)=='A_{r r} + A_{t t}')
+   print("Test 56 passed")
+
+test56()

web2/cadabra2/source/download.html

@@ -90,7 +90,11 @@ <h2>Binary packages</h2>
   <div class="distrotype">
 	 <img src="static/images/debian-logo.jpg"/>
 	 <div class="distronum"><a href="https://cadabra.science/packages/debian9/">Debian Stretch 9</a></div>
-	 <div class="distronum"><a href="https://cadabra.science/packages/debian10/">Debian Buster 10</a></div>
+	 <div class="distronum"><a href="https://cadabra.science/packages/debian10/">Debian
+	     Buster 10</a></div>
+    <div class="distrotxt">
+      Cadabra is now also available in Debian Unstable (`Sid') as <code>cadabra2</code>.
+    </div>
   </div>
 
   <div class="distrotype">