[LON-CAPA-cvs] cvs: loncom /homework/caparesponse caparesponse.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 07 Apr 2003 23:19:58 -0000


This is a MIME encoded message

--albertel1049757598
Content-Type: text/plain

albertel		Mon Apr  7 19:19:58 2003 EDT

  Modified files:              
    /loncom/homework/caparesponse	caparesponse.pm 
  Log:
  - retabinate
  
  
  
--albertel1049757598
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20030407191958.txt"

Index: loncom/homework/caparesponse/caparesponse.pm
diff -u loncom/homework/caparesponse/caparesponse.pm:1.88 loncom/homework/caparesponse/caparesponse.pm:1.89
--- loncom/homework/caparesponse/caparesponse.pm:1.88	Mon Apr  7 19:14:52 2003
+++ loncom/homework/caparesponse/caparesponse.pm	Mon Apr  7 19:19:58 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.88 2003/04/07 23:14:52 albertel Exp $
+# $Id: caparesponse.pm,v 1.89 2003/04/07 23:19:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,483 +31,447 @@
 use capa;
 
 BEGIN {
-  &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
-}
-
-sub start_caparesponse {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my $id = &Apache::response::start_response($parstack,$safeeval);
-  return '';
-}
-
-sub end_caparesponse {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  my $result = '';
-  if ( $target eq 'grade' ) {
-    if ( defined $ENV{'form.submitted'}) {
-      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
-      my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']};
-      if ( $response =~ /[^\s]/) {
-	my $id = $Apache::inputtags::response['-1'];
-	my $previous= &Apache::response::check_for_previous($response,$id,$response);
-	if ( $previous ) { 
-	  $result = 'PREVIOUSLY_USED';
-	} else {
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
-	  &Apache::lonxml::debug("submitted a $response<br>\n");
-	  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
-	  my $expression="&caparesponse_check('".$response."','".
-	    $$parstack[$#$parstack].
-	      ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
-		';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
-		  "');";
-	  $result = &Apache::run::run($expression,$safeeval);
-	  my ($ad) = split /:/ , $result;
-	  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
-	  &Apache::lonxml::debug("$expression");
-	  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
-	}
-      }
-    }
-  } elsif ($target eq 'web') {
-    #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
-  }
-  #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");
-  &Apache::response::end_response;
-  return '';
+    &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
 }
 
 sub start_numericalresponse {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my $id = &Apache::response::start_response($parstack,$safeeval);
-  my $result;
-  if ($target eq 'edit') {
-    $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).
-                         &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','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).
-             &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
-    }
-    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
-  } elsif ($target eq 'modified') {
-    my $constructtag;
-    if ($token->[1] eq 'numericalresponse') {
-      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
-						'answer','unit','format');
-    } elsif ($token->[1] eq 'stringresponse') {
-      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
-						'answer','type');
-    } elsif ($token->[1] eq 'formularesponse') {
-      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
-						'answer','samples');
-    }
-    if ($constructtag) {
-      $result = &Apache::edit::rebuild_tag($token);
-      $result.=&Apache::edit::handle_insert();
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $id = &Apache::response::start_response($parstack,$safeeval);
+    my $result;
+    if ($target eq 'edit') {
+	$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).
+		&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','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).
+	      &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
+	}
+	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag;
+	if ($token->[1] eq 'numericalresponse') {
+	    $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						      $safeeval,'answer',
+						      'unit','format');
+	} elsif ($token->[1] eq 'stringresponse') {
+	    $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						      $safeeval,'answer',
+						      'type');
+	} elsif ($token->[1] eq 'formularesponse') {
+	    $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						      $safeeval,'answer',
+						      'samples');
+	}
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	    $result.=&Apache::edit::handle_insert();
+	}
+    } elsif ($target eq 'meta') {
+	$result=&Apache::response::meta_package_write('numericalresponse');
+    } elsif ($target eq 'answer' || $target eq 'grade') {
+	&Apache::response::reset_params();
     }
