Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/unittests/bondgraphunittest.cpp

    rd74077 r952f38  
    2323#include "bondgraph.hpp"
    2424#include "element.hpp"
    25 #include "log.hpp"
     25#include "Helpers/Log.hpp"
    2626#include "molecule.hpp"
    2727#include "periodentafel.hpp"
     
    5454  Walker = World::getInstance().createAtom();
    5555  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    56   Walker->setType(carbon);
    57   Walker->setPosition(Vector(1., 0., 1. ));
     56  Walker->type = carbon;
     57  *Walker->node = Vector(1., 0., 1. );
    5858  TestMolecule->AddAtom(Walker);
    5959
    6060  Walker = World::getInstance().createAtom();
    6161  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    62   Walker->setType(carbon);
    63   Walker->setPosition(Vector(0., 1., 1. ));
     62  Walker->type = carbon;
     63  *Walker->node = Vector(0., 1., 1. );
    6464  TestMolecule->AddAtom(Walker);
    6565
    6666  Walker = World::getInstance().createAtom();
    6767  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    68   Walker->setType(carbon);
    69   Walker->setPosition(Vector(1., 1., 0. ));
     68  Walker->type = carbon;
     69  *Walker->node = Vector(1., 1., 0. );
    7070  TestMolecule->AddAtom(Walker);
    7171
    7272  Walker = World::getInstance().createAtom();
    7373  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    74   Walker->setType(carbon);
    75   Walker->setPosition(Vector(0., 0., 0. ));
     74  Walker->type = carbon;
     75  *Walker->node = Vector(0., 0., 0. );
    7676  TestMolecule->AddAtom(Walker);
    7777
Note: See TracChangeset for help on using the changeset viewer.