Use less ambiguous variable names

Author: t-schoof

base/quadgk.jl

@@ -114,13 +114,13 @@ function do_quadgk{Tw}(f, s, n, ::Type{Tw}, abstol, reltol, maxevals, nrm)
     return do_quadgk_no_inf(f, s, n, Tw, abstol, reltol, maxevals, nrm)
 end
 
-function do_quadgk_no_inf{Tw}(f, ss, n, ::Type{Tw}, abstol, reltol, maxevals, nrm)
+function do_quadgk_no_inf{Tw}(f, s, n, ::Type{Tw}, abstol, reltol, maxevals, nrm)
     key = rulekey(Tw,n)
     x::Vector{Tw},w::Vector{Tw},gw::Vector{Tw} = haskey(rulecache, key) ? rulecache[key] :
        (rulecache[key] = kronrod(Tw, n))
-    segs = [evalrule(f, ss[1],ss[2], x,w,gw, nrm)]
-    for i in 2:length(ss) - 1
-        heappush!(segs, evalrule(f, ss[i],ss[i+1], x,w,gw, nrm), Reverse)
+    segs = [evalrule(f, s[1],s[2], x,w,gw, nrm)]
+    for i in 2:length(s) - 1
+        heappush!(segs, evalrule(f, s[i], s[i+1], x,w,gw, nrm), Reverse)
     end
     numevals = (2n+1) * length(segs)
     I = segs[1].I
@@ -132,14 +132,14 @@ function do_quadgk_no_inf{Tw}(f, ss, n, ::Type{Tw}, abstol, reltol, maxevals, nr
     # Pop the biggest-error segment and subdivide (h-adaptation)
     # until convergence is achieved or maxevals is exceeded.
     while E > abstol && E > reltol * nrm(I) && numevals < maxevals
-        s = heappop!(segs, Reverse)
-        mid = (s.a + s.b) * 0.5
-        s1 = evalrule(f, s.a, mid, x,w,gw, nrm)
-        s2 = evalrule(f, mid, s.b, x,w,gw, nrm)
-        heappush!(segs, s1, Reverse)
-        heappush!(segs, s2, Reverse)
-        I = (I - s.I) + s1.I + s2.I
-        E = (E - s.E) + s1.E + s2.E
+        seg = heappop!(segs, Reverse)
+        mid = (seg.a + seg.b) * 0.5
+        seg1 = evalrule(f, seg.a, mid, x,w,gw, nrm)
+        seg2 = evalrule(f, mid, seg.b, x,w,gw, nrm)
+        heappush!(segs, seg1, Reverse)
+        heappush!(segs, seg2, Reverse)
+        I = (I - seg.I) + seg1.I + seg2.I
+        E = (E - seg.E) + seg1.E + seg2.E
         numevals += 4n+2
     end
     # re-sum (paranoia about accumulated roundoff)