Commit 7755deb6 authored by Matt Clarkson's avatar Matt Clarkson

Issue #61: Move HandEye optimisers to Internal/HandEye.

parent 641779b0
......@@ -53,52 +53,40 @@ if(ITK_FOUND)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearNoIntrinsicsCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMonoCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsaiCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMaltiHandEyeCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMaltiHandEyeOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearNDOFHandEyeCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearNDOFHandEyeOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereo2DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereo3DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsaiCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai3ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai3ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai2ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai2ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai5ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai5ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai8ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai8ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai10ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai10ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai11ParamOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Tsai/niftkNonLinearTsai11ParamCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereo2DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoHandEye2DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoHandEye2DOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Stereo/niftkNonLinearStereoCameraCalibration2DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Stereo/niftkNonLinearStereoCameraCalibration2DOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereo3DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Stereo/niftkNonLinearStereoExtrinsicsCalibration3DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/Stereo/niftkNonLinearStereoExtrinsicsCalibration3DOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/HandEye/niftkNonLinearMaltiHandEyeCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/HandEye/niftkNonLinearMaltiHandEyeOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/HandEye/niftkNonLinearNDOFHandEyeCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/HandEye/niftkNonLinearNDOFHandEyeOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/HandEye/niftkNonLinearStereoHandEye2DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/HandEye/niftkNonLinearStereoHandEye2DOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/HandEye/niftkNonLinearStereoHandEye3DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/HandEye/niftkNonLinearStereoHandEye3DOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoIntrinsicsCalibration3DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoIntrinsicsCalibration3DOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoHandEye3DCostFunction.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearStereoHandEye3DOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMonoCostFunction3D.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMonoCameraCalibration3DOptimiser.cxx)
list(APPEND NIFTYCAL_SRCS Internal/niftkNonLinearMonoCameraCalibration3DCostFunction.cxx)
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearMaltiHandEyeCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
#include <niftkNiftyCalExceptionMacro.h>
#include <niftkMatrixUtilities.h>
#include <niftkPointUtilities.h>
......
......@@ -15,7 +15,7 @@
#ifndef niftkNonLinearMaltiHandEyeCostFunction_h
#define niftkNonLinearMaltiHandEyeCostFunction_h
#include "niftkNonLinearMonoCostFunction.h"
#include <Internal/niftkNonLinearMonoCostFunction.h>
namespace niftk
{
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearNDOFHandEyeCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
#include <niftkNiftyCalExceptionMacro.h>
#include <niftkMatrixUtilities.h>
#include <niftkPointUtilities.h>
......
......@@ -15,8 +15,8 @@
#ifndef niftkNonLinearNDOFHandEyeCostFunction_h
#define niftkNonLinearNDOFHandEyeCostFunction_h
#include "niftkNonLinearNoIntrinsicsCostFunction.h"
#include "niftkNonLinearMonoCostFunction.h"
#include <Internal/niftkNonLinearNoIntrinsicsCostFunction.h>
#include <Internal/niftkNonLinearMonoCostFunction.h>
namespace niftk
{
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearStereoHandEye2DCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
#include <niftkNiftyCalExceptionMacro.h>
#include <niftkMatrixUtilities.h>
#include <niftkPointUtilities.h>
......
......@@ -15,8 +15,8 @@
#ifndef niftkNonLinearStereoHandEye2DCostFunction_h
#define niftkNonLinearStereoHandEye2DCostFunction_h
#include "niftkNonLinearStereo2DCostFunction.h"
#include "niftkNonLinearNoIntrinsicsCostFunction.h"
#include <Internal/niftkNonLinearStereo2DCostFunction.h>
#include <Internal/niftkNonLinearNoIntrinsicsCostFunction.h>
namespace niftk
{
......
......@@ -13,7 +13,7 @@
=============================================================================*/
#include "niftkNonLinearStereoHandEye3DCostFunction.h"
#include "niftkCalibrationUtilities_p.h"
#include <Internal/niftkCalibrationUtilities_p.h>
#include <niftkNiftyCalExceptionMacro.h>
#include <niftkMatrixUtilities.h>
#include <niftkPointUtilities.h>
......
......@@ -15,8 +15,8 @@
#ifndef niftkNonLinearStereoHandEye3DCostFunction_h
#define niftkNonLinearStereoHandEye3DCostFunction_h
#include "niftkNonLinearStereo3DCostFunction.h"
#include "niftkNonLinearNoIntrinsicsCostFunction.h"
#include <Internal/niftkNonLinearStereo3DCostFunction.h>
#include <Internal/niftkNonLinearNoIntrinsicsCostFunction.h>
namespace niftk
{
......
......@@ -16,10 +16,10 @@
#include "niftkNiftyCalExceptionMacro.h"
#ifdef NIFTYCAL_WITH_ITK
#include <Internal/niftkNonLinearMaltiHandEyeOptimiser.h>
#include <Internal/niftkNonLinearNDOFHandEyeOptimiser.h>
#include <Internal/niftkNonLinearStereoHandEye2DOptimiser.h>
#include <Internal/niftkNonLinearStereoHandEye3DOptimiser.h>
#include <Internal/HandEye/niftkNonLinearMaltiHandEyeOptimiser.h>
#include <Internal/HandEye/niftkNonLinearNDOFHandEyeOptimiser.h>
#include <Internal/HandEye/niftkNonLinearStereoHandEye2DOptimiser.h>
#include <Internal/HandEye/niftkNonLinearStereoHandEye3DOptimiser.h>
#endif
namespace niftk {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment