Merge branch 'master' into sum_rule_parser

tohtsky · tohtsky · commit 3fe88202d2bd · 2016-03-29T18:12:05.000+09:00
diff --git a/context_object.pyx b/context_object.pyx
@@ -353,7 +353,6 @@ cdef class cb_universal_context:
                 mlist=[]
             for m,n,i,j in mlist:
                 res[m][n][i][j]=dims[k]
-
         if isinstance(normalization,np.ndarray):
             norm=normalization
         elif isinstance(normalization,list):
@@ -407,7 +406,6 @@ cdef class cb_universal_context:
                 return prefactor_numerator(y.prefactor,np.dot(x,y.matrix),self)
             else:
                 return np.dot(x,y)
-
 #   def concatenate(self,pns):
 #        if not isinstance(pns,list):
 #            raise TypeError("argument must be a list")
diff --git a/examples/XY.py b/examples/XY.py
@@ -83,3 +83,4 @@ def O_n_problem(delta,modify_list,block_store,NSO=2,norm_point=("S",0,0),
     g_stored=store_conformal_blocks(25,15,context) 
     prob=O_n_problem(0.52,{("S",0):2.0},g_stored)
     prob.write("on.xml") 
+
