Changeset c979dc3 in tol


Ignore:
Timestamp:
Sep 30, 2009, 3:24:48 PM (17 years ago)
Author:
Víctor de Buen <vdebuen@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
a561555
Parents:
70d5bcf
Message:

Tuning stop conditions

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1476 be4846ae-f051-483a-831f-b64e7d08527f

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tol/stdlib/math/optim/LP/polytope.tol

    r70d5bcf rc979dc3  
    3737      Region region = region_;
    3838      VMatrix x = x_;
     39      Real drop = region::r*region::n*1.E-15;
    3940      Real isFinite = (VMatSum(IsFinite(x))==VRows(x));
    4041      VMatrix g = region::evalBorderDistance(x);
    41       Real match = Point::EnsureKnown(1+VMatMax(g)-1<=0, 0);
     42      Real match = Point::EnsureKnown(VMatMax(g)<=
     43                                      drop, 0);
    4244      VMatrix G = GT(g, region::zero);
    4345      VMatrix h = Max(region::zero,g);
    44       Real f = Point::EnsureKnown(VMatSum(RPow(h,2)), 1/0)
     46      Real f =
     47      {
     48        Real aux = Point::EnsureKnown(VMatSum(RPow(h,2)), 1/0);
     49        Max(aux,drop^2)
     50      }
    4551    ]];
    4652    new
Note: See TracChangeset for help on using the changeset viewer.