[avida-cvs] avida CVS commits: /current/source/main analyze.cc inst_set.cc

[mercere99]

mercere99		Mon May 26 21:21:57 2003 EDT

  Modified files:              
    /avida/current/source/main	analyze.cc inst_set.cc 
  Log:
  When one instruction set was initialized to another one, the associated
  instruction library was not properly copied.  This is now fixed.
  
  
Index: avida/current/source/main/analyze.cc
diff -u avida/current/source/main/analyze.cc:1.72 avida/current/source/main/analyze.cc:1.73
--- avida/current/source/main/analyze.cc:1.72	Sun May 25 09:46:31 2003
+++ avida/current/source/main/analyze.cc	Mon May 26 21:21:55 2003
@@ -2021,7 +2021,7 @@
     // Locate instruction corresponding to "NULL" in the instruction library.
     {
       const cInstruction inst_lib_null_inst = map_inst_set.GetInstLib()->GetInst("NULL");
-      if(inst_lib_null_inst == map_inst_set.GetInstLib()->GetInstError()){
+      if (inst_lib_null_inst == map_inst_set.GetInstLib()->GetInstError()){
         cout << "<cAnalyze::CommandMapMutations> got error:" << endl;
         cout << " --- instruction \"NULL\" isn't in the instruction library;" << endl;
         cout << " --- get somebody to map a function to \"NULL\" in the library." << endl;
Index: avida/current/source/main/inst_set.cc
diff -u avida/current/source/main/inst_set.cc:1.2 avida/current/source/main/inst_set.cc:1.3
--- avida/current/source/main/inst_set.cc:1.2	Fri May 23 04:43:22 2003
+++ avida/current/source/main/inst_set.cc	Mon May 26 21:21:56 2003
@@ -34,7 +34,8 @@
 
 #ifdef USE_INST_SET_CODE
 cInstSet::cInstSet(const cInstSet & in_inst_set)
-  : m_lib_name_map(in_inst_set.m_lib_name_map)
+  : m_inst_lib(in_inst_set.m_inst_lib)
+  , m_lib_name_map(in_inst_set.m_lib_name_map)
   , m_lib_nopmod_map(in_inst_set.m_lib_nopmod_map)
   , mutation_chart2(in_inst_set.mutation_chart2)
 {