Commit 40c359fb authored by snuverink_j's avatar snuverink_j
Browse files

attribute Distribution::TYPE is now an UpperCaseString

parent e7648a59
...@@ -34,7 +34,7 @@ TEST(BinomialTest, FullSigmaTest1) { ...@@ -34,7 +34,7 @@ TEST(BinomialTest, FullSigmaTest1) {
Distribution dist; Distribution dist;
Attributes::setString(dist.itsAttr[Attrib::Distribution::TYPE], "BINOMIAL"); Attributes::setUpperCaseString(dist.itsAttr[Attrib::Distribution::TYPE], "BINOMIAL");
Attributes::setReal(dist.itsAttr[Attrib::Distribution::MX], 999999999.9); Attributes::setReal(dist.itsAttr[Attrib::Distribution::MX], 999999999.9);
Attributes::setReal(dist.itsAttr[Attrib::Distribution::MY], 999999999.9); Attributes::setReal(dist.itsAttr[Attrib::Distribution::MY], 999999999.9);
Attributes::setReal(dist.itsAttr[Attrib::Distribution::MZ], 999999999.9); Attributes::setReal(dist.itsAttr[Attrib::Distribution::MZ], 999999999.9);
...@@ -114,7 +114,7 @@ TEST(BinomialTest, FullSigmaTest2) { ...@@ -114,7 +114,7 @@ TEST(BinomialTest, FullSigmaTest2) {
Distribution dist; Distribution dist;
Attributes::setString(dist.itsAttr[Attrib::Distribution::TYPE], "BINOMIAL"); Attributes::setUpperCaseString(dist.itsAttr[Attrib::Distribution::TYPE], "BINOMIAL");
Attributes::setReal(dist.itsAttr[Attrib::Distribution::MX], 1.0); Attributes::setReal(dist.itsAttr[Attrib::Distribution::MX], 1.0);
Attributes::setReal(dist.itsAttr[Attrib::Distribution::MY], 1.0); Attributes::setReal(dist.itsAttr[Attrib::Distribution::MY], 1.0);
Attributes::setReal(dist.itsAttr[Attrib::Distribution::MZ], 1.0); Attributes::setReal(dist.itsAttr[Attrib::Distribution::MZ], 1.0);
......
...@@ -15,7 +15,7 @@ TEST(GaussTest, FullSigmaTest1) { ...@@ -15,7 +15,7 @@ TEST(GaussTest, FullSigmaTest1) {
const double expectedR22 = 0.7998; const double expectedR22 = 0.7998;
const double expectedR33 = 2.498; const double expectedR33 = 2.498;
const double expectedR44 = 0.6212; const double expectedR44 = 0.6212;
const double expectedR55 = 1.537; const double expectedR55 = 1.537;
const double expectedR66 = 0.9457; const double expectedR66 = 0.9457;
const double expectedR21 = -0.40993; const double expectedR21 = -0.40993;
...@@ -34,7 +34,7 @@ TEST(GaussTest, FullSigmaTest1) { ...@@ -34,7 +34,7 @@ TEST(GaussTest, FullSigmaTest1) {
Distribution dist; Distribution dist;
Attributes::setString(dist.itsAttr[Attrib::Distribution::TYPE], "GAUSS"); Attributes::setUpperCaseString(dist.itsAttr[Attrib::Distribution::TYPE], "GAUSS");
Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAX], expectedR11 * 1e-3); Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAX], expectedR11 * 1e-3);
Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAPX], expectedR22); Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAPX], expectedR22);
Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAY], expectedR33 * 1e-3); Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAY], expectedR33 * 1e-3);
...@@ -112,7 +112,7 @@ TEST(GaussTest, FullSigmaTest2) { ...@@ -112,7 +112,7 @@ TEST(GaussTest, FullSigmaTest2) {
Distribution dist; Distribution dist;
Attributes::setString(dist.itsAttr[Attrib::Distribution::TYPE], "GAUSS"); Attributes::setUpperCaseString(dist.itsAttr[Attrib::Distribution::TYPE], "GAUSS");
Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAX], expectedR11 * 1e-3); Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAX], expectedR11 * 1e-3);
Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAPX], expectedR22); Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAPX], expectedR22);
Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAY], expectedR33 * 1e-3); Attributes::setReal(dist.itsAttr[Attrib::Distribution::SIGMAY], expectedR33 * 1e-3);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment