--- loncom/homework/functionplotresponse.pm	2011/11/19 20:03:58	1.76
+++ loncom/homework/functionplotresponse.pm	2011/11/21 20:20:48	1.82
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # Functionplot responses
 #
-# $Id: functionplotresponse.pm,v 1.76 2011/11/19 20:03:58 www Exp $
+# $Id: functionplotresponse.pm,v 1.82 2011/11/21 20:20:48 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -389,6 +389,7 @@ sub plotobject_script {
       $Apache::functionplotresponse::counter++;
       $label='O'.$Apache::functionplotresponse::counter;
    }
+   &generate_input_field($id,$label,$x,$y);
    return "document.ggbApplet_$id.evalCommand('a=1');\n".
           "document.ggbApplet_$id.setVisible('a', false);\n".
           "document.ggbApplet_$id.setLabelVisible('a', false);\n".
@@ -653,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
@@ -767,16 +764,18 @@ sub start_functionplotvectorrule {
    }
    $label=~s/\W//gs;
    unless ($label) {
-      $label='V'.$Apache::functionplotresponse::counter;
+      $label='R'.$Apache::functionplotresponse::counter;
    } else {
-      $label='V'.$label;
-   }
-   if ($Apache::functionplotresponse::splineorder{$label}) {
-       &Apache::lonxml::error(&mt('Rule indices must be unique.'));
+      $label='R'.$label;
    }
 
    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 $vector=&Apache::lonxml::get_param('vector',$parstack,$safeeval);
       $vector=~s/\W//gs;
       $vector=ucfirst($vector);
