--- loncom/homework/functionplotresponse.pm	2011/11/20 02:53:27	1.79
+++ loncom/homework/functionplotresponse.pm	2011/11/24 13:43:21	1.86
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.79 2011/11/20 02:53:27 www Exp $
+# $Id: functionplotresponse.pm,v 1.86 2011/11/24 13:43:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,10 +32,13 @@ use Apache::response();
 use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::run;
+use LONCAPA;
  
 BEGIN {
   &Apache::lonxml::register('Apache::functionplotresponse',('functionplotresponse','backgroundplot','spline',
-                                                            'plotobject','plotvector','functionplotvectorrule','functionplotvectorsumrule',
+                                                            'plotobject','plotvector',
+                                                            'functionplotvectorrule','functionplotvectorsumrule',
+                                                            'functionplotcustomrule',
                                                             'functionplotrule','functionplotruleset',
                                                             'functionplotelements'));
 }
@@ -654,10 +657,6 @@ sub start_functionplotrule {
    } else {
       $label='R'.$label;
    }
-   if ($Apache::functionplotresponse::splineorder{$label}) {
-       &Apache::lonxml::error(&mt('Rule indices must be unique.'));
-   }
-
 
    if ($target eq 'grade') {
 # Simply remember - in order - for later
@@ -772,9 +771,6 @@ sub start_functionplotvectorrule {
    } else {
       $label='R'.$label;
    }
-   if ($Apache::functionplotresponse::splineorder{$label}) {
-       &Apache::lonxml::error(&mt('Rule indices must be unique.'));
-   }
 
    if ($target eq 'grade') {
 # Simply remember - in order - for later
@@ -844,11 +840,11 @@ sub start_functionplotvectorrule {
              &Apache::edit::text_arg('Tip not attached to object:','nottippoint',
                                       $token,'16').'<br />'.
              &Apache::edit::text_arg('Length:','length',
-                                     $token,'16').
-             &Apache::edit::text_arg('Angle:','angle',
-                                     $token,'16').
+                                     $token,'30').
              &Apache::edit::text_arg('Absolute error length:','lengtherror',
-                                     $token,'8').
+                                     $token,'8').'<br />'.
+             &Apache::edit::text_arg('Angle:','angle',
+                                     $token,'30').
              &Apache::edit::text_arg('Absolute error angle:','angleerror',
                                      $token,'8').
              &Apache::edit::end_row();
@@ -896,52 +892,43 @@ sub start_functionplotvectorsumrule {
    } else {
       $label='R'.$label;
    }
-   if ($Apache::functionplotresponse::splineorder{$label}) {
-       &Apache::lonxml::error(&mt('Rule indices must be unique.'));
-   }
    if ($target eq 'grade') {
 # Simply remember - in order - for later
       my $id=$Apache::inputtags::response[-1];
       my $partid=$Apache::inputtags::part;
       my $internalid = $partid.'_'.$id;
-      my $object=&Apache::lonxml::get_param('object',$parstack,$safeeval);
-      $object=~s/\W//gs;
-      $object=ucfirst($object);
+      my $vectors=&Apache::lonxml::get_param('vectors',$parstack,$safeeval);
       push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
            $label,
            'sum',
            $internalid,
-           $object,
+           $vectors,
            &Apache::lonxml::get_param('length',$parstack,$safeeval),
            &Apache::lonxml::get_param('angle',$parstack,$safeeval),
-           &Apache::lonxml::get_param('lengthpercenterror',$parstack,$safeeval),
-           &Apache::lonxml::get_param('lengthabserror',$parstack,$safeeval),
+           &Apache::lonxml::get_param('lengtherror',$parstack,$safeeval),
            &Apache::lonxml::get_param('angleerror',$parstack,$safeeval),
           )));
    } elsif ($target eq 'edit') {
         $result=&Apache::edit::tag_start($target,$token,'Function Plot Vector Sum Rule').
              &Apache::edit::text_arg('Index/Name:','index',
                                      $token,'10').'&nbsp;'.
-             &Apache::edit::text_arg('Vectors attached to object:','object',
-                                      $token,'16').'<br />'.
+             &Apache::edit::text_arg('Comma-separated list of vectors:','vectors',
+                                      $token,'30').'<br />'.
              &Apache::edit::text_arg('Sum vector length:','length',
-                                     $token,'16').
+                                     $token,'30').
+             &Apache::edit::text_arg('Absolute error length:','lengtherror',
+                                     $token,'8').'<br />'.
              &Apache::edit::text_arg('Sum vector angle:','angle',
-                                     $token,'16').
-             &Apache::edit::text_arg('Percent error length:','lengthpercenterror',
-                                     $token,'8').
-             &Apache::edit::text_arg('Absolute error length:','lengthabserror',
-                                     $token,'8').
-             &Apache::edit::text_arg('Error angle:','angleerror',
+                                     $token,'30').
+             &Apache::edit::text_arg('Absolute error angle:','angleerror',
                                      $token,'8').
              &Apache::edit::end_row();
