Commit fddf36ec authored by David Gobbi's avatar David Gobbi
Browse files

Move vtkAmoebaMinimizer into Common to make it available to other kits

parent cfcb0864
......@@ -3,6 +3,7 @@ vtkAbstractMapper.cxx
vtkAbstractTransform.cxx
vtkActor2D.cxx
vtkActor2DCollection.cxx
vtkAmoebaMinimizer.cxx
vtkAssemblyNode.cxx
vtkAssemblyPath.cxx
vtkAssemblyPaths.cxx
......
......@@ -15,6 +15,7 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
otherCellTypes.cxx
otherFieldData.cxx
quadraticEvaluation.cxx
TestAmoebaMinimizer.cxx
TestImageIterator.cxx
TestContainers.cxx
TestReferenceCountedList.cxx
......
/*=========================================================================
Program: Visualization Toolkit
Module: AmoebaMinimizer.cxx
Module: TestAmoebaMinimizer.cxx
Language: C++
Date: $Date$
Version: $Revision$
......@@ -33,7 +33,7 @@ static void vtkFunctionToMinimize(void *arg)
minimizer->SetFunctionValue(r);
}
int AmoebaMinimizer(int argc, char*[])
int TestAmoebaMinimizer(int argc, char*[])
{
vtkAmoebaMinimizer *minimizer = vtkAmoebaMinimizer::New();
......
......@@ -16,10 +16,11 @@ ADD_TEST(TestArrays ${VTK_EXECUTABLE}
ADD_TEST(otherDataSetAttributes ${VTK_EXECUTABLE}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/otherDataSetAttributes.tcl
-A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
ADD_TEST(TestAmoebaMinimizer ${VTK_EXECUTABLE}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/TestAmoebaMinimizer.tcl)
ADD_TEST(PrintSelf-Common ${TCL_TCLSH}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
${VTK_SOURCE_DIR}/Common)
ADD_TEST(TestSetObjectMacro-Common ${TCL_TCLSH}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/FindString.tcl
"${VTK_SOURCE_DIR}/Common/vtk\\\\*.h"
......
......@@ -18,7 +18,7 @@
#include "vtkAmoebaMinimizer.h"
#include "vtkObjectFactory.h"
vtkCxxRevisionMacro(vtkAmoebaMinimizer, "1.5");
vtkCxxRevisionMacro(vtkAmoebaMinimizer, "1.1");
vtkStandardNewMacro(vtkAmoebaMinimizer);
//----------------------------------------------------------------------------
......
SET ( Hybrid_SRCS
vtk3DSImporter.cxx
vtk3DWidget.cxx
vtkAmoebaMinimizer.cxx
vtkArcPlotter.cxx
vtkBoxWidget.cxx
vtkCaptionActor2D.cxx
......
......@@ -2,7 +2,6 @@ SET(KIT Hybrid)
# add tests that do not require data
SET(MyTests
BoxWidget.cxx
AmoebaMinimizer.cxx
TestImplicitPlaneWidget.cxx
)
IF (VTK_DATA_ROOT)
......
......@@ -82,9 +82,6 @@ IF (VTK_USE_RENDERING)
ENDIF (VTK_USE_RENDERING)
ADD_TEST(TestAmoebaMinimizer ${VTK_EXECUTABLE}
${VTK_SOURCE_DIR}/Hybrid/Testing/Tcl/TestAmoebaMinimizer.tcl)
ADD_TEST(PrintSelf-Hybrid ${TCL_TCLSH}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/PrintSelfCheck.tcl
${VTK_SOURCE_DIR}/Hybrid)
......
Supports Markdown
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