/[escript]/branches/clazy/escriptcore/src/DataLazy.cpp
ViewVC logotype

Diff of /branches/clazy/escriptcore/src/DataLazy.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 195  resultShape(DataAbstract_ptr left, ES_op Line 195  resultShape(DataAbstract_ptr left, ES_op
195          return DataTypes::scalarShape;          return DataTypes::scalarShape;
196      break;      break;
197          default:          default:
 cout << op << endl;  
198      throw DataException("Programmer error - resultShape(left,op) can't compute shapes for operator "+opToString(op)+".");      throw DataException("Programmer error - resultShape(left,op) can't compute shapes for operator "+opToString(op)+".");
199      }      }
200  }  }
# Line 220  GTPShape(DataAbstract_ptr left, DataAbst Line 219  GTPShape(DataAbstract_ptr left, DataAbst
219    else if (transpose == 2)  { start1 = rank1-axis_offset; }    else if (transpose == 2)  { start1 = rank1-axis_offset; }
220    else              { throw DataException("DataLazy GeneralTensorProduct Constructor: Error - transpose should be 0, 1 or 2"); }    else              { throw DataException("DataLazy GeneralTensorProduct Constructor: Error - transpose should be 0, 1 or 2"); }
221    
222      if (rank0<axis_offset)
223      {
224        throw DataException("DataLazy GeneralTensorProduct Constructor: Error - rank of left < axisoffset");
225      }
226    
227    // Adjust the shapes for transpose    // Adjust the shapes for transpose
228    DataTypes::ShapeType tmpShape0(rank0);    // pre-sizing the vectors rather    DataTypes::ShapeType tmpShape0(rank0);    // pre-sizing the vectors rather

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

  ViewVC Help
Powered by ViewVC 1.1.26