Changeset 5166 for branches/uq

Timestamp:

Mar 23, 2015, 10:48:24 AM (9 years ago)

Author:

mmh

Message:

snapshot of uq work

Location:

branches/uq

Files:

• gui/scripts/analyzer.tcl (modified) (1 diff)
• gui/scripts/numberentry.tcl (modified) (4 diffs)
• gui/scripts/probdisteditor.tcl (modified) (2 diffs)
• puq/puq_analyze.py (modified) (5 diffs)

branches/uq/gui/scripts/analyzer.tcl

@@ -1103 +1103 @@
 
     #
+    # Now handle SUBMIT-PROGRESS
+    #
+    while {[regexp -indices {=SUBMIT-PROGRESS=> aborted=([0-9]+) finished=([0-9]+) failed=([0-9]+) executing=([0-9]+)\
+        waiting=([0-9]+) setting_up=([0-9]+) setup=([0-9]+) %done=([0-9.]+) timestamp=([0-9.]+)} $message \
+        match aborted finished failed executing waiting setting_up setup percent ts mesg]} {
+
+        set mesg ""
+        foreach {i0 i1} $percent break
+        set percent [string range $message $i0 $i1]
+        foreach {i0 i1} $failed break
+        set failed [string range $message $i0 $i1]
+        foreach {i0 i1} $match break
+        set message [string replace $message $i0 $i1]
+
+        if {$failed != 0} {set mesg "$failed jobs failed!"}
+        if {$percent >= 100} { set mesg "Jobs finished.  Analyzing results..."}
+
+        pack $itk_component(progress) -fill x -padx 10 -pady 10
+        $itk_component(progress) settings -percent $percent -message $mesg
+    }
+
+
+    #
     # Break up the remaining lines according to =RAPPTURE-ERROR=> messages.
     # Show errors in a special color.

branches/uq/gui/scripts/numberentry.tcl