-  } elsif ($target eq 'modified') {
-    $env{'form.'.&Apache::edit::html_element_name('object')}=ucfirst($env{'form.'.&Apache::edit::html_element_name('object')});
-    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-                                                 $safeeval,'index','object',
-                                                           'length','angle',
-                                                           'lengthpercenterror','lengthabserror','angleerror');
-    if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+   } elsif ($target eq 'modified') {
+      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                   $safeeval,'index','vectors',
+                                                             'length','angle',
+                                                             'lengtherror','angleerror');
+      if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
    }
    return $result;
 }
@@ -956,6 +943,65 @@ sub end_functionplotvectorsumrule {
 }
 
 #
+# <functionplotcustom ... />
+#
+sub start_functionplotcustomrule {
+   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+   my $result='';
+   my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval);
+   $Apache::functionplotresponse::counter++;
+   if ($label=~/\W/) {
+      &Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.'));
+   }
+   $label=~s/\W//gs;
+   unless ($label) {
+      $label='R'.$Apache::functionplotresponse::counter;
+   } else {
+      $label='R'.$label;
+   }
+   &Apache::lonxml::register('Apache::response',('answer'));
+   if ($target eq 'edit') {
+        $result=&Apache::edit::tag_start($target,$token,'Function Plot Custom Rule').
+             &Apache::edit::text_arg('Index/Name:','index',$token,'10').
+             &Apache::edit::end_row();
+  } elsif ($target eq 'modified') {
+      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'index');
+      if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+   }
+   return $result;
+}
+
+sub end_functionplotcustomrule {
+   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+   my $result='';
+   if ($target eq 'edit') {
+      $result=&Apache::edit::end_table();
+   } elsif ($target eq 'grade') {
+# Simply remember - in order - for later
+      my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval);
+      $Apache::functionplotresponse::counter++;
+      if ($label=~/\W/) {
+         &Apache::lonxml::warning(&mt('Rule indices should only contain alphanumeric characters.'));
+      }
+      $label=~s/\W//gs;
+      unless ($label) {
+         $label='R'.$Apache::functionplotresponse::counter;
+      } else {
+         $label='R'.$label;
+      }
+      push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
+           $label,
+           'custom',
+           &escape($Apache::response::custom_answer[-1])
+          )));
+   }
+   &Apache::lonxml::deregister('Apache::response',('answer'));
+   return $result;
+}
+
+
+
+#
 # <spline index="..." order="1,2,3,4" initx="..." inity="..." scalex="..." scaley="..." />
 #
 # Unfortunately, GeoGebra seems to want all splines after everything else, so we need to store them
@@ -1371,6 +1417,43 @@ sub fpr_d2fdx2 {
                                                                 $arg)];
 }
 
