From 5d4c3462a1bbecac2cb8216bf3afbd3af5cd2985 Mon Sep 17 00:00:00 2001
From: rieger <rieger@fhi-berlin.mpg.de>
Date: Tue, 29 Apr 2008 11:24:27 +0200
Subject: [PATCH] added enums for interactions parameters to interactions.ini
 to keep the names

added interactions data structure, added some test contructions for value assignment to this data structure
working!
---
 interactions.ini | 34 ++++++++++++++++++++
 main.cpp         | 96 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 86 insertions(+), 44 deletions(-)

diff --git a/interactions.ini b/interactions.ini
index 770f9f7..f273311 100644
--- a/interactions.ini
+++ b/interactions.ini
@@ -14,6 +14,40 @@ quattro =
 quinto = 
 
 
+enum Pair_Interaction_Parameters {
+	no_pair_interaction = 0,
+	Vp1,
+	Vp2,
+	Vp2across,
+	Vp3,
+	Vp4,
+	Vp4across,
+	Vp5,
+	Vp5across,
+	Vp6,
+	max_pair_interactions
+};
+
+enum Trio_Interaction_Parameters {
+	no_trio_interaction = 0,
+	Vtr,
+	Vtr112,
+	Vtr112across,
+	Vtr2,
+	Vtr2across,
+	Vtr22across3,
+	Vtr214,
+	Vtr214across,
+	Vtr3,
+	Vtr13,
+	Vtr335,
+	Vtr335across,
+	Vtr223across,
+	Vtr134,
+	Vtr237,
+	Vtr237across,
+	max_trio_interactions
+};
 
 
 
diff --git a/main.cpp b/main.cpp
index 3681249..3d35cfb 100755
--- a/main.cpp
+++ b/main.cpp
@@ -21,6 +21,8 @@ using namespace std;
 using namespace blitz;
 using namespace ranlib;
 
+#define BZ_DEBUG
+
 
 enum Occupation { 
 	empty = 0,
@@ -32,41 +34,6 @@ enum Atom {
 	Pd = 2
 };
 
-enum Pair_Interaction_Parameters {
-	no_pair_interaction = 0,
-	Vp1,
-	Vp2,
-	Vp2across,
-	Vp3,
-	Vp4,
-	Vp4across,
-	Vp5,
-	Vp5across,
-	Vp6,
-	max_pair_interactions
-};
-
-enum Trio_Interaction_Parameters {
-	no_trio_interaction = 0,
-	Vtr,
-	Vtr112,
-	Vtr112across,
-	Vtr2,
-	Vtr2across,
-	Vtr22across3,
-	Vtr214,
-	Vtr214across,
-	Vtr3,
-	Vtr13,
-	Vtr335,
-	Vtr335across,
-	Vtr223across,
-	Vtr134,
-	Vtr237,
-	Vtr237across,
-	max_trio_interactions
-};
-
 class Lattice {
 public:
 	Array<Occupation, 2> sites;
@@ -75,23 +42,21 @@ public:
 	int UnitCellSizeX, UnitCellSizeY;
 };
 
-struct directions {
+class Directions_def {
+public:
 	int x;
 	int y;
 };
 
-// direction.x = etc..
-
-struct interaction_definition {
+class interaction_parameter_def {
+public:
 	string name;
-	Array<directions, 1> direction;
+	Array<Directions_def, 1> direction;
 };
- 
 
-// interaction_parameter.name and interaction_parameter.interaction_vector(direction.x,1) 
-// and interaction_parameter.interaction_vector(direction.y,1)
 
-Array<interaction_definition, 1> Interactions;
+
+
 
 
 void usage(const char *prog)
@@ -216,15 +181,58 @@ void read_ini_structure(const char *input_file_name, Lattice &lattice)
 	
 }
 
+/*
+void read_ini_structure(const char *input_file_name, Lattice &lattice)
+{
+	CSimpleIni ini(false, true, false);
+	const char *tmp;
+	
+	SI_Error rc = ini.LoadFile(input_file_name);
+	if (rc < 0) 
+		panic("Failed loading ini file: %s", str_SI_Error(rc));
+		
+		
+
+
+	
+}
+*/
+
 int main(int argc, char* argv[])
 {
 	Lattice lattice;
+	Array<interaction_parameter_def, 1> Interactions_array;
+	
+	Interactions_array.resize(2);
+	
 	if (argc != 2)
 		usage(*argv);
 	read_ini_structure(argv[1], lattice);
 		
 	cout << "lattice:" << endl << lattice.sites;
 	cout << "underlying surface:" << endl << lattice.surface;
+	
+	// read_ini_interactions(argv[2], interactions);
+	
+	// testzuweisung interactions array
+	
+		
+	Interactions_array(1).name = "trio";
+	Interactions_array(1).direction;
+	Interactions_array(1).direction.resize(1);
+	Interactions_array(1).direction(1).x = 1;
+	
+	
+	
+	cout << Interactions_array(1).name << endl;
+	cout << Interactions_array(1).direction(1).x << endl;
+	// Interactions(1).direction(1);
+	
+	//Interactions(1).direction(1).x = 2;
+	
+	//cout << Interactions(1).name << endl;
+	
+	
 		
 	exit(EXIT_SUCCESS);
 }
-- 
2.11.4.GIT