modified some calculators and other stuff - pds

[mothur.git] / npshannon.cpp

diff --git a/npshannon.cpp b/npshannon.cpp
index 4ff26110d20ee42914d9bfb20a0b523a945f4216..faabc9874dbcd4b08739dc66cf2e8728c710fa48 100644 (file)
--- a/npshannon.cpp
+++ b/npshannon.cpp
@@ -3,7 +3,7 @@
  *  Dotur
  *
  *  Created by John Westcott on 1/7/09.
- *  Copyright 2009 __MyCompanyName__. All rights reserved.
+ *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
 
@@ -28,6 +28,7 @@ EstOutput NPShannon::getValues(SAbundVector* rank){
                                double ChatPi = Chat*pi;
                                if(ChatPi>0){
                                        npShannon += rank->get(i) * ChatPi*log(ChatPi)/(1-pow(1-ChatPi,(double)sampled));
+                                       cout << ChatPi << '\t' << rank->get(i) * ChatPi*log(ChatPi)/(1-pow(1-ChatPi,(double)sampled)) << endl;
                                }
                        }
                        npShannon = -npShannon;