--- capa/capa51/JavaTools/TScore.java	1999/11/29 19:56:28	1.2
+++ capa/capa51/JavaTools/TScore.java	1999/12/03 18:39:38	1.3
@@ -111,7 +111,7 @@ public void init() {
    //    if epc 1 is not given, use exam 1 as epc 1
    // if exam 2 is not given, use exam 1 to extrapolate
    // if exam 3 is not given, use exam 2 to extrapolate
-   // 
+   // I am lying, I only use the homework score
 
    float exam_sum = (float)0.0;
    for(idx=0;idx<Exam_cnt;idx++) {
@@ -132,7 +132,7 @@ public void init() {
      } else {
          Exam_ratio[idx] = Raw_exam_ratio[idx];
      }
-     
+     //System.out.print("idx="+idx+":Exam_ratio="+Exam_ratio[idx]+"\n");
      Sum_ratio[2*(idx+1)] = Exam_ratio[idx];
      tmp_i = (int)(10000 * Exam_ratio[idx] );
      Sum_percent[2*(idx+1)] = (float)tmp_i / (float)100.0;
@@ -268,7 +268,8 @@ class ExpPanel extends Panel
         float sf_ratio =  (float)ss / (float)ff;
         tmp_i = (int)(10000 * sf_ratio);
         float sf_percent =  (float)tmp_i / (float)100.0;
-        float sum_ratio = (float)(ss + ((float)rr*ff*sf_ratio/(float)cc)) / (float)(ff*(1.0 + (float)rr/(float)cc));
+        float sum_ratio = (float)(ss + ((float)rr*ff*sf_ratio/(float)(cc+rr))) / (float)(ff*(1.0 + (float)rr/(float)(cc+rr)));
+	//System.out.print("ss ="+ss+":rr="+rr+":ff="+ff+":sf_ratio="+sf_ratio+":cc="+cc+":sum_ratio="+sum_ratio+"\n");
         tmp_i = (int)(10000 * sum_ratio);
         float sum_percent =  (float)tmp_i / (float)100.0;
 
@@ -363,6 +364,7 @@ class ExpPanel extends Panel
         double f;
         try {
             f = (double)Double.valueOf(exT.getText()).doubleValue();
+	    if (f > max) {f=max;}
         } catch (java.lang.NumberFormatException e) {
             f = 0.0;
         }
@@ -388,7 +390,8 @@ class ExpPanel extends Panel
     }
     void  recalcSumm(int tf) {
         float my_r = (float) tf / (float)100.0;
-        int  tmp_i= (int)(10000*(ss+(rr*ff*my_r/cc))/(float)(ff*(1.0+rr/cc)));
+        int  tmp_i= (int)(10000*(ss+((float)rr*ff*my_r/(cc+rr)))/(float)(ff*(1.0+(float)rr/(cc+rr))));
+	//System.out.print("ss ="+ss+":rr="+rr+":ff="+ff+":my_r="+my_r+":cc="+cc+":tmp_i="+((float)tmp_i/10000.0)+"\n");
         float sum  = (float)tmp_i / (float)100.0;
         sumL.setText(sum + "%");
         controller.recalcTermScore();
@@ -459,7 +462,11 @@ class ExmPanel extends Panel
 
         if( exam_x == 0 ) {
           // exam not extrapolated
-          exam_ratio = (float)s_ex / (float)f_ex;
+	  if ((float)f_ex < 0.00000001) {
+	      exam_ratio = (float) 0.0;
+	  } else {
+	      exam_ratio = (float)s_ex / (float)f_ex;
+	  }
           tmp_i = (int) (10000 * exam_ratio );
           float percent = (float)tmp_i / (float)100.0;
           String cs =  " " + a + "/" + b + " = " + percent + " %";
@@ -536,7 +543,12 @@ class ExmPanel extends Panel
            gridbag.setConstraints(eL, c);
            add(eL);
            if( epc_x == 0 ) {
-             float ratio = (float) ( s_pc / f_pc);
+	     float ratio;
+	     if ((float)f_pc < 0.00000001) {
+		 ratio = (float) 0.0;
+	     } else {
+		 ratio = (float) ( s_pc / f_pc);
+	     }
              tmp_i = (int) (10000 * ratio );
              float percent = (float)tmp_i / (float)100.0;
              String cs =  " " + s_pc + "/" + f_pc + " = " + percent + " %";