Merge pull request #5 from Alex-Linhares/master

Cleaned up git FETCH HEAD

README.md

@@ -29,11 +29,11 @@ Where to start?
 The supplemental_data.pdf holds:
 
 
-i) An introduction to the computational methods available in https://github.com/msbrogli/sdm;  
-ii) A large set of additional heatmaps, documenting the critical distance behavior of the model in a 1000-dimensional memory;  
-iii) The same tests on 256-dimensional memory,  
-iv) all rehearsal results for 256-dimensional memory, and  
-v) the same tests for 1000-dimensional memory.  
+i) An introduction to the computational methods available in https://github.com/msbrogli/sdm;    
+ii) A large set of additional heatmaps, documenting the critical distance behavior of the model in a 1000-dimensional memory;    
+iii) The same tests on 256-dimensional memory,    
+iv) all rehearsal results for 256-dimensional memory, and    
+v) the same tests for 1000-dimensional memory.    
 
 
 How do I contribute?

pyopenCL_Tests/GPU_Code_OpenCLv1_2.cl

@@ -10,6 +10,21 @@
 #define HASH_TABLE_SIZE6 25028
 #define HASH_TABLE_SIZE7 25027
 
+
+/*
+
+
+#define HASH_TABLE_SIZE 48781
+#define HASH_TABLE_SIZE2 48780
+#define HASH_TABLE_SIZE3 48779
+#define HASH_TABLE_SIZE4 48778
+#define HASH_TABLE_SIZE5 48777
+#define HASH_TABLE_SIZE6 48776
+#define HASH_TABLE_SIZE7 48775
+*/
+
+
+
 /*
 #define HASH_TABLE_SIZE 12043
 #define HASH_TABLE_SIZE2 12042
@@ -19,6 +34,8 @@
 #define HASH_TABLE_SIZE6 12038
 #define HASH_TABLE_SIZE7 12037
 */
+
+
 // HASH_TABLE_SIZE must be prime.  The higher it is, the more bandwidth, but less collisions.  It should also be "far" from a power of 2. 
 
 #define ACCESS_RADIUS_THRESHOLD 104

pyopenCL_Tests/SDM_OpenCL_get_active_locations.py

@@ -94,15 +94,15 @@ def Get_Active_Locations(bitstring, ctx):
 
 
 
-
-
-
+#bin_active_index_gpu = Get_Bin_Active_Indexes_GPU_Buffer(ctx)
 
 bin_active_index_gpu = Get_Hash_Table_GPU_Buffer(ctx)
+
 memory_addresses_gpu = Get_Memory_Addresses_Buffer(ctx)
 distances_gpu = Get_Distances_GPU_Buffer(ctx)
 
 
+
 OpenCL_code = Get_Text_code ('GPU_Code_OpenCLv1_2.cl')
 
 import os
@@ -157,9 +157,9 @@ def Get_Active_Locations(bitstring, ctx):
 
 mean  = Results[Results !=0].mean()
 
-print Results[Results !=0].min(), " the minimum of HLs found should be 980"
-print mean, "the mean of HLs found should be 1094.7665"
-print Results[Results !=0].max(), "the max of HLs found should be 1220"
+print Results[Results !=0].min(), " the minimum of HLs found should be 1001"
+print mean, "the mean of HLs found should be 1119.077"
+print Results[Results !=0].max(), "the max of HLs found should be 1249"
 
 
 print numpy.size(hash_table_active_index)