updated some changes to normalize in dataset.

ragavvenkatesan · Jan 24, 2017 · 4670c6a · 4670c6a
1 parent 9c3cf24
commit 4670c6a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/yann/utils/dataset.py b/yann/utils/dataset.py
@@ -731,11 +731,13 @@ def preprocessing( data, height, width, channels, args):
 
 	# from here on data is processed as a 2D matrix
 	data = numpy.reshape(data,out_shp)
-	if normalize is True or ZCA is True: 
-		data = data / (data.max(axis = 0) + 1e-7)
-		# do this normalization thing in batch mode.	
-	if mean_subtract is True or ZCA is True:    			
-		data = data - data.mean(axis = 0)		
+	if mean_subtract is True:
+		if normalize is True or ZCA is True: 
+			data = (data - data.mean(axis = 0)) / (data.max(axis = 0) + 1e-7)
+			# do this normalization thing in batch mode.	
+	else:
+    	if normalize is True or ZCA is True:
+			data = data / (data.max(axis =0) + 1e-7)
 
 	if ZCA is True: