comparison eval.c @ 11739:ceffa0ca7596 libavcodec

Change the order of parameters for ff_eval_expr() and ff_parse_and_eval_expr(), place the names for constants/functions before the corresponding values. This looks more readable, as the user is expected to know the names before the values.

11738:9bfef228a117

        case e_gauss: return verify_expr(e->param[0]);
        default: return verify_expr(e->param[0]) && verify_expr(e->param[1]);
    }
}

AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
               double (* const *func1)(void *, double), const char * const *func1_name,
               double (* const *func2)(void *, double, double), const char * const *func2_name,
               const char **error){
    Parser p;
    AVExpr *e = NULL;
    char *w = av_malloc(strlen(s) + 1);
    char *wp = w;

    p.const_value= const_value;
    p.opaque     = opaque;
    return eval_expr(&p, e);
}

double ff_parse_and_eval_expr(const char *s, const double *const_value, const char * const *const_name,
               double (* const *func1)(void *, double), const char * const *func1_name,
               double (* const *func2)(void *, double, double), const char * const *func2_name,
               void *opaque, const char **error){
    AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error);
    double d;
    if (!e) return NAN;
    d = ff_eval_expr(e, const_value, opaque);
    ff_free_expr(e);
    return d;

    "E",
    0
};
int main(void){
    int i;
    printf("%f == 12.7\n", ff_parse_and_eval_expr("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL));
    printf("%f == 0.931322575\n", ff_parse_and_eval_expr("80G/80Gi", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL));

    for(i=0; i<1050; i++){
        START_TIMER
            ff_parse_and_eval_expr("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_values, const_names, NULL, NULL, NULL, NULL, NULL, NULL);
        STOP_TIMER("ff_parse_and_eval_expr")
    }
    return 0;
}
#endif

11739:ceffa0ca7596

        case e_gauss: return verify_expr(e->param[0]);
        default: return verify_expr(e->param[0]) && verify_expr(e->param[1]);
    }
}

AVExpr *ff_parse_expr(const char *s,
                      const char * const *const_name,
                      const char * const *func1_name, double (* const *func1)(void *, double),
                      const char * const *func2_name, double (* const *func2)(void *, double, double),
               const char **error){
    Parser p;
    AVExpr *e = NULL;
    char *w = av_malloc(strlen(s) + 1);
    char *wp = w;

    p.const_value= const_value;
    p.opaque     = opaque;
    return eval_expr(&p, e);
}

double ff_parse_and_eval_expr(const char *s,
                              const char * const *const_name, const double *const_value,
                              const char * const *func1_name, double (* const *func1)(void *, double),
                              const char * const *func2_name, double (* const *func2)(void *, double, double),
               void *opaque, const char **error){
    AVExpr *e = ff_parse_expr(s, const_name, func1_name, func1, func2_name, func2, error);
    double d;
    if (!e) return NAN;
    d = ff_eval_expr(e, const_value, opaque);
    ff_free_expr(e);
    return d;

    "E",
    0
};
int main(void){
    int i;
    printf("%f == 12.7\n", ff_parse_and_eval_expr("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_names, const_values, NULL, NULL, NULL, NULL, NULL, NULL));
    printf("%f == 0.931322575\n", ff_parse_and_eval_expr("80G/80Gi", const_names, const_values, NULL, NULL, NULL, NULL, NULL, NULL));

    for(i=0; i<1050; i++){
        START_TIMER
            ff_parse_and_eval_expr("1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_names, const_values, NULL, NULL, NULL, NULL, NULL, NULL);
        STOP_TIMER("ff_parse_and_eval_expr")
    }
    return 0;
}
#endif