--- loncom/homework/functionplotresponse.pm	2011/11/20 02:53:27	1.79
+++ loncom/homework/functionplotresponse.pm	2011/11/21 19:48:52	1.81
@@ -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.81 2011/11/21 19:48:52 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -654,10 +654,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 +768,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
@@ -896,9 +889,6 @@ 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];
@@ -914,8 +904,7 @@ sub start_functionplotvectorsumrule {
            $object,
            &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') {
@@ -928,9 +917,7 @@ sub start_functionplotvectorsumrule {
                                      $token,'16').
              &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',
+             &Apache::edit::text_arg('Error length:','lengtherror',
                                      $token,'8').
              &Apache::edit::text_arg('Error angle:','angleerror',
                                      $token,'8').
@@ -940,7 +927,7 @@ sub start_functionplotvectorsumrule {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
                                                  $safeeval,'index','object',
                                                            'length','angle',
-                                                           'lengthpercenterror','lengthabserror','angleerror');
+                                                           ,'lengtherror','angleerror');
     if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
    }
    return $result;
@@ -1385,6 +1372,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,$xe,$ys,$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)=@_;
@@ -1445,13 +1448,79 @@ 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);
+   my ($label,$type,$id,$object,$length,$angle,$lengtherror,$angleerror)=split(/\:/,$rule);
    &addlog("Vector Sum Rule $label for vectors attached to ".$object);
 
    &addlog("Rule $label passed.");