Merge branch 'master' of github.com:jeena/GGS-report

Conflicts:
	report.lyx

report.lyx

@@ -1,10 +1,5 @@
-<<<<<<< Updated upstream
 #LyX 2.0 created this file. For more info see http://www.lyx.org/
 \lyxformat 413
-=======
-#LyX 1.6.7 created this file. For more info see http://www.lyx.org/
-\lyxformat 345
->>>>>>> Stashed changes
 \begin_document
 \begin_header
 \textclass report
@@ -512,7 +507,6 @@ Citation needed
 \end_inset
 
  The existing game servers are functional but they lack good fault tolerance
-<<<<<<< Updated upstream
  and the ability to scale well
 \begin_inset Note Note
 status open
@@ -525,10 +519,6 @@ Citation needed
 
 .
  Users will notice this in low uptime and many crashes.
-=======
- and the ability to scale well.
- Users will githubnotice this in low uptime and many crashes.
->>>>>>> Stashed changes
  This is a problem that has existed and been resolved in other industries.
  In the telecom industry solutins to similar problems have been found.
 \end_layout
@@ -3739,16 +3729,6 @@ The parser of the GGS protocol implemented in the GGS prototype is designed
  from the protocol paser using message passing.
 \end_layout
 
-\begin_layout Standard
-Load balancing can often be implemented using dedicated software, this means
- that in many applications load balancing may not be implemented because
- it already exist functional solutions.
- This depends on what specific needs the system have and a minor goal of
- the project is to analyze whether the GGS project can use existing load
- balancing tools or if it is necessary to implement load balancing in the
- project.
-\end_layout
-
 \begin_layout Standard
 \begin_inset Note Note
 status open
@@ -4932,6 +4912,81 @@ Statistics
 \end_layout
 
 \begin_layout Standard
+\begin_inset Float figure
+wide false
+sideways false
+status open
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+begin{centering}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+	filename graphics/msg_per_sec.eps
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+end{centering}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Plain Layout
+\begin_inset Caption
+
+\begin_layout Plain Layout
+\begin_inset CommandInset label
+LatexCommand label
+name "fig:The-layout-of-1"
+
+\end_inset
+
+The layout of the GGS.
+ The circles marked with 'C' topmost in the picture represent clients.
+ The cloud marked 'network' pictured directly below the clients can be any
+ network, for example the Internet.
+ The barell figure marked 'backup' is a process being fed backup data from
+ the coordinator.
+ The barell marked 'State' contains the state of a table, and this is fed
+ into the box marked 'Mnesia' which is database.
+ Finally the figure shaped as a shield marked 'GameVM' contains the actual
+ game process.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
 
 \end_layout
 
@@ -5034,3 +5089,4 @@ options "plainnat"
 
 \end_body
 \end_document
+