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

Log of /trunk/escript/src/DataTypes.h

Parent Directory Parent Directory | Revision Log Revision Log


Sticky Revision:
(Current path doesn't exist after revision 4507)

Revision 1838 - (view) (annotate) - [select for diffs]
Modified Fri Oct 3 02:05:01 2008 UTC (11 years, 2 months ago) by phornby
File length: 12424 byte(s)
Diff to previous 1811
add 4 missing  ESCRIPT_DLL_API that prevented linking.

Revision 1811 - (view) (annotate) - [select for diffs]
Modified Thu Sep 25 23:11:13 2008 UTC (11 years, 2 months ago) by ksteube
File length: 12349 byte(s)
Diff to previous 1796
Copyright updated in all files


Revision 1796 - (view) (annotate) - [select for diffs]
Modified Wed Sep 17 01:45:46 2008 UTC (11 years, 3 months ago) by jfenwick
File length: 12389 byte(s)
Copied from: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h revision 1795
Diff to previous 1781
Merged noarrayview branch onto trunk.



Revision 1781 - (view) (annotate) - [select for diffs]
Modified Thu Sep 11 05:03:14 2008 UTC (11 years, 3 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 12389 byte(s)
Diff to previous 1779
Branch commit

Merged changes from trunk version 1695 up to and including version 1779.



Revision 1779 - (view) (annotate) - [select for diffs]
Modified Thu Sep 11 01:06:15 2008 UTC (11 years, 3 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 12383 byte(s)
Diff to previous 1747
Branch commit:

Updated the doxyfile for deprecated/modified options (eg encoding is set 
to UTF-8).
Also set it not to scan directories called .svn or deprecated.

Removed #includes of DataArrayView.h
Moved DataArrayView into a new deprecated directory

Commented out setTaggedValue in DataExpanded which still referred to 
DataArrayView

Fixed some of the doxygen comments in DataMaths.h, DataTypes.h, 
DataTagged.h

Removed the empty JoelMods.cpp_

Unit tests appear to indicate that this branch is now "no more broken" 
than the version I branched from.




Revision 1747 - (view) (annotate) - [select for diffs]
Modified Wed Sep 3 04:56:50 2008 UTC (11 years, 3 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 9926 byte(s)
Diff to previous 1734
Branch commit.

Current status, this version compiles as passes run_tests (haven't tried 
all_tests), provided that the following files are moved out of the way:

DataAlgorithmAdapterTestCase.h 
DataTaggedTestCase.cpp 
DataTestCase.cpp 
DataTaggedTestCase.h

(They are not run by the unit tests at the moment).

I will fix those next.




Revision 1734 - (view) (annotate) - [select for diffs]
Modified Thu Aug 28 06:11:56 2008 UTC (11 years, 3 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 9009 byte(s)
Diff to previous 1724
Added operations to Datatypes:
checkOffset
copySlice
copySliceFrom

Fixed some error reporting using EsysAssert.

Added two new c++ test suites:
DataTypesTest
DataMathsTest

Note that the test suite does not compile with dodebug=yes. There is an issue with linking one of the exception functions. I'm going to leave this 
until I have finished the rest of the work, perhaps Ken's scons changes will fix it.



Revision 1724 - (view) (annotate) - [select for diffs]
Modified Mon Aug 25 05:38:57 2008 UTC (11 years, 3 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 7263 byte(s)
Diff to previous 1715
Branch commit

Moved createShapeErrorMessage() into DataTypes.h
Modified functions in DataAlgorithm.h to use non-DataArrayView accesses.

Added getVector() to each of DataTagged, DataConstant, DataExpanded - This method returns 
the underlying DataVector by reference/constant reference. Note that this method does not 
exist in DataAbstract so (at the momement) in order to pull the data from something you 
need to know what you are looking at. (Lower level access is still possible via double* 
though).

DataTagged now has a getOffsetForTag method and a getDefaultOffset method.

DataMaths.h - A new file containing the reductionOps etc from DataArrayView (but without 
requiring DAV).
This file requires significant commenting improvements.



Revision 1715 - (view) (annotate) - [select for diffs]
Modified Thu Aug 21 04:52:14 2008 UTC (11 years, 3 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 7043 byte(s)
Diff to previous 1714
Branch commit.

Moved getSliceRegionLoopRange and checkShape into DataTypes.h
Some work on methods to set/addTaggedValues without using DataArrayView.
To do this I added copyFromNumArray() on DataVector (It buggy at the 
moment).

This build passes the tests but only because copyFromNumArray is not 
used.



Revision 1714 - (view) (annotate) - [select for diffs]
Modified Thu Aug 21 00:01:55 2008 UTC (11 years, 3 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 6221 byte(s)
Diff to previous 1712
Branch commit

Moved getSliceRegion() and getSliceRange() into DataTypes
Data.cpp - modified not to rely on operator() from DataArrayView
         - Used more const& to avoid copies



Revision 1712 - (view) (annotate) - [select for diffs]
Modified Wed Aug 20 05:04:28 2008 UTC (11 years, 3 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 1724 byte(s)
Diff to previous 1704
Branch commit.

Finished first pass of Data.h - There is still a constructor which takes 
a DataArrayView as a parameter. Apart from that, there are no direct 
references to DataArrayView.

DataTagged has a new constructor for copying just the tags from an 
existing object.
DataTypes:: now has a scalarShape constant (to avoid creating one 
everytime you create a scalar).




Revision 1704 - (view) (annotate) - [select for diffs]
Modified Thu Aug 14 05:35:32 2008 UTC (11 years, 4 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 1686 byte(s)
Diff to previous 1698
Branch commit:

DataTagged::addTag() = Add a tag with default value. (All uses that I can find 
apart from test code only require this anyway).

DataAbstract now knows its own shape, rank and number of values and have accessors 
for them.
Data Objects also have acessors for these but query their DataAbstracts for the 
answers.

Data::getDataAtOffset() = access to a particular point in the underlying array. (At 
the moment this call references the DataArrayView, but that will change when I have 
everything else working).

DataTagged::getDataByTag() = same but search by tag.
DataTagged::getDefaultValue() = returns default value without obvious reference to 
DataArrayView


C_GeneralTensorProduct_J  is my temporary copy of C_GeneralTensorProduct for 
experimentation.
It and a number of other temporary functions live in JoelMods.cpp_ for now.



Revision 1698 - (view) (annotate) - [select for diffs]
Modified Tue Aug 12 01:13:16 2008 UTC (11 years, 4 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 1578 byte(s)
Diff to previous 1697
Branch commit DO NOT PANIC.

Moved shapeToString and noValues from DataArrayView to 
DataTypes{.h,.cpp}



Revision 1697 - (view) (annotate) - [select for diffs]
Added Mon Aug 11 06:29:54 2008 UTC (11 years, 4 months ago) by jfenwick
Original Path: branches/arrayview_from_1695_trunk/escript/src/DataTypes.h
File length: 1019 byte(s)
Moved ValueType, ShapeType, RegionType, RegionLoopRangeType and maxRank
From DataArrayView.h to DataTypes.h

This is a simple rename but did require modifying a lot of files.



This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

  ViewVC Help
Powered by ViewVC 1.1.26