@@ -806,6 +805,7 @@ sub start_functionplotvectorrule {
       push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
            $label,
            'vector',
+           $internalid,
            $vector,
            $attachpoint,
            $notattachpoint,
@@ -815,8 +815,8 @@ sub start_functionplotvectorrule {
            $nottippoint,
            &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('anglepercenterror',$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 Rule').
@@ -840,9 +840,9 @@ sub start_functionplotvectorrule {
                                      $token,'16').
              &Apache::edit::text_arg('Angle:','angle',
                                      $token,'16').
-             &Apache::edit::text_arg('Percent error length:','lengthpercenterror',
+             &Apache::edit::text_arg('Absolute error length:','lengtherror',
                                      $token,'8').
-             &Apache::edit::text_arg('Percent error angle:','anglepercenterror',
+             &Apache::edit::text_arg('Absolute error angle:','angleerror',
                                      $token,'8').
              &Apache::edit::end_row();
   } elsif ($target eq 'modified') {
@@ -857,7 +857,7 @@ sub start_functionplotvectorrule {
                                                  $safeeval,'index','vector','attachpoint','notattachpoint',
                                                            'tailpoint','tippoint','nottailpoint','nottipoint',
                                                            'length','angle',
-                                                           'lengthpercenterror','anglepercenterror');
+                                                           'lengtherror','angleerror');
     if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
    }
    return $result;
@@ -885,51 +885,47 @@ sub start_functionplotvectorsumrule {
    }
    $label=~s/\W//gs;
    unless ($label) {
-      $label='V'.$Apache::functionplotresponse::counter;
+      $label='R'.$Apache::functionplotresponse::counter;
    } else {
-      $label='V'.$label;
-   }
-   if ($Apache::functionplotresponse::splineorder{$label}) {
-       &Apache::lonxml::error(&mt('Rule indices must be unique.'));
+      $label='R'.$label;
    }
    if ($target eq 'grade') {
 # Simply remember - in order - for later
-      my $object=&Apache::lonxml::get_param('object',$parstack,$safeeval);
-      $object=~s/\W//gs;
-      $object=ucfirst($object);
+      my $id=$Apache::inputtags::response[-1];
+      my $partid=$Apache::inputtags::part;
+      my $internalid = $partid.'_'.$id;
+      my $vectors=&Apache::lonxml::get_param('vectors',$parstack,$safeeval);
       push(@Apache::functionplotresponse::functionplotvectorrules,join(':',(
            $label,
            'sum',
-           $object,
+           $internalid,
+           $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('anglepercenterror',$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').' '.
-             &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').
              &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('Percent error angle:','anglepercenterror',
+             &Apache::edit::text_arg('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',
+                                                 $safeeval,'index','vectors',
                                                            'length','angle',
-                                                           'lengthpercenterror','lengthabserror','anglepercenterror');
+                                                           ,'lengtherror','angleerror');
     if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
    }
    return $result;
@@ -1359,6 +1355,186 @@ sub fpr_d2fdx2 {
                                                                 $Apache::functionplotresponse::fpr_xmax,
                                                                 $arg)];
 }
+
+
+sub vectorcoords {
+   my ($id,$label)=@_;
+   return ($env{'form.HWVAL_'.$id.'_'.$label.'Start_x'},
+           $env{'form.HWVAL_'.$id.'_'.$label.'End_x'},
+           $env{'form.HWVAL_'.$id.'_'.$label.'Start_y'},
+           $env{'form.HWVAL_'.$id.'_'.$label.'End_y'});
+}
+
+sub objectcoords {
+   my ($id,$label)=@_;
+   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)=@_;
+   my $angle=57.2957795*atan2($y,$x);
+   if ($angle<0) { $angle=360+$angle; }
+   return $angle;
+}
+
+sub vectorlength {
+   my ($x,$y)=@_;
+   return sqrt($x*$x+$y*$y);
+}
+
+sub relvector {
+   my ($xs,$xe,$ys,$ye)=@_;
+   return ($xe-$xs,$ye-$ys);
+}
+
+sub plotvectorlength {
+   return &vectorlength(&relvector(&vectorcoords(@_)));
+}
+
+sub plotvectorangle {
+   return &vectorangle(&relvector(&vectorcoords(@_)));
+}
+
+
+#
+# Evaluate a functionplotvectorrule
+#
+
+sub functionplotvectorrulecheck {
+   my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_;
+   &addlog("=================");
+   my ($label,$type)=split(/\:/,$rule);
+   if ($type eq 'vector') {
+      return &vectorcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval);
+   } elsif ($type eq 'sum') {
+      return &sumcheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval);
+   }
+}
+
+sub vectorcheck {
+   my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_;
+   my ($label,$type,$id,$vector,
+       $attachpoint,$notattachpoint,
+       $tailpoint,$tippoint,$nottailpoint,$nottippoint,
+       $length,$angle,$lengtherror,$angleerror)=split(/\:/,$rule);
+   &addlog("Vector Rule $label for vector ".$vector);
+   if ($length ne '') {
+      &addlog("Checking for length $length with error $lengtherror");
+      $length=&Apache::run::run($length,$safeeval);
+      &addlog("Length evaluated to $length");
+      my $thislength=&plotvectorlength($id,$vector);
+      &addlog("Found length $thislength");
+      if (abs($thislength-$length)>$lengtherror) {
+         &setfailed($label);
+         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,$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)");
+   &addlog("Rule $label passed.");
+   return 1;
+}
+
+#
+# Evaluate a functionplotrule
+#
  
 sub functionplotrulecheck {
    my ($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)=@_;
@@ -1455,10 +1631,7 @@ sub functionplotrulecheck {
      unless (&compare_rel($relationship,$value,$integral,$tol)) {
         &addlog("Actual integral ".(defined($integral)?$integral:'undef').", expected $value, tolerance $tol");
         &addlog("Rule $label failed.");
-        my $hintlabel=$label;
-        $hintlabel=~s/^R//;
-        push(@Apache::functionplotresponse::failedrules,$hintlabel);
-        &addlog("Set hint condition $hintlabel");
+        &setfailed($label);
         return 0;
      } 
    } else {
@@ -1524,8 +1697,7 @@ sub checklength {
 }
 
 sub setfailed {
-   my ($label)=@_;
-   my $hintlabel=$label;
+   my ($hintlabel)=@_;
    $hintlabel=~s/^R//;
    push(@Apache::functionplotresponse::failedrules,$hintlabel);
    &addlog("Set hint condition $hintlabel");
@@ -1583,6 +1755,13 @@ sub end_functionplotruleset {
                  $ad='INCORRECT';
                  last;
               }
+           }
+# And now go through the vector rules
+           foreach my $rule (@Apache::functionplotresponse::functionplotvectorrules) {
+              unless (&functionplotvectorrulecheck($rule,$xmin,$xmax,$ymin,$ymax,$safeeval)) {
+                 $ad='INCORRECT';
+                 last;
+              }
            }
 # If it's not wrong, it's correct 
            unless ($ad) { $ad='EXACT_ANS' };