Merge pull request #83 from CitrineInformatics/backports/v0.4.1

Backport: v0.4.1

Author: maxhutch

setup.py

@@ -36,15 +36,17 @@ def run(self):
 
 
 setup(name='taurus-citrine',
-      version='0.4.0',
+      version='0.4.1',
       url='http://github.com/CitrineInformatics/taurus',
       description='Python library for the Citrine Platform',
       author='Max Hutchinson',
       author_email='[email protected]',
       packages=find_packages(),
       package_data={
           'taurus': [
-              'demo/strehlow_and_cook.json',
+              'demo/strehlow_and_cook.pif',
+              'demo/strehlow_and_cook_small.pif',
+              'demo/toothpick.jpg',
               'units/citrine_en.txt',
               'units/constants_en.txt'
           ]

taurus/demo/cake.py

@@ -118,10 +118,15 @@ def make_cake_templates():
             ]
         )
     )
-    tmpl["Sample Size"] = ConditionTemplate(
-        name="Sample Size",
+    tmpl["Sample Mass"] = ConditionTemplate(
+        name="Sample Mass",
         description="Sample size in mass units, to go along with FDA Nutrition Facts",
-        bounds=RealBounds(1.e-3, 10.e3, "g")
+        bounds=RealBounds(1.e-3, 1.e4, "g")
+    )
+    tmpl["Expected Sample Mass"] = ParameterTemplate(
+        name="Expected Sample Mass",
+        description="Specified sample size in mass units, to go along with FDA Nutrition Facts",
+        bounds=RealBounds(1.e-3, 1.e4, "g")
     )
     tmpl["Chemical Formula"] = PropertyTemplate(
         name="Chemical Formula",
@@ -152,12 +157,14 @@ def make_cake_templates():
     tmpl["Nutritional Analysis"] = MeasurementTemplate(
         name="Nutritional Analysis",
         properties=[tmpl["Nutritional Information"]],
-        conditions=[tmpl["Sample Size"]]
+        conditions=[tmpl["Sample Mass"]],
+        parameters=[tmpl["Expected Sample Mass"]]
     )
     tmpl["Elemental Analysis"] = MeasurementTemplate(
         name="Elemental Analysis",
         properties=[tmpl["Chemical Formula"]],
-        conditions=[tmpl["Sample Size"]]
+        conditions=[tmpl["Sample Mass"]],
+        parameters=[tmpl["Expected Sample Mass"]]
     )
 
     tmpl["Dessert"] = MaterialTemplate(
@@ -383,7 +390,7 @@ def ingredient_kwargs(material):
                 conditions=Condition(
                     name="Serving Size",
                     value=NominalReal(30, 'g'),
-                    template=tmpl["Sample Size"],
+                    template=tmpl["Sample Mass"],
                     origin="specified"
                 )
             )
@@ -811,22 +818,34 @@ def find_name(name, material):
         origin="measured"
     ))
     flour_content.conditions.append(Condition(
-        name='Sample Size',
+        name='Sample Mass',
         value=NormalReal(
             mean=99 + 2 * random.random(),
             std=1.5,
             units='mg'
         ),
-        template=tmpl["Sample Size"],
+        template=tmpl["Sample Mass"],
         origin="measured"
     ))
+    flour_content.parameters.append(Parameter(
+        name='Expected Sample Mass',
+        value=NominalReal(nominal=0.1, units='g'),
+        template=tmpl["Expected Sample Mass"],
+        origin="specified"
+    ))
     flour_content.spec.conditions.append(Condition(
-        name='Sample Size',
+        name='Sample Mass',
         value=NominalReal(
             nominal=100,
             units='mg'
         ),
-        template=tmpl["Sample Size"],
+        template=tmpl["Sample Mass"],
+        origin="specified"
+    ))
+    flour_content.spec.parameters.append(Parameter(
+        name='Expected Sample Mass',
+        value=NominalReal(nominal=0.1, units='g'),
+        template=tmpl["Expected Sample Mass"],
         origin="specified"
     ))
 
@@ -837,22 +856,28 @@ def find_name(name, material):
         origin="measured"
     ))
     salt_content.conditions.append(Condition(
-        name='Sample Size',
+        name='Sample Mass',
         value=NormalReal(
             mean=99 + 2 * random.random(),
             std=1.5,
             units='mg'
         ),
-        template=tmpl["Sample Size"],
+        template=tmpl["Sample Mass"],
         origin="measured"
     ))
+    salt_content.parameters.append(Parameter(
+        name='Expected Sample Mass',
+        value=NominalReal(nominal=0.1, units='g'),
+        template=tmpl["Expected Sample Mass"],
+        origin="specified"
+    ))
     salt_content.spec.conditions.append(Condition(
-        name='Sample Size',
+        name='Sample Mass',
         value=NominalReal(
             nominal=100,
             units='mg'
         ),
-        template=tmpl["Sample Size"],
+        template=tmpl["Sample Mass"],
         origin="specified"
     ))
 
@@ -863,15 +888,21 @@ def find_name(name, material):
         origin="measured"
     ))
     sugar_content.conditions.append(Condition(
-        name='Sample Size',
+        name='Sample Mass',
         value=NormalReal(
             mean=99 + 2 * random.random(),
             std=1.5,
             units='mg'
         ),
-        template=tmpl["Sample Size"],
+        template=tmpl["Sample Mass"],
         origin="measured"
     ))
+    sugar_content.spec.parameters.append(Parameter(
+        name='Expected Sample Mass',
+        value=NominalReal(nominal=0.1, units='g'),
+        template=tmpl["Expected Sample Mass"],
+        origin="specified"
+    ))
 
     # Code to generate quasi-repeatable run annotations
     # Note there are potential machine dependencies