loncom/homework/caparesponse/caparesponse.c - diff

Return to caparesponse.c CVS log

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

version 1.18, 2005/11/07 23:37:39	version 1.19, 2005/12/01 22:34:10
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) {	// if ( p.id_list == NULL \|\| p.pts_list == NULL) {
return BAD_FORMULA;	// return BAD_FORMULA;
}	// }
}	}
p.ans_type = type;	p.ans_type = type;
p.answer = correct;	p.answer = correct;
Line 163 int caparesponse_get_real_response (char	Line 163 int caparesponse_get_real_response (char
}	}
}	}
if( !all_alphabet ) {	if( !all_alphabet ) {
tmp_unit_str[0]=NULL;	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 > 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 ) {
Line 188 lphabet, but no number */	Line 188 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);
	}
	*/