[LON-CAPA-cvs] cvs: loncom /homework/templates organic.problem organic_hint.problem organic_hint.problem.meta reaction.problem reaction_hint.problem reaction_hint.problem.meta doc/loncapafiles loncapafiles.lpml
www
www@source.lon-capa.org
Tue, 07 Jul 2009 23:38:39 -0000
www Tue Jul 7 23:38:39 2009 EDT
Added files:
/loncom/homework/templates organic_hint.problem
organic_hint.problem.meta
reaction_hint.problem
reaction_hint.problem.meta
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom/homework/templates organic.problem reaction.problem
Log:
Updated reaction and organic response templates, including hints
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.650 doc/loncapafiles/loncapafiles.lpml:1.651
--- doc/loncapafiles/loncapafiles.lpml:1.650 Tue Jul 7 19:50:40 2009
+++ doc/loncapafiles/loncapafiles.lpml Tue Jul 7 23:38:35 2009
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.650 2009/07/07 19:50:40 droeschl Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.651 2009/07/07 23:38:35 www Exp $ -->
<!--
@@ -1303,8 +1303,12 @@
SimpleTrueFalse.problem.meta;
organic.problem;
organic.problem.meta;
+organic_hint.problem;
+organic_hint.problem.meta;
reaction.problem;
-reaction.problem.meta
+reaction.problem.meta;
+reaction_hint.problem;
+reaction_hint.problem.meta
</filenames>
</fileglob>
Index: loncom/homework/templates/organic.problem
diff -u loncom/homework/templates/organic.problem:1.4 loncom/homework/templates/organic.problem:1.5
--- loncom/homework/templates/organic.problem:1.4 Mon Jul 6 17:12:47 2009
+++ loncom/homework/templates/organic.problem Tue Jul 7 23:38:39 2009
@@ -1,16 +1,16 @@
<problem>
<startouttext />
-<p>The image below is <chem>C2H4O2</chem></p>
+<p>The image below is acedic acid <chem>C2H4O2</chem></p>
<endouttext />
<organicstructure width="250" options="border" texwidth="70" molecule="4 3 C 6.33 -6.22 C 7.73 -6.22 O 8.43 -7.43 O 8.43 -5.00 1 2 1 2 3 1 2 4 2" />
<startouttext />
-<p>Draw acetic acid.</p>
+<p>Complete acetic acid.</p>
<endouttext />
-<organicresponse jmeanswer="4 3 C 6.33 -6.22 C 7.73 -6.22 O 8.43 -7.43 O 8.43 -5.00 1 2 1 2 3 1 2 4 2" answer="CC(=O)O">
+<organicresponse jmeanswer="4 3 C 6.33 -6.22 C 7.73 -6.22 O 8.43 -7.43 O 8.43 -5.00 1 2 1 2 3 1 2 4 2" answer="CC(=O)O" molecule="3 2 C 11.42 -7.84 C 12.64 -8.54 O 12.64 -9.94 1 2 1 2 3 2">
<textline readonly="yes" />
</organicresponse>
Index: loncom/homework/templates/reaction.problem
diff -u loncom/homework/templates/reaction.problem:1.2 loncom/homework/templates/reaction.problem:1.3
--- loncom/homework/templates/reaction.problem:1.2 Mon Jul 6 17:12:47 2009
+++ loncom/homework/templates/reaction.problem Tue Jul 7 23:38:39 2009
@@ -1,6 +1,7 @@
<problem>
<script type="loncapa/perl">
+# you could randomize here
$formula = "C2H5OH";
$name = "ethanol";
$answer = "C2H5OH + 3O2 -> 2CO2 + 3H2O";
@@ -14,12 +15,6 @@
<reactionresponse answer="$answer" initial="$formula ->">
<textline readonly="yes" />
- <hintgroup showoncorrect="no">
- <stringhint answer="/\(g\)/" name="state" type="re" />
- <hintpart on="state">
- <startouttext />Do not include symbols for state of matter in your answer.<endouttext />
- </hintpart>
- </hintgroup>
</reactionresponse>
</problem>
Index: loncom/homework/templates/organic_hint.problem
+++ loncom/homework/templates/organic_hint.problem
<problem>
<startouttext />
<p>Draw ethane.</p>
<endouttext />
<organicresponse answer="CC" jmeanswer="2 1 C 11.14 -7.90 C 12.36 -8.60 1 2 1">
<textline readonly="yes" />
<hintgroup showoncorrect="no">
<organichint name="propane" answer="CCC"></organichint>
<hintpart on="propane">
<startouttext />That's propane.<endouttext />
</hintpart>
</hintgroup>
</organicresponse>
</problem>
Index: loncom/homework/templates/organic_hint.problem.meta
+++ loncom/homework/templates/organic_hint.problem.meta
<title>Organic Material Response with Hint</title>
<category>Chemistry Problems</category>
Index: loncom/homework/templates/reaction_hint.problem
+++ loncom/homework/templates/reaction_hint.problem
<problem>
<startouttext />
<p>
Write a balanced reaction for hydrogen gas and oxygen gas forming water, using the smallest integer coefficients.
</p>
<endouttext />
<reactionresponse answer="2H2 + O2 -> 2H2O" initial="">
<textline readonly="yes" />
<hintgroup showoncorrect="no">
<reactionhint answer="H2 + O -> H2O" name="gas"/>
<hintpart on="gas">
<startouttext />Oxygen is a diatomic gas.<endouttext />
</hintpart>
<stringhint answer="/\((s|l|g)\)/" name="state" type="re" />
<hintpart on="state">
<startouttext />Do not include symbols for state of matter in your answer.<endouttext />
</hintpart>
</hintgroup>
</reactionresponse>
</problem>
Index: loncom/homework/templates/reaction_hint.problem.meta
+++ loncom/homework/templates/reaction_hint.problem.meta
<title>Chemical Reaction Response with Hints</title>
<category>Chemistry Problems</category>