+sub fpr_vectorcoords {
+   my ($arg)=@_;
+   $arg=~s/\W//gs;
+   $arg=ucfirst($arg);
+   my $id=$Apache::inputtags::response[-1];
+   my $partid=$Apache::inputtags::part;
+   my $internalid = $partid.'_'.$id;
+   return ($env{'form.HWVAL_'.$internalid.'_'.$arg.'Start_x'},
+           $env{'form.HWVAL_'.$internalid.'_'.$arg.'End_x'},
+           $env{'form.HWVAL_'.$internalid.'_'.$arg.'Start_y'},
+           $env{'form.HWVAL_'.$internalid.'_'.$arg.'End_y'});
+}
+
+sub fpr_objectcoords {
+   my ($arg)=@_;
+   $arg=~s/\W//gs;
+   $arg=ucfirst($arg);
+   my $id=$Apache::inputtags::response[-1];
+   my $partid=$Apache::inputtags::part;
+   my $internalid = $partid.'_'.$id;
+   return ($env{'form.HWVAL_'.$internalid.'_'.$arg.'_x'},
+           $env{'form.HWVAL_'.$internalid.'_'.$arg.'_y'});
+}
+
+sub fpr_vectorlength {
+   my ($arg)=@_;
+   my ($xs,$xe,$ys,$ye)=&fpr_vectorcoords($arg);
+   return sqrt(($xe-$xs)*($xe-$xs)+($ye-$ys)*($ye-$ys));
+}
+
+sub fpr_vectorangle {
+   my ($arg)=@_;
+   my ($xs,$xe,$ys,$ye)=&fpr_vectorcoords($arg);
+   my $angle=57.2957795*atan2(($ye-$ys),($xe-$xs));
+   if ($angle<0) { $angle=360+$angle; }
+   return $angle;
+}
 
 sub vectorcoords {
    my ($id,$label)=@_;
@@ -1385,6 +1468,22 @@ sub objectcoords {
    return ($env{'form.HWVAL_'.$id.'_'.$label.'_x'},
            $env{'form.HWVAL_'.$id.'_'.$label.'_y'});
 }
+
+sub attached {
+   my ($id,$vector,$object,$xmin,$xmax,$ymin,$ymax)=@_;
+   my ($xs,$xe,$ys,$ye)=&vectorcoords($id,$vector);
+   my ($xo,$yo)=&objectcoords($id,$object);
+   my $tolx=($xmax-$xmin)/100.;
+   my $toly=($ymax-$ymin)/100.;
+   my $tail=0;
+   my $tip=0;
+   &addlog("Proximity $vector ($xs,$ys)-($xe,$ye) to $object ($xo,$yo)");
+   if ((abs($xs-$xo)<$tolx) && (abs($ys-$yo)<$toly)) { $tail=1; }
+   if ((abs($xe-$xo)<$tolx) && (abs($ye-$yo)<$toly)) { $tip=1; }
+   &addlog("Result tail:$tail tip:$tip");
+   return($tail,$tip);
+}
+
  
 sub vectorangle {
    my ($x,$y)=@_;
@@ -1424,6 +1523,8 @@ sub functionplotvectorrulecheck {
       return &vectorcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval);
    } elsif ($type eq 'sum') {
       return &sumcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval);
+   } elsif ($type eq 'custom') {
+      return &customcheck($rule,$safeeval);
    }
 }
 
@@ -1445,15 +1546,130 @@ sub vectorcheck {
          return 0;
       }
    }
