[BACK]Return to capaUnit.c CVS log [TXT] [DIR] Up to [LON-CAPA] / capa / capa51 / pProj

Diff for /capa/capa51/pProj/capaUnit.c between versions 1.1 and 1.4

version 1.1, 1999/09/28 21:26:21 version 1.4, 2000/03/22 21:08:03
Line 632  postorder_utree(node_p) Unit_t  *node_p; Line 632  postorder_utree(node_p) Unit_t  *node_p;
   return (result);    return (result);
 }  }
   
   /* returns 1 on okay, 2 on error*/
 int  int
 postwalk_utree(Unit_t  *n_p)  postwalk_utree(Unit_t  *n_p)
 {  {
Line 640  postwalk_utree(Unit_t  *n_p) Line 641  postwalk_utree(Unit_t  *n_p)
   if( n_p == NULL )  return (1);    if( n_p == NULL )  return (1);
       
   result = postwalk_utree(U_LEFT(n_p));    result = postwalk_utree(U_LEFT(n_p));
   if( result ) result = postwalk_utree(U_RIGHT(n_p));    if (result !=2) {
   if( result ) {      if( result ) result = postwalk_utree(U_RIGHT(n_p));
     switch(U_TYPE(n_p)) {      if (result !=2) {
       case U_DERIVED:   Ptopidx++; Pstack[Ptopidx] = n_p;  /* push into stack */        if( result ) {
             break;   switch(U_TYPE(n_p)) {
       case U_CONSTANT:  Ptopidx++; Pstack[Ptopidx] = n_p;  /* push into stack */   case U_DERIVED:   Ptopidx++; Pstack[Ptopidx] = n_p;  /* push into stack */
             break;    break;
       case U_OP_POWER:  printf("^");   case U_CONSTANT:  Ptopidx++; Pstack[Ptopidx] = n_p;  /* push into stack */
             break;    break;
       case U_OP_TIMES:  process_op(U_OP_TIMES);        /* process operator */   case U_UNKNOWN:   result=2; 
             break;    /*push into stack anyway, try to parse rest of tree */
       case U_OP_PLUS:   printf("+");    break;
             break;   case U_OP_POWER:  printf("^"); result=2;
       case U_OP_MINUS:  printf("-");    break;
             break;   case U_OP_TIMES:  process_op(U_OP_TIMES);        /* process operator */
       case U_OP_DIVIDE: process_op(U_OP_DIVIDE);       /* process operator */    break;
             break;   case U_OP_PLUS:   printf("+"); result=2;
       default:          printf("()");    break;
             break;     case U_OP_MINUS:  printf("-"); result=2;
     break;
    case U_OP_DIVIDE: process_op(U_OP_DIVIDE);       /* process operator */
     break;
    default:          printf("()"); result=2;
     break;  
    }
         }
     }      }
   }    }
   return (result);    return (result);
Line 727  int  check_correct_unit(char *u_symb,Uni Line 735  int  check_correct_unit(char *u_symb,Uni
   int       result=UNIT_OK;    int       result=UNIT_OK;
   
 #ifdef UNIT_DBUG  #ifdef UNIT_DBUG
    if ((ufp=fopen("unit.DBUG","a"))==NULL) { fprintf(stderr,"Error: can't open login debug\n"); return; }     if ((ufp=fopen("unit.DBUG","a"))==NULL) { fprintf(stderr,"Error: can't open login debug\n"); return UNIT_FAIL; }
 #endif   #endif 
   
   while( isspace(*u_symb) )  u_symb++;    while( isspace(*u_symb) )  u_symb++; 
     /* <= change this to search from the end of string */
     /* or to get rid of all the white spaces */
   
   
   ap = parse_unit_expr(u_symb);    ap = parse_unit_expr(u_symb);
   Ptopidx=0;    Ptopidx=0;
   postwalk_utree(ap);  
     if (postwalk_utree(ap)==1) {
 #ifdef UNIT_DBUG  #ifdef UNIT_DBUG
   fprintf(ufp,"Ptopidx %d\n",Ptopidx);      fprintf(ufp,"Ptopidx %d\n",Ptopidx);
 #endif  #endif
   if( Ptopidx == 1 ) {      if( Ptopidx == 1 ) {
     simplify_unit(Pstack[Ptopidx]);        simplify_unit(Pstack[Ptopidx]);
             
     if( (Pstack[Ptopidx]->u_count != 0) ||        if( (Pstack[Ptopidx]->u_count != 0) ||
         (Pstack[Ptopidx]->u_count == t->u_count) ) { /* has unit */    (Pstack[Ptopidx]->u_count == t->u_count) ) { /* has unit */
       *scale = units_ratio(Pstack[Ptopidx], t);   *scale = units_ratio(Pstack[Ptopidx], t);
       if( *scale == 0.0 ) {   if( *scale == 0.0 ) {
         result = UNIT_FAIL;    result = UNIT_FAIL;
    }
    free_utree(ap);
         } else {
    result = UNIT_FAIL;
       }        }
       free_utree(ap);      } else { /* invalid unit representation */
     } else {  
       result = UNIT_FAIL;        result = UNIT_FAIL;
     }      }
   } else { /* invalid unit representation */    } else {
     result = UNIT_FAIL;      result = UNIT_FAIL;
   }    }
 #ifdef UNIT_DBUG  #ifdef UNIT_DBUG
Line 856  u_copy_unit(Unit_t *a_p, Unit_t *b_p, do Line 872  u_copy_unit(Unit_t *a_p, Unit_t *b_p, do
     a_p->u_scale = a_p->u_scale * scale;      a_p->u_scale = a_p->u_scale * scale;
     /* printf("Found scale=%g=%g\n",a_p->u_scale,b_p->u_scale); */      /* printf("Found scale=%g=%g\n",a_p->u_scale,b_p->u_scale); */
   } else {      } else {  
     if( b_p->u_type == U_BASE || b_p->u_type == U_DERIVED) {      if( b_p->u_type == U_BASE ) { 
       /* *b_p is a base unit, so create a one element unit */        /* *b_p is a base unit, so create a one element unit */
       ne_p = (Unit_E *) capa_malloc(1, sizeof(Unit_E));   /* *** */        ne_p = (Unit_E *) capa_malloc(1, sizeof(Unit_E));   /* *** */
       ne_p->ue_scale = b_p->u_scale;        ne_p->ue_scale = b_p->u_scale;
Line 870  u_copy_unit(Unit_t *a_p, Unit_t *b_p, do Line 886  u_copy_unit(Unit_t *a_p, Unit_t *b_p, do
       }        }
       last_p = ne_p;        last_p = ne_p;
       a_p->u_count++;        a_p->u_count++;
       } else if( b_p->u_type == U_DERIVED) {
         /* derived units but without any units elements (scalar) */
         /* do nothing, ignore this units  WE REALLY MEAN THIS DON'T DO THE NEXT LINE!*/
         /*a_p->u_count++;*/
     } else if( b_p->u_type == U_CONSTANT ) {      } else if( b_p->u_type == U_CONSTANT ) {
       scale = pow(b_p->u_scale, exp_scale);        scale = pow(b_p->u_scale, exp_scale);
       a_p->u_scale = a_p->u_scale * scale;        a_p->u_scale = a_p->u_scale * scale;
Line 1363  u_insert_derived(n_p,s_p,c_p,u_p)char  * Line 1383  u_insert_derived(n_p,s_p,c_p,u_p)char  *
   strcpy(new_p->u_comment,c_p);    strcpy(new_p->u_comment,c_p);
       
   simplify_unit(new_p);    simplify_unit(new_p);
       /*
   /* print_unit_t(new_p); */    printf("Derived Unit:%s\n",new_p->u_name);
       print_unit_t(new_p); 
     */
   if (c_result < 0 ) {    if (c_result < 0 ) {
     new_p->u_left = t->u_left; new_p->u_right = t;      new_p->u_left = t->u_left; new_p->u_right = t;
     t->u_left = NULL;      t->u_left = NULL;
Line 1411  simplify_unit(u_p) Unit_t *u_p; Line 1432  simplify_unit(u_p) Unit_t *u_p;
     CScale[ii] = 0.0;      CScale[ii] = 0.0;
     CExp[ii] = 0.0;      CExp[ii] = 0.0;
   }    }
     /*
     printf("Before Simplify:: \n");
     print_unit_t(u_p);
     */
   if( u_p->u_count > 0 ) {    if( u_p->u_count > 0 ) {
           
     for(eu_p=u_p->u_list; eu_p; eu_p = eu_p->ue_nextp) {      for(eu_p=u_p->u_list; eu_p; eu_p = eu_p->ue_nextp) {
Line 1422  simplify_unit(u_p) Unit_t *u_p; Line 1447  simplify_unit(u_p) Unit_t *u_p;
       CScale[idx] = CScale[idx] * eu_p->ue_scale;        CScale[idx] = CScale[idx] * eu_p->ue_scale;
       CExp[idx] = CExp[idx] + eu_p->ue_exp;        CExp[idx] = CExp[idx] + eu_p->ue_exp;
     }      }
     /*      /* debugging 
     for(ii=0;ii<BaseUnitcnt;ii++) {      for(ii=0;ii<BaseUnitcnt;ii++) {
       if( CScale[ii] != 0.0 ) {        if( CScale[ii] != 0.0 ) {
         printf("(%d)%s,S=%g,E=%g\n",ii,CSymb[ii],CScale[ii], CExp[ii]);          printf("(%d)%s,S=%g,E=%g\n",ii,CSymb[ii],CScale[ii], CExp[ii]);
       }        }
         if( CExp[ii] == 0.0 ) {
           printf("(%d)%s,S=%g,Exp=%g\n",ii,CSymb[ii],CScale[ii], CExp[ii]);
         }
     }      }
     */      */
     freelist_unit_e(u_p->u_list);      freelist_unit_e(u_p->u_list);
Line 1448  simplify_unit(u_p) Unit_t *u_p; Line 1476  simplify_unit(u_p) Unit_t *u_p;
         u_p->u_count++;          u_p->u_count++;
       }        }
     }      }
       
       
   }    }
       /* 
     printf("After Simplify:: \n");
     print_unit_t(u_p);
     */
 }  }
   
 /* before comparing two units, make sure they are of  basic form */  /* before comparing two units, make sure they are of  basic form */
Line 1688  p_new_unit(Unit_t *left_p, Unit_t *right Line 1717  p_new_unit(Unit_t *left_p, Unit_t *right
           } else { /* unit *tmp_str not found */            } else { /* unit *tmp_str not found */
             /* printf(" not found\n"); */              /* printf(" not found\n"); */
             err_code = 3;              err_code = 3;
       cu_p->u_type   = U_UNKNOWN;
           }            }
         } else {          } else {
           /* printf("<<%s>>", symb_str); */            /* printf("<<%s>>", symb_str); */
           err_code = 2;            err_code = 2;
     cu_p->u_type   = U_UNKNOWN;
         }          }
       } else {/* len == 1 */        } else {/* len == 1 */
         /* printf(" not found\n"); */          /* printf(" not found\n"); */
         err_code = 1;          err_code = 1;
    cu_p->u_type   = U_UNKNOWN;
       }        }
     }      }
   } else {    } else {
Removed from v.1.1  
changed lines
  Added in v.1.4

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