Révision 71 pobysoPythonSage/src/sageSLZ/sageSLZ.sage

sageSLZ.sage (revision 71)
30 30
    maxErrorSa = pobyso_get_constant_as_rn_with_rf_so_sa(maxErrorSo)
31 31
    while maxErrorSa > approxPrecSa:
32 32
        sollya_lib_clear_obj(maxErrorSo)
33
        errorRatioSa = (approxPrecSa/maxErrorSa).log2()
33
        errorRatioSa = 1/(maxErrorSa/approxPrecSa).log2()
34 34
        #print "Error ratio: ", errorRatioSa
35
        if errorRatioSa < intervalShrinkConstFactorSa:
36
            #currentUpperBoundSa = currentLowerBoundSa + (currentUpperBoundSa - currentLowerBoundSa) * errorRatioSa
35
        if errorRatioSa > intervalShrinkConstFactorSa:
37 36
            currentUpperBoundSa = currentLowerBoundSa + \
38 37
                                  (currentUpperBoundSa - currentLowerBoundSa) * \
39 38
                                   intervalShrinkConstFactorSa
......
41 40
            currentUpperBoundSa = currentLowerBoundSa + \
42 41
                                  (currentUpperBoundSa - currentLowerBoundSa) * \
43 42
                                  intervalShrinkConstFactorSa
44
        #print lowerBoundSa, currentUpperBoundSa
43
            currentUpperBoundSa = currentLowerBoundSa + \
44
                                  (currentUpperBoundSa - currentLowerBoundSa) * \
45
                                  errorRatioSa
46
        #print "Current upper bound:", currentUpperBoundSa
45 47
        sollya_lib_clear_obj(currentRangeSo)
46 48
        sollya_lib_clear_obj(polySo)
47 49
        currentRangeSo = pobyso_bounds_to_range_sa_so(currentLowerBoundSa, 

Formats disponibles : Unified diff