--- loncom/homework/caparesponse/caparesponse.pm	2002/09/30 16:01:36	1.59
+++ loncom/homework/caparesponse/caparesponse.pm	2003/03/21 15:39:24	1.85
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.59 2002/09/30 16:01:36 albertel Exp $
+# $Id: caparesponse.pm,v 1.85 2003/03/21 15:39:24 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,13 +85,17 @@ sub start_numericalresponse {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);
     if ($token->[1] eq 'numericalresponse') {
-      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
-      $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
+                         &Apache::loncommon::help_open_topic('Physical_Units');
+      $result.=&Apache::edit::text_arg('Format:','format',$token,4).
+              &Apache::loncommon::help_open_topic('Numerical_Response_Format');
     } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',
-					 ['cs','ci','mc'],$token);
+		 [['cs','Case Sensitive'],['ci','Case Insensitive'],
+		  ['mc','Case Insensitive, Any Order']],$token);
     } elsif ($token->[1] eq 'formularesponse') {
-      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
+      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40).
+             &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
     }
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
@@ -112,6 +116,8 @@ sub start_numericalresponse {
     }
   } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('numericalresponse');
+  } elsif ($target eq 'answer' || $target eq 'grade') {
+      &Apache::response::reset_params();
   }
   return $result;
 }
