--- trunk/src/brains/Register.cpp	2005/01/12 22:41:40	246
+++ trunk/src/brains/Register.cpp	2005/04/12 21:58:09	484
@@ -54,9 +54,12 @@
 #include "minimizers/PRCG.hpp"
 #include "minimizers/SDMinimizer.hpp"
 #include "UseTheForce/DUFF.hpp"
-#include "UseTheForce/EAM.hpp"
+#include "UseTheForce/EAM_FF.hpp"
 #include "UseTheForce/ForceFieldFactory.hpp"
 #include "UseTheForce/ForceFieldCreator.hpp"
+#include "lattice/LatticeFactory.hpp"
+#include "lattice/LatticeCreator.hpp"
+#include "lattice/Lattice.hpp"
 
 namespace oopse {
 
@@ -68,7 +71,7 @@ void registerForceFields() {
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("WATER"));
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
     //in theory, EAM can also be merged
-    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM>("EAM"));
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
 }
 
 void registerIntegrators() {
@@ -84,6 +87,11 @@ void registerMinimizers() {
     MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<PRCGMinimizer>("CG"));
 }
 
+void registerLattice(){
+    LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<CubicLattice>("CUBIC"));
+    LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<FCCLattice>("FCC"));
+}
+
 void registerAll() {
     registerForceFields();
     registerIntegrators();