[Avida-SVN] r1800 - branches/uml/source/main

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2007-07-13 15:00:39 -0400 (Fri, 13 Jul 2007)
New Revision: 1800

Modified:
   branches/uml/source/main/cOrganism.cc
   branches/uml/source/main/cUMLModel.cc
Log:
initialization fixes.

Modified: branches/uml/source/main/cOrganism.cc
===================================================================
--- branches/uml/source/main/cOrganism.cc	2007-07-13 18:47:44 UTC (rev 1799)
+++ branches/uml/source/main/cOrganism.cc	2007-07-13 19:00:39 UTC (rev 1800)
@@ -68,6 +68,9 @@
   , m_max_executed(-1)
   , m_is_running(false)
   , m_net(NULL)
+  , m_state_diag(0)
+  , m_orig_state_index(0)
+  , m_dest_state_index(0)
 {
   // Initialization of structures...
   m_hardware = m_world->GetHardwareManager().Create(this);
@@ -680,10 +683,7 @@
 
 cUMLModel* cOrganism::getUMLModel()
 {
-	cUMLModel* temp_mod;
-	
-	temp_mod = &m_model;
-	return temp_mod;
+  return &m_model;
 }
 
 bool cOrganism::absoluteJumpStateDiagram (int amount )
@@ -716,9 +716,7 @@
 
 cUMLStateDiagram* cOrganism::getStateDiagram() 
 { 
-	int m = m_state_diag;
-	return getUMLModel()->getStateDiagram(m); 
-
+  return m_model.getStateDiagram(m_state_diag);
 }
 
 // Determines if this is the transition the organism is about to add

Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2007-07-13 18:47:44 UTC (rev 1799)
+++ branches/uml/source/main/cUMLModel.cc	2007-07-13 19:00:39 UTC (rev 1800)
@@ -44,11 +44,8 @@
 
 cUMLStateDiagram* cUMLModel::getStateDiagram (int x) 
 {
-	// check to see whether this state diagram exists
-	if (x < state_diagrams.size()) { 
-		return (&(state_diagrams.begin()[x]));
-	}
-
+  assert(x<state_diagrams.size());
+  return &state_diagrams[x];
 }
 
 /* This is a crappy little function to read in from a file.