Changeset 06b7d9 for src/Dynamics/unittests

Timestamp:

Nov 12, 2017, 8:48:40 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_with_BondGraph_continued_betteresults

Children:

30e1a4

Parents:

982e6d

git-author:

Frederik Heber <frederik.heber@…> (07/18/17 22:24:12)

git-committer:

Frederik Heber <frederik.heber@…> (11/12/17 08:48:40)

Message:

We now obtain weights via levmar minimization.

• this should yield the best possible weights within the interval of [1/n,1.].
• note that we cannot always get an exact solution because of this constraint.

Location:

src/Dynamics/unittests

Files:

• BondVectorsUnitTest.cpp (modified) (2 diffs)
• Makefile.am (modified) (1 diff)

src/Dynamics/unittests/BondVectorsUnitTest.cpp

@@ -197 +197 @@
   CPPUNIT_ASSERT( fabs(weight_sum - 1.) < MYEPSILON );
   // check weight
-  CPPUNIT_ASSERT_EQUAL( weights[0], 1. );
+  CPPUNIT_ASSERT( fabs(weight_sum - 1.) < 1e-10 );
 }
 
@@ -289 +289 @@
   // check number of weights
   CPPUNIT_ASSERT_EQUAL( weights.size(), (size_t)5 );
-  // check sum of weights: one linear independent, two dependent vectors = 1 + 2*0.5
-  const double weight_sum = std::accumulate(weights.begin(), weights.end(), 0.);
-  CPPUNIT_ASSERT( fabs(weight_sum - 2.) < 1e-10 );
-}
+  // check sum of weights
+  const double weight_sum = std::accumulate(weights.begin(), weights.end(), 0.);
+  CPPUNIT_ASSERT( fabs(weights[0] - .372244) < 1e-6 );
+  CPPUNIT_ASSERT( fabs(weights[1] - .529694) < 1e-6 );
+  CPPUNIT_ASSERT( fabs(weights[2] - .2) < 1e-6 );
+  CPPUNIT_ASSERT( fabs(weights[3] - .248464) < 1e-6 );
+  CPPUNIT_ASSERT( fabs(weights[4] - .248464) < 1e-6 );
+}

src/Dynamics/unittests/Makefile.am

@@ -11 +11 @@
   BondVectorsUnitTest
 
-XFAIL_TESTS += BondVectorsUnitTest
-  
 TESTS += $(DYNAMICSTESTS)
 check_PROGRAMS += $(DYNAMICSTESTS)