diff --git a/additional b/additional
index 756c5ef3..2eae8cd8 160000
--- a/additional
+++ b/additional
@@ -1 +1 @@
-Subproject commit 756c5ef3ee334cdf29595b43c1465491d42cc47f
+Subproject commit 2eae8cd87072075eb990626560d3e35749f96393
diff --git a/tests/python/PlotTestResults.ipynb b/tests/python/PlotTestResults.ipynb
index dd6ef32c..2a1a9100 100644
--- a/tests/python/PlotTestResults.ipynb
+++ b/tests/python/PlotTestResults.ipynb
@@ -1,9 +1,23 @@
{
"cells": [
+ {
+ "cell_type": "markdown",
+ "metadata": {
+ "toc": "true"
+ },
+ "source": [
+ "# Table of Contents\n",
+ " "
+ ]
+ },
{
"cell_type": "code",
"execution_count": 1,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2017-11-12T20:45:44.257560",
+ "start_time": "2017-11-12T20:45:43.593822"
+ },
"_draft": {
"init_cell": true
},
@@ -60,6 +74,10 @@
"cell_type": "code",
"execution_count": 2,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2017-11-12T20:45:44.485077",
+ "start_time": "2017-11-12T20:45:44.398022"
+ },
"_draft": {
"init_cell": true
},
@@ -136,6 +154,10 @@
"cell_type": "code",
"execution_count": 3,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2017-11-12T20:45:45.255650",
+ "start_time": "2017-11-12T20:45:45.247441"
+ },
"_draft": {
"init_cell": true
},
@@ -157,6 +179,10 @@
"cell_type": "code",
"execution_count": 4,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2017-11-12T20:45:45.977048",
+ "start_time": "2017-11-12T20:45:45.964540"
+ },
"_draft": {
"init_cell": true
},
@@ -180,8 +206,12 @@
},
{
"cell_type": "code",
- "execution_count": 7,
+ "execution_count": 5,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2017-11-12T20:45:46.499062",
+ "start_time": "2017-11-12T20:45:46.483501"
+ },
"_draft": {
"init_cell": true
},
@@ -216,8 +246,12 @@
},
{
"cell_type": "code",
- "execution_count": 102,
+ "execution_count": 8,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2017-11-12T20:57:51.892246",
+ "start_time": "2017-11-12T20:57:45.050567"
+ },
"collapsed": false,
"scrolled": true
},
@@ -226,69 +260,89 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Line2 {'path': './ConvexHullTest-Line2-double.bin', 'name': 'Line2', 'prec': 'double'} {'path': './ConvexHullTest-Line2-double-Out.bin', 'name': 'Line2', 'prec': 'double'}\n",
- "Matrix Binary: 2 2 8 big Endian: False\n",
- "Matrix Binary: 2 2 8 big Endian: False\n",
- "PointsBadProjectionFilter {'path': './ConvexHullTest-PointsBadProjectionFilter-double.bin', 'name': 'PointsBadProjectionFilter', 'prec': 'double'} {'path': './ConvexHullTest-PointsBadProjectionFilter-double-Out.bin', 'name': 'PointsBadProjectionFilter', 'prec': 'double'}\n",
- "Matrix Binary: 2 34 8 big Endian: False\n",
+ "PointsBadProjection4 {'name': 'PointsBadProjection4', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection4-double.bin'} {'name': 'PointsBadProjection4', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection4-double-Out.bin'}\n",
+ "Matrix Binary: 2 16 8 big Endian: False\n",
"Matrix Binary: 2 7 8 big Endian: False\n",
- "PointsBadProjection2 {'path': './ConvexHullTest-PointsBadProjection2-double.bin', 'name': 'PointsBadProjection2', 'prec': 'double'} {'path': './ConvexHullTest-PointsBadProjection2-double-Out.bin', 'name': 'PointsBadProjection2', 'prec': 'double'}\n",
- "Matrix Binary: 2 400 8 big Endian: False\n",
- "Matrix Binary: 2 10 8 big Endian: False\n",
- "PointsOnCricle1000 {'path': './ConvexHullTest-PointsOnCricle1000-double.bin', 'name': 'PointsOnCricle1000', 'prec': 'double'} {'path': './ConvexHullTest-PointsOnCricle1000-double-Out.bin', 'name': 'PointsOnCricle1000', 'prec': 'double'}\n",
+ "Triangle {'name': 'Triangle', 'prec': 'double', 'path': './ConvexHullTest-Triangle-double.bin'} {'name': 'Triangle', 'prec': 'double', 'path': './ConvexHullTest-Triangle-double-Out.bin'}\n"
+ ]
+ },
+ {
+ "name": "stderr",
+ "output_type": "stream",
+ "text": [
+ "/opt/python3.4Env/lib/python3.4/site-packages/matplotlib/text.py:2130: UserWarning: You have used the `textcoords` kwarg, but not the `xytext` kwarg. This can lead to surprising results.\n",
+ " warnings.warn(\"You have used the `textcoords` kwarg, but not \"\n"
+ ]
+ },
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "Matrix Binary: 2 3 8 big Endian: False\n",
+ "Matrix Binary: 2 3 8 big Endian: False\n",
+ "PointsOnCricle1000 {'name': 'PointsOnCricle1000', 'prec': 'double', 'path': './ConvexHullTest-PointsOnCricle1000-double.bin'} {'name': 'PointsOnCricle1000', 'prec': 'double', 'path': './ConvexHullTest-PointsOnCricle1000-double-Out.bin'}\n",
"Matrix Binary: 2 1000 8 big Endian: False\n",
"Matrix Binary: 2 1000 8 big Endian: False\n",
- "PointsBadProjection3 {'path': './ConvexHullTest-PointsBadProjection3-double.bin', 'name': 'PointsBadProjection3', 'prec': 'double'} {'path': './ConvexHullTest-PointsBadProjection3-double-Out.bin', 'name': 'PointsBadProjection3', 'prec': 'double'}\n",
+ "PointsBadProjection {'name': 'PointsBadProjection', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection-double.bin'} {'name': 'PointsBadProjection', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection-double-Out.bin'}\n",
"Matrix Binary: 2 400 8 big Endian: False\n",
- "Matrix Binary: 2 8 8 big Endian: False\n",
- "Points2DRectFail {'path': './ConvexHullTest-Points2DRectFail-double.bin', 'name': 'Points2DRectFail', 'prec': 'double'} {'path': './ConvexHullTest-Points2DRectFail-double-Out.bin', 'name': 'Points2DRectFail', 'prec': 'double'}\n",
+ "Matrix Binary: 2 14 8 big Endian: False\n",
+ "PointsBadProjectionFilter {'name': 'PointsBadProjectionFilter', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjectionFilter-double.bin'} {'name': 'PointsBadProjectionFilter', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjectionFilter-double-Out.bin'}\n",
+ "Matrix Binary: 2 34 8 big Endian: False\n",
+ "Matrix Binary: 2 7 8 big Endian: False\n",
+ "Points2DRectFail {'name': 'Points2DRectFail', 'prec': 'double', 'path': './ConvexHullTest-Points2DRectFail-double.bin'} {'name': 'Points2DRectFail', 'prec': 'double', 'path': './ConvexHullTest-Points2DRectFail-double-Out.bin'}\n"
+ ]
+ },
+ {
+ "name": "stderr",
+ "output_type": "stream",
+ "text": [
+ "/opt/python3.4Env/lib/python3.4/site-packages/matplotlib/text.py:2130: UserWarning: You have used the `textcoords` kwarg, but not the `xytext` kwarg. This can lead to surprising results.\n",
+ " warnings.warn(\"You have used the `textcoords` kwarg, but not \"\n"
+ ]
+ },
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
"Matrix Binary: 2 18 8 big Endian: False\n",
"Matrix Binary: 2 8 8 big Endian: False\n",
- "PointsBadProjection5 {'path': './ConvexHullTest-PointsBadProjection5-double.bin', 'name': 'PointsBadProjection5', 'prec': 'double'} {'path': './ConvexHullTest-PointsBadProjection5-double-Out.bin', 'name': 'PointsBadProjection5', 'prec': 'double'}\n",
- "Matrix Binary: 2 5 8 big Endian: False\n",
- "Matrix Binary: 2 4 8 big Endian: False\n",
- "Point {'path': './ConvexHullTest-Point-double.bin', 'name': 'Point', 'prec': 'double'} {'path': './ConvexHullTest-Point-double-Out.bin', 'name': 'Point', 'prec': 'double'}\n",
+ "Point {'name': 'Point', 'prec': 'double', 'path': './ConvexHullTest-Point-double.bin'} {'name': 'Point', 'prec': 'double', 'path': './ConvexHullTest-Point-double-Out.bin'}\n",
"Matrix Binary: 2 1 8 big Endian: False\n",
"Matrix Binary: 2 1 8 big Endian: False\n",
- "Line4 {'path': './ConvexHullTest-Line4-double.bin', 'name': 'Line4', 'prec': 'double'} {'path': './ConvexHullTest-Line4-double-Out.bin', 'name': 'Line4', 'prec': 'double'}\n",
- "Matrix Binary: 2 5 8 big Endian: False\n",
- "Matrix Binary: 2 3 8 big Endian: False\n",
- "PointsBadProjection6 {'path': './ConvexHullTest-PointsBadProjection6-double.bin', 'name': 'PointsBadProjection6', 'prec': 'double'} {'path': './ConvexHullTest-PointsBadProjection6-double-Out.bin', 'name': 'PointsBadProjection6', 'prec': 'double'}\n",
- "Matrix Binary: 2 100 8 big Endian: False\n",
+ "PointsBadProjection3 {'name': 'PointsBadProjection3', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection3-double.bin'} {'name': 'PointsBadProjection3', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection3-double-Out.bin'}\n",
+ "Matrix Binary: 2 400 8 big Endian: False\n",
"Matrix Binary: 2 8 8 big Endian: False\n",
- "PointsRandom10 {'path': './ConvexHullTest-PointsRandom10-double.bin', 'name': 'PointsRandom10', 'prec': 'double'} {'path': './ConvexHullTest-PointsRandom10-double-Out.bin', 'name': 'PointsRandom10', 'prec': 'double'}\n",
+ "PointsBadProjection2 {'name': 'PointsBadProjection2', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection2-double.bin'} {'name': 'PointsBadProjection2', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection2-double-Out.bin'}\n",
+ "Matrix Binary: 2 400 8 big Endian: False\n",
"Matrix Binary: 2 10 8 big Endian: False\n",
+ "Line_2 {'name': 'Line_2', 'prec': 'double', 'path': './ConvexHullTest-Line_2-double.bin'} {'name': 'Line_2', 'prec': 'double', 'path': './ConvexHullTest-Line_2-double-Out.bin'}\n",
+ "Matrix Binary: 2 2 8 big Endian: False\n",
+ "Matrix Binary: 2 2 8 big Endian: False\n",
+ "PointsBadProjection5 {'name': 'PointsBadProjection5', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection5-double.bin'} {'name': 'PointsBadProjection5', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection5-double-Out.bin'}\n",
+ "Matrix Binary: 2 5 8 big Endian: False\n",
+ "Matrix Binary: 2 4 8 big Endian: False\n",
+ "Line4 {'name': 'Line4', 'prec': 'double', 'path': './ConvexHullTest-Line4-double.bin'} {'name': 'Line4', 'prec': 'double', 'path': './ConvexHullTest-Line4-double-Out.bin'}\n",
"Matrix Binary: 2 5 8 big Endian: False\n",
- "PointsBadProjection {'path': './ConvexHullTest-PointsBadProjection-double.bin', 'name': 'PointsBadProjection', 'prec': 'double'} {'path': './ConvexHullTest-PointsBadProjection-double-Out.bin', 'name': 'PointsBadProjection', 'prec': 'double'}\n",
- "Matrix Binary: 2 400 8 big Endian: False\n",
- "Matrix Binary: 2 14 8 big Endian: False\n",
- "Triangle {'path': './ConvexHullTest-Triangle-double.bin', 'name': 'Triangle', 'prec': 'double'} {'path': './ConvexHullTest-Triangle-double-Out.bin', 'name': 'Triangle', 'prec': 'double'}\n",
"Matrix Binary: 2 3 8 big Endian: False\n",
+ "Line3 {'name': 'Line3', 'prec': 'double', 'path': './ConvexHullTest-Line3-double.bin'} {'name': 'Line3', 'prec': 'double', 'path': './ConvexHullTest-Line3-double-Out.bin'}\n",
"Matrix Binary: 2 3 8 big Endian: False\n",
- "PointsBadProjection4 {'path': './ConvexHullTest-PointsBadProjection4-double.bin', 'name': 'PointsBadProjection4', 'prec': 'double'} {'path': './ConvexHullTest-PointsBadProjection4-double-Out.bin', 'name': 'PointsBadProjection4', 'prec': 'double'}\n",
- "Matrix Binary: 2 16 8 big Endian: False\n",
+ "Matrix Binary: 2 2 8 big Endian: False\n",
+ "PointsBadProjection6 {'name': 'PointsBadProjection6', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection6-double.bin'} {'name': 'PointsBadProjection6', 'prec': 'double', 'path': './ConvexHullTest-PointsBadProjection6-double-Out.bin'}\n",
+ "Matrix Binary: 2 100 8 big Endian: False\n",
+ "Matrix Binary: 2 8 8 big Endian: False\n",
+ "PointsRandom10 {'name': 'PointsRandom10', 'prec': 'double', 'path': './ConvexHullTest-PointsRandom10-double.bin'} {'name': 'PointsRandom10', 'prec': 'double', 'path': './ConvexHullTest-PointsRandom10-double-Out.bin'}\n",
+ "Matrix Binary: 2 10 8 big Endian: False\n",
"Matrix Binary: 2 7 8 big Endian: False\n",
- "Line3 {'path': './ConvexHullTest-Line3-double.bin', 'name': 'Line3', 'prec': 'double'} {'path': './ConvexHullTest-Line3-double-Out.bin', 'name': 'Line3', 'prec': 'double'}\n",
- "Matrix Binary: 2 3 8 big Endian: False\n",
- "Matrix Binary: 2 2 8 big Endian: False\n"
- ]
- },
- {
- "name": "stderr",
- "output_type": "stream",
- "text": [
- "/opt/python3.4Env/lib/python3.4/site-packages/matplotlib/text.py:1857: UserWarning: You have used the `textcoords` kwarg, but not the `xytext` kwarg. This can lead to surprising results.\n",
- " warnings.warn(\"You have used the `textcoords` kwarg, but not \"\n",
- "/opt/python3.4Env/lib/python3.4/site-packages/matplotlib/collections.py:590: FutureWarning: elementwise comparison failed; returning scalar instead, but in the future will perform elementwise comparison\n",
- " if self._edgecolors == str('face'):\n"
+ "PointsRandom14M {'name': 'PointsRandom14M', 'prec': 'double', 'path': './ConvexHullTest-PointsRandom14M-double.bin'} {'name': 'PointsRandom14M', 'prec': 'double', 'path': './ConvexHullTest-PointsRandom14M-double-Out.bin'}\n",
+ "Matrix Binary: 2 42 8 big Endian: False\n"
]
}
],
"source": [
"plt.close(\"all\")\n",
"\n",
- "files = loadFiles(\"./\" , \".*ConvexHullTest-(\\w*)-(\\w*)\\.bin\", (\"name\",\"prec\") );\n",
- "filesOut = loadFiles(\"./\" , \".*ConvexHullTest-(\\w*)-(\\w*)-Out\\.bin\", (\"name\",\"prec\"));\n",
+ "files = loadFiles(\"./\" , \".*ConvexHullTest-(.*?)-(\\w+)\\.bin\", (\"name\",\"prec\") );\n",
+ "filesOut = loadFiles(\"./\" , \".*ConvexHullTest-(.*?)-(\\w+)-Out\\.bin\", (\"name\",\"prec\"));\n",
"\n",
"for i,f in files.items():\n",
" \n",
@@ -448,8 +502,8 @@
"source": [
"plt.close(\"all\")\n",
"\n",
- "files = loadFiles(\"./\" , \".*MinAreaRectangleTest-(\\w*)-(\\w*).bin\", (\"name\",\"prec\") );\n",
- "filesOut = loadFiles(\"./\" , \".*MinAreaRectangleTest-(\\w*)-(\\w*)-Out\\.bin\", (\"name\",\"prec\"));\n",
+ "files = loadFiles(\"./\" , \".*MinAreaRectangleTest-(.*?)-(\\w+).bin\", (\"name\",\"prec\") );\n",
+ "filesOut = loadFiles(\"./\" , \".*MinAreaRectangleTest-(.*?)-(\\w+)-Out\\.bin\", (\"name\",\"prec\"));\n",
"\n",
"\n",
"for i,f in files.items():\n",
@@ -530,9 +584,9 @@
"source": [
"plt.close(\"all\")\n",
"\n",
- "files = loadFiles(\"./\" , \".*DiameterOOBBTest-(\\w*)-(\\w*)\\.bin\", (\"name\",\"prec\") );\n",
- "filesOut = loadFiles(\"./\" , \".*DiameterOOBBTest-(\\w*)-(\\w*)-Out\\.txt\", (\"name\",\"prec\") );\n",
- "filesOut2 = loadFiles(\"./\" , \".*DiameterOOBBTest-(\\w*)-(\\w*)-Out2\\.bin\", (\"name\",\"prec\") );\n",
+ "files = loadFiles(\"./\" , \".*DiameterOOBBTest-(.*?)-(\\w+)\\.bin\", (\"name\",\"prec\") );\n",
+ "filesOut = loadFiles(\"./\" , \".*DiameterOOBBTest-(.*?)-(\\w+)-Out\\.txt\", (\"name\",\"prec\") );\n",
+ "filesOut2 = loadFiles(\"./\" , \".*DiameterOOBBTest-(.*?)-(\\w+)-Out2\\.bin\", (\"name\",\"prec\") );\n",
"\n",
"for i,f in files.items():\n",
" \n",
@@ -572,19 +626,12 @@
},
{
"cell_type": "code",
- "execution_count": 10,
- "metadata": {
- "collapsed": false
- },
- "outputs": [],
- "source": [
- "plt.close(\"all\")"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 26,
+ "execution_count": 7,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2017-11-12T20:47:57.540581",
+ "start_time": "2017-11-12T20:47:51.926140"
+ },
"collapsed": false
},
"outputs": [
@@ -592,27 +639,64 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "TwoPoints {'name': 'TwoPoints', 'prec': 'double', 'path': './MVBBTest-TwoPoints-double.bin'} {'name': 'TwoPoints', 'prec': 'double', 'path': './MVBBTest-TwoPoints-double-Out.txt'}\n",
- "Matrix Binary: 3 2 8 big Endian: False\n",
- "[[-0.57735027 0.36514837 -0.73029674]\n",
- " [-0.57735027 -0.81502972 0.04892061]\n",
- " [-0.57735027 0.44988135 0.68137614]] [ -1.73205081e+00 -5.00111022e-13 -5.00000000e-13] [ -0.00000000e+00 4.99888978e-13 5.00000000e-13] [ 0. 0. 0.]\n"
- ]
- },
- {
- "name": "stderr",
- "output_type": "stream",
- "text": [
- "/opt/python3.4Env/lib/python3.4/site-packages/matplotlib/collections.py:590: FutureWarning: elementwise comparison failed; returning scalar instead, but in the future will perform elementwise comparison\n",
- " if self._edgecolors == str('face'):\n"
+ "PointClouds-Nr-3 {'name': 'PointClouds-Nr-3', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-3-double.bin'} {'name': 'PointClouds-Nr-3', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-3-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[ 0.70869138 -0.49319411 0.50449588]\n",
+ " [ 0.63834646 0.14372591 -0.75621205]\n",
+ " [ 0.3004502 0.85796412 0.41668603]] [-1.42661565 -3.86197932 -1.84620041] [ 5.34794633 0.33660258 5.23716277] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-2 {'name': 'PointClouds-Nr-2', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-2-double.bin'} {'name': 'PointClouds-Nr-2', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-2-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[ 0.10556901 0.99296013 -0.05371568]\n",
+ " [ 0.31158544 -0.08432764 -0.94646889]\n",
+ " [-0.94433559 0.08318076 -0.3182943 ]] [-2.75246443 0.47313016 -5.80166171] [ 4.34356251 3.28634465 1.24852591] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-0 {'name': 'PointClouds-Nr-0', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-0-double.bin'} {'name': 'PointClouds-Nr-0', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-0-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[-0.67326785 0.72861482 -0.1258207 ]\n",
+ " [-0.12721436 -0.28177578 -0.95100942]\n",
+ " [-0.72837278 -0.62427787 0.28240084]] [-3.07889923 0.06567176 -2.56760063] [ 1.46037201 2.70302304 1.97016091] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-1 {'name': 'PointClouds-Nr-1', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-1-double.bin'} {'name': 'PointClouds-Nr-1', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-1-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[ 0.71790551 0.3225827 -0.61688903]\n",
+ " [-0.49581552 -0.38509148 -0.7783775 ]\n",
+ " [-0.48864982 0.86466465 -0.11651779]] [-3.7118524 -1.98637348 -3.588783 ] [ 1.95426225 3.62481662 -0.85203934] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-5 {'name': 'PointClouds-Nr-5', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-5-double.bin'} {'name': 'PointClouds-Nr-5', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-5-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[-0.42217616 -0.81731231 -0.39213248]\n",
+ " [-0.69052784 0.00968801 0.72324093]\n",
+ " [-0.58731473 0.57611347 -0.56846695]] [-5.20026337 -3.69057488 -3.25279152] [ 0.02893903 1.76741518 2.60115356] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-4 {'name': 'PointClouds-Nr-4', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-4-double.bin'} {'name': 'PointClouds-Nr-4', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-4-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[-0.5726534 -0.60236496 0.55607962]\n",
+ " [-0.59910837 0.77050971 0.21767855]\n",
+ " [-0.55958668 -0.2084976 -0.80211689]] [-4.80008815 -3.87343944 -3.96441211] [ 0.69617304 2.06699221 2.01829794] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-9 {'name': 'PointClouds-Nr-9', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-9-double.bin'} {'name': 'PointClouds-Nr-9', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-9-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[ 0.79753714 -0.33199973 -0.50369702]\n",
+ " [ 0.51391843 0.811184 0.27904905]\n",
+ " [ 0.31594675 -0.48141116 0.81757015]] [-1.50647084 -3.63294126 -1.71404585] [ 5.51640073 4.3488506 2.03292811] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-6 {'name': 'PointClouds-Nr-6', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-6-double.bin'} {'name': 'PointClouds-Nr-6', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-6-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[ 0.40071774 0.84480005 0.35459579]\n",
+ " [-0.86700551 0.47476635 -0.15132202]\n",
+ " [-0.296187 -0.24679909 0.9226936 ]] [-4.10844183 -0.31695178 -0.30692678] [ 2.17617083 4.12642096 4.31170007] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-7 {'name': 'PointClouds-Nr-7', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-7-double.bin'} {'name': 'PointClouds-Nr-7', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-7-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[ 0.84772018 0.20510971 -0.48918351]\n",
+ " [ 0.06008722 0.87914833 0.4727449 ]\n",
+ " [ 0.52702943 -0.43014907 0.73294731]] [-0.39393158 -2.65702974 0.50217223] [ 3.90889747 3.6933134 5.19834765] [ 0. 0. 0.]\n",
+ "PointClouds-Nr-8 {'name': 'PointClouds-Nr-8', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-8-double.bin'} {'name': 'PointClouds-Nr-8', 'prec': 'double', 'path': './MVBBTest-PointClouds-Nr-8-double-Out.txt'}\n",
+ "Matrix Binary: 3 2501 8 big Endian: False\n",
+ "[[-0.34365444 -0.0969246 0.93408097]\n",
+ " [-0.3375783 0.94092259 -0.02656272]\n",
+ " [-0.8763233 -0.32445386 -0.35607186]] [-5.02406698 -2.44769914 -2.22532513] [-0.01006527 3.0529593 2.29540345] [ 0. 0. 0.]\n"
]
}
],
"source": [
"plt.close(\"all\")\n",
"\n",
- "files = loadFiles(\"./\" , \".*MVBBTest-(\\w*)-(\\w*).bin\", (\"name\",\"prec\") );\n",
- "filesOut = loadFiles(\"./\" , \".*MVBBTest-(\\w*)-(\\w*)-Out\\.txt\", (\"name\",\"prec\"));\n",
+ "files = loadFiles(\"./\" , \".*MVBBTest-(.*?)-(\\w+).bin\", (\"name\",\"prec\") );\n",
+ "filesOut = loadFiles(\"./\" , \".*MVBBTest-(.*?)-(\\w+)-Out\\.txt\", (\"name\",\"prec\"));\n",
"\n",
"\n",
"for i,f in files.items():\n",
@@ -670,7 +754,17 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.4.3"
+ "version": "3.4.4"
+ },
+ "nav_menu": {},
+ "toc": {
+ "navigate_menu": true,
+ "number_sections": true,
+ "sideBar": true,
+ "threshold": 6,
+ "toc_cell": true,
+ "toc_section_display": "block",
+ "toc_window_display": true
}
},
"nbformat": 4,
diff --git a/tests/src/main_convexHullTests.cpp b/tests/src/main_convexHullTests.cpp
index 21b410c9..88d3d762 100644
--- a/tests/src/main_convexHullTests.cpp
+++ b/tests/src/main_convexHullTests.cpp
@@ -34,13 +34,13 @@ void convexHullTest(std::string name, const TMatrix& v, bool dumpPoints = true)
dumpPointsMatrixBinary(getPointsDumpPath(name, ".bin"), v);
dumpPointsMatrix(getPointsDumpPath(name, ".txt"), v);
}
- std::cout << "\n\nStart ConvexHull test " << name << "" << std::endl;
+ std::cout << "\n\nStart convexHull test " << name << "" << std::endl;
START_TIMER(start)
ConvexHull2D c(v);
c.compute();
STOP_TIMER_SEC(count, start)
std::cout << "Timings: " << count << " sec for " << v.cols() << " points" << std::endl;
- std::cout << "End ConvexHull test " << name << "" << std::endl;
+ std::cout << "End convexHull test " << name << "" << std::endl;
if (!c.verifyHull())
{
std::cerr << "ConvexHull test " << name << " not ok!" << std::endl;
diff --git a/tests/src/main_diameterOOBBTests.cpp b/tests/src/main_diameterOOBBTests.cpp
index c249116b..bb76d45f 100644
--- a/tests/src/main_diameterOOBBTests.cpp
+++ b/tests/src/main_diameterOOBBTests.cpp
@@ -46,7 +46,7 @@ void diameterTest(std::string name,
auto oobb = ApproxMVBB::approximateMVBBDiam(v, epsilon, optLoops);
STOP_TIMER_SEC(count, start)
std::cout << "Timings: " << count << " sec for " << v.cols() << " points" << std::endl;
- std::cout << "End approximateMVBBDiam test " + name << std::endl;
+ std::cout << "End diameterOOBB test " + name << std::endl;
oobb.expand(1e-10);
if (!checkPointsInOOBB(v, oobb))
diff --git a/tests/src/main_diameterTests.cpp b/tests/src/main_diameterTests.cpp
index 52bd7cff..831e713f 100644
--- a/tests/src/main_diameterTests.cpp
+++ b/tests/src/main_diameterTests.cpp
@@ -35,7 +35,7 @@ void diameterTest(std::string name, const TMatrix& v, PREC epsilon = 0.001)
auto pp = estimateDiameter<3>(v, epsilon);
STOP_TIMER_SEC(count, start)
std::cout << "Timings: " << count << " sec for " << v.cols() << " points" << std::endl;
- std::cout << "End estimateDiam test " + name << std::endl;
+ std::cout << "End diameterTest " + name << std::endl;
Matrix3Dyn diam(3, 2);
diam.col(0) = pp.first;
diff --git a/tests/src/main_minAreaRectangleTests.cpp b/tests/src/main_minAreaRectangleTests.cpp
index 0204fb93..618fb662 100644
--- a/tests/src/main_minAreaRectangleTests.cpp
+++ b/tests/src/main_minAreaRectangleTests.cpp
@@ -40,7 +40,7 @@ void minRectTest(std::string name, const TMatrix& v)
STOP_TIMER_SEC(count, start)
std::cout << "Timings: " << count << " sec for " << v.cols() << " points" << std::endl;
- std::cout << "End MinAreaRectangle Test " + name + "" << std::endl;
+ std::cout << "End minAreaRectangleTest " + name + "" << std::endl;
auto rect = c.getMinRectangle();
Matrix2Dyn p(2, 6);
diff --git a/tests/src/main_mvbbTests.cpp b/tests/src/main_mvbbTests.cpp
index eefb0daf..9463d8f6 100644
--- a/tests/src/main_mvbbTests.cpp
+++ b/tests/src/main_mvbbTests.cpp
@@ -43,12 +43,12 @@ void mvbbTest(std::string name,
dumpPointsMatrix(getPointsDumpPath(name, ".txt"), v);
}
- std::cout << "\n\nStart mVBBTest " + name + "" << std::endl;
+ std::cout << "\n\nStart mvbbTest " + name + "" << std::endl;
START_TIMER(start)
auto oobb = ApproxMVBB::approximateMVBB(v, eps, nPoints, gridSize, mvbbDiamOptLoops, gridSearchOptLoops);
STOP_TIMER_SEC(count, start)
std::cout << "Timings: " << count << " sec for " << v.cols() << " points" << std::endl;
- std::cout << "End MVBBTest " + name << std::endl;
+ std::cout << "End mvbbTest " + name << std::endl;
// oobb.expandToMinExtentRelative(0.1);
@@ -234,7 +234,7 @@ MY_TEST(MVBBTest, Lucy)
MY_TEST(MVBBTest, PointClouds)
{
MY_TEST_RANDOM_STUFF(MVBBTest, PointClouds);
- for (unsigned int k = 0; k < 1; k++)
+ for (unsigned int k = 0; k < 10; k++)
{
auto v = getPointsFromFile3D(getFileInPath("PointCloud_" + std::to_string(k) + ".txt"));
Matrix3Dyn t(3, v.size());