[Avida-SVN] r2729 - in branches/collect/source: tools utils/hist_map

[blwalker at myxo.css.msu.edu]

Author: blwalker
Date: 2008-07-28 11:16:20 -0400 (Mon, 28 Jul 2008)
New Revision: 2729

Modified:
   branches/collect/source/tools/cFile.cc
   branches/collect/source/tools/tHashTable.h
   branches/collect/source/utils/hist_map/Makefile
   branches/collect/source/utils/hist_map/hist_map.cc
Log:

Porting r2721:2728 from development to the collect branch.


Modified: branches/collect/source/tools/cFile.cc
===================================================================
--- branches/collect/source/tools/cFile.cc	2008-07-28 13:32:26 UTC (rev 2728)
+++ branches/collect/source/tools/cFile.cc	2008-07-28 15:16:20 UTC (rev 2729)
@@ -53,6 +53,7 @@
     if (err_id == EACCES) error_desc = "Access denied";
     else if (err_id == EINVAL) error_desc = "Invalid open flag or access mode";
     else if (err_id == ENOENT) error_desc = "File or path not found";
+    else if (_fname.Find('~') != -1) error_desc = "Tildes do not get expanded";
 
     // Print the error.
     cerr << "Error: Unable to open file '" << _fname << "' : " << error_desc << endl;

Modified: branches/collect/source/tools/tHashTable.h
===================================================================
--- branches/collect/source/tools/tHashTable.h	2008-07-28 13:32:26 UTC (rev 2728)
+++ branches/collect/source/tools/tHashTable.h	2008-07-28 15:16:20 UTC (rev 2729)
@@ -124,7 +124,7 @@
       out_hash += (unsigned int) key[i];
     return out_hash % table_size;
   }
-};
+}
 
 
 template <class HASH_TYPE, class DATA_TYPE> class tHashTable {

Modified: branches/collect/source/utils/hist_map/Makefile
===================================================================
--- branches/collect/source/utils/hist_map/Makefile	2008-07-28 13:32:26 UTC (rev 2728)
+++ branches/collect/source/utils/hist_map/Makefile	2008-07-28 15:16:20 UTC (rev 2729)
@@ -22,14 +22,15 @@
 ### Different Builds #########################################################
 
 # executable make
-TARGET		= hist_map2
+TARGET		= hist_map
 
 default:  $(TARGET)
 
 ### List Source Files in the Project #########################################
-SRC		= hist_map2.cc			../../tools/cFile.cc  \
+SRC		= hist_map.cc			../../tools/cFile.cc  \
 		../../tools/cInitFile.cc	../../tools/cString.cc  \
 		../../tools/cStringList.cc  ../../tools/cStringIterator.cc  \
+		../../tools/cStringUtil.cc
 
 ### List Object Files (for each source file there is a object file) ###########
 OBJ	 	= $(SRC:.cc=.o)
@@ -71,16 +72,3 @@
 ### Release Packageing ########################################################
 # DO NOT DELETE
 
-hist_map2.o: ../../tools/tMatrix.h ../../tools/tArray.h
-hist_map2.o: ../../tools/cString.h ../../tools/cFile.h
-hist_map2.o: ../../tools/cInitFile.h ../../tools/cStringList.h
-hist_map2.o: ../../tools/tList.h
-../../tools/file.o: ../../tools/cFile.h ../../tools/cString.h
-../../tools/file.o: ../../tools/cInitFile.h ../../tools/cStringList.h
-../../tools/file.o: ../../tools/tList.h ../../tools/tArray.h
-../../tools/file.o: ../../tools/cGenesis.h ../../tools/cStringIterator.h
-../../tools/file.o: ../../tools/cTools.h ../../tools/cRandom.h
-../../tools/init_file.o: ../../tools/cInitFile.h ../../tools/cStringList.h
-../../tools/init_file.o: ../../tools/tList.h ../../tools/tArray.h
-../../tools/init_file.o: ../../tools/cStringIterator.h
-../../tools/string.o: ../../tools/cString.h

Modified: branches/collect/source/utils/hist_map/hist_map.cc
===================================================================
--- branches/collect/source/utils/hist_map/hist_map.cc	2008-07-28 13:32:26 UTC (rev 2728)
+++ branches/collect/source/utils/hist_map/hist_map.cc	2008-07-28 15:16:20 UTC (rev 2729)
@@ -4,11 +4,11 @@
 
 #include <iostream>
 
-#include "tools/tMatrix.h"
+#include "../../tools/tMatrix.h"
 
-#include "tools/cString.h"
-#include "tools/cFile.h"
-#include "tools/cInitFile.h"
+#include "../../tools/cString.h"
+#include "../../tools/cFile.h"
+#include "../../tools/cInitFile.h"
 
 
 using namespace std;
@@ -34,9 +34,9 @@
     cerr << "Processing: '" << argv[i+3] << "'" << endl;
 
     cInitFile file(argv[i+3]);
-    file.Load();
-    file.Compress();
-    file.Close();
+//     file.Load();
+//     file.Compress();
+//     file.Close();
 
     tArray<int> & site_count = count_arrays[i];
     site_count.SetAll(0);