[BACK]Return to caparesponse.c CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework / caparesponse

Diff for /loncom/homework/caparesponse/caparesponse.c between versions 1.19 and 1.22

version 1.19, 2005/12/01 22:34:10 version 1.22, 2024/04/29 00:22:49
Line 134  int caparesponse_capa_check_answer(char Line 134  int caparesponse_capa_check_answer(char
 int caparesponse_get_real_response (char* unit_str, char* answer,  int caparesponse_get_real_response (char* unit_str, char* answer,
     double* scaled) {      double* scaled) {
   //double caparesponse_get_real_response (char* unit_str, char* answer) {    //double caparesponse_get_real_response (char* unit_str, char* answer) {
   int     input_len,all_alphabet,idx,outcome,result;    int     input_len,all_alphabet,idx,outcome=-1,result;
   double  n_part,scale=1.0,given,target;    ouble  n_part,scale=1.0,given;
   char    input[ANSWER_STRING_LENG],filename[FILE_NAME_LENGTH],    char    input[ANSWER_STRING_LENG],filename[FILE_NAME_LENGTH],
     tmp_unit_str[ANSWER_STRING_LENG];      tmp_unit_str[ANSWER_STRING_LENG];
   Unit_t *ans_unit;    Unit_t *ans_unit;
   long    seed1,seed2;  
   FILE   *fp;    FILE   *fp;
   sprintf(filename,"/home/httpd/html/res/adm/includes/capa.units");    sprintf(filename,"/home/httpd/html/res/adm/includes/capa.units");
   if ((fp=fopen(filename,"r"))==NULL) {    if ((fp=fopen(filename,"r"))==NULL) {
Line 165  int caparesponse_get_real_response (char Line 164  int caparesponse_get_real_response (char
   if( !all_alphabet ) {    if( !all_alphabet ) {
     tmp_unit_str[0] = 0;      tmp_unit_str[0] = 0;
     outcome = split_num_unit(answer,&n_part,input,tmp_unit_str);      outcome = split_num_unit(answer,&n_part,input,tmp_unit_str);
     }
     if( outcome > 0 ) {
     if( outcome > 1 ) { /* with both num and unit parts or only unit part */      if( outcome > 1 ) { /* with both num and unit parts or only unit part */
       if( ans_unit != NULL ) {        if( ans_unit != NULL ) {
  result = check_correct_unit(tmp_unit_str,ans_unit,&scale);   result = check_correct_unit(tmp_unit_str,ans_unit,&scale);
Line 182  int caparesponse_get_real_response (char Line 183  int caparesponse_get_real_response (char
       *scaled=given;        *scaled=given;
       /* convert the given answer into proper scale for units */        /* convert the given answer into proper scale for units */
     } /* end if unit check */      } /* end if unit check */
   } else { /* user entered a    } else { /* user entered alphabet, but no number */
 lphabet, but no number */  
     result = WANTED_NUMERIC;      result = WANTED_NUMERIC;
   }     } 
   return result;    return result;
 }  }
   
 /* Testing harnass  /* Testing harness
 int main(void) {  int main(void) {
   int result=0;    int result=0;
   char *reterror=NULL;    char *reterror=NULL;
Removed from v.1.19  
changed lines
  Added in v.1.22

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>