NO CHANGE RECORD

bairesearch · Jun 14, 2017 · 5a18f9f · 5a18f9f
1 parent f345922
commit 5a18f9f
Show file tree

Hide file tree

Showing 36 changed files with 40 additions and 40 deletions.
diff --git a/ATOR/ATORTHimageCategorisationNN.cpp b/ATOR/ATORTHimageCategorisationNN.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORTHimageCategorisationNN.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  * Test Harness for OR Image Categorisation NN method (not yet implemented)
  *******************************************************************************/
 

diff --git a/ATOR/ATORTHimageCategorisationNN.hpp b/ATOR/ATORTHimageCategorisationNN.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORTHimageCategorisationNN.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  * Test Harness for OR Image Categorisation NN method (not yet implemented)
  *******************************************************************************/
 

diff --git a/ATOR/ATORTHmain.cpp b/ATOR/ATORTHmain.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORTHmain.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  * NB pointmap is a new addition for test streamlining; NB in test scenarios 2 and 3, there will be no pointmap available; the pointmap will have to be generated after depth map is obtained by using calculatePointUsingTInWorld()
  *******************************************************************************/
 

diff --git a/ATOR/ATORTHmain.hpp b/ATOR/ATORTHmain.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORTHmain.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORcomparison.cpp b/ATOR/ATORcomparison.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORcomparison.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 
@@ -309,7 +309,7 @@ double ORcomparisonClass::compareNormalisedSnapshots(const int numberOfTestPolys
 		string ICRheader = "";
 		if(OR_GENERATE_IMAGE_COMPARITOR_RESULTS_NO_EXPLICIT_CONFIDENTIAL_WARNINGS)
 		{
-			ICRheader = ICRheader + "<HTML><HEAD><TITLE>Results </TITLE><style type=\"text/css\">TD { font-size:50%; } </style></HEAD><BODY>Results<p>Project Version: 3l1f 01-June-2017<p>";
+			ICRheader = ICRheader + "<HTML><HEAD><TITLE>Results </TITLE><style type=\"text/css\">TD { font-size:50%; } </style></HEAD><BODY>Results<p>Project Version: 3l2a 12-June-2017<p>";
 		}
 		else
 		{

diff --git a/ATOR/ATORcomparison.hpp b/ATOR/ATORcomparison.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORcomparison.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORdatabaseDecisionTree.cpp b/ATOR/ATORdatabaseDecisionTree.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORdatabaseDecisionTree.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORdatabaseDecisionTree.hpp b/ATOR/ATORdatabaseDecisionTree.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORdatabaseDecisionTree.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORdatabaseFileIO.cpp b/ATOR/ATORdatabaseFileIO.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORdatabaseFileIO.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORdatabaseFileIO.hpp b/ATOR/ATORdatabaseFileIO.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORdatabaseFileIO.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORdatabaseSQL.cpp b/ATOR/ATORdatabaseSQL.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORdatabaseSQL.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORdatabaseSQL.hpp b/ATOR/ATORdatabaseSQL.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORdatabaseSQL.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORfeatureGeneration.cpp b/ATOR/ATORfeatureGeneration.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORfeatureGeneration.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  * Assumes that depth information is less accurate than image information
  *

diff --git a/ATOR/ATORfeatureGeneration.hpp b/ATOR/ATORfeatureGeneration.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORfeatureGeneration.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORglobalDefs.cpp b/ATOR/ATORglobalDefs.cpp
@@ -25,7 +25,7 @@
  * File Name: SHAREDglobalDefs.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Description: Generic Construct Functions: shared global definitions (configure to compile different BAI projects)
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORglobalDefs.hpp b/ATOR/ATORglobalDefs.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORglobalDefs.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: OR specific global definitions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  * Preconditions: Assume Linux EL5 or Windows XP or is installed
  *
  * 1. Object Recognition Software Installation Instructions;

diff --git a/ATOR/ATORimagecomparison.cpp b/ATOR/ATORimagecomparison.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORimagecomparison.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORimagecomparison.hpp b/ATOR/ATORimagecomparison.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORimagecomparison.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORmain.cpp b/ATOR/ATORmain.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORmain.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 
@@ -68,9 +68,9 @@ static char errmessage[] = "Usage:  ATOR.exe [options]\n\n\twhere options are an
 "\n\t-viewsizeh [float]: viewport height (def: 3)"
 "\n\t-scale [float]    : mapping between depthmap bits and pov (defines resolution and maximum depth range/coverage of depth map)"
 "\n\n multi view options only \n"
-"\n\t-multview [string]     : use multiview list [NEEDS WORK] (def: multViewList.txt) {3DOD every row; ObjectViewFileNameWithNoExtension|imageext|imageWidth|imageHeight|depthext|vieweyex|vieweyey|vieweyez|viewatx|viewaty|viewatz|viewupx|viewupy|viewupz|viewfocal|viewsizew|viewsizeh|scale. 2DOD every row; ObjectViewFileNameWithNoExtension|imageext|imageWidth|imageHeight|xOffset|yOffset}"
+"\n\t-multview [string]     : use multiview list [EXPERIMENTAL] (def: multViewList.txt) {3DOD every row; ObjectViewFileNameWithNoExtension|imageext|imageWidth|imageHeight|depthext|vieweyex|vieweyey|vieweyez|viewatx|viewaty|viewatz|viewupx|viewupy|viewupz|viewfocal|viewsizew|viewsizeh|scale. 2DOD every row; ObjectViewFileNameWithNoExtension|imageext|imageWidth|imageHeight|xOffset|yOffset}"
 #ifdef OR_USE_DATABASE
-"\n\t-dbfolder          : file system database base folder path (def: /home/systemusername/source/ORfsdatabase)"
+"\n\t-dbfolder [string]     : file system database base folder path (def: /home/systemusername/source/ORfsdatabase)"
 #endif
 "\n\n\t-version        : print version"
 "\n\n\tThis program either adds an object (imaged from a particular viewpoint) to a BAI OR database, or finds the closest matching object already existent in the BAI OR database.\n\n";
@@ -324,7 +324,7 @@ int main(const int argc,const char* *argv)
 
 	if(SHAREDvarsClass().argumentExists(argc, argv, "-version"))
 	{
-		cerr << "ATOR.exe - Project Version: 3l1f 01-June-2017" << endl;
+		cerr << "ATOR.exe - Project Version: 3l2a 12-June-2017" << endl;
 		exit(EXIT_OK);
 	}
 

diff --git a/ATOR/ATORmain.hpp b/ATOR/ATORmain.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORmain.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORmethod.cpp b/ATOR/ATORmethod.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORmethod.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  * NB pointmap is a new addition for test streamlining; NB in test scenarios 2 and 3, there will be no pointmap available; the pointmap will have to be generated after depth map is obtained by using calculatePointUsingTInWorld()
  *******************************************************************************/
 

diff --git a/ATOR/ATORmethod.hpp b/ATOR/ATORmethod.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORmethod.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORmethod2DOD.cpp b/ATOR/ATORmethod2DOD.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORmethod2DOD.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  * NB pointmap is a new addition for test streamlining; NB in test scenarios 2 and 3, there will be no pointmap available; the pointmap will have to be generated after depth map is obtained by using calculatePointUsingTInWorld()
  *******************************************************************************/
 

diff --git a/ATOR/ATORmethod2DOD.hpp b/ATOR/ATORmethod2DOD.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORmethod2DOD.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORmethod3DOD.cpp b/ATOR/ATORmethod3DOD.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORmethod3DOD.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  * NB pointmap is a new addition for test streamlining; NB in test scenarios 2 and 3, there will be no pointmap available; the pointmap will have to be generated after depth map is obtained by using calculatePointUsingTInWorld()
  *******************************************************************************/
 

diff --git a/ATOR/ATORmethod3DOD.hpp b/ATOR/ATORmethod3DOD.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORmethod3DOD.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORoperations.cpp b/ATOR/ATORoperations.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORoperations.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORoperations.hpp b/ATOR/ATORoperations.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORoperations.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORpixelMaps.cpp b/ATOR/ATORpixelMaps.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORpixelMaps.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORpixelMaps.hpp b/ATOR/ATORpixelMaps.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORpixelMaps.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORpolygonList.cpp b/ATOR/ATORpolygonList.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORpolygonList.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORpolygonList.hpp b/ATOR/ATORpolygonList.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORpolygonList.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: ATOR (Axis Transformation Object Recognition) Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORquadraticFit.cpp b/ATOR/ATORquadraticFit.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORquadraticFit.cpp (based on EdgiseFrame.java, version 1.17 (26-02-04) CSEM)
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: Generic Construct Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  * Assumes that depth information is less accurate than image information
  *******************************************************************************/

diff --git a/ATOR/ATORquadraticFit.hpp b/ATOR/ATORquadraticFit.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORquadraticFit.hpp (based on EdgiseFrame.java, version 1.17 (26-02-04) CSEM)
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: Generic Construct Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORrules.cpp b/ATOR/ATORrules.cpp
@@ -25,7 +25,7 @@
  * File Name: ATORrules.cpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: Generic Construct Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/
 

diff --git a/ATOR/ATORrules.hpp b/ATOR/ATORrules.hpp
@@ -25,7 +25,7 @@
  * File Name: ATORrules.hpp
  * Author: Richard Bruce Baxter - Copyright (c) 2005-2017 Baxter AI (baxterai.com)
  * Project: Generic Construct Functions
- * Project Version: 3l1f 01-June-2017
+ * Project Version: 3l2a 12-June-2017
  *
  *******************************************************************************/