Output option added, output refined

README.md

@@ -64,15 +64,16 @@ Execution Options:
 -h [ --help ]                produce help message
 --input arg                  name of the input files
 -s [ --sync ]                synchronize the node base, for example to fairly
-														 evaluate against top K selected clusters that
-														 are subset of the original nodes
--f [ --fnmi ]                evaluate also FNMI
+								evaluate against top K selected clusters that
+								are subset of the original nodes
+-n [ --nmis ]			 	 output both NMI [max] and NMI_sqrt
+-f [ --fnmi ]                evaluate also FNMI, includes '-x'
 -r [ --risk ] arg (=0.01)    probability of value being outside
 -e [ --error ] arg (=0.01)   admissible error
 -a [ --fast ]                apply fast approximate evaluations that are less
-														 accurate, but much faster on large networks
+								 accurate, but much faster on large networks
 -m [ --membership ] arg (=1) average expected membership of nodes in the
-														 clusters, > 0, typically >= 1
+								 clusters, > 0, typically >= 1
 ```
 If you want to tweak the precision, use the options `-e` and `-r`, to set the error and
 the risk respectively. See the [paper](http://arxiv.org/abs/1202.0425) for the meaning of these concepts.  

gecmi.cpp

@@ -40,7 +40,8 @@ int main(int argc, char* argv[])
             "name of the input files" )
         ("sync,s", "synchronize the node base, for example to fairly evaluate against"
             " top K selected clusters that are subset of the original nodes")
-        ("fnmi,f", "evaluate also FNMI")
+        ("nmis,n", "output both NMI [max] and NMI_sqrt")
+        ("fnmi,f", "evaluate also FNMI, includes '-x'")
         ("risk,r",
             po::value<double>()->default_value(0.01),
             "probability of value being outside" )
@@ -144,11 +145,13 @@ int main(int argc, char* argv[])
     if (vm.count("fnmi")) {
         const auto b1rnum = bcp1.uniqrSize();
         const auto b2rnum = bcp2.uniqrSize();
-        printf("NMI: %G, FNMI: %G, NMI_sqrt: %G; cls1: %lu, cls2: %lu\n", cit.nmi
+        printf("NMI_max: %G, FNMI: %G, NMI_sqrt: %G; cls1: %lu, cls2: %lu\n", cit.nmi
               // Note: 2^x is used instead of e^x to have the same base as in the log
             , cit.nmi * pow(2, -double(abs(b1rnum - b2rnum)) / std::max(b1rnum, b2rnum))
             , cit.nmi_sqrt, b1rnum, b2rnum);
-    } else printf("NMI: %G, NMI_sqrt: %G\n", cit.nmi, cit.nmi_sqrt);
+    } else if (vm.count("nmis"))
+        printf("NMI_max: %G, NMI_sqrt: %G\n", cit.nmi, cit.nmi_sqrt);
+    else printf("%G\n", cit.nmi);
 
     return 0;
 }