- inserted a couple of missing namepace std:: resolutions.

[ginac.git] / ginac / color.cpp

diff --git a/ginac/color.cpp b/ginac/color.cpp
index f06805e95ea3f617d4136e6c8a76efa35746a12b..adcd8740f2ab7686a7babde2ca6a493cfa998394 100644 (file)
--- a/ginac/color.cpp
+++ b/ginac/color.cpp
@@ -24,7 +24,6 @@
 #include <stdexcept>
 
 #include "color.h"
-#include "ex.h"
 #include "idx.h"
 #include "ncmul.h"
 #include "numeric.h"
@@ -363,16 +362,16 @@ bool su3d::contract_with(exvector::iterator self, exvector::iterator other, exve
                exvector free_indices, dummy_indices;
                find_free_and_dummy(all_indices, free_indices, dummy_indices);
 
-               // d.abc*d.abc=40/3
+               // d.abc d.abc = 40/3
                if (dummy_indices.size() == 3) {
                        *self = numeric(40, 3);
                        *other = _ex1();
                        return true;
 
-               // d.akl*d.bkl=5/3*delta.ab
+               // d.akl d.bkl = 5/3 delta.ab
                } else if (dummy_indices.size() == 2) {
                        exvector a;
-                       back_insert_iterator<exvector> ita(a);
+                       std::back_insert_iterator<exvector> ita(a);
                        ita = set_difference(self_indices.begin(), self_indices.end(), dummy_indices.begin(), dummy_indices.end(), ita, ex_is_less());
                        ita = set_difference(other_indices.begin(), other_indices.end(), dummy_indices.begin(), dummy_indices.end(), ita, ex_is_less());
                        GINAC_ASSERT(a.size() == 2);
@@ -380,6 +379,25 @@ bool su3d::contract_with(exvector::iterator self, exvector::iterator other, exve
                        *other = _ex1();
                        return true;
                }
+
+       } else if (is_ex_exactly_of_type(other->op(0), su3t)) {
+
+               // d.abc T.b T.c = 5/6 T.a
+               if (other+1 != v.end()
+                && is_ex_exactly_of_type(other[1].op(0), su3t)
+                && ex_to_indexed(*self).has_dummy_index_for(other[1].op(1))) {
+
+                       exvector self_indices = ex_to_indexed(*self).get_indices();
+                       exvector dummy_indices;
+                       dummy_indices.push_back(other[0].op(1));
+                       dummy_indices.push_back(other[1].op(1));
+                       int sig;
+                       ex a = permute_free_index_to_front(self_indices, dummy_indices, sig);
+                       *self = numeric(5, 6);
+                       other[0] = color_T(a, ex_to_color(other[0]).get_representation_label());
+                       other[1] = _ex1();
+                       return true;
+               }
        }
 
        return false;
@@ -399,13 +417,13 @@ bool su3f::contract_with(exvector::iterator self, exvector::iterator other, exve
                exvector dummy_indices;
                dummy_indices = ex_to_indexed(*self).get_dummy_indices(ex_to_indexed(*other));
 
-               // f.abc*f.abc=24
+               // f.abc f.abc = 24
                if (dummy_indices.size() == 3) {
                        *self = 24;
                        *other = _ex1();
                        return true;
 
-               // f.akl*f.bkl=3*delta.ab
+               // f.akl f.bkl = 3 delta.ab
                } else if (dummy_indices.size() == 2) {
                        int sign1, sign2;
                        ex a = permute_free_index_to_front(ex_to_indexed(*self).get_indices(), dummy_indices, sign1);
@@ -414,6 +432,25 @@ bool su3f::contract_with(exvector::iterator self, exvector::iterator other, exve
                        *other = _ex1();
                        return true;
                }
+
+       } else if (is_ex_exactly_of_type(other->op(0), su3t)) {
+
+               // f.abc T.b T.c = 3/2 I T.a
+               if (other+1 != v.end()
+                && is_ex_exactly_of_type(other[1].op(0), su3t)
+                && ex_to_indexed(*self).has_dummy_index_for(other[1].op(1))) {
+
+                       exvector self_indices = ex_to_indexed(*self).get_indices();
+                       exvector dummy_indices;
+                       dummy_indices.push_back(other[0].op(1));
+                       dummy_indices.push_back(other[1].op(1));
+                       int sig;
+                       ex a = permute_free_index_to_front(self_indices, dummy_indices, sig);
+                       *self = numeric(3, 2) * sig * I;
+                       other[0] = color_T(a, ex_to_color(other[0]).get_representation_label());
+                       other[1] = _ex1();
+                       return true;
+               }
        }
 
        return false;