/[escript]/trunk/escript/src/Data.cpp
ViewVC logotype

Diff of /trunk/escript/src/Data.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2084 by jfenwick, Fri Nov 21 05:20:42 2008 UTC revision 2085 by jfenwick, Mon Nov 24 00:45:48 2008 UTC
# Line 1483  Data::Lsup() Line 1483  Data::Lsup()
1483  {  {
1484     if (isLazy())     if (isLazy())
1485     {     {
1486      expand();      resolve();
1487     }     }
1488     return LsupWorker();     return LsupWorker();
1489  }  }
# Line 1503  Data::sup() Line 1503  Data::sup()
1503  {  {
1504     if (isLazy())     if (isLazy())
1505     {     {
1506      expand();      resolve();
1507     }     }
1508     return supWorker();     return supWorker();
1509  }  }
# Line 1523  Data::inf() Line 1523  Data::inf()
1523  {  {
1524     if (isLazy())     if (isLazy())
1525     {     {
1526      expand();      resolve();
1527     }     }
1528     return infWorker();     return infWorker();
1529  }  }
# Line 1615  Data::minval() const Line 1615  Data::minval() const
1615  Data  Data
1616  Data::swapaxes(const int axis0, const int axis1) const  Data::swapaxes(const int axis0, const int axis1) const
1617  {  {
1618         if (isLazy())
1619         {
1620        Data temp(*this);
1621        temp.resolve();
1622        return temp.swapaxes(axis0,axis1);
1623         }
1624       int axis0_tmp,axis1_tmp;       int axis0_tmp,axis1_tmp;
1625       DataTypes::ShapeType s=getDataPointShape();       DataTypes::ShapeType s=getDataPointShape();
1626       DataTypes::ShapeType ev_shape;       DataTypes::ShapeType ev_shape;

Legend:
Removed from v.2084  
changed lines
  Added in v.2085

  ViewVC Help
Powered by ViewVC 1.1.26