-  } elsif ($target eq 'meta') {
-    $result=&Apache::response::meta_package_write('numericalresponse');
-  } elsif ($target eq 'answer' || $target eq 'grade') {
-      &Apache::response::reset_params();
-  }
-  return $result;
+    return $result;
 }
 
 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]);
-      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
-      my $partid = $Apache::inputtags::part;
-      my $id = $Apache::inputtags::response['-1'];
-      my $response = &Apache::response::getresponse();
-      if ( $response =~ /[^\s]/) {
-	my $ad;
-	my %previous = &Apache::response::check_for_previous($response,$partid,$id);
-	$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
-	&Apache::lonxml::debug("submitted a $response<br>\n");
-	&Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
-	if ($Apache::lonhomework::type eq 'exam' &&
-	   ($$tagstack[-1] eq 'numericalresponse')) {
-	    &Apache::response::setrandomnumber();
-	    #FIXME the 8 here is based off of number of powers need a parameter
-	    my $ind=&Math::Random::random_uniform_integer(1,0,8);
-	    if ($ind eq $response) { $ad='CORRECT'; } else { $ad='INCORRECT'; }
-	} else {
-	    $response =~ s/\\/\\\\/g;
-	    $response =~ s/\'/\\\'/g;
-	    &Apache::lonxml::debug("current $response");
-	    my $expression="&caparesponse_check_list('".$response."','".
-		$$parstack[-1];
-	    foreach my $key (keys(%Apache::inputtags::params)) {
-		$expression.= ';my $'. #'
-		    $key.'="'.$Apache::inputtags::params{$key}.'"';
-	    }
-	    if ($$tagstack[-1] eq 'formularesponse') {
-		$expression.=';my $type="fml";';
-	    } elsif ($$tagstack[-1] eq 'numericalresponse') {
-		$expression.=';my $type="float";';
-	    }
-	    $expression.="');";
-	    $result = &Apache::run::run($expression,$safeeval);
-	    my ($awards) = split /:/ , $result;
-	    ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
-	    &Apache::lonxml::debug("$expression");
-	    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
-	}
-	&Apache::response::handle_previous(\%previous,$ad);
-	$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
-	$result='';
-      }
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result = '';
+    if (!$Apache::lonxml::default_homework_loaded) {
+	&Apache::lonxml::default_homework_load($safeeval);
     }