+   if ($angle ne '') {
+      &addlog("Checking for angle $angle with error $angleerror");
+      $angle=&Apache::run::run($angle,$safeeval);
+      &addlog("Angle evaluated to $angle");
+      my $thisangle=&plotvectorangle($id,$vector);
+      &addlog("Found angle $thisangle");
+      my $anglediff=abs($thisangle-$angle);
+      &addlog("Angle difference: $anglediff");
+      if ($anglediff>360.-$anglediff) {
+         $anglediff=360.-$anglediff;
+      }
+      &addlog("Smallest angle difference: $anglediff");
+      if ($anglediff>$angleerror) {
+         &setfailed($label);
+         return 0;
+      }
+   }
+   if ($attachpoint ne '') {
+      &addlog("Checking attached: ".$attachpoint);
+      my ($tail,$tip)=&attached($id,$vector,$attachpoint,$xmin,$xmax,$ymin,$ymax);
+      unless ($tail || $tip) {
+         &setfailed($label);
+         return 0;
+      }
+   }
+   if ($notattachpoint ne '') {
+      &addlog("Checking not attached: ".$notattachpoint);
+      my ($tail,$tip)=&attached($id,$vector,$notattachpoint,$xmin,$xmax,$ymin,$ymax);
+      if ($tail || $tip) {
+         &setfailed($label);
+         return 0;
+      }
+   }
+   if ($tailpoint ne '') {
+      &addlog("Checking tail: ".$tailpoint);
+      my ($tail,$tip)=&attached($id,$vector,$tailpoint,$xmin,$xmax,$ymin,$ymax);
+      unless ($tail) {
+         &setfailed($label);
+         return 0;
+      }
+   }
+   if ($nottailpoint ne '') {
+      &addlog("Checking not tail: ".$nottailpoint);
+      my ($tail,$tip)=&attached($id,$vector,$nottailpoint,$xmin,$xmax,$ymin,$ymax);
+      if ($tail) {
+         &setfailed($label);
+         return 0;
+      }
+   }
+   if ($tippoint ne '') {
+      &addlog("Checking tip: ".$tippoint);
+      my ($tail,$tip)=&attached($id,$vector,$tippoint,$xmin,$xmax,$ymin,$ymax);
+      unless ($tip) {
+         &setfailed($label);
+         return 0;
+      }
+   }
+   if ($nottippoint ne '') {
+      &addlog("Checking not tip: ".$nottippoint);
+      my ($tail,$tip)=&attached($id,$vector,$nottippoint,$xmin,$xmax,$ymin,$ymax);
+      if ($tip) {
+         &setfailed($label);
+         return 0;
+      }
+   }
+
    &addlog("Rule $label passed.");
    return 1;
 }
 
 sub sumcheck {
    my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_;
-   my ($label,$type,$id,$object,$length,$angle,$lengthpercenterror,$lengthabserror,$angleerror)=split(/\:/,$rule);
-   &addlog("Vector Sum Rule $label for vectors attached to ".$object);
+   my ($label,$type,$id,$vectors,$length,$angle,$lengtherror,$angleerror)=split(/\:/,$rule);
+   &addlog("Vector Sum Rule $label for vectors ".$vectors);
+   my $sumx=0;
+   my $sumy=0;
+   foreach my $sv (split(/\s*\,\s*/,$vectors)) {
+      my ($rx,$ry)=&relvector(&vectorcoords($id,$sv));
+      $sumx+=$rx;
+      $sumy+=$ry;
+   }
+   &addlog("Sum vector ($sumx,$sumy)");
+   if ($length ne '') {
+      &addlog("Checking length $length with error $lengtherror");
+      $length=&Apache::run::run($length,$safeeval);
+      &addlog("Evaluated to $length");
+      my $thislength=&vectorlength($sumx,$sumy);
+      &addlog("Actual length $thislength");
+      if (abs($length-$thislength)>$lengtherror) {
+                  &setfailed($label);
+         return 0;
+      }
+   }
+   if ($angle ne '') {
+      &addlog("Checking angle $angle with error $angleerror");
+      $angle=&Apache::run::run($angle,$safeeval);
+      &addlog("Evaluated to $angle");
+      my $thisangle=&vectorangle($sumx,$sumy);
+      &addlog("Actual angle $thisangle");
+      my $anglediff=abs($thisangle-$angle);
+      &addlog("Angle difference: $anglediff");
+      if ($anglediff>360.-$anglediff) {
+         $anglediff=360.-$anglediff;
+      }
+      &addlog("Smallest angle difference: $anglediff");
+      if ($anglediff>$angleerror) {
+         &setfailed($label);
+         return 0;
+      }
+   }
+   &addlog("Rule $label passed.");
+   return 1;
+}
 
+sub customcheck {
+   my ($rule,$safeeval)=@_;
+   my ($label,$type,$prg)=split(/\:/,$rule);
+   &addlog("Custom Rule ".$label);
+   my $result=&Apache::run::run(&unescape($prg),$safeeval);
+   &addlog("Algorithm returned $result");
+   unless ($result) {
+      &setfailed($label);
+      return 0;
+   }
    &addlog("Rule $label passed.");
    return 1;
 }