modified shhhercommand to make buildable with windows

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index 8aeed0adfe8fa9da5104938157691f4fca534a87..ce1354bfa1f0667a0f2678db6539bd3562777309 100644 (file)
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -1585,7 +1585,10 @@
 /* Begin PBXProject section */
                08FB7793FE84155DC02AAC07 /* Project object */ = {
                        isa = PBXProject;
-                       buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "mothur" */;
+                       attributes = {
+                               ORGANIZATIONNAME = "Schloss Lab";
+                       };
+                       buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "Mothur" */;
                        compatibilityVersion = "Xcode 3.1";
                        developmentRegion = English;
                        hasScannedForEncodings = 1;
@@ -1995,7 +1998,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "mothur" */ = {
+               1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "Mothur" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                1DEB928A08733DD80010E9CD /* Debug */,

diff --git a/shhhercommand.cpp b/shhhercommand.cpp
index 63df681923c0a91e87c3507f861fcd519253f332..ffddb8cfc9de4dd92feb4966dd8d31477e1363fa 100644 (file)
--- a/shhhercommand.cpp
+++ b/shhhercommand.cpp
@@ -838,7 +838,7 @@ void ShhherCommand::getJointLookUp(){
                for(int i=0;i<NUMBINS;i++){
                        for(int j=0;j<NUMBINS;j++){             
                                
-                               double minSum = 10000000000;
+                               double minSum = 100000000;
                                
                                for(int k=0;k<HOMOPS;k++){
                                        double sum = singleLookUp[k * NUMBINS + i] + singleLookUp[k * NUMBINS + j];
@@ -857,9 +857,11 @@ void ShhherCommand::getJointLookUp(){
 
 /**************************************************************************************************/
 
-float ShhherCommand::getProbIntensity(int intIntensity){                          
+double ShhherCommand::getProbIntensity(int intIntensity){                          
        try{
-               double minNegLogProb = 10000000000; 
+
+               double minNegLogProb = 100000000; 
+
                
                for(int i=0;i<HOMOPS;i++){//loop signal strength
                        float negLogProb = singleLookUp[i * NUMBINS + intIntensity];

diff --git a/shhhercommand.h b/shhhercommand.h
index b26341ebe4c83dc0024f313640a06bf62f045638..b423b4d320acd81ecb1c2e67b1f4ba6c3ad9d3fc 100644 (file)
--- a/shhhercommand.h
+++ b/shhhercommand.h
@@ -70,7 +70,7 @@ private:
        void getJointLookUp();
        void getFlowData();
        void getUniques();
-       float getProbIntensity(int);
+       double getProbIntensity(int);
        float calcPairwiseDist(int, int);
        void flowDistParentFork(string, int, int);