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

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

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

trunk/esys2/escript/src/Data/Data.h revision 113 by jgs, Mon Feb 28 07:06:33 2005 UTC trunk/escript/src/Data.h revision 775 by ksteube, Mon Jul 10 04:00:08 2006 UTC
# Line 1  Line 1 
1  // $Id$  // $Id$
2  /*=============================================================================  /*
3     ************************************************************
4   ******************************************************************************   *          Copyright 2006 by ACcESS MNRF                   *
5   *                                                                            *   *                                                          *
6   *       COPYRIGHT ACcESS 2004 -  All Rights Reserved                         *   *              http://www.access.edu.au                    *
7   *                                                                            *   *       Primary Business: Queensland, Australia            *
8   * This software is the property of ACcESS.  No part of this code             *   *  Licensed under the Open Software License version 3.0    *
9   * may be copied in any form or by any means without the expressed written    *   *     http://www.opensource.org/licenses/osl-3.0.php       *
10   * consent of ACcESS.  Copying, use or modification of this software          *   *                                                          *
11   * by any unauthorised person is illegal unless that                          *   ************************************************************
12   * person has a software license agreement with ACcESS.                       *  */
  *                                                                            *  
  ******************************************************************************  
13    
14  ******************************************************************************/  /** \file Data.h */
15    
16  #ifndef DATA_H  #ifndef DATA_H
17  #define DATA_H  #define DATA_H
18    #include "system_dep.h"
19    
20  #include "escript/Data/DataAbstract.h"  #include "DataAbstract.h"
21  #include "escript/Data/DataTagged.h"  #include "DataAlgorithm.h"
22  #include "escript/Data/FunctionSpace.h"  #include "FunctionSpace.h"
23  #include "escript/Data/BinaryOp.h"  #include "BinaryOp.h"
24  #include "escript/Data/UnaryOp.h"  #include "UnaryOp.h"
25  #include "escript/Data/DataException.h"  #include "DataException.h"
26    
27  extern "C" {  extern "C" {
28  #include "escript/Data/DataC.h"  #include "DataC.h"
29    #include "paso/Paso.h"
30  }  }
31    
 #include <iostream>  
32  #include <string>  #include <string>
 #include <memory>  
33  #include <algorithm>  #include <algorithm>
34    
35  #include <boost/shared_ptr.hpp>  #include <boost/shared_ptr.hpp>
36  #include <boost/python/object.hpp>  #include <boost/python/object.hpp>
 #include <boost/python/list.hpp>  
