[python-demgengeo] 01/08: Merge tag 'upstream/0.99_bzr124'
Anton Gladky
gladk at moszumanska.debian.org
Sun Jan 26 13:48:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository python-demgengeo.
commit 1620203022ef95b11783ef49f078f8eb9c0f11b6
Merge: 61b2494 830010a
Author: Anton Gladky <gladk at debian.org>
Date: Sun Jan 26 13:38:08 2014 +0100
Merge tag 'upstream/0.99_bzr124'
Upstream version 0.99~bzr124
AUTHORS | 6 +-
COPYING | 6 +-
ChangeLog | 6 +-
INSTALL | 6 +-
NEWS | 6 +-
Python/AVolume2DPy.cc | 28 ++----
Python/AVolume2DPy.h | 12 +--
Python/AVolume3DPy.cc | 17 ++--
Python/AVolume3DPy.h | 8 +-
Python/BoxWithJointSetPy.cc | 17 ++--
Python/BoxWithJointSetPy.h | 10 +--
Python/BoxWithLines2DPy.cc | 19 ++---
Python/BoxWithLines2DPy.h | 8 +-
Python/BoxWithLines2DSubVolPy.cc | 19 ++---
Python/BoxWithLines2DSubVolPy.h | 8 +-
Python/BoxWithPlanes3DPy.cc | 17 ++--
Python/BoxWithPlanes3DPy.h | 10 +--
Python/CircMNTable2DPy.cc | 17 ++--
Python/CircMNTable2DPy.h | 8 +-
Python/CircMNTable3DPy.cc | 17 ++--
Python/CircMNTable3DPy.h | 8 +-
Python/CircMNTableXY2DPy.cc | 17 ++--
Python/CircMNTableXY2DPy.h | 8 +-
Python/CircleVolPy.cc | 17 ++--
Python/CircleVolPy.h | 8 +-
Python/ClippedCircleVolPy.cc | 17 ++--
Python/ClippedCircleVolPy.h | 8 +-
Python/ClippedSphereVolPy.cc | 17 ++--
Python/ClippedSphereVolPy.h | 8 +-
Python/ConvexPolyhedronPy.cc | 17 ++--
Python/ConvexPolyhedronPy.h | 12 +--
Python/CylinderVolPy.cc | 17 ++--
Python/CylinderVolPy.h | 8 +-
Python/CylinderWithJointSetPy.cc | 17 ++--
Python/CylinderWithJointSetPy.h | 8 +-
Python/DifferenceVolPy.cc | 17 ++--
Python/DifferenceVolPy.h | 8 +-
Python/DogBonePy.cc | 17 ++--
Python/DogBonePy.h | 8 +-
Python/EllipsoidVolPy.cc | 17 ++--
Python/EllipsoidVolPy.h | 8 +-
Python/ExportModuleUtil.cc | 6 +-
Python/FullCircMNTable3DPy.cc | 17 ++--
Python/FullCircMNTable3DPy.h | 8 +-
Python/HGrainGenerator2DPy.cc | 17 ++--
Python/HGrainGenerator2DPy.h | 8 +-
Python/HexAggregateInsertGenerator2DPy.cc | 17 ++--
Python/HexAggregateInsertGenerator2DPy.h | 10 +--
Python/HexAggregateInsertGenerator3DPy.cc | 17 ++--
Python/HexAggregateInsertGenerator3DPy.h | 8 +-
Python/HexAggregateShapePy.cc | 17 ++--
Python/HexAggregateShapePy.h | 8 +-
Python/InsertGenerator2DPy.cc | 28 ++----
Python/InsertGenerator2DPy.h | 13 ++-
Python/InsertGenerator3DPy.cc | 28 ++----
Python/InsertGenerator3DPy.h | 12 +--
Python/IntersectionVolPy.cc | 17 ++--
Python/IntersectionVolPy.h | 8 +-
Python/Line2DPy.cc | 17 ++--
Python/Line2DPy.h | 8 +-
Python/LineSegment2DPy.cc | 17 ++--
Python/LineSegment2DPy.h | 8 +-
Python/MNTable2DPy.cc | 17 ++--
Python/MNTable2DPy.h | 12 +--
Python/MNTable3DPy.cc | 26 +++---
Python/MNTable3DPy.h | 8 +-
Python/MeshVolumePy.cc | 17 ++--
Python/MeshVolumePy.h | 8 +-
Python/PlanePy.cc | 17 ++--
Python/PlanePy.h | 8 +-
Python/PolygonWithLines2DPy.cc | 19 ++---
Python/PolygonWithLines2DPy.h | 8 +-
Python/ShapeListPy.cc | 17 ++--
Python/ShapeListPy.h | 8 +-
Python/ShapePy.cc | 17 ++--
Python/ShapePy.h | 8 +-
Python/SphereObjPy.cc | 17 ++--
Python/SphereObjPy.h | 8 +-
Python/SpherePy.cc | 17 ++--
Python/SpherePy.h | 8 +-
Python/SphereSectionVolPy.cc | 17 ++--
Python/SphereSectionVolPy.h | 8 +-
Python/SphereVolPy.cc | 17 ++--
Python/SphereVolPy.h | 8 +-
Python/TriBoxPy.cc | 17 ++--
Python/TriBoxPy.h | 10 +--
Python/TriPatchSetPy.cc | 17 ++--
Python/TriPatchSetPy.h | 8 +-
Python/TriWithLines2DPy.cc | 19 ++---
Python/TriWithLines2DPy.h | 8 +-
Python/UnionVolPy.cc | 17 ++--
Python/UnionVolPy.h | 8 +-
Python/Vector3Py.cc | 17 ++--
Python/Vector3Py.h | 8 +-
Python/__init__.py | 6 +-
README | 8 +-
build/Epydoc/Makefile.am | 6 +-
build/Makefile.am | 6 +-
build/autogen.sh | 4 +-
build/config/Cpp.am | 6 +-
build/config/Python.am | 6 +-
build/configure.ac | 27 ++++--
build/m4/boost.m4 | 99 ++++++++++++++++++++--
doc/CSG.readme | 34 ++++++++
doc/README | 8 +-
examples/gengeo_DFN.py | 6 +-
examples/gengeo_crack.py | 6 +-
examples/gengeo_example1.py | 6 +-
examples/gengeo_example10.py | 6 +-
examples/gengeo_example11.py | 6 +-
examples/gengeo_example2.py | 11 +--
examples/gengeo_example3.py | 6 +-
examples/gengeo_example4.py | 6 +-
examples/gengeo_example5.py | 6 +-
examples/gengeo_example6.py | 9 +-
examples/gengeo_example7.py | 11 +--
examples/gengeo_example8.py | 6 +-
examples/gengeo_example9.py | 6 +-
examples/gengeo_exampleShapeList.py | 11 +--
examples/gengeo_obstructed_flow.py | 6 +-
examples/gengeo_polygon.py | 11 +--
examples/gengeo_test_cluster.py | 14 +--
examples/gouge_example.py | 6 +-
examples/granular_gouge.py | 9 +-
examples/hlayer_example.py | 6 +-
examples/jointed_box_file.py | 12 +--
examples/layered_example.py | 9 +-
geometry/AGeometricObject.h | 8 +-
geometry/Cylinder.cc | 6 +-
geometry/Cylinder.h | 8 +-
geometry/Line2D.cc | 6 +-
geometry/Line2D.h | 8 +-
geometry/LineSegment.h | 6 +-
geometry/LineSegment2D.cc | 6 +-
geometry/LineSegment2D.h | 6 +-
geometry/Plane.cc | 6 +-
geometry/Plane.h | 8 +-
geometry/Sphere.cc | 6 +-
geometry/Sphere.h | 8 +-
geometry/SphereIn.cc | 6 +-
geometry/SphereIn.h | 8 +-
geometry/Torus.cc | 6 +-
geometry/Torus.h | 8 +-
geometry/Triangle3D.cc | 6 +-
geometry/Triangle3D.h | 8 +-
sphere_fitting/Sphere2DFitter.cc | 12 +--
sphere_fitting/Sphere2DFitter.h | 10 +--
sphere_fitting/Sphere3DFitter.cc | 12 +--
sphere_fitting/Sphere3DFitter.h | 10 +--
sphere_fitting/fit_2d_sphere.cc | 6 +-
sphere_fitting/fit_2d_sphere.h | 14 +--
sphere_fitting/fit_3d_sphere.cc | 6 +-
sphere_fitting/fit_3d_sphere.h | 14 +--
.../fit_functions/fit_2d_sphere_2lines.cc | 6 +-
.../fit_functions/fit_2d_sphere_2lines.h | 12 +--
sphere_fitting/fit_functions/fit_2d_sphere_line.cc | 6 +-
sphere_fitting/fit_functions/fit_2d_sphere_line.h | 12 +--
.../fit_functions/fit_3d_1sphere_3lines.cc | 6 +-
.../fit_functions/fit_3d_1sphere_3lines.h | 12 +--
.../fit_functions/fit_3d_2spheres_2lines.cc | 6 +-
.../fit_functions/fit_3d_2spheres_2lines.h | 12 +--
.../fit_functions/fit_3d_3spheres_1line.cc | 6 +-
.../fit_functions/fit_3d_3spheres_1line.h | 12 +--
sphere_fitting/utils/nfunction.h | 6 +-
sphere_fitting/utils/nvector.h | 6 +-
sphere_fitting/utils/nvector.hh | 6 +-
sphere_fitting/utils/simplex.h | 6 +-
sphere_fitting/utils/simplex.hh | 6 +-
src/AGenerator2D.h | 6 +-
src/AGenerator3D.h | 6 +-
src/AVolume.h | 10 +--
src/AVolume2D.cc | 6 +-
src/AVolume2D.h | 8 +-
src/AVolume3D.h | 8 +-
src/BoxWithJointSet.cc | 6 +-
src/BoxWithJointSet.h | 8 +-
src/BoxWithLines2D.cc | 6 +-
src/BoxWithLines2D.h | 6 +-
src/BoxWithLines2DSubVol.cc | 6 +-
src/BoxWithLines2DSubVol.h | 6 +-
src/BoxWithPlanes3D.cc | 6 +-
src/BoxWithPlanes3D.h | 8 +-
src/CircMNTable2D.cc | 6 +-
src/CircMNTable2D.h | 6 +-
src/CircMNTable3D.cc | 6 +-
src/CircMNTable3D.h | 6 +-
src/CircMNTableXY2D.cc | 6 +-
src/CircMNTableXY2D.h | 6 +-
src/CircleVol.cc | 6 +-
src/CircleVol.h | 8 +-
src/ClippedCircleVol.cc | 6 +-
src/ClippedCircleVol.h | 8 +-
src/ClippedSphereVol.cc | 6 +-
src/ClippedSphereVol.h | 8 +-
src/ConvexPolyhedron.cc | 6 +-
src/ConvexPolyhedron.h | 8 +-
src/CylinderVol.cc | 6 +-
src/CylinderVol.h | 10 +--
src/CylinderWithJointSet.cc | 6 +-
src/CylinderWithJointSet.h | 10 +--
src/DifferenceVol.cc | 8 +-
src/DifferenceVol.h | 6 +-
src/DogBone.cc | 6 +-
src/DogBone.h | 12 +--
src/EllipsoidVol.cc | 6 +-
src/EllipsoidVol.h | 6 +-
src/FullCircMNTable3D.cc | 6 +-
src/FullCircMNTable3D.h | 6 +-
src/GenericShape.cc | 6 +-
src/GenericShape.h | 8 +-
src/HGrainGenerator.cc | 6 +-
src/HGrainGenerator.h | 6 +-
src/HexAggregateInsertGenerator2D.cc | 8 +-
src/HexAggregateInsertGenerator2D.h | 6 +-
src/HexAggregateInsertGenerator2DRand.cc | 8 +-
src/HexAggregateInsertGenerator2DRand.h | 6 +-
src/HexAggregateInsertGenerator3D.cc | 8 +-
src/HexAggregateInsertGenerator3D.h | 6 +-
src/HexAggregateShape.cc | 6 +-
src/HexAggregateShape.h | 8 +-
src/InsertGenerator2D.cc | 8 +-
src/InsertGenerator2D.h | 6 +-
src/InsertGenerator3D.cc | 8 +-
src/InsertGenerator3D.h | 6 +-
src/IntersectionVol.cc | 8 +-
src/IntersectionVol.h | 6 +-
src/JointSet.h | 8 +-
src/MNTCell.cc | 6 +-
src/MNTCell.h | 8 +-
src/MNTCell3D.h | 6 +-
src/MNTable2D.cc | 6 +-
src/MNTable2D.h | 12 +--
src/MNTable3D.cc | 20 ++++-
src/MNTable3D.h | 13 +--
src/MeshVolume.cc | 8 +-
src/MeshVolume.h | 8 +-
src/Model2D.cc | 6 +-
src/Model2D.h | 12 +--
src/PolygonWithLines2D.cc | 6 +-
src/PolygonWithLines2D.h | 6 +-
src/Shape.cc | 6 +-
src/Shape.h | 8 +-
src/ShapeList.cc | 6 +-
src/ShapeList.h | 8 +-
src/SphereObj.cc | 6 +-
src/SphereObj.h | 9 +-
src/SphereSectionVol.cc | 6 +-
src/SphereSectionVol.h | 8 +-
src/SphereVol.cc | 6 +-
src/SphereVol.h | 8 +-
src/TriBox.cc | 6 +-
src/TriBox.h | 8 +-
src/TriPatchSet.cc | 6 +-
src/TriPatchSet.h | 10 +--
src/TriWithLines2D.cc | 6 +-
src/TriWithLines2D.h | 6 +-
src/UnionVol.cc | 20 +++--
src/UnionVol.h | 6 +-
src/granular_gouge.cc | 6 +-
src/granular_gouge.h | 6 +-
src/main.cc | 44 +++++-----
src/main_gouge.cc | 10 +--
src/main_hlayer.cc | 10 +--
src/main_layered.cc | 10 +--
src/main_sbx.cc | 28 +++---
util/vector3.cc | 6 +-
util/vector3.h | 6 +-
util/vector3.hh | 6 +-
268 files changed, 1326 insertions(+), 1398 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-demgengeo.git
More information about the debian-science-commits
mailing list