@@ -43 +43 @@
 itcl::body Rappture::NumberEntry::constructor {owner path args} {
     puts "NumberEntry '$path' '$args'"
-    set varname [lindex [split $path ()] 1]
-
+    set varname [lindex [split $path ()] end-1]
     if {[catch {$owner isa Rappture::ControlOwner} valid] != 0 || !$valid} {
         error "bad object \"$owner\": should be Rappture::ControlOwner"
@@ -51 +50 @@
     set _path $path
 
-    puts "LABEL=[label]"
     #
     # Figure out what sort of control to create
@@ -64 +62 @@
     set class Rappture::Gauge
     set units [string trim [$_owner xml get $path.units]]
-    puts "units=$units"
     if {$units != ""} {
         set desc [Rappture::Units::description $units]
@@ -123 +120 @@
     #
     set str [string trim [$_owner xml get $path.default]]
-    puts "Default=$str"
     if {$str ne ""} {
         $itk_component(gauge) value $str

branches/uq/gui/scripts/probdisteditor.tcl

@@ -243 +243 @@
             if {"" != $_umin} {
                 if {"" != $units} {
-                    set tmp(min) [Rappture::Units::convert $_umin -to $units -units off]
+                    set tmp(min) [Rappture::Units::convert $_umin -to $units -context $units -units off]
                 } else {
                     set tmp(min) $_umin
@@ -250 +250 @@
             if {"" != $_umax} {
                 if {"" != $units} {
-                    set tmp(max) [Rappture::Units::convert $_umax -to $units -units off]
+                    set tmp(max) [Rappture::Units::convert $_umax -to $units -context $units -units off]
                 } else {
                     set tmp(max) $_umax

branches/uq/puq/puq_analyze.py

@@ -62 +62 @@
     xy.text = pts
 
+def dist(x1,y1, x2,y2, x3,y3): # x3,y3 is the point
+    diffx = x2-x1
+    diffy = y2-y1
+    sqdiff = float(diffx**2 + diffy**2)
+
+    u = ((x3 - x1) * diffx + (y3 - y1) * diffy) / sqdiff
+
+    if u > 1:
+        u = 1
+    elif u < 0:
+        u = 0
+
+    x = x1 + u * diffx
+    y = y1 + u * diffy
+
+    dx = x - x3
+    dy = y - y3
+
+    return np.sqrt(dx*dx + dy*dy)
+
+# Plots advanced probability curves
+def plot_pdf_acurve(hf, acurves, vname, percent, desc):
+    print 'plot_pdf_acurve %s %s %s' % (vname, percent, desc)
+    # compute upper and lower percentiles
+    pm = (100 - percent)/200.0
+    pp = 1 - pm
+    vlen = len(acurves[vname])
+
+    print 'vlen=', vlen
+    # collect data into an array
+    xp = np.empty(vlen)
+    xm = np.empty(vlen)
+    yp = np.empty(vlen)
+    ym = np.empty(vlen)
+
+    for vindex in sorted(acurves[vname].keys()):
+        print 'vindex=', vindex
+        x1 = acurves[vname][vindex][0].ppf(pp)
+        x2 = acurves[vname][vindex][0].ppf(pm)
+        y1 = acurves[vname][vindex][1].ppf(pp)
+        y2 = acurves[vname][vindex][1].ppf(pm)
+        xd = hf['/output/data/%s.x[%d]' % (vname, int(vindex))].value
+        yd = hf['/output/data/%s.y[%d]' % (vname, int(vindex))].value
+        #p1, p2 = get_closest2()
+        if int(vindex) == 2:
+            print x1, x2, y1, y2
+            print 'xd=', repr(xd)
+            print 'yd=', repr(yd)
+
+        #xp[vindex] = x1
+        #xm[vindex] = x2
+        #yp[vindex] = y1
+        #ym[vindex] = y2
+    return
+    curve = xml.SubElement(dout, 'curve', {'id': 'curve_pdf-%s-%s' % (vname, percent)})
+    about = xml.SubElement(curve, 'about')
+    if percent == 0:
+        xml.SubElement(about, 'label').text = "mean"
+    else:
+        xml.SubElement(about, 'label').text = "middle %s%%" % percent
+    xml.SubElement(about, 'group').text = '%s (Probability)' % desc
+    comp = xml.SubElement(curve, 'component')
+    xy = xml.SubElement(comp, 'xy')
+    pts = ""
+    for x, y in zip(xarr, yp):
+        pts += "%s %s " % (x, y)
+    if percent == 0:
+        pts += '\n'
+    else:
+        for x, y in reversed(zip(xarr, ym)):
+            pts += "%s %s " % (x, y)
+        pts += "%s %s\n" % (xarr[0], yp[0])
+    xy.text = pts
+
 
 def plot_pdf(v, pdf, desc):
@@ -91 +165 @@
 pcurves = {}
 xvals = {}
-
-regexp = re.compile('([ \da-z]+)\[([ \d]+)\]')
+acurves = {}
+
+reg1 = re.compile('([ \da-zA-Z]+)\[([ \d]+)\]')
+reg2 = re.compile('([ \da-zA-Z]+)\.([xy])\[([ \d]+)\]')
 
 uqtype = h5.attrs['UQtype']
@@ -102 +178 @@
     # For curves built from pdfs, just put them in a dict for now
     if 'x' in odata.attrs:
-        matches = regexp.findall(v)
+        matches = reg1.findall(v)
         vname, vindex = matches[0]
         vindex = int(vindex)
@@ -110 +186 @@
         xvals[vname][vindex] = odata.attrs['x']
         pcurves[vname][vindex] = pdf
+    elif reg2.findall(v) != []:
+        matches = reg2.findall(v)
+        vname, xy, vindex = matches[0]
+        if vname not in acurves:
+            acurves[vname] = {}
+        if vindex not in acurves[vname]:
+            acurves[vname][vindex] = {}
+        if xy == 'x':
+            acurves[vname][vindex][0] = pdf
+        else:
+            acurves[vname][vindex][1] = pdf
     else:
         desc = h5['/output/data/%s' % v].attrs['description']
@@ -121 +208 @@
     plot_pdf_curve(xvals, vname, 95, desc)
 
+#for vname in acurves:
+#    desc = h5['/output/data/%s.x[0]' % vname].attrs['description']
+#    plot_pdf_acurve(h5, acurves, vname, 0, desc)
+#    plot_pdf_acurve(h5, acurves, vname, 50, desc)
+#    plot_pdf_acurve(h5, acurves, vname, 95, desc)
+
 with open('run_uq.xml', 'w') as f:
     f.write("<?xml version=\"1.0\"?>\n")