Ignore:
Timestamp:
Jul 31, 2010, 3:23:10 PM (14 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
8f4df1
Parents:
5fbaeb
Message:

Member variable Vector and element of class atom are now private.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/unittests/analysisbondsunittest.cpp

    r5fbaeb rd74077  
    1616#include <cstring>
    1717
    18 #include "World.hpp"
    1918#include "analysis_bonds.hpp"
    2019#include "analysisbondsunittest.hpp"
     
    2524#include "molecule.hpp"
    2625#include "periodentafel.hpp"
     26#include "vector.hpp"
    2727#include "World.hpp"
    2828
     
    5252  Walker = World::getInstance().createAtom();
    5353  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    54   Walker->type = hydrogen;
    55   *Walker->node = Vector(1.5, 0., 1.5 );
     54  Walker->setType(hydrogen);
     55  Walker->setPosition(Vector(1.5, 0., 1.5 ));
    5656  TestMolecule->AddAtom(Walker);
    5757  Walker = World::getInstance().createAtom();
    5858  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    59   Walker->type = hydrogen;
    60   *Walker->node = Vector(0., 1.5, 1.5 );
     59  Walker->setType(hydrogen);
     60  Walker->setPosition(Vector(0., 1.5, 1.5 ));
    6161  TestMolecule->AddAtom(Walker);
    6262  Walker = World::getInstance().createAtom();
    6363  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    64   Walker->type = hydrogen;
    65   *Walker->node = Vector(1.5, 1.5, 0. );
     64  Walker->setType(hydrogen);
     65  Walker->setPosition(Vector(1.5, 1.5, 0. ));
    6666  TestMolecule->AddAtom(Walker);
    6767  Walker = World::getInstance().createAtom();
    6868  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    69   Walker->type = hydrogen;
    70   *Walker->node = Vector(0., 0., 0. );
     69  Walker->setType(hydrogen);
     70  Walker->setPosition(Vector(0., 0., 0. ));
    7171  TestMolecule->AddAtom(Walker);
    7272  Walker = World::getInstance().createAtom();
    7373  CPPUNIT_ASSERT(Walker != NULL && "could not create atom");
    74   Walker->type = carbon;
    75   *Walker->node = Vector(0.5, 0.5, 0.5 );
     74  Walker->setType(carbon);
     75  Walker->setPosition(Vector(0.5, 0.5, 0.5 ));
    7676  TestMolecule->AddAtom(Walker);
    7777
Note: See TracChangeset for help on using the changeset viewer.