partial fix NNNL utility output

jpn-- · Jan 23, 2017 · 8b1410b · 8b1410b
1 parent 78d3a79
commit 8b1410b
Showing 1 changed file with 66 additions and 1 deletion.
diff --git a/py/model_reporter/xhtml.py b/py/model_reporter/xhtml.py
@@ -2295,15 +2295,80 @@ def add_util_component(beta, resolved, x, first_thing):
 									beta_data_value = "*"+str(bracketize(beta.data))
 								x.data(beta_data_value)
 								return x, first_thing
+							# END add_util_component
+
+
+
+							def add_size_component(beta, resolved, x, first_thing):
+								if resolved:
+									beta_val = "{:{PARAM}}".format(numpy.exp(self.metaparameter(beta.param).value), **format).strip()
+									if not first_thing:
+										x.simple("br")
+										x.data(NonBreakSpace*4)
+										x.data("+ {}".format(beta_val).replace("+ -","- "))
+									else: # is first thing
+										x.data(NonBreakSpace*6)
+										x.data(beta_val)
+									first_thing = False
+								else:
+									if not first_thing:
+										x.simple("br")
+										x.data(NonBreakSpace*4)
+										x.data("+ ")
+									else:
+										x.data(NonBreakSpace*6)
+									first_thing = False
+									x.data("exp(")
+									x.start('a', {'class':'parameter_reference', 'href':'#param{}'.format(beta.param.replace("#","_hash_"))})
+									x.data(beta.param)
+									x.end('a')
+									x.data(")")
+									if beta.multiplier != 1.0:
+										x.data("*"+str(beta.multiplier))
+								try:
+									beta_data_value = float(beta.data)
+									if beta_data_value==1.0:
+										beta_data_value=""
+									else:
+										beta_data_value="*"+str(bracketize(beta_data_value))
+								except:
+									beta_data_value = "*"+str(bracketize(beta.data))
+								x.data(beta_data_value)
+								return x, first_thing
+
+							# END add_size_component
 
-
 							for beta in self.utility.ca:
 								x, first_thing = add_util_component(beta, resolved, x, first_thing)
 							if altcode in self.utility.co:
 								for beta in self.utility.co[altcode]:
 									x, first_thing = add_util_component(beta, resolved, x, first_thing)
 
+							if len(self.quantity):
+								x.simple("br")
+								x.data("+ ")
+								if resolved:
+									if self.quantity_scale != "":
+										theta_val = "{:{PARAM}}".format(self.metaparameter(self.quantity_scale).value, **format).strip()
+										x.data(theta_val)
+										x.data(" * ")
+								else:
+									if self.quantity_scale != "":
+										x.start('a', {'class':'parameter_reference', 'href':'#param{}'.format(self.quantity_scale.replace("#","_hash_"))})
+										x.data(self.quantity_scale)
+										x.end('a')
+										x.data(" * ")
+								x.data("log(")
+								x.simple("br")
+								first_thing = True
+								for quant in self.quantity:
+									x, first_thing = add_size_component(quant, resolved, x, first_thing)
+								x.simple("br")
+								x.data(")")
 
+
+							#######
+
 							x.end("td")
 
 					G = self.networkx_digraph()