Update remaining site definitions

Author: emstoudenmire

src/physics/site_types/electron.jl

@@ -58,6 +58,7 @@ function space(
   return 4
 end
 
+<<<<<<< HEAD
 state(::SiteType"Electron", ::StateName"Emp") = 1
 state(::SiteType"Electron", ::StateName"Up") = 2
 state(::SiteType"Electron", ::StateName"Dn") = 3
@@ -66,6 +67,25 @@ state(st::SiteType"Electron", ::StateName"0") = state(st, StateName("Emp"))
 state(st::SiteType"Electron", ::StateName"↑") = state(st, StateName("Up"))
 state(st::SiteType"Electron", ::StateName"↓") = state(st, StateName("Dn"))
 state(st::SiteType"Electron", ::StateName"↑↓") = state(st, StateName("UpDn"))
+=======
+val(::SiteType"Electron",::ValName"Emp")  = 1
+val(::SiteType"Electron",::ValName"Up")   = 2
+val(::SiteType"Electron",::ValName"Dn")   = 3
+val(::SiteType"Electron",::ValName"UpDn") = 4
+val(st::SiteType"Electron",::ValName"0")  = val(st,ValName("Emp"))
+val(st::SiteType"Electron",::ValName"↑")  = val(st,ValName("Up"))
+val(st::SiteType"Electron",::ValName"↓")  = val(st,ValName("Dn"))
+val(st::SiteType"Electron",::ValName"↑↓") = vaval(st,ValName("UpDn"))
+
+state(::SiteType"Electron",::StateName"Emp")  = [1.,0,0,0]
+state(::SiteType"Electron",::StateName"Up")   = [0.,1,0,0]
+state(::SiteType"Electron",::StateName"Dn")   = [0.,0,1,0]
+state(::SiteType"Electron",::StateName"UpDn") = [0.,0,0,1]
+state(st::SiteType"Electron",::StateName"0")  = state(st,StateName("Emp"))
+state(st::SiteType"Electron",::StateName"↑")  = state(st,StateName("Up"))
+state(st::SiteType"Electron",::StateName"↓")  = state(st,StateName("Dn"))
+state(st::SiteType"Electron",::StateName"↑↓") = state(st,StateName("UpDn"))
+>>>>>>> Update remaining site definitions
 
 function op!(Op::ITensor, ::OpName"Nup", ::SiteType"Electron", s::Index)
   Op[s' => 2, s => 2] = 1.0

src/physics/site_types/fermion.jl

@@ -59,10 +59,22 @@ function space(
   return 2
 end
 
+<<<<<<< HEAD
 state(::SiteType"Fermion", ::StateName"Emp") = 1
 state(::SiteType"Fermion", ::StateName"Occ") = 2
 state(st::SiteType"Fermion", ::StateName"0") = state(st, StateName("Emp"))
 state(st::SiteType"Fermion", ::StateName"1") = state(st, StateName("Occ"))
+=======
+val(::SiteType"Fermion",::ValName"Emp")  = 1
+val(::SiteType"Fermion",::ValName"Occ")  = 2
+val(st::SiteType"Fermion",::ValName"0") = val(st,ValName("Emp"))
+val(st::SiteType"Fermion",::ValName"1") = val(st,ValName("Occ"))
+
+state(::SiteType"Fermion",::StateName"Emp")  = 1
+state(::SiteType"Fermion",::StateName"Occ")  = 2
+state(st::SiteType"Fermion",::StateName"0") = state(st,StateName("Emp"))
+state(st::SiteType"Fermion",::StateName"1") = state(st,StateName("Occ"))
+>>>>>>> Update remaining site definitions
 
 function op!(Op::ITensor, ::OpName"N", ::SiteType"Fermion", s::Index)
   return Op[s' => 2, s => 2] = 1.0

src/physics/site_types/tj.jl

@@ -54,12 +54,28 @@ function space(
   return 3
 end
 
+<<<<<<< HEAD
 state(::SiteType"tJ", ::StateName"Emp") = 1
 state(::SiteType"tJ", ::StateName"Up") = 2
 state(::SiteType"tJ", ::StateName"Dn") = 3
 state(st::SiteType"tJ", ::StateName"0") = state(st, StateName("Emp"))
 state(st::SiteType"tJ", ::StateName"↑") = state(st, StateName("Up"))
 state(st::SiteType"tJ", ::StateName"↓") = state(st, StateName("Dn"))
+=======
+val(::SiteType"tJ",::ValName"Emp")  = 1
+val(::SiteType"tJ",::ValName"Up")   = 2
+val(::SiteType"tJ",::ValName"Dn")   = 3
+val(st::SiteType"tJ",::ValName"0")  = val(st,ValName("Emp"))
+val(st::SiteType"tJ",::ValName"↑")  = val(st,ValName("Up"))
+val(st::SiteType"tJ",::ValName"↓")  = val(st,ValName("Dn"))
+
+state(::SiteType"tJ",::StateName"Emp")  = [1.,0,0]
+state(::SiteType"tJ",::StateName"Up")   = [0.,1,0]
+state(::SiteType"tJ",::StateName"Dn")   = [0.,0,1]
+state(st::SiteType"tJ",::StateName"0")  = state(st,StateName("Emp"))
+state(st::SiteType"tJ",::StateName"↑")  = state(st,StateName("Up"))
+state(st::SiteType"tJ",::StateName"↓")  = state(st,StateName("Dn"))
+>>>>>>> Update remaining site definitions
 
 function op!(Op::ITensor, ::OpName"Nup", ::SiteType"tJ", s::Index)
   return Op[s' => 2, s => 2] = 1.0