Rename the Nearest-Neighbour matrix now that I've recognised it

GEODE/Visualisation/ConfusionMatrix.py

@@ -30,7 +30,7 @@ def maxOutOfDiagonal(n, row):
     m = max([row[i] for i in range(l) if i != n])
     return [row[i] if i != n and row[i] == m else 0 for i in range(l)]
 
-def maxConfusionMatrix(m):
+def nearestNeighbour(m):
     return [maxOutOfDiagonal(i, m[i]) for i in range(len(m))]
 
 def confusionMatrix(data, labels):
@@ -44,10 +44,10 @@ def getConfusionMatrix(inputFile, labels=None):
     elif inputFile[-5:] == '.json':
         return JSON.load(inputFile)
 
-def extractConfusionMatrix(inputFile, outputJSON, labels=None, maximal=False):
+def extractConfusionMatrix(inputFile, outputJSON, labels=None, nearest=False):
     data = getConfusionMatrix(inputFile, labels)
-    if maximal:
-        data['matrix'] = maxConfusionMatrix(data['matrix'])
+    if nearest:
+        data['matrix'] = nearestNeighbour(data['matrix'])
     JSON.save(data, outputJSON)
 
 def getArgs(arguments):
@@ -57,8 +57,9 @@ def getArgs(arguments):
     cli.add_argument('inputFile')
     cli.add_argument('outputJSON')
     add_labels_argument(cli)
-    cli.add_argument('-m', '--maximal', action='store_const', const=True,
-                     default=False, help="Simplify the matrix into an MCM")
+    cli.add_argument('-n', '--nearestNeighbour', action='store_const',
+                     const=True, default=False,
+                     help="Simplify the matrix into an MCM")
     return cli.parse_args(arguments)
 
 def extractConfusionMatrixCLI(arguments):
@@ -67,4 +68,4 @@ def extractConfusionMatrixCLI(arguments):
     extractConfusionMatrix(args.inputFile,
                            args.outputJSON,
                            labels=labels,
-                           maximal=args.maximal)
+                           nearest=args.nearestNeighbour)

GEODE/Visualisation/__init__.py

 from GEODE.Visualisation.ConfusionMatrix import extractConfusionMatrix, \
-        maxConfusionMatrix
+        nearestNeighbour
 from GEODE.Visualisation.DensityProfile import densityProfile, \
         drawDensityProfile, plotDensity
 from GEODE.Visualisation.DrawMatrix import drawMatrix

GEODE/__init__.py

@@ -24,7 +24,7 @@ from GEODE.Metadata import article, articleKey, paragraph, paragraphKey, \
         fromKey, relativePath, toKey, uid
 from GEODE.Store import corpus, Directory, JSON, SelfContained, tabular, toTSV
 from GEODE.Visualisation import densityProfile, drawMatrix, drawGraph, legend, \
-        maxConfusionMatrix
+        nearestNeighbour
 from GEODE.Visualisation.ConfusionMatrix import extractConfusionMatrixCLI
 from GEODE.Visualisation.DensityProfile import drawDensityProfileCLI
 from GEODE.Visualisation.DrawMatrix import drawMatrixCLI