@@ -119,6 +125,9 @@ sub start_numericalresponse {
 sub end_numericalresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';
+  if (!$Apache::lonxml::default_homework_loaded) {
+      &Apache::lonxml::default_homework_load($safeeval);
+  }
   if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {
       &Apache::response::setup_params($$tagstack[-1]);
@@ -135,7 +144,7 @@ sub end_numericalresponse {
 	$response =~ s/\'/\\\'/g;
 	&Apache::lonxml::debug("current $response");
 	my $expression="&caparesponse_check_list('".$response."','".
-	  $$parstack[$#$parstack];
+	    $$parstack[-1];
 	foreach my $key (keys(%Apache::inputtags::params)) {
 	  $expression.= ';my $'. #'
 	    $key.'="'.$Apache::inputtags::params{$key}.'"';
@@ -157,7 +166,6 @@ sub end_numericalresponse {
       }
     }
   } elsif ($target eq 'web' || $target eq 'tex') {
-    if ($Apache::lonhomework::type ne 'exam') {
       my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
       my $status = $Apache::inputtags::status['-1'];
       if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
@@ -168,9 +176,9 @@ sub end_numericalresponse {
 	my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
 	
 	if ($target eq 'web') {
-	  $result="<br />The computer got ";
+	  $result="<br />The correct answer is ";
         } elsif ($target eq 'tex') {
-	  $result='\vskip 0 mm The computer got \\texttt{';
+	  #$result='\vskip 0 mm The correct answer is \\texttt{';
         }
 	for (my $i=0; $i <= $#answers; $i++) {
 	   my $answer=$answers[$i];
@@ -188,18 +196,22 @@ sub end_numericalresponse {
 	     &Apache::lonxml::debug("no format answer :$answer:");
 	     $formatted="$answer,";
 	   }
-	   if ($target eq 'tex') {$formatted=&Apache::lonxml::latex_special_symbols($formatted);}
-	     $result.=$formatted;
-           }
+
+	   if ($target eq 'tex') {
+	       $formatted='';
+	       #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
+	   }
+	   $result.=$formatted;
+       }
 	   chop $result;
 	   if ($target eq 'web') {
 	     $result.=" $unit.<br />";
 	   } elsif ($target eq 'tex') {
-	     $result.=&Apache::lonxml::latex_special_symbols($unit);
-	     $result.="}. \\vskip 0 mm ";
+	     #$result.=&Apache::lonxml::latex_special_symbols($unit);
+	     #$result.="}. \\vskip 0 mm ";
 	   }
        }
-    } else {
+      if ($Apache::lonhomework::type eq 'exam') {
       	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
 	my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
 	my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
@@ -211,119 +223,218 @@ sub end_numericalresponse {
 	my $powers_number = 8; #default values for number of powers
 	my $symb;
 	if ($ENV{'form.symb'}=~/___\d+___/) {$symb=$ENV{'form.symb'};} else {$symb=$ENV{'request.symb'};}
-	my $randomseed = srand(&Apache::lonnet::rndseed($symb,$ENV{'request.course.id'},
-                                                              $ENV{'user.domain'},$ENV{'user.name'}));
-	my $ind=1+int(rand()*($factors_number-1));
-	my $factor = $factors[$ind];
-	$ind=1+int(rand()*($powers_number-1));
+
+	&Apache::response::setrandomnumber();
+	my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);
 	my $power = $powers[$ind];
+	$ind=&Math::Random::random_uniform_integer(1,0,$#factors);
+	my $factor = $factors[$ind];
 	for ($ind=0;$ind<$number_of_bubbles;$ind++) {
-	    $bubbles_values[$ind] = $answers[0]*$factor**($power-$powers[$powers_number-$ind-1]);
-	}	    
+	    $bubbles_values[$ind] = $answers[0]*($factor**($power-$powers[$#powers-$ind]));
+	}
+	my @alphabet=('A'..'Z');
         if ($target eq 'web') {
+	  if ($$tagstack[-1] eq 'numericalresponse') {
+	    my $id=$Apache::inputtags::response[-1];
+	    if ($unit=~/\S/) {$result.=' (<i>in '.$unit.'</i>)<br /><br />';}
 	    $result.= '<table border="1"><tr>';
 	    for ($ind=0;$ind<$number_of_bubbles;$ind++) {
-		my $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);
-		$result.='<td>'.$ans.'</td>';
+		my $ans;
+		if ($formats[0] ne '') {
+		    $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);
+		} else {
+		    my $badans = $bubbles_values[$ind];
+		    my $format = ''; 
+                    #What is the number? (integer,decimal,floating point)
+                    if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
+			$format = 'e'.$2;
+		    } elsif ($badans=~/^(\d*)\.(\d*)$/) {
+			$format = '4f';
+		    } elsif ($badans=~/^(\d*)$/) {
+			$format = 'd';
+		    }
+		    $ans = sprintf('%.'.$format,$bubbles_values[$ind]);
 		}
+		    $result.='<td><input type="radio" name="HWVAL'.$id.'" value="'.$ans.'"><b>'.$alphabet[$ind].'</b>: '.$ans.'</td>';
+	    }
 	    $result.='</tr></table>';
+	  } elsif ($$tagstack[-1] eq 'formularesponse') {
+	    $result.= '<br /><br /><font color="red"> Formula have to be entered here! </font><br /><br />';
+	  }
 	} elsif ($target eq 'tex') {
-	    my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
-                            'Q','R','S','T','U','V','W','X','Y','Z');
-	    my $max_val = 0;
-	    if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {
-		$max_val=$1+$2+4;
-	    }
-	    $max_val = int(90/(($max_val+6)*2));
-            my $celllength = 90/$max_val-12;
-	    my @table_range = ();
-	    my $number_of_tables = int($number_of_bubbles/$max_val);
-	    for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}
-	    if ($number_of_bubbles % $max_val != 0) {
-		$number_of_tables++;
-		push @table_range,($number_of_bubbles % $max_val);
-	    }
-	    my $j=0;
-	    my $cou=0;
-	    $result.='\vskip 2 mm \noindent ';
-	    for (my $i=0;$i<$number_of_tables;$i++) {
-		$result.='\vskip 0 mm \noindent \begin{tabular}{|';
-		for ($ind=0;$ind<$table_range[$j];$ind++) {
-		    $result.='lp{'.$celllength.' mm}|';
-		}
-		$result.='}\hline';
-		for ($ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
-		    my $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);
-		    $result.=' '.$alphabet[$ind].': & '.$ans.' ';
-		    if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
+	 if (defined $unit and $Apache::lonhomework::type eq 'exam') {
+	   $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
+         }
+	 if ($$tagstack[-1] eq 'numericalresponse') {
+	     my $max_val = 0;
+	     if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {
+		 $max_val=$1+$2+4;
+	     } else {
+		 $max_val=4;
+	     }
+	     $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2));
+		my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10;
+	     my @table_range = ();
+	     my $number_of_tables = int($number_of_bubbles/$max_val);
+		for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}
+	     if ($number_of_bubbles % $max_val != 0) {
+		    $number_of_tables++;
+		    push @table_range,($number_of_bubbles % $max_val);
 		}
-		$j++;
-		$cou += $table_range[$j];
-		$result.='\\\\\hline\end{tabular}\vskip 0 mm ';
-	    }	    
+	     my $j=0;
+	     my $cou=0;
+	     $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+	     for (my $i=0;$i<$number_of_tables;$i++) {
+		 $result.='\vskip -1 mm \noindent \begin{tabular}{';
+		 for ($ind=0;$ind<$table_range[$j];$ind++) {
+		     $result.='lp{'.$celllength.' mm}';
+		 }
+		 $result.='}';
+		 for ($ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
+		     my $ans;
+		     if ($formats[0] ne '') {
+			 $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);
+			 if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
+			     my $number = $1;
+			     my $power = $2;
+			     $power=~s/^\+//;
+			     $power=~s/^(-?)0+(\d+)//;
+			     $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
+			 } 
+		     } else {
+			 my $badans = $bubbles_values[$ind];
+			 my $format = ''; 
+			 #What is the number? (integer,decimal,floating point)
+			 if ($badans=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
+			     $format = 'e'.$2;
+			 } elsif ($badans=~/^(\d*)\.(\d*)$/) {
+			     $format = '4f';
+			 } elsif ($badans=~/^(\d*)$/) {
+			     $format = 'd';
+			 }
+			 $ans = sprintf('%.'.$format,$bubbles_values[$ind]);			
+			 if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
+			     my $number = $1;
+			     my $power = $2;
+			     $power=~s/^\+//;
+			     $power=~s/^(-?)0+(\d+)//;
+			     $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
+			 } 
+		     }
+		     $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} ';
+		     if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
+		 }
+		 $cou += $table_range[$j];
+		 $j++;
+		 $result.='\\\\\end{tabular}\vskip 0 mm ';    
+	     }
+	     $result.='\end{enumerate}';
+	     &Apache::lonxml::increment_counter();
+         } else {
+	     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
+	    my $id = $Apache::inputtags::part;
+	    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+            my $repetition = int $weight/9;
+	    if ($weight % 9 != 0) {$repetition++;} 
+	      $result.='\begin{enumerate}';
+	      for (my $i=0;$i<$repetition;$i++) {
+		 $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
+		 &Apache::lonxml::increment_counter();
+	      }
+	      $result.= '\end{enumerate}';
+	    }
 	}
     }
   } elsif ($target eq 'edit') {
     $result.='</td></tr>'.&Apache::edit::end_table;
-  } elsif ($target eq 'answer') {
+  } elsif ($target eq 'answer' || $target eq 'analyze') {
 
-    &Apache::response::setup_params($$tagstack[-1]);
-    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
-    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
-    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
-    my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+      if ($target eq 'analyze') {
+	  push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+	  $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1];
+      }
+      &Apache::response::setup_params($$tagstack[-1]);
+      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
+      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
+      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
+      my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
 