-  } elsif ($target eq 'web' || $target eq 'tex') {
-      my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
-      my $status = $Apache::inputtags::status['-1'];
-      if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
-	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);
+    if ( $target eq 'grade' ) {
+	if ( defined $ENV{'form.submitted'}) {
+	    &Apache::response::setup_params($$tagstack[-1]);
+	    $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
+	    my $partid = $Apache::inputtags::part;
+	    my $id = $Apache::inputtags::response['-1'];
+	    my $response = &Apache::response::getresponse();
+	    if ( $response =~ /[^\s]/) {
+		my $ad;
+		my %previous = &Apache::response::check_for_previous($response,$partid,$id);
+		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
+		&Apache::lonxml::debug("submitted a $response<br>\n");
+		&Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+		if ($Apache::lonhomework::type eq 'exam' &&
+		    ($$tagstack[-1] eq 'numericalresponse')) {
+		    &Apache::response::setrandomnumber();
+		    #FIXME the 8 here is based off of number of powers need a parameter
+		    my $ind=&Math::Random::random_uniform_integer(1,0,8);
+		    if ($ind eq $response) { $ad='CORRECT'; } else { $ad='INCORRECT'; }
+		} else {
+		    $response =~ s/\\/\\\\/g;
+		    $response =~ s/\'/\\\'/g;
+		    &Apache::lonxml::debug("current $response");
+		    my $expression="&caparesponse_check_list('".$response."','".
+			$$parstack[-1];
+		    foreach my $key (keys(%Apache::inputtags::params)) {
+			$expression.= ';my $'. #'
+			    $key.'="'.$Apache::inputtags::params{$key}.'"';
+		    }
+		    if ($$tagstack[-1] eq 'formularesponse') {
+			$expression.=';my $type="fml";';
+		    } elsif ($$tagstack[-1] eq 'numericalresponse') {
+			$expression.=';my $type="float";';
+		    }
+		    $expression.="');";
+		    $result = &Apache::run::run($expression,$safeeval);
+		    my ($awards) = split /:/ , $result;
+		    ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
+		    &Apache::lonxml::debug("$expression");
+		    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
+		}
+		&Apache::response::handle_previous(\%previous,$ad);
+		$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+		$result='';
+	    }
+	}
+    } elsif ($target eq 'web' || $target eq 'tex') {
+	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
+	my $status = $Apache::inputtags::status['-1'];
+	if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
+	    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);
+
+	    if ($target eq 'web') {
+		$result="<br />The correct answer is ";
+	    } elsif ($target eq 'tex') {
+		#$result='\vskip 0 mm The correct answer is \\texttt{';
+	    }
+	    for (my $i=0; $i <= $#answers; $i++) {
+		my $answer=$answers[$i];
+		my $format;
+		if ($#formats > 0) {
+		    $format=$formats[$i];
+		} else {
+		    $format=$formats[0];
+		}
+		my $formatted;
+		if ((defined($format)) && ($format ne '')) {
+		    &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
+		    $formatted=sprintf('%.'.$format,$answer).',';
+		} else {
+		    &Apache::lonxml::debug("no format answer :$answer:");
+		    $formatted="$answer,";
+		}
+		
+		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 ";
+	    }
+	}
+	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);
+	    my $number_of_bubbles = 8; #default values for number of bubbles
+	    my @bubbles_values = (); 
+	    my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
+	    my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers
+	    &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-$ind]));
+	    }
+	    my @alphabet=('A'..'Z');
+	    if ($target eq 'web') {
+		if ($$tagstack[-1] eq 'numericalresponse') {
+		    my $id=$Apache::inputtags::response[-1];
+		    if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
+		    $result.= '<table border="1"><tr>';
+		    for ($ind=0;$ind<$number_of_bubbles;$ind++) {
+			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"><textarea name="formulainput" rows="4" cols="50"> </textarea></font> <br /><br />';
+		}
+	    } elsif ($target eq 'tex') {
+		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);
+		    }
+		    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\\\\}}}';
+		    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' || $target eq 'analyze') {
 	
-	if ($target eq 'web') {
-	  $result="<br />The correct answer is ";
-        } elsif ($target eq 'tex') {
-	  #$result='\vskip 0 mm The correct answer is \\texttt{';
-        }
-	for (my $i=0; $i <= $#answers; $i++) {
-	   my $answer=$answers[$i];
-	   my $format;
-	   if ($#formats > 0) {
-	     $format=$formats[$i];
-	   } else {
-	     $format=$formats[0];
-	   }
-	   my $formatted;
-	   if ((defined($format)) && ($format ne '')) {
-	     &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
-	     $formatted=sprintf('%.'.$format,$answer).',';
-	   } else {
-	     &Apache::lonxml::debug("no format answer :$answer:");
-	     $formatted="$answer,";
-	   }
-
-	   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 ";
-	   }
-       }
-      if ($Apache::lonhomework::type eq 'exam') {
-      	my (@answers)=&Apache::lonxml::get_param_var('answer',$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 $number_of_bubbles = 8; #default values for number of bubbles
-	my @bubbles_values = (); 
-	my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
-	my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers
-	&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-$ind]));
-	}
-	my @alphabet=('A'..'Z');
-        if ($target eq 'web') {
-	  if ($$tagstack[-1] eq 'numericalresponse') {
-	    my $id=$Apache::inputtags::response[-1];
-	    if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
-	    $result.= '<table border="1"><tr>';
-	    for ($ind=0;$ind<$number_of_bubbles;$ind++) {
-		my $ans;
-		if ($formats[0] ne '') {
-		    $ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);
+	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+	
+	if ($target eq 'answer') {
+	    $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 {
-		    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]);
+		    $fmt=$formats[0];
 		}
-		    $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"><textarea name="formulainput" rows="4" cols="50"> </textarea></font> <br /><br />';
-	  }
-	} elsif ($target eq 'tex') {
-	 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);
+	    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);
 		}
