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
        Candidate_v1.7.0
        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
      
      
        
          | Last change
 on this file since afd01c was             5f612ee, checked in by Frederik Heber <heber@…>, 16 years ago | 
        
          | 
Merge branch 'Analysis_PairCorrelation' into StructureRefactoring
 
Conflicts:
 
molecuilder/src/Makefile.ammolecuilder/src/World.cpp
 molecuilder/src/World.hpp
 molecuilder/src/boundary.cpp
 molecuilder/src/builder.cpp
 molecuilder/src/log.cpp
 molecuilder/src/moleculelist.cpp
 molecuilder/src/periodentafel.cpp
 molecuilder/src/tesselation.cpp
 molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
 molecuilder/src/unittests/Makefile.am
 molecuilder/src/unittests/bondgraphunittest.cpp
 molecuilder/src/unittests/gslvectorunittest.cpp
 molecuilder/src/unittests/logunittest.cpp
 molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp
 molecuilder/src/vector.cpp
 molecuilder/tests/Tesselations/defs.in
 
 
Conflicts have been many and too numerous to listen here, just the few general cases
 new molecule() replaced by World::getInstance().createMolecule()
new atom() replaced by World::getInstance().createAtom() where appropriate.
Some DoLog()s added interfered with changes to the message produced by Log() << Verbose(.) << ...
DoLog() has been erroneously added to TestRunner.cpp as well, there cout is appropriate
...
 
Additionally, there was a bug in atom::clone(), sort was set to atom::nr of the atom to clone not of the clone itself. This caused a failure of the fragmentation.
 
This merge has been fully checked from a clean build directory with subsequent configure,make all install and make check.It configures, compiles and runs all test cases and the test suite without errors.
 
 
Signed-off-by: Frederik Heber <heber@…>
 | 
        
          | 
              
Property                 mode
 set to                 100644 | 
        
          | File size:
            1.1 KB | 
      
      
| Rev | Line |  | 
|---|
| [e9c677] | 1 | /* | 
|---|
|  | 2 | * tesselation_boundarytriangleunittest.hpp | 
|---|
|  | 3 | * | 
|---|
|  | 4 | *  Created on: Jan 13, 2010 | 
|---|
|  | 5 | *      Author: heber | 
|---|
|  | 6 | */ | 
|---|
|  | 7 |  | 
|---|
|  | 8 | #ifndef TESSELATION_BOUNDARYTRIANGLEUNITTEST_HPP_ | 
|---|
|  | 9 | #define TESSELATION_BOUNDARYTRIANGLEUNITTEST_HPP_ | 
|---|
|  | 10 |  | 
|---|
|  | 11 | /*********************************************** includes ***********************************/ | 
|---|
|  | 12 |  | 
|---|
|  | 13 | #include <cppunit/extensions/HelperMacros.h> | 
|---|
|  | 14 |  | 
|---|
|  | 15 | #include "linkedcell.hpp" | 
|---|
|  | 16 | #include "tesselation.hpp" | 
|---|
|  | 17 |  | 
|---|
|  | 18 | /********************************************** Test classes **************************************/ | 
|---|
|  | 19 |  | 
|---|
|  | 20 | class TesselationBoundaryTriangleTest : public CppUnit::TestFixture | 
|---|
|  | 21 | { | 
|---|
|  | 22 | CPPUNIT_TEST_SUITE( TesselationBoundaryTriangleTest) ; | 
|---|
|  | 23 | CPPUNIT_TEST ( GetClosestPointOnPlaneTest ); | 
|---|
|  | 24 | CPPUNIT_TEST ( GetClosestPointOffPlaneTest ); | 
|---|
|  | 25 | CPPUNIT_TEST_SUITE_END(); | 
|---|
|  | 26 |  | 
|---|
|  | 27 | public: | 
|---|
|  | 28 | void setUp(); | 
|---|
|  | 29 | void tearDown(); | 
|---|
|  | 30 | void GetClosestPointOnPlaneTest(); | 
|---|
|  | 31 | void GetClosestPointOffPlaneTest(); | 
|---|
|  | 32 |  | 
|---|
|  | 33 | private: | 
|---|
|  | 34 | class BoundaryTriangleSet *triangle; | 
|---|
|  | 35 | class BoundaryLineSet *lines[3]; | 
|---|
|  | 36 | class BoundaryPointSet *points[3]; | 
|---|
| [5c8592] | 37 | class TesselPoint *tesselpoints[3]; | 
|---|
| [734816] | 38 | LinkedCell::LinkedNodes Corners; | 
|---|
| [e9c677] | 39 | }; | 
|---|
|  | 40 |  | 
|---|
|  | 41 |  | 
|---|
|  | 42 | #endif /* TESSELATION_BOUNDARYTRIANGLEUNITTEST_HPP_ */ | 
|---|
       
      
  Note:
 See   
TracBrowser
 for help on using the repository browser.