comparison eval.c @ 2436:86d14aebd527 libavcodec

simplify benchmark

2435:c89ac0e70c66

        return NAN;
    }

    return d;
}      
       
static double evalPow(Parser *p){
    if(p->s[0]=='+') p->s++;
       
    if(p->s[0]=='-'){ 
        p->s++;
        return -evalPrimary(p);
    }else
        return  evalPrimary(p);
}

static double evalFactor(Parser *p){
    double ret= evalPow(p);
    while(p->s[0]=='^'){

    }
    return ret;
}

static double evalExpression(Parser *p){
    double ret;

    if(p->stack_index <= 0) //protect against stack overflows
        return NAN;
    p->stack_index--;

    ret= evalTerm(p);
    while(p->s[0]=='+' || p->s[0]=='-'){
        if(*p->s++ == '+') ret+= evalTerm(p);
        else               ret-= evalTerm(p);
    }

    p->stack_index++;

    return ret;
}

    "PI",
    "E",
    0
};
main(){
    printf("%f == 12.7\n", ff_eval("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL));
}
#endif

2436:86d14aebd527

        return NAN;
    }

    return d;
}      

static double evalPow(Parser *p){
    int sign= (*p->s == '+') - (*p->s == '-');
    p->s += sign&1;
    return (sign|1) * evalPrimary(p);
}

static double evalFactor(Parser *p){
    double ret= evalPow(p);
    while(p->s[0]=='^'){

    }
    return ret;
}

static double evalExpression(Parser *p){
    double ret= 0;

    if(p->stack_index <= 0) //protect against stack overflows
        return NAN;
    p->stack_index--;

    do{
        ret += evalTerm(p);
    }while(*p->s == '+' || *p->s == '-');

    p->stack_index++;

    return ret;
}

    "PI",
    "E",
    0
};
main(){
    int i;
    printf("%f == 12.7\n", ff_eval("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL));
    
    for(i=0; i<1050; i++){
        START_TIMER
            ff_eval("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL);
        STOP_TIMER("ff_eval")
    }
}
#endif