/[escript]/branches/intelc_win32/escript/src/DataArray.h
ViewVC logotype

Diff of /branches/intelc_win32/escript/src/DataArray.h

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

trunk/escript/src/DataArray.h revision 734 by elspeth, Wed Mar 22 02:12:00 2006 UTC branches/intelc_win32/escript/src/DataArray.h revision 742 by woo409, Sat Jun 24 11:27:16 2006 UTC
# Line 12  Line 12 
12    
13  #if !defined escript_DataArray_20040421_H  #if !defined escript_DataArray_20040421_H
14  #define escript_DataArray_20040421_H  #define escript_DataArray_20040421_H
15    #include "system_dep.h"
16    
17  #include "DataArrayView.h"  #include "DataArrayView.h"
18    
# Line 47  class DataArray { Line 48  class DataArray {
48       Creates a data vector containing a single value, plus a DataArrayView       Creates a data vector containing a single value, plus a DataArrayView
49       which presents this data value as a scalar Data object.       which presents this data value as a scalar Data object.
50    */    */
51      ESCRIPT_DLL_API
52    DataArray(double value=0.0);    DataArray(double value=0.0);
53    
54    /**    /**
# Line 57  class DataArray { Line 59  class DataArray {
59       Constructor for DataArray of given shape.       Constructor for DataArray of given shape.
60       Assigns each element of the shape the given value.       Assigns each element of the shape the given value.
61    */    */
62      ESCRIPT_DLL_API
63    DataArray(const DataArrayView::ShapeType& shape,    DataArray(const DataArrayView::ShapeType& shape,
64              double value=0.0);              double value=0.0);
65    
# Line 68  class DataArray { Line 71  class DataArray {
71       Copy constructor for DataArray.       Copy constructor for DataArray.
72       Takes a DataArray and performs a deep copy.       Takes a DataArray and performs a deep copy.
73    */    */
74      ESCRIPT_DLL_API
75    DataArray(const DataArray& value);    DataArray(const DataArray& value);
76    
77    /**    /**
# Line 78  class DataArray { Line 82  class DataArray {
82       Constructor for DataArray.       Constructor for DataArray.
83       Takes a DataArrayView and performs a deep copy.       Takes a DataArrayView and performs a deep copy.
84    */    */
85      ESCRIPT_DLL_API
86    DataArray(const DataArrayView& value);    DataArray(const DataArrayView& value);
87    
88    /**    /**
# Line 91  class DataArray { Line 96  class DataArray {
96       Throws:       Throws:
97       A DataException if a DataArray cannot be created from the python object.       A DataException if a DataArray cannot be created from the python object.
98    */    */
99      ESCRIPT_DLL_API
100    DataArray(const boost::python::object& value);    DataArray(const boost::python::object& value);
101    
102    /**    /**
# Line 101  class DataArray { Line 107  class DataArray {
107       Constructor for DataArray.       Constructor for DataArray.
108       Takes a boost::python::numeric::array.       Takes a boost::python::numeric::array.
109    */    */
110      ESCRIPT_DLL_API
111    DataArray(const boost::python::numeric::array& value);    DataArray(const boost::python::numeric::array& value);
112    
113    /**    /**
114       \brief       \brief
115       Return a reference to the DataArrayView.       Return a reference to the DataArrayView.
116    */    */
117      ESCRIPT_DLL_API
118    const DataArrayView&    const DataArrayView&
119    getView() const;    getView() const;
120    
121      ESCRIPT_DLL_API
122    DataArrayView&    DataArrayView&
123    getView();    getView();
124    
# Line 117  class DataArray { Line 126  class DataArray {
126       \brief       \brief
127       Return a reference to the the data vector.       Return a reference to the the data vector.
128    */    */
129      ESCRIPT_DLL_API
130    const DataArrayView::ValueType&    const DataArrayView::ValueType&
131    getData() const;    getData() const;
132    
133      ESCRIPT_DLL_API
134    DataArrayView::ValueType&    DataArrayView::ValueType&
135    getData();    getData();
136    

Legend:
Removed from v.734  
changed lines
  Added in v.742

  ViewVC Help
Powered by ViewVC 1.1.26