From 3ab608d15783a707123551378a4c8db5413fe4cd Mon Sep 17 00:00:00 2001
From: Travis Scrimshaw <tscrim at ucdavis.edu>
Date: Thu, 7 Aug 2014 20:43:01 +0900
Subject: [PATCH] Some more fixes and tweaks.

---
 .../combinat/crystals/kirillov_reshetikhin.py |  1 -
 .../rigged_configuration_element.py           | 20 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/sage/combinat/crystals/kirillov_reshetikhin.py b/src/sage/combinat/crystals/kirillov_reshetikhin.py
index d8724529bba..3e841963f56 100644
--- a/src/sage/combinat/crystals/kirillov_reshetikhin.py
+++ b/src/sage/combinat/crystals/kirillov_reshetikhin.py
@@ -2569,7 +2569,6 @@ def _element_constructor_(self, *args, **options):
             raise ValueError("no matching highest weight element found")
         return KirillovReshetikhinGenericCrystal._element_constructor_(self, *args, **options)
 
-
     def classical_decomposition(self):
         r"""
         Specifies the classical crystal underlying the Kirillov-Reshetikhin crystal `B^{n,s}`
diff --git a/src/sage/combinat/rigged_configurations/rigged_configuration_element.py b/src/sage/combinat/rigged_configurations/rigged_configuration_element.py
index 9ed719debf2..e08e916ffb3 100644
--- a/src/sage/combinat/rigged_configurations/rigged_configuration_element.py
+++ b/src/sage/combinat/rigged_configurations/rigged_configuration_element.py
@@ -1949,14 +1949,14 @@ class KRRCNonSimplyLacedElement(KRRiggedConfigurationElement, RCNonSimplyLacedEl
         sage: TestSuite(elt).run()
     """
     def e(self, a):
-        """
+        r"""
         Return the action of `e_a` on ``self``.
 
         This works by lifting into the virtual configuration, then applying
 
         .. MATH::
 
-            \hat{e}_a = \prod_{j \in \iota(a)} e_j^{\gamma_j}
+            e^v_a = \prod_{j \in \iota(a)} \hat{e}_j^{\gamma_j}
 
         and pulling back.
 
@@ -1996,14 +1996,14 @@ def e(self, a):
         return RCNonSimplyLacedElement.e(self, a)
 
     def f(self, a):
-        """
+        r"""
         Return the action of `f_a` on ``self``.
 
         This works by lifting into the virtual configuration, then applying
 
         .. MATH::
 
-            \hat{f}_a = \prod_{j \in \iota(a)} f_j^{\gamma_j}
+            f^v_a = \prod_{j \in \iota(a)} \hat{f}_j^{\gamma_j}
 
         and pulling back.
 
@@ -2107,11 +2107,11 @@ def epsilon(self, a):
         if a == self.parent()._cartan_type.special_node():
             return self.to_tensor_product_of_kirillov_reshetikhin_tableaux().epsilon(a)
 
-        epsilon = Integer(KRRCNonSimplyLacedElement.epsilon(self, a))
+        epsilon = KRRCNonSimplyLacedElement.epsilon(self, a)
         n = self.parent().cartan_type().classical().rank()
         if self.parent()._rc_index.index(a) == n-1: # -1 for indexing
-            return 2 * epsilon
-        return epsilon
+            epsilon *= 2
+        return Integer(epsilon)
 
     def phi(self, a):
         r"""
@@ -2136,9 +2136,9 @@ def phi(self, a):
         if a == self.parent()._cartan_type.special_node():
             return self.to_tensor_product_of_kirillov_reshetikhin_tableaux().phi(a)
 
-        phi = Integer(KRRCNonSimplyLacedElement.phi(self, a))
+        phi = KRRCNonSimplyLacedElement.phi(self, a)
         n = self.parent().cartan_type().classical().rank()
         if self.parent()._rc_index.index(a) == n-1: # -1 for indexing
-            return 2 * phi
-        return phi
+            phi *= 2
+        return Integer(phi)