[Opal-commits] opal/src testSimulator.cpp,NONE,1.1 Makefile.am,1.2,1.3 Makefile.in,1.2,1.3

[Olex <ole...@us...>]

Update of /cvsroot/opal/opal/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28046/src

Modified Files:
	Makefile.am Makefile.in 
Added Files:
	testSimulator.cpp 
Log Message:
Added more unit tests.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/opal/opal/src/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	13 Nov 2005 18:51:20 -0000	1.2
--- Makefile.in	21 Nov 2005 13:59:16 -0000	1.3
***************
*** 66,70 ****
  PROGRAMS = $(bin_PROGRAMS)
  am_test_opal_OBJECTS = testopal.$(OBJEXT) testsolid.$(OBJEXT) \
! 	testAccelerationSensor.$(OBJEXT)
  test_opal_OBJECTS = $(am_test_opal_OBJECTS)
  test_opal_DEPENDENCIES =  \
--- 66,71 ----
  PROGRAMS = $(bin_PROGRAMS)
  am_test_opal_OBJECTS = testopal.$(OBJEXT) testsolid.$(OBJEXT) \
! 	testAccelerationSensor.$(OBJEXT) testRaycastSensor.$(OBJEXT) \
! 	testSimulator.$(OBJEXT)
  test_opal_OBJECTS = $(am_test_opal_OBJECTS)
  test_opal_DEPENDENCIES =  \
***************
*** 207,211 ****
  	VolumeSensor.cpp
  
! test_opal_SOURCES = testopal.cpp testsolid.cpp testAccelerationSensor.cpp
  test_opal_LDADD = $(top_builddir)/src/external/tinyxml/libtinyxml.a \
  	$(top_builddir)/src/ODE/libodeimpl.a $(top_builddir)/src/libopalode.a -lode
--- 208,214 ----
  	VolumeSensor.cpp
  
! test_opal_SOURCES = testopal.cpp testsolid.cpp testAccelerationSensor.cpp \
! 		testRaycastSensor.cpp testSimulator.cpp
! 
  test_opal_LDADD = $(top_builddir)/src/external/tinyxml/libtinyxml.a \
  	$(top_builddir)/src/ODE/libodeimpl.a $(top_builddir)/src/libopalode.a -lode
***************
*** 311,314 ****
--- 314,319 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VolumeSensor.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testAccelerationSensor.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testRaycastSensor.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testSimulator.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testopal.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testsolid.Po@am__quote@

--- NEW FILE: testSimulator.cpp ---
/*************************************************************************
*                                                                       *
* Open Physics Abstraction Layer                                        *
* Copyright (C) 2004-2005                                               *
* Alan Fischer  ala...@gm...                                  *
* Andres Reinot  an...@re...                                      *
* Tyler Streeter  tyl...@gm...                               *
* Oleksandr Lozitskiy mr....@gm...                            *
* All rights reserved.                                                  *
* Web: opal.sourceforge.net                                             *
*                                                                       *
* This library is free software; you can redistribute it and/or         *
* modify it under the terms of EITHER:                                  *
*   (1) The GNU Lesser General Public License as published by the Free  *
*       Software Foundation; either version 2.1 of the License, or (at  *
*       your option) any later version. The text of the GNU Lesser      *
*       General Public License is included with this library in the     *
*       file license-LGPL.txt.                                          *
*   (2) The BSD-style license that is included with this library in     *
*       the file license-BSD.txt.                                       *
*                                                                       *
* This library is distributed in the hope that it will be useful,       *
* but WITHOUT ANY WARRANTY; without even the implied warranty of        *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files    *
* license-LGPL.txt and license-BSD.txt for more details.                *
*                                                                       *
*************************************************************************/

// system headers
#include <quicktest.h>

// project headers
#include "opal.h"

using namespace opal;

namespace testSimulator
{
    QT_TEST( multi )
    {
        Simulator * sim1 = createSimulator();
        Simulator * sim2 = createSimulator();
        Simulator * sim3 = createSimulator();

        Vec3r g( 0, -10, 0 );
        sim1->setGravity( g );
        sim2->setGravity( g );
        sim3->setGravity( g );

        Solid * s1 = sim1->createSolid();
        Solid * s2 = sim2->createSolid();
        Solid * s3 = sim3->createSolid();

        SphereShapeData data;
        data.radius = 1;
        data.material.density = 1;
        s1->addShape( data );
        s2->addShape( data );
        s3->addShape( data );

        s1->setPosition( 0, 0, 0 );
        s2->setPosition( 0, 100, 0 );
        s3->setPosition( 0, 10000, 0 );

        int steps = 100;
        for ( int i = 0; i < steps; ++i )
        {
            sim1->simulate( 0.1 );
        }
        QT_CHECK_LESS( s1->getPosition() [ 1 ], 0 );
        QT_CHECK_EQUAL( s2->getPosition() [ 1 ], 100 );
        QT_CHECK_EQUAL( s3->getPosition() [ 1 ], 10000 );

        for ( int i = 0; i < steps; ++i )
        {
            sim2->simulate( 0.1 );
        }
        QT_CHECK_LESS( s1->getPosition() [ 1 ], 0 );
        QT_CHECK_LESS( s2->getPosition() [ 1 ], 100 );
        QT_CHECK_EQUAL( s3->getPosition() [ 1 ], 10000 );

        for ( int i = 0; i < steps; ++i )
        {
            sim3->simulate( 0.1 );
        }
        QT_CHECK_LESS( s1->getPosition() [ 1 ], 0 );
        QT_CHECK_LESS( s2->getPosition() [ 1 ], 100 );
        QT_CHECK_LESS( s3->getPosition() [ 1 ], 10000 );

        sim1->destroySolid( s1 );
        sim2->destroySolid( s2 );
        sim3->destroySolid( s3 );

        sim1->destroy();
        sim2->destroy();
        sim3->destroy();
    }
}

Index: Makefile.am
===================================================================
RCS file: /cvsroot/opal/opal/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	13 Nov 2005 18:51:20 -0000	1.2
--- Makefile.am	21 Nov 2005 13:59:16 -0000	1.3
***************
*** 15,19 ****
  	VolumeSensor.cpp
  bin_PROGRAMS = test_opal
! test_opal_SOURCES = testopal.cpp testsolid.cpp testAccelerationSensor.cpp
  test_opal_LDADD = $(top_builddir)/src/external/tinyxml/libtinyxml.a \
  	$(top_builddir)/src/ODE/libodeimpl.a $(top_builddir)/src/libopalode.a -lode
--- 15,20 ----
  	VolumeSensor.cpp
  bin_PROGRAMS = test_opal
! test_opal_SOURCES = testopal.cpp testsolid.cpp testAccelerationSensor.cpp \
! 		testRaycastSensor.cpp testSimulator.cpp
  test_opal_LDADD = $(top_builddir)/src/external/tinyxml/libtinyxml.a \
  	$(top_builddir)/src/ODE/libodeimpl.a $(top_builddir)/src/libopalode.a -lode