-    $result.=&Apache::response::answer_header($$tagstack[-1]);
-    for(my $i=0;$i<=$#answers;$i++) {
-      my $ans=$answers[$i];
-      my $fmt;
-      if (@formats) {
-	if ($#formats) {
-	  $fmt=$formats[$i];
-	} else {
-	  $fmt=$formats[0];
-	}
+      if ($target eq 'answer') {
+	  $result.=&Apache::response::answer_header($$tagstack[-1]);
       }
-      my ($high,$low);
-      if ($Apache::inputtags::params{'tol'}) {
-	($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
-      }	
-      my ($sighigh,$siglow);
-      if ($Apache::inputtags::params{'sig'}) {
-	($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
+      for(my $i=0;$i<=$#answers;$i++) {
+	  my $ans=$answers[$i];
+	  my $fmt;
+	  if (@formats) {
+	      if ($#formats) {
+		  $fmt=$formats[$i];
+	      } else {
+		  $fmt=$formats[0];
+	      }
+	  }
+	  my ($high,$low);
+	  if ($Apache::inputtags::params{'tol'}) {
+	      ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
+	  }
+	  my ($sighigh,$siglow);
+	  if ($Apache::inputtags::params{'sig'}) {
+	      ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
+	  }
+	  if ($fmt) {
+	      $ans = sprintf('%.'.$fmt,$ans);
+	      if ($high) {
+		  $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
+	      }
+	  }
+	  if ($target eq 'answer') {
+	      if ($high) { $ans.=' ['.$low.','.$high.']'; }
+	      if ($sighigh) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }
+	      $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
+	  } elsif ($target eq 'analyze') {
+	      push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },
+		    $ans);
+	      if ($high) {
+		  push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);
+		  push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);
+	      }
+	  }
       }
