Skip to content

Commit

Permalink
atcFrequencyGridSource.vb - removed Disclaimer and re-worded LP3 Noti…
Browse files Browse the repository at this point in the history 
…ce in Frequency Report;

                            revised output of Variance/CIs for both CPA and non-CPA conditions
modUtil.vb - removed Disclaimer from DFLOW report
  • Loading branch information
PaulHummelRESPEC committed Mar 13, 2018
1 parent 430a4d4 commit 59ace99
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 21 deletions.
43 changes: 24 additions & 19 deletions atcIntegratedDesignFlow/atcFrequencyGridSource.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,15 +478,13 @@ Public Class atcFrequencyGridSource
Next ' for each lRecurrenceKey As String In pRecurrence.Keys
lExpTab.CurrentRecord += 1
Else
lRept.Append(SWStatDisclaimer) 'Add Message Here
lRept.AppendLine()
lRept.AppendLine("-----------------------SWToolbox Version 1.0------------------------")
lRept.AppendLine("Program SWStat U.S. GEOLOGICAL SURVEY Seq " & lPageCount.ToString.PadLeft(5, "0"))
lRept.AppendLine("Ver. 5.0 Log-Pearson & Pearson Type III Statistics Run Date / Time")
lRept.AppendLine("11/24/2015 based on USGS Program A193 " & System.DateTime.Now.ToString("M/d/yyyy h:mm tt"))
lRept.AppendLine("03/13/2018 based on USGS Program A193 " & System.DateTime.Now.ToString("M/d/yyyy h:mm tt"))
lRept.AppendLine()
lRept.AppendLine(" Notice -- Log-Pearson Type III or Pearson Type III distributions are for")
lRept.AppendLine(" preliminary computations. Users are responsible for assessment")
lRept.AppendLine(" Notice -- Log-Pearson Type III or Pearson Type III distributions are used")
lRept.AppendLine(" for these computations. Users are responsible for assessment")
lRept.AppendLine(" and interpretation.")
lRept.AppendLine()
lRept.AppendLine(" Description: " & lIdentifier)
Expand Down Expand Up @@ -601,14 +599,12 @@ Public Class atcFrequencyGridSource
lExpTab.Value(14) = DoubleToString(lLogNdayTs.Attributes.GetValue("Standard Deviation", 0), , "0.000") '" StDev"
lExpTab.Value(15) = DoubleToString(lLogNdayTs.Attributes.GetValue("Skew", 0), , "0.000") '" Skw"
Else
lRept.Append(SWStatDisclaimer) 'Add Message Here
lRept.AppendLine()
lRept.AppendLine("Program SWStat U.S. GEOLOGICAL SURVEY Seq " & lPageCount.ToString.PadLeft(5, "0"))
lRept.AppendLine("Ver. 5.0 Log-Pearson & Pearson Type III Statistics Run Date / Time")
lRept.AppendLine("11/24/2015 based on USGS Program A193 " & System.DateTime.Now.ToString("M/d/yyyy h:mm tt"))
lRept.AppendLine("03/13/2018 based on USGS Program A193 " & System.DateTime.Now.ToString("M/d/yyyy h:mm tt"))
lRept.AppendLine()
lRept.AppendLine(" Notice -- Log-Pearson Type III or Pearson Type III distributions are for")
lRept.AppendLine(" preliminary computations. Users are responsible for assessment")
lRept.AppendLine(" Notice -- Log-Pearson Type III or Pearson Type III distributions are used")
lRept.AppendLine(" for these computations. Users are responsible for assessment")
lRept.AppendLine(" and interpretation.")


