Changeset 3c73107 in tol


Ignore:
Timestamp:
Mar 16, 2011, 4:00:57 PM (16 years ago)
Author:
Víctor de Buen <vdebuen@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
e42587d
Parents:
17a82c4
Message:

Fixes #960

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tol/bmath/bstat/stat.cpp

    r17a82c4 r3c73107  
    314314//--------------------------------------------------------------------
    315315{
    316     if(!vec.Size()) { return(BDat::Unknown()); }
    317     BDat result = BDat::NegInf();
     316  if(!vec.Size()) { return(BDat::Unknown()); }
     317  BDat result = BDat::NegInf();
    318318  bool allUnknown = true;
    319     for(BInt k = 0; k<vec.Size(); k++)
    320     {
    321         if(vec(k).IsKnown())
    322         {
    323             if(result<vec(k))
    324             {
    325                 result = vec(k);
     319  for(BInt k = 0; k<vec.Size(); k++)
     320  {
     321    if(vec(k).IsKnown())
     322    {
    326323      if(allUnknown) { allUnknown=false; }
    327             }
    328         }
    329     }
    330     if(allUnknown) { result = BDat::Nan(); }
    331     return(result);
     324      if(result<vec(k)) {  result = vec(k); }
     325    }
     326  }
     327  if(allUnknown) { result = BDat::Nan(); }
     328  return(result);
    332329}
    333330
    … …  
    340337//--------------------------------------------------------------------
    341338{
    342     if(!vec.Size()) { return(BDat::Unknown()); }
    343     BDat result = BDat::PosInf();
     339  if(!vec.Size()) { return(BDat::Unknown()); }
     340  BDat result = BDat::PosInf();
    344341  bool allUnknown = true;
    345     for(BInt k = 0; k<vec.Size(); k++)
    346     {
    347         if(vec(k).IsKnown())
    348         {
    349             if(result>vec(k)) { result = vec(k); }
     342  for(BInt k = 0; k<vec.Size(); k++)
     343  {
     344    if(vec(k).IsKnown())
     345    {
    350346      if(allUnknown) { allUnknown=false; }
    351         }
    352     }
    353     if(allUnknown) { result = BDat::Nan(); }
    354     return(result);
     347      if(result>vec(k)) { result = vec(k); }
     348    }
     349  }
     350  if(allUnknown) { result = BDat::Nan(); }
     351  return(result);
    355352}
    356353
Note: See TracChangeset for help on using the changeset viewer.