-      if ($fmt) {
-	$ans = sprintf('%.'.$fmt,$ans);
-	if ($high) {
-	  $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
-	}
+      if ($unit) {
+	  if ($target eq 'answer') {
+	      $result.=&Apache::response::answer_part($$tagstack[-1],
+						      "Unit: <b>$unit</b>");
+	  } elsif ($target eq 'analyze') {
+	      push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
+		    $unit);
+	  }
       }
-      if ($high) { $ans.=' ['.$low.','.$high.'] '; }
-      if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }
-      $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
-    }
-    if ($unit) {
-      $result.=&Apache::response::answer_part($$tagstack[-1],"Unit: <b>$unit</b>");
-    }
-    if ($type || $token->[1] eq 'stringresponse') {
-      my $string='Case Insensitive';
-      if ($type eq 'mc') {
-	$string='Multiple Choice';
-      } elsif ($type eq 'cs') {
-	$string='Case Sensitive';
-      } elsif ($type eq 'ci') {
-	$string='Case Insensitive';
-      } elsif ($type eq 'fml') {
-	$string='Formula';
+      if ($type || $token->[1] eq 'stringresponse') {
+	  my $string='Case Insensitive';
+	  if ($type eq 'mc') {
+	      $string='Multiple Choice';
+	  } elsif ($type eq 'cs') {
+	      $string='Case Sensitive';
+	  } elsif ($type eq 'ci') {
+	      $string='Case Insensitive';
+	  } elsif ($type eq 'fml') {
+	      $string='Formula';
+	  }
+	  if ($target eq 'answer') {
+	      $result.=&Apache::response::answer_part($$tagstack[-1],
+						      '<b>'.$string.'</b>');
+	  } elsif ($target eq 'analyze') {
+	      push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },
+		    $type);
+	  }
+      }
+      if ($$tagstack[-1] eq 'formularesponse' && $target eq 'answer') {
+	  my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
+	  $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
+      }
+      if ($target eq 'answer') {
+	  $result.=&Apache::response::answer_footer($$tagstack[-1]);
       }
-      $result.=&Apache::response::answer_part($$tagstack[-1],
-					      '<b>'.$string.'</b>');
-    }
-    if ($$tagstack[-1] eq 'formularesponse') {
-      my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
-      $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
-    }
-    $result.=&Apache::response::answer_footer($$tagstack[-1]);
   }
   &Apache::response::end_response;
   return $result;