-	     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\\\\}}}';
-	    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}';
 	    }
 	}
+	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 ($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]);
+	}
     }
-  } elsif ($target eq 'edit') {
-    $result.='</td></tr>'.&Apache::edit::end_table;
-  } elsif ($target eq 'answer' || $target eq 'analyze') {
-
-      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);
-
-      if ($target eq 'answer') {
-	  $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];
-	      }
-	  }
-	  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 ($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 ($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]);
-      }
-  }
-  &Apache::response::end_response;
-  return $result;
+    &Apache::response::end_response;
+    return $result;
 }
 
 sub get_tolrange {
-  my ($ans,$tol)=@_;
-  my ($high,$low);
-  if ($tol =~ /%$/) {
-    chop($tol);
-    my $change=$ans*($tol/100.0);
-    $high=$ans+$change;
-    $low=$ans-$change;
-  } else {
-    $high=$ans+$tol;
-    $low=$ans-$tol;
-  }
-  return ($high,$low);
+    my ($ans,$tol)=@_;
+    my ($high,$low);
+    if ($tol =~ /%$/) {
+	chop($tol);
+	my $change=$ans*($tol/100.0);
+	$high=$ans+$change;
+	$low=$ans-$change;
+    } else {
+	$high=$ans+$tol;
+	$low=$ans-$tol;
+    }
+    return ($high,$low);
 }
 
 sub get_sigrange {
-  my ($sig)=@_;
-  &Apache::lonxml::debug("Got a sig of :$sig:");
-  my $sig_lbound;
-  my $sig_ubound;
-  if ($sig eq '') {
-    $sig_lbound = 0; #SIG_LB_DEFAULT
-    $sig_ubound =15; #SIG_UB_DEFAULT
-  } else {
-    ($sig_lbound,$sig_ubound) = split(/,/,$sig);
-    if (!$sig_lbound) {
-      $sig_lbound = 0; #SIG_LB_DEFAULT
-      $sig_ubound =15; #SIG_UB_DEFAULT
+    my ($sig)=@_;
+    &Apache::lonxml::debug("Got a sig of :$sig:");
+    my $sig_lbound;
+    my $sig_ubound;
+    if ($sig eq '') {
+	$sig_lbound = 0; #SIG_LB_DEFAULT
+	$sig_ubound =15; #SIG_UB_DEFAULT
+    } else {
+	($sig_lbound,$sig_ubound) = split(/,/,$sig);
+	if (!$sig_lbound) {
+	    $sig_lbound = 0; #SIG_LB_DEFAULT
+	    $sig_ubound =15; #SIG_UB_DEFAULT
+	}
+	if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
     }
-    if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
-  }
-  return ($sig_ubound,$sig_lbound);
+    return ($sig_ubound,$sig_lbound);
 }
 
 sub start_stringresponse {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  my $result;
-  if ($target eq 'meta') {
-    $result=&Apache::response::meta_package_write('stringresponse');
-  } else {
-    $result.=&start_numericalresponse(@_);
-  }
-  return $result;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ($target eq 'meta') {
+	$result=&Apache::response::meta_package_write('stringresponse');
+    } else {
+	$result.=&start_numericalresponse(@_);
+    }
+    return $result;
 }
 
 sub end_stringresponse {
-  return end_numericalresponse(@_);
+    return end_numericalresponse(@_);
 }
 
 sub start_formularesponse {
-  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  my $result;
-  if ($target eq 'meta') {
-    $result=&Apache::response::meta_package_write('formularesponse');
-  } else {
-    $result.=&start_numericalresponse(@_);
-  }
-  return $result;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ($target eq 'meta') {
+	$result=&Apache::response::meta_package_write('formularesponse');
+    } else {
+	$result.=&start_numericalresponse(@_);
+    }
+    return $result;
 }
 
 sub end_formularesponse {
-  return end_numericalresponse(@_);
+    return end_numericalresponse(@_);
 }
 
 1;
 __END__
- 
+

--albertel1049757598--