[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.14 and 1.20

version 1.14, 2004/11/16 23:37:40 version 1.20, 2005/12/20 19:59:52
Line 34  PointsList_t * parse_pts_list (char *pts Line 34  PointsList_t * parse_pts_list (char *pts
   int done=0;    int done=0;
   /*fprintf(stderr,"ids %s\n",id_list);    /*fprintf(stderr,"ids %s\n",id_list);
     fprintf(stderr,"pts %s\n",pts_list);*/      fprintf(stderr,"pts %s\n",pts_list);*/
   while (!done) {    while (!done && pts_list) {
     int idx;      int idx;
     /*fprintf(stderr,"pts; %s\n",idx_pts);*/      /*fprintf(stderr,"pts; %s\n",idx_pts);*/
     new=gen_ptslist_str(idx_pts);      new=gen_ptslist_str(idx_pts);
Line 97  int caparesponse_capa_check_answer(char Line 97  int caparesponse_capa_check_answer(char
   if (type == ANSWER_IS_FORMULA) {    if (type == ANSWER_IS_FORMULA) {
     p.id_list=id_list;      p.id_list=id_list;
     p.pts_list=parse_pts_list(pts_list);      p.pts_list=parse_pts_list(pts_list);
   //  if ( p.id_list == NULL || p.pts_list == NULL) {
   //    return BAD_FORMULA;
   //  }
   }    }
   p.ans_type   = type;    p.ans_type   = type;
   p.answer     = correct;    p.answer     = correct;
Line 110  int caparesponse_capa_check_answer(char Line 113  int caparesponse_capa_check_answer(char
   }    }
   if (unit_str != NULL && unit_str[0]!='\0') {    if (unit_str != NULL && unit_str[0]!='\0') {
     strncpy(p.unit_str,unit_str,ANSWER_STRING_LENG-1);      strncpy(p.unit_str,unit_str,ANSWER_STRING_LENG-1);
     p.ans_unit   = u_parse_unit(unit_str);      //p.ans_unit = u_parse_unit(unit_str);
       p.ans_unit   = parse_unit_expr(unit_str);
       p.ans_unit   = process_utree(p.ans_unit);
       //print_unit_t(p.ans_unit);
   } else {    } else {
     p.unit_str[0]='\0';      p.unit_str[0]='\0';
     p.ans_unit=NULL;      p.ans_unit=NULL;
Line 128  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;    double  n_part,scale=1.0,given,target;
   char    input[ANSWER_STRING_LENG],filename[FILE_NAME_LENGTH];    char    input[ANSWER_STRING_LENG],filename[FILE_NAME_LENGTH],
       tmp_unit_str[ANSWER_STRING_LENG];
   Unit_t *ans_unit;    Unit_t *ans_unit;
   long    seed1,seed2;    long    seed1,seed2;
   FILE   *fp;    FILE   *fp;
Line 143  int caparesponse_get_real_response (char Line 150  int caparesponse_get_real_response (char
   fclose(fp);    fclose(fp);
   
   if (unit_str != NULL && unit_str[0]!='\0') {    if (unit_str != NULL && unit_str[0]!='\0') {
     ans_unit   = u_parse_unit(unit_str);      ans_unit   = parse_unit_expr(unit_str);
       ans_unit   = process_utree(ans_unit);
   } else {    } else {
     ans_unit=NULL;      ans_unit=NULL;
   }    }
Line 155  int caparesponse_get_real_response (char Line 163  int caparesponse_get_real_response (char
     }      }
   }    }
   if( !all_alphabet ) {    if( !all_alphabet ) {
     outcome = split_num_unit(answer,&n_part,input,unit_str);      tmp_unit_str[0] = 0;
       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(unit_str,ans_unit,&scale);   result = check_correct_unit(tmp_unit_str,ans_unit,&scale);
       } else {        } else {
  /* what to do when no unit is specified but student entered a unit? */   /* what to do when no unit is specified but student entered a unit? */
  result = UNIT_NOTNEEDED;   result = UNIT_NOTNEEDED;
Line 179  lphabet, but no number */ Line 190  lphabet, but no number */
   }     } 
   return result;    return result;
 }  }
   
   /* Testing harnass
   int main(void) {
     int result=0;
     char *reterror=NULL;
     result= caparesponse_capa_check_answer("10^3","1000",
    ANSWER_IS_FORMULA,
    TOL_ABSOLUTE,1E-3,
    3,5,NULL,NULL,
    CALC_UNFORMATED,
    "","4",
    "rndseed",
    &reterror);
     fprintf(stderr,"result %d\nreterror: %s\n",result,reterror);
   }
   */
Removed from v.1.14  
changed lines
  Added in v.1.20

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