[Avida-SVN] r2398 - in branches/uml: . source/main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-02-29 10:36:03 -0500 (Fri, 29 Feb 2008)
New Revision: 2398

Modified:
   branches/uml/HPC_CMakeLists.txt
   branches/uml/build_avida
   branches/uml/hpc_build_avida
   branches/uml/source/main/cStats.cc
   branches/uml/source/main/cUMLModel.h
Log:


Modified: branches/uml/HPC_CMakeLists.txt
===================================================================
--- branches/uml/HPC_CMakeLists.txt	2008-02-29 15:16:12 UTC (rev 2397)
+++ branches/uml/HPC_CMakeLists.txt	2008-02-29 15:36:03 UTC (rev 2398)
@@ -217,6 +217,14 @@
   ${MAIN_DIR}/cSpatialResCount.cc
   ${MAIN_DIR}/cUMLModel.cc
   ${MAIN_DIR}/cUMLStateDiagram.cc
+  ${MAIN_DIR}/cUMLClass.cc
+  ${MAIN_DIR}/cMDEProperty.cc
+  ${MAIN_DIR}/cMDEPropertyGenerator.cc
+  ${MAIN_DIR}/cMDEUniversalProperty.cc
+  ${MAIN_DIR}/cMDEExistenceProperty.cc
+  ${MAIN_DIR}/cMDEAbsenceProperty.cc
+  ${MAIN_DIR}/cMDEResponseProperty.cc
+  ${MAIN_DIR}/cMDEPrecedenceProperty.cc
   ${MAIN_DIR}/cStats.cc
   ${MAIN_DIR}/cTaskLib.cc
   ${MAIN_DIR}/cWorld.cc

Modified: branches/uml/build_avida
===================================================================
--- branches/uml/build_avida	2008-02-29 15:16:12 UTC (rev 2397)
+++ branches/uml/build_avida	2008-02-29 15:36:03 UTC (rev 2398)
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-cp Alice_CMakeLists.txt CMakeLists.txt
 mkdir -p cbuild
 cd cbuild
 cmake "$@" ../

Modified: branches/uml/hpc_build_avida
===================================================================
--- branches/uml/hpc_build_avida	2008-02-29 15:16:12 UTC (rev 2397)
+++ branches/uml/hpc_build_avida	2008-02-29 15:36:03 UTC (rev 2398)
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-module unload ps25
-module unload intelcc
+module rm sgicluster
 module load gnu
 cp HPC_CMakeLists.txt CMakeLists.txt
 mkdir -p cbuild

Modified: branches/uml/source/main/cStats.cc
===================================================================
--- branches/uml/source/main/cStats.cc	2008-02-29 15:16:12 UTC (rev 2397)
+++ branches/uml/source/main/cStats.cc	2008-02-29 15:36:03 UTC (rev 2398)
@@ -1063,7 +1063,7 @@
 	cDataFile& df = m_world->GetDataFile(filename);
 
   // This to force every row to have the same number of columns.
-  if(m_scenario_completion.size()==0) return;
+//  if(m_scenario_completion.size()==0) return;
   
 	df.WriteComment( "Avida uml data\n" );
 	df.WriteComment("the average number of transitions and states per organism");

Modified: branches/uml/source/main/cUMLModel.h
===================================================================
--- branches/uml/source/main/cUMLModel.h	2008-02-29 15:16:12 UTC (rev 2397)
+++ branches/uml/source/main/cUMLModel.h	2008-02-29 15:36:03 UTC (rev 2398)
@@ -4,7 +4,7 @@
 #include "cUMLClass.h"
 #include "cUMLStateDiagram.h"
 #include "cMDEPropertyGenerator.h"
-#include "cMDEExpressionAttribute.H"
+#include "cMDEExpressionAttribute.h"
 
 #include <string>
 #include <iostream>