37  #include <boost/python/tuple.hpp>  #include <boost/python/tuple.hpp>
38  #include <boost/python/numeric.hpp>  #include <boost/python/numeric.hpp>
39    
40    namespace escript {
41    
42    //
43    // Forward declaration for various implementations of Data.
44    class DataConstant;
45    class DataTagged;
46    class DataExpanded;
47    
48  /**  /**
49     \brief     \brief
50     Data is essentially a factory class which creates the appropriate Data     Data creates the appropriate Data object for the given construction
51     object for the given construction arguments. It retains control over     arguments.
    the object created for the lifetime of the object.  
    The type of Data object referred to may change during the lifetime of  
    the Data object.  
52    
53     Description:     Description:
54     Data is essentially a factory class which creates the appropriate Data     Data is essentially a factory class which creates the appropriate Data
# Line 55  extern "C" { Line 57  extern "C" {
57     The type of Data object referred to may change during the lifetime of     The type of Data object referred to may change during the lifetime of
58     the Data object.     the Data object.
59  */  */
   
 namespace escript {  
   
 //  
 // Forward declaration for various implimentations of Data.  
 class DataEmpty;  
 class DataConstant;  
 class DataTagged;  
 class DataExpanded;  
   
60  class Data {  class Data {
61    
62    public:    public:
# Line 83  class Data { Line 75  class Data {
75       Default constructor.       Default constructor.
76       Creates a DataEmpty object.       Creates a DataEmpty object.
77    */    */
78      ESCRIPT_DLL_API
79    Data();    Data();
80    
81    /**    /**
# Line 90  class Data { Line 83  class Data {
83       Copy constructor.       Copy constructor.
84       WARNING: Only performs a shallow copy.       WARNING: Only performs a shallow copy.
85    */    */
86      ESCRIPT_DLL_API
87    Data(const Data& inData);    Data(const Data& inData);
88    
89    /**    /**
# Line 98  class Data { Line 92  class Data {
92       function space of inData the inData are tried to be interpolated to what,       function space of inData the inData are tried to be interpolated to what,
93       otherwise a shallow copy of inData is returned.       otherwise a shallow copy of inData is returned.
94    */    */
95      ESCRIPT_DLL_API
96    Data(const Data& inData,    Data(const Data& inData,
97         const FunctionSpace& what);         const FunctionSpace& what);
98    
# Line 111  class Data { Line 106  class Data {
106                         the value. Otherwise a more efficient storage                         the value. Otherwise a more efficient storage
107                         mechanism will be used.                         mechanism will be used.
108    */    */
109      ESCRIPT_DLL_API
110    Data(const DataArrayView& value,    Data(const DataArrayView& value,
111         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
112         bool expanded=false);         bool expanded=false);
# Line 126  class Data { Line 122  class Data {
122                         the given value. Otherwise a more efficient storage                         the given value. Otherwise a more efficient storage
123                         mechanism will be used.                         mechanism will be used.
124    */    */
125      ESCRIPT_DLL_API
126    Data(double value,    Data(double value,
127         const DataArrayView::ShapeType& dataPointShape=DataArrayView::ShapeType(),         const DataArrayView::ShapeType& dataPointShape=DataArrayView::ShapeType(),
128         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
# Line 138  class Data { Line 135  class Data {
135       \param inData - Input - Input Data object.       \param inData - Input - Input Data object.
136       \param region - Input - Region to copy.       \param region - Input - Region to copy.
137    */    */
138      ESCRIPT_DLL_API
139    Data(const Data& inData,    Data(const Data& inData,
140         const DataArrayView::RegionType& region);         const DataArrayView::RegionType& region);
141    
# Line 153  class Data { Line 151  class Data {
151       \param what - Input - A description of what this data represents.       \param what - Input - A description of what this data represents.
152       \param expanded - Input - Flag, if true fill the entire container with       \param expanded - Input - Flag, if true fill the entire container with
153                         the appropriate values.                         the appropriate values.
154        ==>*
155    */    */
156      ESCRIPT_DLL_API
157    Data(const DataTagged::TagListType& tagKeys,    Data(const DataTagged::TagListType& tagKeys,
158         const DataTagged::ValueListType& values,         const DataTagged::ValueListType& values,
159         const DataArrayView& defaultValue,         const DataArrayView& defaultValue,
# Line 170  class Data { Line 170  class Data {
170                         the value. Otherwise a more efficient storage                         the value. Otherwise a more efficient storage
171                         mechanism will be used.                         mechanism will be used.
172    */    */
173      ESCRIPT_DLL_API
174    Data(const boost::python::numeric::array& value,    Data(const boost::python::numeric::array& value,
175         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
176         bool expanded=false);         bool expanded=false);
# Line 185  class Data { Line 186  class Data {
186                         the value. Otherwise a more efficient storage                         the value. Otherwise a more efficient storage
187                         mechanism will be used.                         mechanism will be used.
188    */    */
189      ESCRIPT_DLL_API
190    Data(const boost::python::object& value,    Data(const boost::python::object& value,
191         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
192         bool expanded=false);         bool expanded=false);
# Line 198  class Data { Line 200  class Data {
200       \param value - Input - Input data.       \param value - Input - Input data.
201       \param other - Input - contains all other parameters.       \param other - Input - contains all other parameters.
202    */    */
203      ESCRIPT_DLL_API
204    Data(const boost::python::object& value,    Data(const boost::python::object& value,
205         const Data& other);         const Data& other);
206    
# Line 205  class Data { Line 208  class Data {
208       \brief       \brief
209       Constructor which creates a DataConstant of "shape" with constant value.       Constructor which creates a DataConstant of "shape" with constant value.
210    */    */
211      ESCRIPT_DLL_API
212    Data(double value,    Data(double value,
213         const boost::python::tuple& shape=boost::python::make_tuple(),         const boost::python::tuple& shape=boost::python::make_tuple(),
214         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
215         bool expanded=false);         bool expanded=false);
216      /**
217         \brief
218         Destructor
219      */
220      ESCRIPT_DLL_API
221      ~Data();
222    
223    /**    /**
224       \brief       \brief
225       Perform a deep copy.       Perform a deep copy.
226    */    */
227      ESCRIPT_DLL_API
228    void    void
229    copy(const Data& other);    copy(const Data& other);
230    
# Line 223  class Data { Line 234  class Data {
234    
235    /**    /**
236       \brief       \brief
237         Return the values of all data-points as a single python numarray object.
238      */
239      ESCRIPT_DLL_API
240      const boost::python::numeric::array
241      convertToNumArray();
242    
243      /**
244         \brief
245         Return the values of all data-points for the given sample as a single python numarray object.
246      */
247      ESCRIPT_DLL_API
248      const boost::python::numeric::array
249      convertToNumArrayFromSampleNo(int sampleNo);
250    
251      /**
252         \brief
253         Return the value of the specified data-point as a single python numarray object.
254      */
255      ESCRIPT_DLL_API
256      const boost::python::numeric::array
257      convertToNumArrayFromDPNo(int sampleNo,
258                                int dataPointNo);
259    
260      /**
261         \brief
262         Fills the expanded Data object from values of a python numarray object.
263      */
264      ESCRIPT_DLL_API
265      void
266      fillFromNumArray(const boost::python::numeric::array);
267    
268      /**
269         \brief
270         Return the tag number associated with the given data-point.
271    
272         The data-point number here corresponds to the data-point number in the
273         numarray returned by convertToNumArray.
274      */
275      ESCRIPT_DLL_API
276      int
277      getTagNumber(int dpno);
278    
279      /**
280         \brief
281       Return the C wrapper for the Data object.       Return the C wrapper for the Data object.
282    */    */
283      ESCRIPT_DLL_API
284    escriptDataC    escriptDataC
285    getDataC();    getDataC();
286    
# Line 232  class Data { Line 288  class Data {
288       \brief       \brief
289       Return the C wrapper for the Data object - const version.       Return the C wrapper for the Data object - const version.
290    */    */
291      ESCRIPT_DLL_API
292    escriptDataC    escriptDataC
293    getDataC() const;    getDataC() const;
294    
# Line 239  class Data { Line 296  class Data {
296       \brief       \brief
297       Write the data as a string.       Write the data as a string.
298    */    */
299      ESCRIPT_DLL_API
300    inline    inline
301    std::string    std::string
302    toString() const    toString() const
# Line 252  class Data { Line 310  class Data {
310       the shape information for each data point although it also may be used       the shape information for each data point although it also may be used
311       to manipulate the point data.       to manipulate the point data.
312    */    */
313      ESCRIPT_DLL_API
314    inline    inline
315    const DataArrayView&    const DataArrayView&
316    getPointDataView() const    getPointDataView() const
# Line 263  class Data { Line 322  class Data {
322       \brief       \brief
323       Whatever the current Data type make this into a DataExpanded.       Whatever the current Data type make this into a DataExpanded.
324    */    */
325      ESCRIPT_DLL_API
326    void    void
327    expand();    expand();
328    
# Line 271  class Data { Line 331  class Data {
331       If possible convert this Data to DataTagged. This will only allow       If possible convert this Data to DataTagged. This will only allow
332       Constant data to be converted to tagged. An attempt to convert       Constant data to be converted to tagged. An attempt to convert
333       Expanded data to tagged will throw an exception.       Expanded data to tagged will throw an exception.
334        ==>*
335    */    */
336      ESCRIPT_DLL_API
337    void    void
338    tag();    tag();
339    
# Line 279  class Data { Line 341  class Data {
341       \brief       \brief
342       Return true if this Data is expanded.       Return true if this Data is expanded.
343    */    */
344      ESCRIPT_DLL_API
345    bool    bool
346    isExpanded() const;    isExpanded() const;
347    
# Line 286  class Data { Line 349  class Data {
349       \brief       \brief
350       Return true if this Data is tagged.       Return true if this Data is tagged.
351    */    */
352      ESCRIPT_DLL_API
353    bool    bool
354    isTagged() const;    isTagged() const;
355    
# Line 293  class Data { Line 357  class Data {
357       \brief       \brief
358       Return true if this Data is constant.       Return true if this Data is constant.
359    */    */
360      ESCRIPT_DLL_API
361    bool    bool
362    isConstant() const;    isConstant() const;
363    
# Line 300  class Data { Line 365  class Data {
365       \brief       \brief
366       Return true if this Data is empty.       Return true if this Data is empty.
367    */    */
368      ESCRIPT_DLL_API
369    bool    bool
370    isEmpty() const;    isEmpty() const;
371    
# Line 307  class Data { Line 373  class Data {
373       \brief       \brief
374       Return the function space.       Return the function space.
375    */    */
376      ESCRIPT_DLL_API
377    inline    inline
378    const FunctionSpace&    const FunctionSpace&
379    getFunctionSpace() const    getFunctionSpace() const
# Line 318  class Data { Line 385  class Data {
385       \brief       \brief
386       Return a copy of the function space.       Return a copy of the function space.
387    */    */
388      ESCRIPT_DLL_API
389    const FunctionSpace    const FunctionSpace
390    getCopyOfFunctionSpace() const;    getCopyOfFunctionSpace() const;
391    
# Line 325  class Data { Line 393  class Data {
393       \brief       \brief
394       Return the domain.       Return the domain.
395    */    */
396      ESCRIPT_DLL_API
397    inline    inline
398    const AbstractDomain&    const AbstractDomain&
399    getDomain() const    getDomain() const
# Line 336  class Data { Line 405  class Data {
405       \brief       \brief
406       Return a copy of the domain.       Return a copy of the domain.
407    */    */
408      ESCRIPT_DLL_API
409    const AbstractDomain    const AbstractDomain
410    getCopyOfDomain() const;    getCopyOfDomain() const;
411    
# Line 343  class Data { Line 413  class Data {
413       \brief       \brief
414       Return the rank of the point data.       Return the rank of the point data.
415    */    */
416      ESCRIPT_DLL_API
417    inline    inline
418    int    int
419    getDataPointRank() const    getDataPointRank() const
# Line 354  class Data { Line 425  class Data {
425       \brief       \brief
426       Return the number of samples.       Return the number of samples.
427    */    */
428      ESCRIPT_DLL_API
429    inline    inline
430    int    int
431    getNumSamples() const    getNumSamples() const
# Line 365  class Data { Line 437  class Data {
437       \brief       \brief
438       Return the number of data points per sample.       Return the number of data points per sample.
439    */    */
440      ESCRIPT_DLL_API
441    inline    inline
442    int    int
443    getNumDataPointsPerSample() const    getNumDataPointsPerSample() const
# Line 378  class Data { Line 451  class Data {
451       preferred interface but is provided for use by C code.       preferred interface but is provided for use by C code.
452       \param sampleNo - Input - the given sample no.       \param sampleNo - Input - the given sample no.
453    */    */
454      ESCRIPT_DLL_API
455    inline    inline
456    DataAbstract::ValueType::value_type*    DataAbstract::ValueType::value_type*
457    getSampleData(DataAbstract::ValueType::size_type sampleNo)    getSampleData(DataAbstract::ValueType::size_type sampleNo)
# Line 391  class Data { Line 465  class Data {
465       access data that isn't tagged an exception will be thrown.       access data that isn't tagged an exception will be thrown.
466       \param tag - Input - the tag key.       \param tag - Input - the tag key.
467    */    */
468      ESCRIPT_DLL_API
469    inline    inline
470    DataAbstract::ValueType::value_type*    DataAbstract::ValueType::value_type*
471    getSampleDataByTag(int tag)    getSampleDataByTag(int tag)
# Line 414  class Data { Line 489  class Data {
489       \param value - Input - value to assign to data-points associated with       \param value - Input - value to assign to data-points associated with
490                              the given reference number.                              the given reference number.
491    */    */
492      ESCRIPT_DLL_API
493    void    void
494    setRefValue(int ref,    setRefValue(int ref,
495                const boost::python::numeric::array& value);                const boost::python::numeric::array& value);
# Line 433  class Data { Line 509  class Data {
509       \param value - Output - object to receive values from data-points       \param value - Output - object to receive values from data-points
510                               associated with the given reference number.                               associated with the given reference number.
511    */    */
512      ESCRIPT_DLL_API
513    void    void
514    getRefValue(int ref,    getRefValue(int ref,
515                boost::python::numeric::array& value);                boost::python::numeric::array& value);
# Line 445  class Data { Line 522  class Data {
522       \param sampleNo - Input -       \param sampleNo - Input -
523       \param dataPointNo - Input -       \param dataPointNo - Input -
524    */    */
525      ESCRIPT_DLL_API
526    inline    inline
527    DataArrayView    DataArrayView
528    getDataPoint(int sampleNo,    getDataPoint(int sampleNo,
# Line 457  class Data { Line 535  class Data {
535       \brief       \brief
536       Return a reference to the data point shape.       Return a reference to the data point shape.
537    */    */
538      ESCRIPT_DLL_API
539    const DataArrayView::ShapeType&    const DataArrayView::ShapeType&
540    getDataPointShape() const;    getDataPointShape() const;
541    
# Line 464  class Data { Line 543  class Data {
543       \brief       \brief
544       Return the data point shape as a tuple of integers.       Return the data point shape as a tuple of integers.
545    */    */
546    boost::python::tuple    ESCRIPT_DLL_API
547      const boost::python::tuple
548    getShapeTuple() const;    getShapeTuple() const;
549    
550    /**    /**
# Line 472  class Data { Line 552  class Data {
552       Return the size of the data point. It is the product of the       Return the size of the data point. It is the product of the
553       data point shape dimensions.       data point shape dimensions.
554    */    */
555      ESCRIPT_DLL_API
556    int    int
557    getDataPointSize() const;    getDataPointSize() const;
558    
# Line 479  class Data { Line 560  class Data {
560       \brief       \brief
561       Return the number of doubles stored for this Data.       Return the number of doubles stored for this Data.
562    */    */
563      ESCRIPT_DLL_API
564    DataArrayView::ValueType::size_type    DataArrayView::ValueType::size_type
565    getLength() const;    getLength() const;
566    
# Line 489  class Data { Line 571  class Data {
571       cannot be converted to a DataTagged object.       cannot be converted to a DataTagged object.
572       \param tagKey - Input - Integer key.       \param tagKey - Input - Integer key.
573       \param value - Input - Value to associate with given key.       \param value - Input - Value to associate with given key.
574        ==>*
575    */    */
576      ESCRIPT_DLL_API
577    void    void
578    setTaggedValue(int tagKey,    setTaggedValue(int tagKey,
579                   const boost::python::object& value);                   const boost::python::object& value);
# Line 501  class Data { Line 585  class Data {
585       cannot be converted to a DataTagged object.       cannot be converted to a DataTagged object.
586       \param tagKey - Input - Integer key.       \param tagKey - Input - Integer key.
587       \param value - Input - Value to associate with given key.       \param value - Input - Value to associate with given key.
588       Note: removed for now - this version not needed, and breaks escript.cpp      ==>*
589    */    */
590    /*    ESCRIPT_DLL_API
591    void    void
592    setTaggedValue(int tagKey,    setTaggedValueFromCPP(int tagKey,
593                   const DataArrayView& value);                          const DataArrayView& value);
   */  
594    
595    /**    /**
596      \brief      \brief
597      Copy other Data object into this Data object where mask is positive.      Copy other Data object into this Data object where mask is positive.
598    */    */
599      ESCRIPT_DLL_API
600    void    void
601    copyWithMask(const Data& other,    copyWithMask(const Data& other,
602                 const Data& mask);                 const Data& mask);
# Line 525  class Data { Line 609  class Data {
609       \brief       \brief
610       Interpolates this onto the given functionspace and returns       Interpolates this onto the given functionspace and returns
611       the result as a Data object.       the result as a Data object.
612         *
613    */    */
614      ESCRIPT_DLL_API
615    Data    Data
616    interpolate(const FunctionSpace& functionspace) const;    interpolate(const FunctionSpace& functionspace) const;
617    
# Line 533  class Data { Line 619  class Data {
619       \brief       \brief
620       Calculates the gradient of the data at the data points of functionspace.       Calculates the gradient of the data at the data points of functionspace.
621       If functionspace is not present the function space of Function(getDomain()) is used.       If functionspace is not present the function space of Function(getDomain()) is used.
622         *
623    */    */
624      ESCRIPT_DLL_API
625    Data    Data
626    gradOn(const FunctionSpace& functionspace) const;    gradOn(const FunctionSpace& functionspace) const;
627    
628      ESCRIPT_DLL_API
629    Data    Data
630    grad() const;    grad() const;
631    
632    /**    /**
633       \brief       \brief
634       Calculate the integral over the function space domain.       Calculate the integral over the function space domain.
635         *
636    */    */
637      ESCRIPT_DLL_API
638    boost::python::numeric::array    boost::python::numeric::array
639    integrate() const;    integrate() const;
640    
641    /**    /**
642       \brief       \brief
643       Return a Data with a 1 for +ive values and a 0 for 0 or -ive values.       Return a Data with a 1 for +ive values and a 0 for 0 or -ive values.
644         *
645    */    */
646      ESCRIPT_DLL_API
647    Data    Data
648    wherePositive() const;    wherePositive() const;
649    
650    /**    /**
651       \brief       \brief
652       Return a Data with a 1 for -ive values and a 0 for +ive or 0 values.       Return a Data with a 1 for -ive values and a 0 for +ive or 0 values.
653         *
654    */    */
655      ESCRIPT_DLL_API
656    Data    Data
657    whereNegative() const;    whereNegative() const;
658    
659    /**    /**
660       \brief       \brief
661       Return a Data with a 1 for +ive or 0 values and a 0 for -ive values.       Return a Data with a 1 for +ive or 0 values and a 0 for -ive values.
662         *
663    */    */
664      ESCRIPT_DLL_API
665    Data    Data
666    whereNonNegative() const;    whereNonNegative() const;
667    
668    /**    /**
669       \brief       \brief
670       Return a Data with a 1 for -ive or 0 values and a 0 for +ive values.       Return a Data with a 1 for -ive or 0 values and a 0 for +ive values.
671         *
672    */    */
673      ESCRIPT_DLL_API
674    Data    Data
675    whereNonPositive() const;    whereNonPositive() const;
676    
677    /**    /**
678       \brief       \brief
679       Return a Data with a 1 for 0 values and a 0 for +ive or -ive values.       Return a Data with a 1 for 0 values and a 0 for +ive or -ive values.
680         *
681    */    */
682      ESCRIPT_DLL_API
683    Data    Data
684    whereZero() const;    whereZero(double tol=0.0) const;
685    
686    /**    /**
687       \brief       \brief
688       Return a Data with a 0 for 0 values and a 1 for +ive or -ive values.       Return a Data with a 0 for 0 values and a 1 for +ive or -ive values.
689         *
690      */
691      ESCRIPT_DLL_API
692      Data
693      whereNonZero(double tol=0.0) const;
694    
695      /**
696         \brief
697         Return the maximum absolute value of this Data object.
698         *
699      */
700      ESCRIPT_DLL_API
701      double
702      Lsup() const;
703    
704      /**
705         \brief
706         Return the minimum absolute value of this Data object.
707         *
708      */
709      ESCRIPT_DLL_API
710      double
711      Linf() const;
712    
713      /**
714         \brief
715         Return the maximum value of this Data object.
716         *
717      */
718      ESCRIPT_DLL_API
719      double
720      sup() const;
721    
722      /**
723         \brief
724         Return the minimum value of this Data object.
725         *
726      */
727      ESCRIPT_DLL_API
728      double
729      inf() const;
730    
731      /**
732         \brief
733         Return the absolute value of each data point of this Data object.
734         *
735      */
736      ESCRIPT_DLL_API
737      Data
738      abs() const;
739    
740      /**
741         \brief
742         Return the maximum value of each data point of this Data object.
743         *
744      */
745      ESCRIPT_DLL_API
746      Data
747      maxval() const;
748    
749      /**
750         \brief
751         Return the minimum value of each data point of this Data object.
752         *
753      */
754      ESCRIPT_DLL_API
755      Data
756      minval() const;
757    
758      /**
759         \brief
760         Return the (sample number, data-point number) of the data point with
761         the minimum value in this Data object.
762      */
763      ESCRIPT_DLL_API
764      const boost::python::tuple
765      mindp() const;
766    
767      ESCRIPT_DLL_API
768      void
769      calc_mindp(int& SampleNo,
770                 int& DataPointNo) const;
771    
772      /**
773         \brief
774         Return the sign of each data point of this Data object.
775         -1 for negative values, zero for zero values, 1 for positive values.
776         *
777    */    */
778      ESCRIPT_DLL_API
779    Data    Data
780    whereNonZero() const;    sign() const;
781    
782      /**
783         \brief
784         Return the symmetric part of a matrix which is half the matrix plus its transpose.
785         *
786      */
787      ESCRIPT_DLL_API
788      Data
789      symmetric() const;
790    
791      /**
792         \brief
793         Return the nonsymmetric part of a matrix which is half the matrix minus its transpose.
794         *
795      */
796      ESCRIPT_DLL_API
797      Data
798      nonsymmetric() const;
799    
800      /**
801         \brief
802         Return the trace of a matrix
803         *
804      */
805      ESCRIPT_DLL_API
806      Data
807      matrixtrace(int axis_offset) const;
808    
809      /**
810         \brief
811         Transpose each data point of this Data object around the given axis.
812         *
813      */
814      ESCRIPT_DLL_API
815      Data
816      transpose(int axis_offset) const;
817    
818      /**
819         \brief
820         Return the eigenvalues of the symmetric part at each data point of this Data object in increasing values.
821         Currently this function is restricted to rank 2, square shape, and dimension 3.
822         *
823      */
824      ESCRIPT_DLL_API
825      Data
826      eigenvalues() const;
827    
828      /**
829         \brief
830         Return the eigenvalues and corresponding eigenvcetors of the symmetric part at each data point of this Data object.
831         the eigenvalues are ordered in increasing size where eigenvalues with relative difference less than
832         tol are treated as equal. The eigenvectors are orthogonal, normalized and the sclaed such that the
833         first non-zero entry is positive.
834         Currently this function is restricted to rank 2, square shape, and dimension 3
835         *
836      */
837      ESCRIPT_DLL_API
838      const boost::python::tuple
839      eigenvalues_and_eigenvectors(const double tol=1.e-12) const;
840    
841      /**
842         \brief
843         Calculate the trace of each data point of this Data object.
844         *
845      */
846      ESCRIPT_DLL_API
847      Data
848      trace() const;
849    
850    /**    /**
851       \brief       \brief
852       Return the sin of each data point of this Data object.       Return the sin of each data point of this Data object.
853         *
854    */    */
855      ESCRIPT_DLL_API
856    Data    Data
857    sin() const;    sin() const;
858    
859    /**    /**
860       \brief       \brief
861       Return the cos of each data point of this Data object.       Return the cos of each data point of this Data object.
862         *
863    */    */
864      ESCRIPT_DLL_API
865    Data    Data
866    cos() const;    cos() const;
867    
868    /**    /**
869       \brief       \brief
870       Return the tan of each data point of this Data object.       Return the tan of each data point of this Data object.
871         *
872    */    */
873      ESCRIPT_DLL_API
874    Data    Data
875    tan() const;    tan() const;
876    
877    /**    /**
878       \brief       \brief
879       Return the log to base 10 of each data point of this Data object.       Return the asin of each data point of this Data object.
880         *
881    */    */
882      ESCRIPT_DLL_API
883    Data    Data
884    log() const;    asin() const;
885    
886    /**    /**
887       \brief       \brief
888       Return the natural log of each data point of this Data object.       Return the acos of each data point of this Data object.
889         *
890    */    */
891      ESCRIPT_DLL_API
892    Data    Data
893    ln() const;    acos() const;
894    
895    /**    /**
896       \brief       \brief
897       Return the maximum absolute value of this Data object.       Return the atan of each data point of this Data object.
898         *
899    */    */
900    double    ESCRIPT_DLL_API
901    Lsup() const;    Data
902      atan() const;
903    
904    /**    /**
905       \brief       \brief
906       Return the maximum value of this Data object.       Return the sinh of each data point of this Data object.
907         *
908    */    */
909    double    ESCRIPT_DLL_API
910    sup() const;    Data
911      sinh() const;
912    
913    /**    /**
914       \brief       \brief
915       Return the minimum value of this Data object.       Return the cosh of each data point of this Data object.
916         *
917    */    */
918    double    ESCRIPT_DLL_API
919    inf() const;    Data
920      cosh() const;
921    
922    /**    /**
923       \brief       \brief
924       Return the absolute value of each data point of this Data object.       Return the tanh of each data point of this Data object.
925         *
926    */    */
927      ESCRIPT_DLL_API
928    Data    Data
929    abs() const;    tanh() const;
930    
931    /**    /**
932       \brief       \brief
933       Return the maximum value of each data point of this Data object.       Return the asinh of each data point of this Data object.
934         *
935    */    */
936      ESCRIPT_DLL_API
937    Data    Data
938    maxval() const;    asinh() const;
939    
940    /**    /**
941       \brief       \brief
942       Return the minimum value of each data point of this Data object.       Return the acosh of each data point of this Data object.
943         *
944    */    */
945      ESCRIPT_DLL_API
946    Data    Data
947    minval() const;    acosh() const;
948    
949    /**    /**
950       \brief       \brief
951       Return the length of each data point of this Data object.       Return the atanh of each data point of this Data object.
952       sqrt(sum(A[i,j,k,l]^2))       *
953    */    */
954      ESCRIPT_DLL_API
955    Data    Data
956    length() const;    atanh() const;
957    
958    /**    /**
959       \brief       \brief
960       Return the sign of each data point of this Data object.       Return the log to base 10 of each data point of this Data object.
961       -1 for negative values, zero for zero values, 1 for positive values.       *
962    */    */
963      ESCRIPT_DLL_API
964    Data    Data
965    sign() const;    log10() const;
966    
967    /**    /**
968      \transpose       \brief
969      Transpose each data point of this Data object around the given axis.       Return the natural log of each data point of this Data object.
970      --* not implemented yet *--       *
971    */    */
972      ESCRIPT_DLL_API
973    Data    Data
974    transpose(int axis) const;    log() const;
975    
976    /**    /**
977      \trace       \brief
978      Calculate the trace of each data point of this Data object.       Return the exponential function of each data point of this Data object.
979      sum(A[i,i,i,i])       *
980    */    */
981      ESCRIPT_DLL_API
982    Data    Data
983    trace() const;    exp() const;
984    
985    /**    /**
986      \exp       \brief
987      Return the exponential function of each data point of this Data object.       Return the square root of each data point of this Data object.
988         *
989    */    */
990      ESCRIPT_DLL_API
991    Data    Data
992    exp() const;    sqrt() const;
993    
994    /**    /**
995      \sqrt       \brief
996      Return the square root of each data point of this Data object.       Return the negation of each data point of this Data object.
997         *
998    */    */
999      ESCRIPT_DLL_API
1000    Data    Data
1001    sqrt() const;    neg() const;
1002    
1003      /**
1004         \brief
1005         Return the identity of each data point of this Data object.
1006         Simply returns this object unmodified.
1007         *
1008      */
1009      ESCRIPT_DLL_API
1010      Data
1011      pos() const;
1012    
1013    /**    /**
1014       \brief       \brief
1015       Return the given power of each data point of this Data object.       Return the given power of each data point of this Data object.
1016    
1017         \param right Input - the power to raise the object to.
1018         *
1019    */    */
1020      ESCRIPT_DLL_API
1021    Data    Data
1022    powD(const Data& right) const;    powD(const Data& right) const;
1023    
1024      /**
1025         \brief
1026         Return the given power of each data point of this boost python object.
1027        
1028         \param right Input - the power to raise the object to.
1029         *
1030       */
1031      ESCRIPT_DLL_API
1032    Data    Data
1033    powO(const boost::python::object& right) const;    powO(const boost::python::object& right) const;
1034    
1035    /**    /**
1036      \brief       \brief
1037      writes the object to a file in the DX file format       Return the given power of each data point of this boost python object.
1038        
1039         \param left Input - the bases
1040         *
1041       */
1042    
1043      ESCRIPT_DLL_API
1044      Data
1045      rpowO(const boost::python::object& left) const;
1046    
1047      /**
1048         \brief
1049         writes the object to a file in the DX file format
1050    */    */
1051      ESCRIPT_DLL_API
1052    void    void
1053    saveDX(std::string fileName) const;    saveDX(std::string fileName) const;
1054    
1055    /**    /**
1056      \brief       \brief
1057      writes the object to a file in the VTK file format       writes the object to a file in the VTK file format
1058    */    */
1059      ESCRIPT_DLL_API
1060    void    void
1061    saveVTK(std::string fileName) const;    saveVTK(std::string fileName) const;
1062    
1063    /**    /**
     \brief  
     Return the negation of each data point of this Data object.  
   */  
   Data  
   neg() const;  
   
   /**  
     \brief  
     Return the identity of each data point of this Data object.  
     Simply returns this object unmodified.  
   */  
   Data  
   pos() const;  
   
   /**  
1064       \brief       \brief
1065       Overloaded operator +=       Overloaded operator +=
1066       \param right - Input - The right hand side.       \param right - Input - The right hand side.
1067         *
1068    */    */
1069      ESCRIPT_DLL_API
1070    Data& operator+=(const Data& right);    Data& operator+=(const Data& right);
1071      ESCRIPT_DLL_API
1072    Data& operator+=(const boost::python::object& right);    Data& operator+=(const boost::python::object& right);
1073    
1074    /**    /**
1075       \brief       \brief
1076       Overloaded operator -=       Overloaded operator -=
1077       \param right - Input - The right hand side.       \param right - Input - The right hand side.
1078         *
1079    */    */
1080      ESCRIPT_DLL_API
1081    Data& operator-=(const Data& right);    Data& operator-=(const Data& right);
1082      ESCRIPT_DLL_API
1083    Data& operator-=(const boost::python::object& right);    Data& operator-=(const boost::python::object& right);
1084    
1085   /**   /**
1086       \brief       \brief
1087       Overloaded operator *=       Overloaded operator *=
1088       \param right - Input - The right hand side.       \param right - Input - The right hand side.
1089         *
1090    */    */
1091      ESCRIPT_DLL_API
1092    Data& operator*=(const Data& right);    Data& operator*=(const Data& right);
1093      ESCRIPT_DLL_API
1094    Data& operator*=(const boost::python::object& right);    Data& operator*=(const boost::python::object& right);
1095    
1096   /**   /**
1097       \brief       \brief
1098       Overloaded operator /=       Overloaded operator /=
1099       \param right - Input - The right hand side.       \param right - Input - The right hand side.
1100         *
1101    */    */
1102      ESCRIPT_DLL_API
1103    Data& operator/=(const Data& right);    Data& operator/=(const Data& right);
1104      ESCRIPT_DLL_API
1105    Data& operator/=(const boost::python::object& right);    Data& operator/=(const boost::python::object& right);
1106    
1107    /**    /**
1108       \brief       \brief
1109       Returns true if this can be interpolated to functionspace.       Returns true if this can be interpolated to functionspace.
1110    */    */
1111      ESCRIPT_DLL_API
1112    bool    bool
1113    probeInterpolation(const FunctionSpace& functionspace) const;    probeInterpolation(const FunctionSpace& functionspace) const;
1114    
# Line 805  class Data { Line 1127  class Data {
1127       \param key - Input - python slice tuple specifying       \param key - Input - python slice tuple specifying
1128       slice to return.       slice to return.
1129    */    */
1130      ESCRIPT_DLL_API
1131    Data    Data
1132    getItem(const boost::python::object& key) const;    getItem(const boost::python::object& key) const;
1133    
# Line 812  class Data { Line 1135  class Data {
1135       \brief       \brief
1136       Copies slice from value into this Data object.       Copies slice from value into this Data object.
1137    
      \description  
1138       Implements the [] set operator in python.       Implements the [] set operator in python.
1139       Calls setSlice.       Calls setSlice.
1140    
# Line 820  class Data { Line 1142  class Data {
1142       slice to copy from value.       slice to copy from value.
1143       \param value - Input - Data object to copy from.       \param value - Input - Data object to copy from.
1144    */    */
1145      ESCRIPT_DLL_API
1146    void    void
1147    setItemD(const boost::python::object& key,    setItemD(const boost::python::object& key,
1148             const Data& value);             const Data& value);
1149    
1150      ESCRIPT_DLL_API
1151    void    void
1152    setItemO(const boost::python::object& key,    setItemO(const boost::python::object& key,
1153             const boost::python::object& value);             const boost::python::object& value);
# Line 836  class Data { Line 1160  class Data {
1160       this Data object.       this Data object.
1161    */    */
1162    template <class UnaryFunction>    template <class UnaryFunction>
1163      ESCRIPT_DLL_API
1164    inline    inline
1165    void    void
1166    unaryOp(UnaryFunction operation);    unaryOp(UnaryFunction operation);
# Line 845  class Data { Line 1170  class Data {
1170       Return a Data object containing the specified slice of       Return a Data object containing the specified slice of
1171       this Data object.       this Data object.
1172       \param region - Input - Region to copy.       \param region - Input - Region to copy.
1173         *
1174    */    */
1175      ESCRIPT_DLL_API
1176    Data    Data
1177    getSlice(const DataArrayView::RegionType& region) const;    getSlice(const DataArrayView::RegionType& region) const;
1178    
# Line 855  class Data { Line 1182  class Data {
1182       Data object.       Data object.
1183       \param value - Input - Data to copy from.       \param value - Input - Data to copy from.
1184       \param region - Input - Region to copy.       \param region - Input - Region to copy.
1185         *
1186    */    */
1187      ESCRIPT_DLL_API
1188    void    void
1189    setSlice(const Data& value,    setSlice(const Data& value,
1190             const DataArrayView::RegionType& region);             const DataArrayView::RegionType& region);
1191    
1192      /**
1193         \brief
1194         Archive the current Data object to the given file.
1195         \param fileName - Input - file to archive to.
1196      */
1197      ESCRIPT_DLL_API
1198      void
1199      archiveData(const std::string fileName);
1200    
1201      /**
1202         \brief
1203         Extract the Data object archived in the given file, overwriting
1204         the current Data object.
1205         Note - the current object must be of type DataEmpty.
1206         \param fileName - Input - file to extract from.
1207         \param fspace - Input - a suitable FunctionSpace descibing the data.
1208      */
1209      ESCRIPT_DLL_API
1210      void
1211      extractData(const std::string fileName,
1212                  const FunctionSpace& fspace);
1213    
1214    
1215      /**
1216         \brief
1217         print the data values to stdout. Used for debugging
1218      */
1219      void print();
1220    
1221   protected:   protected:
1222    
1223   private:   private:
# Line 882  class Data { Line 1240  class Data {
1240       Perform the specified reduction algorithm on every element of every data point in       Perform the specified reduction algorithm on every element of every data point in
1241       this Data object according to the given function and return the single value result.       this Data object according to the given function and return the single value result.
1242    */    */
1243    template <class UnaryFunction>    template <class BinaryFunction>
1244    inline    inline
1245    double    double
1246    algorithm(UnaryFunction operation) const;    algorithm(BinaryFunction operation,
1247                double initial_value) const;
1248    
1249    /**    /**
1250       \brief       \brief
# Line 894  class Data { Line 1253  class Data {
1253       one value - the result of the reduction operation on the corresponding data-point in       one value - the result of the reduction operation on the corresponding data-point in
1254       this Data object       this Data object
1255    */    */
1256    template <class UnaryFunction>    template <class BinaryFunction>
1257    inline    inline
1258    Data    Data
1259    dp_algorithm(UnaryFunction operation) const;    dp_algorithm(BinaryFunction operation,
1260                   double initial_value) const;
1261    
1262    /**    /**
1263       \brief       \brief
# Line 964  class Data { Line 1324  class Data {
1324    // pointer to the actual data object    // pointer to the actual data object
1325    boost::shared_ptr<DataAbstract> m_data;    boost::shared_ptr<DataAbstract> m_data;
1326    
1327      //
1328      // pointer to the internal profiling data
1329      struct profDataEntry *profData;
1330    
1331  };  };
1332    
1333  template <class IValueType>  template <class IValueType>
# Line 997  Data::initialise(const IValueType& value Line 1361  Data::initialise(const IValueType& value
1361    Operator+    Operator+
1362    Takes two Data objects.    Takes two Data objects.
1363  */  */
1364  Data operator+(const Data& left, const Data& right);  ESCRIPT_DLL_API Data operator+(const Data& left, const Data& right);
1365    
1366  /**  /**
1367    \brief    \brief
1368    Operator-    Operator-
1369    Takes two Data objects.    Takes two Data objects.
1370  */  */
1371  Data operator-(const Data& left, const Data& right);  ESCRIPT_DLL_API Data operator-(const Data& left, const Data& right);
1372    
1373  /**  /**
1374    \brief    \brief
1375    Operator*    Operator*
1376    Takes two Data objects.    Takes two Data objects.
1377  */  */
1378  Data operator*(const Data& left, const Data& right);  ESCRIPT_DLL_API Data operator*(const Data& left, const Data& right);
1379    
1380  /**  /**
1381    \brief    \brief
1382    Operator/    Operator/
1383    Takes two Data objects.    Takes two Data objects.
1384  */  */
1385  Data operator/(const Data& left, const Data& right);  ESCRIPT_DLL_API Data operator/(const Data& left, const Data& right);
1386    
1387  /**  /**
1388    \brief    \brief
# Line 1026  Data operator/(const Data& left, const D Line 1390  Data operator/(const Data& left, const D
1390    Takes LHS Data object and RHS python::object.    Takes LHS Data object and RHS python::object.
1391    python::object must be convertable to Data type.    python::object must be convertable to Data type.
1392  */  */
1393  Data operator+(const Data& left, const boost::python::object& right);  ESCRIPT_DLL_API Data operator+(const Data& left, const boost::python::object& right);
1394    
1395  /**  /**
1396    \brief    \brief
# Line 1034  Data operator+(const Data& left, const b Line 1398  Data operator+(const Data& left, const b
1398    Takes LHS Data object and RHS python::object.    Takes LHS Data object and RHS python::object.
1399    python::object must be convertable to Data type.    python::object must be convertable to Data type.
1400  */  */
1401  Data operator-(const Data& left, const boost::python::object& right);  ESCRIPT_DLL_API Data operator-(const Data& left, const boost::python::object& right);
1402    
1403  /**  /**
1404    \brief    \brief
# Line 1042  Data operator-(const Data& left, const b Line 1406  Data operator-(const Data& left, const b
1406    Takes LHS Data object and RHS python::object.    Takes LHS Data object and RHS python::object.
1407    python::object must be convertable to Data type.    python::object must be convertable to Data type.
1408  */  */
1409  Data operator*(const Data& left, const boost::python::object& right);  ESCRIPT_DLL_API Data operator*(const Data& left, const boost::python::object& right);
1410    
1411  /**  /**
1412    \brief    \brief
# Line 1050  Data operator*(const Data& left, const b Line 1414  Data operator*(const Data& left, const b
1414    Takes LHS Data object and RHS python::object.    Takes LHS Data object and RHS python::object.
1415    python::object must be convertable to Data type.    python::object must be convertable to Data type.
1416  */  */
1417  Data operator/(const Data& left, const boost::python::object& right);  ESCRIPT_DLL_API Data operator/(const Data& left, const boost::python::object& right);
1418    
1419  /**  /**
1420    \brief    \brief
# Line 1058  Data operator/(const Data& left, const b Line 1422  Data operator/(const Data& left, const b
1422    Takes LHS python::object and RHS Data object.    Takes LHS python::object and RHS Data object.
1423    python::object must be convertable to Data type.    python::object must be convertable to Data type.
1424  */  */
1425  Data operator+(const boost::python::object& left, const Data& right);  ESCRIPT_DLL_API Data operator+(const boost::python::object& left, const Data& right);
1426    
1427  /**  /**
1428    \brief    \brief
# Line 1066  Data operator+(const boost::python::obje Line 1430  Data operator+(const boost::python::obje
1430    Takes LHS python::object and RHS Data object.    Takes LHS python::object and RHS Data object.
1431    python::object must be convertable to Data type.    python::object must be convertable to Data type.
1432  */  */
1433  Data operator-(const boost::python::object& left, const Data& right);  ESCRIPT_DLL_API Data operator-(const boost::python::object& left, const Data& right);
1434    
1435  /**  /**
1436    \brief    \brief
# Line 1074  Data operator-(const boost::python::obje Line 1438  Data operator-(const boost::python::obje
1438    Takes LHS python::object and RHS Data object.    Takes LHS python::object and RHS Data object.
1439    python::object must be convertable to Data type.    python::object must be convertable to Data type.
1440  */  */
1441  Data operator*(const boost::python::object& left, const Data& right);  ESCRIPT_DLL_API Data operator*(const boost::python::object& left, const Data& right);
1442    
1443  /**  /**
1444    \brief    \brief
# Line 1082  Data operator*(const boost::python::obje Line 1446  Data operator*(const boost::python::obje
1446    Takes LHS python::object and RHS Data object.    Takes LHS python::object and RHS Data object.
1447    python::object must be convertable to Data type.    python::object must be convertable to Data type.
1448  */  */
1449  Data operator/(const boost::python::object& left, const Data& right);  ESCRIPT_DLL_API Data operator/(const boost::python::object& left, const Data& right);
1450    
1451  /**  /**
1452    \brief    \brief
1453    Output operator    Output operator
1454  */  */
1455  std::ostream& operator<<(std::ostream& o, const Data& data);  ESCRIPT_DLL_API std::ostream& operator<<(std::ostream& o, const Data& data);
1456    
1457  /**  /**
1458    \brief    \brief
# Line 1096  std::ostream& operator<<(std::ostream& o Line 1460  std::ostream& operator<<(std::ostream& o
1460    NB: this operator does very little at this point, and isn't to    NB: this operator does very little at this point, and isn't to
1461    be relied on. Requires further implementation.    be relied on. Requires further implementation.
1462  */  */
1463  //bool operator==(const Data& left, const Data& right);  //ESCRIPT_DLL_API bool operator==(const Data& left, const Data& right);
1464    
1465  /**  /**
1466    \brief    \brief
# Line 1259  Data::unaryOp(UnaryFunction operation) Line 1623  Data::unaryOp(UnaryFunction operation)
1623    object (*this) is a rank n Data object, and returned object is a scalar.    object (*this) is a rank n Data object, and returned object is a scalar.
1624    Calls escript::algorithm.    Calls escript::algorithm.
1625  */  */
1626  template <class UnaryFunction>  template <class BinaryFunction>
1627  inline  inline
1628  double  double
1629  Data::algorithm(UnaryFunction operation) const  Data::algorithm(BinaryFunction operation, double initial_value) const
1630  {  {
1631    if (isExpanded()) {    if (isExpanded()) {
1632      DataExpanded* leftC=dynamic_cast<DataExpanded*>(m_data.get());      DataExpanded* leftC=dynamic_cast<DataExpanded*>(m_data.get());
1633      EsysAssert((leftC!=0), "Programming error - casting to DataExpanded.");      EsysAssert((leftC!=0), "Programming error - casting to DataExpanded.");
1634      return escript::algorithm(*leftC,operation);      return escript::algorithm(*leftC,operation,initial_value);
1635    } else if (isTagged()) {    } else if (isTagged()) {
1636      DataTagged* leftC=dynamic_cast<DataTagged*>(m_data.get());      DataTagged* leftC=dynamic_cast<DataTagged*>(m_data.get());
1637      EsysAssert((leftC!=0), "Programming error - casting to DataTagged.");      EsysAssert((leftC!=0), "Programming error - casting to DataTagged.");
1638      return escript::algorithm(*leftC,operation);      return escript::algorithm(*leftC,operation,initial_value);
1639    } else if (isConstant()) {    } else if (isConstant()) {
1640      DataConstant* leftC=dynamic_cast<DataConstant*>(m_data.get());      DataConstant* leftC=dynamic_cast<DataConstant*>(m_data.get());
1641      EsysAssert((leftC!=0), "Programming error - casting to DataConstant.");      EsysAssert((leftC!=0), "Programming error - casting to DataConstant.");
1642      return escript::algorithm(*leftC,operation);      return escript::algorithm(*leftC,operation,initial_value);
1643    }    }
1644    return 0;    return 0;
1645  }  }
# Line 1288  Data::algorithm(UnaryFunction operation) Line 1652  Data::algorithm(UnaryFunction operation)
1652    rank 0 Data object.    rank 0 Data object.
1653    Calls escript::dp_algorithm.    Calls escript::dp_algorithm.
1654  */  */
1655  template <class UnaryFunction>  template <class BinaryFunction>
1656  inline  inline
1657  Data  Data
1658  Data::dp_algorithm(UnaryFunction operation) const  Data::dp_algorithm(BinaryFunction operation, double initial_value) const
1659  {  {
   Data result(0,DataArrayView::ShapeType(),getFunctionSpace(),isExpanded());  
1660    if (isExpanded()) {    if (isExpanded()) {
1661        Data result(0,DataArrayView::ShapeType(),getFunctionSpace(),isExpanded());
1662      DataExpanded* dataE=dynamic_cast<DataExpanded*>(m_data.get());      DataExpanded* dataE=dynamic_cast<DataExpanded*>(m_data.get());
1663      DataExpanded* resultE=dynamic_cast<DataExpanded*>(result.m_data.get());      DataExpanded* resultE=dynamic_cast<DataExpanded*>(result.m_data.get());
1664      EsysAssert((dataE!=0), "Programming error - casting data to DataExpanded.");      EsysAssert((dataE!=0), "Programming error - casting data to DataExpanded.");
1665      EsysAssert((resultE!=0), "Programming error - casting result to DataExpanded.");      EsysAssert((resultE!=0), "Programming error - casting result to DataExpanded.");
1666      escript::dp_algorithm(*dataE,*resultE,operation);      escript::dp_algorithm(*dataE,*resultE,operation,initial_value);
1667        return result;
1668    } else if (isTagged()) {    } else if (isTagged()) {
1669      DataTagged* dataT=dynamic_cast<DataTagged*>(m_data.get());      DataTagged* dataT=dynamic_cast<DataTagged*>(m_data.get());
1670        DataArrayView::ShapeType viewShape;
1671        DataArrayView::ValueType viewData(1);
1672        viewData[0]=0;
1673        DataArrayView defaultValue(viewData,viewShape);
1674        DataTagged::TagListType keys;
1675        DataTagged::ValueListType values;
1676        DataTagged::DataMapType::const_iterator i;
1677        for (i=dataT->getTagLookup().begin();i!=dataT->getTagLookup().end();i++) {
1678          keys.push_back(i->first);
1679          values.push_back(defaultValue);
1680        }
1681        Data result(keys,values,defaultValue,getFunctionSpace());
1682      DataTagged* resultT=dynamic_cast<DataTagged*>(result.m_data.get());      DataTagged* resultT=dynamic_cast<DataTagged*>(result.m_data.get());
1683      EsysAssert((dataT!=0), "Programming error - casting data to DataTagged.");      EsysAssert((dataT!=0), "Programming error - casting data to DataTagged.");
1684      EsysAssert((resultT!=0), "Programming error - casting result to DataTagged.");      EsysAssert((resultT!=0), "Programming error - casting result to DataTagged.");
1685      escript::dp_algorithm(*dataT,*resultT,operation);      escript::dp_algorithm(*dataT,*resultT,operation,initial_value);
1686        return result;
1687    } else if (isConstant()) {    } else if (isConstant()) {
1688        Data result(0,DataArrayView::ShapeType(),getFunctionSpace(),isExpanded());
1689      DataConstant* dataC=dynamic_cast<DataConstant*>(m_data.get());      DataConstant* dataC=dynamic_cast<DataConstant*>(m_data.get());
1690      DataConstant* resultC=dynamic_cast<DataConstant*>(result.m_data.get());      DataConstant* resultC=dynamic_cast<DataConstant*>(result.m_data.get());
1691      EsysAssert((dataC!=0), "Programming error - casting data to DataConstant.");      EsysAssert((dataC!=0), "Programming error - casting data to DataConstant.");
1692      EsysAssert((resultC!=0), "Programming error - casting result to DataConstant.");      EsysAssert((resultC!=0), "Programming error - casting result to DataConstant.");
1693      escript::dp_algorithm(*dataC,*resultC,operation);      escript::dp_algorithm(*dataC,*resultC,operation,initial_value);
1694        return result;
1695    }    }
1696    return result;    Data falseRetVal; // to keep compiler quiet
1697      return falseRetVal;
1698  }  }
1699    
1700  }  }

Legend:
Removed from v.113  
changed lines
  Added in v.775

  ViewVC Help
Powered by ViewVC 1.1.26