Displaying differences for changeset
 
display as  

src/java/m/cfa/flood/guiFlood_Model.java

@@ -343,7 +343,7 @@
                 String year = df.format( peakFlow[ 0 ] );
                 String rate = df.format( peakFlow[ 1 ] );
 
-                boolean simpleValue = false;
+                boolean simpleValue = true;
                 String lowerFlowInterval = null;
                 String upperFlowInterval = null;
                 if (this.flowIntervals.length() > 0) {
@@ -356,11 +356,11 @@
                             double dischargeRate = Double.parseDouble(rate);
                             double lowerFlowIntervalNumber = Double.parseDouble(lowerFlowInterval);
                             double upperFlowIntervalNumber = Double.parseDouble(upperFlowInterval);
-                            if ( Double.compare(lowerFlowIntervalNumber, upperFlowIntervalNumber) != 0 && 
-                                    Double.compare(lowerFlowIntervalNumber, dischargeRate) != 0){
+                            if ( Double.compare(lowerFlowIntervalNumber, dischargeRate) != 0 ||
+                                    Double.compare(upperFlowIntervalNumber, dischargeRate) != 0) {
                                 //If the upper and lower flow interval are the same
                                 //And the flow intervals match the discharge, then this is a simple one
-                                simpleValue = true;
+                                simpleValue = false;
                             }
                             break;
                         }