Expand Down Expand Up @@ -735,15 +731,20 @@ Public Class atcFrequencyGridSource
lAdjVal = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & "Adj"), , "0.000", "0.000")
End If
lExpTab.Value(lExpTabFldCtr + 2) = lAdjVal '-Day Low or High
'K Value (export only), variance of estimate and confidence intervals
lExpTab.Value(lExpTabFldCtr + 3) = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " K Value", 0), , "0.000", "0.000")
lExpTab.Value(lExpTabFldCtr + 4) = " N/A"
lExpTab.Value(lExpTabFldCtr + 5) = " N/A"
lExpTab.Value(lExpTabFldCtr + 6) = " N/A"
Else
lExpTab.Value(lExpTabFldCtr + 2) = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence, 0), , "0.000", "0.000")
'K Value (export only), variance of estimate and confidence intervals
lExpTab.Value(lExpTabFldCtr + 3) = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " K Value", 0), , "0.000", "0.000")
lExpTab.Value(lExpTabFldCtr + 4) = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " Variance of Estimate", 0), , "0.000", "0.000")
lExpTab.Value(lExpTabFldCtr + 5) = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " CI Lower", 0), , "0.000", "0.000")
lExpTab.Value(lExpTabFldCtr + 6) = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " CI Upper", 0), , "0.000", "0.000")
End If

'K Value (export only), variance of estimate and confidence intervals
lExpTab.Value(lExpTabFldCtr + 3) = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " K Value", 0), , "0.000", "0.000")
lExpTab.Value(lExpTabFldCtr + 4) = " N/A" 'DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " Variance of Estimate", 0), , "0.000", "0.000")
lExpTab.Value(lExpTabFldCtr + 5) = " N/A" 'DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " CI Lower", 0), , "0.000", "0.000")
lExpTab.Value(lExpTabFldCtr + 6) = " N/A" 'DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " CI Upper", 0), , "0.000", "0.000")
lExpTabFldCtr += lExpTabFieldNames7.Length
Next ' for each lRecurrenceKey As String In pRecurrence.Keys
Else
Expand All @@ -768,14 +769,18 @@ Public Class atcFrequencyGridSource
lAdjVal = DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & "Adj"), , "0.000", "0.000")
End If
lThisRow &= lAdjVal.PadLeft(11)
'No variance of estimate and confidence intervals under CPA
lThisRow &= " N/A".PadLeft(11)
lThisRow &= " N/A".PadLeft(11)
lThisRow &= " N/A".PadLeft(11)
Else
lThisRow &= DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence, 0), , "0.000", "0.000").PadLeft(11)
'K Value (export only), variance of estimate and confidence intervals
lThisRow &= DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " Variance of Estimate", 0), , "0.000", "0.000").PadLeft(11)
lThisRow &= DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " CI Lower", 0), , "0.000", "0.000").PadLeft(11)
lThisRow &= DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " CI Upper", 0), , "0.000", "0.000").PadLeft(11)
End If

'K Value (export only), variance of estimate and confidence intervals
lThisRow &= " N/A".PadLeft(11) 'DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " Variance of Estimate", 0), , "0.000", "0.000").PadLeft(11)
lThisRow &= " N/A".PadLeft(11) 'DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " CI Lower", 0), , "0.000", "0.000").PadLeft(11)
lThisRow &= " N/A".PadLeft(11) 'DoubleToString(lAttributes.GetValue(lAttrName & lRecurrence & " CI Upper", 0), , "0.000", "0.000").PadLeft(11)
If pHigh Then
lReverseString &= lThisRow & vbCrLf
Else
Expand Down
2 changes: 0 additions & 2 deletions atcIntegratedDesignFlow/modUtil.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1624,8 +1624,6 @@ Public Module modUtil
'lRept.AppendLine()
'lRept.AppendLine(vbFormFeed)

lHeader &= DFLOWDisclaimer 'Add Message Here
lHeader &= vbCrLf
lHeader &= "Program SWToolbox U.S. GEOLOGICAL SURVEY Version 1.0" & vbCrLf
lHeader &= "Analysis: DFLOW (version " & i_Version & ")" & vbCrLf
lHeader &= "Run Date and Time: " & System.DateTime.Now.ToString("M/d/yyyy h:mm tt")
Expand Down

0 comments on commit 59ace99

Please sign in to comment.