From 3e2fae832fab5fbbd3cbe435eade9e4650ad4355 Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Thu, 27 Sep 2018 15:00:56 +0200
Subject: [PATCH] Use Lattice static methods in LatticeUtils and adapt unittest
---
Core/Lattice/LatticeUtils.cpp | 3 +--
Tests/UnitTests/Core/Sample/LatticeUtilsTest.h | 14 +++++---------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/Core/Lattice/LatticeUtils.cpp b/Core/Lattice/LatticeUtils.cpp
index 8d7d7d49fc9..b14147a0fac 100644
--- a/Core/Lattice/LatticeUtils.cpp
+++ b/Core/Lattice/LatticeUtils.cpp
@@ -22,7 +22,6 @@ Lattice LatticeUtils::CreateFCCLattice(double lattice_constant,
std::unique_ptr<ILatticeOrientation> P_orientation(orientation.clone());
P_orientation->usePrimitiveLattice(prim_cubic);
auto rotation = P_orientation->transformationMatrix();
- double a = lattice_constant/2.0;
- Lattice fcc( {a, a, 0.0}, {0.0, a, a}, {a, 0.0, a} );
+ Lattice fcc = Lattice::createFCCLattice(lattice_constant);
return fcc.createTransformedLattice(rotation);
}
diff --git a/Tests/UnitTests/Core/Sample/LatticeUtilsTest.h b/Tests/UnitTests/Core/Sample/LatticeUtilsTest.h
index b38b2339d6c..b1180411371 100644
--- a/Tests/UnitTests/Core/Sample/LatticeUtilsTest.h
+++ b/Tests/UnitTests/Core/Sample/LatticeUtilsTest.h
@@ -20,9 +20,9 @@ TEST_F(LatticeUtilsTest, cubeAlignedFCCTest)
auto a2 = lattice.getBasisVectorB();
auto a3 = lattice.getBasisVectorC();
- kvector_t v1 { 1.0, 1.0, 0.0 };
- kvector_t v2 { 0.0, 1.0, 1.0 };
- kvector_t v3 { 1.0, 0.0, 1.0 };
+ kvector_t v1 { 0.0, 1.0, 1.0 };
+ kvector_t v2 { 1.0, 0.0, 1.0 };
+ kvector_t v3 { 1.0, 1.0, 0.0 };
EXPECT_EQ(a1, v1);
EXPECT_EQ(a2, v2);
@@ -39,12 +39,8 @@ TEST_F(LatticeUtilsTest, diagonalAlignedFCCTest)
auto a2 = lattice.getBasisVectorB();
auto a3 = lattice.getBasisVectorC();
- kvector_t v1 { 1.0, 1.0, 0.0 };
- kvector_t v2 { 0.0, 1.0, 1.0 };
- kvector_t v3 { 1.0, 0.0, 1.0 };
-
EXPECT_EQ(a1.z(), a2.z());
EXPECT_EQ(a2.z(), a3.z());
- EXPECT_EQ(a2.x(), a3.x());
- EXPECT_EQ(a2.y(), -a3.y());
+ EXPECT_EQ(a1.x(), a2.x());
+ EXPECT_EQ(a1.y(), -a2.y());
}
--
GitLab