loncom/homework/caparesponse/caparesponse.c - diff

Return to caparesponse.c CVS log

Up to [LON-CAPA] / loncom / homework / caparesponse

Diff for /loncom/homework/caparesponse/caparesponse.c between versions 1.13 and 1.15

-version 1.13, 2004/03/12 23:46:06
+version 1.15, 2004/12/23 18:32:50
  Line 124  int caparesponse_capa_check_answer(char
    return result;
  }
+ int caparesponse_get_real_response (char* unit_str, char* answer,
+ 				    double* scaled) {
+   //double caparesponse_get_real_response (char* unit_str, char* answer) {
+   int     input_len,all_alphabet,idx,outcome,result;
+   double  n_part,scale=1.0,given,target;
+   char    input[ANSWER_STRING_LENG],filename[FILE_NAME_LENGTH],
+     tmp_unit_str[ANSWER_STRING_LENG];
+   Unit_t *ans_unit;
+   long    seed1,seed2;
+   FILE   *fp;
+   sprintf(filename,"/home/httpd/html/res/adm/includes/capa.units");
+   if ((fp=fopen(filename,"r"))==NULL) {
+     /* printf("Error: can't open %s\n",filename);*/
+     return (-1);
+   }
+   u_getunit(fp);
+   fclose(fp);
+   if (unit_str != NULL && unit_str[0]!='\0') {
+     ans_unit   = u_parse_unit(unit_str);
+   } else {
+     ans_unit=NULL;
+   }
+   input_len = strlen(answer);
+   all_alphabet = 1;
+   for(idx=0;idx<input_len;idx++) {
+     if( isdigit(answer[idx]) ) {
+       all_alphabet = 0;
+     }
+   }
+   if( !all_alphabet ) {
+     outcome = split_num_unit(answer,&n_part,input,tmp_unit_str);
+     if( outcome > 1 ) { /* with both num and unit parts or only unit part */
+       if( ans_unit != NULL ) {
+ 	result = check_correct_unit(tmp_unit_str,ans_unit,&scale);
+       } else {
+ 	/* what to do when no unit is specified but student entered a unit? */
+ 	result = UNIT_NOTNEEDED;
+       }
+     } else {
+       if( ans_unit != NULL ) {
+ 	result = NO_UNIT;
+       }
+     }
+     if( (result != NO_UNIT) && (!check_for_unit_fail(result)) && ( result != UNIT_NOTNEEDED) ) {
+       given = n_part * scale;
+       *scaled=given;
+       /* convert the given answer into proper scale for units */
+     } /* end if unit check */
+   } else { /* user entered a
+ lphabet, but no number */
+     result = WANTED_NUMERIC;
+   }
+   return result;
+ }

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

Removed from v.1.13
changed lines
	Added in v.1.15