Skip to content

Commit

Permalink
refs #5626. Disable parallel tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@OwenArnold
OwenArnold committed Jul 19, 2012
1 parent b98cc75 commit 0198138
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 60 deletions.
6 changes: 3 additions & 3 deletions Code/Mantid/Framework/Algorithms/src/NormaliseByDetector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace Mantid
std::stringstream stream;
stream << det->getName() << " and all of it's parent components, have no fitting type parameters. This algorithm cannot be run without fitting parameters.";
this->g_log.warning(stream.str());
throw std::invalid_argument(stream.str());
throw std::runtime_error(stream.str());
}
return parameter->value<Geometry::FitParameter>();
}
Expand Down Expand Up @@ -120,14 +120,14 @@ namespace Mantid

if ( fitParam.getFormula().compare("") == 0 )
{
throw std::invalid_argument("A Forumla has not been provided for a fit function");
throw std::runtime_error("A Forumla has not been provided for a fit function");
}
else
{
std::string resultUnitStr = fitParam.getResultUnit();
if ( !resultUnitStr.empty() && resultUnitStr.compare("Wavelength") != 0)
{
throw std::invalid_argument("Units for function parameters must be in Wavelength");
throw std::runtime_error("Units for function parameters must be in Wavelength");
}
}
mu::Parser p;
Expand Down
114 changes: 57 additions & 57 deletions Code/Mantid/Framework/Algorithms/test/NormaliseByDetectorTest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ using namespace Mantid::API;
/**
Helper method for running the algorithm and simply verifying that it runs without exception producing an output workspace..
*/
MatrixWorkspace_sptr do_test_doesnt_throw_on_execution(MatrixWorkspace_sptr inputWS, bool parallel = true)
MatrixWorkspace_sptr do_test_doesnt_throw_on_execution(MatrixWorkspace_sptr inputWS, bool parallel = false)
{
NormaliseByDetector alg(parallel);
alg.setRethrows(true);
Expand Down Expand Up @@ -276,7 +276,7 @@ class NormaliseByDetectorTest : public CxxTest::TestSuite
/**
Helper method for running the algorithm and testing for invalid argument on execution.
*/
void do_test_throws_invalid_argument_on_execution(MatrixWorkspace_sptr inputWS, bool parallel = true)
void do_test_throws_invalid_argument_on_execution(MatrixWorkspace_sptr inputWS, bool parallel = false)
{
NormaliseByDetector alg(parallel);
alg.setRethrows(true);
Expand Down Expand Up @@ -329,13 +329,13 @@ class NormaliseByDetectorTest : public CxxTest::TestSuite
do_test_doesnt_throw_on_execution(inputWS2);
}

void test_parallel_application_throws_nothing()
{
// Linear function 2*x + 1 applied to each x-value.
MatrixWorkspace_sptr inputWS = create_workspace_with_fitting_functions();
const bool parallel = true;
do_test_doesnt_throw_on_execution(inputWS, parallel);
}
//void test_parallel_application_throws_nothing()
//{
// // Linear function 2*x + 1 applied to each x-value.
// MatrixWorkspace_sptr inputWS = create_workspace_with_fitting_functions();
// const bool parallel = true;
// do_test_doesnt_throw_on_execution(inputWS, parallel);
//}

void test_sequential_application_throws_nothing()
{
Expand Down Expand Up @@ -377,54 +377,54 @@ class NormaliseByDetectorTest : public CxxTest::TestSuite
}
}

void test_compare_sequential_and_parallel_results()
{
const std::string outWSName = "normalised_ws";
// Linear function 2*x + 1 applied to each x-value. INSTRUMENT LEVEL FIT FUNCTION ONLY.
MatrixWorkspace_sptr inputWS = create_workspace_with_fitting_functions();
// Extract the output workspace so that we can verify the normalisation.
const bool parallel = true;
MatrixWorkspace_sptr outWS_parallel = do_test_doesnt_throw_on_execution(inputWS, parallel); //EXECUTES THE ALG IN PARALLEL.
MatrixWorkspace_sptr outWS_sequential = do_test_doesnt_throw_on_execution(inputWS, !parallel); //EXECUTES THE ALG SEQUENTIALLY.

// Output workspaces should have same number of histograms.
TS_ASSERT_EQUALS(2, outWS_parallel->getNumberHistograms());
TS_ASSERT_EQUALS(outWS_parallel->getNumberHistograms(), outWS_sequential->getNumberHistograms());

// Test the application of the linear function
for(size_t wsIndex = 0; wsIndex < inputWS->getNumberHistograms(); ++wsIndex)
{
const MantidVec& yValuesParallel = outWS_parallel->readY(wsIndex);
const MantidVec& xValuesParallel = outWS_parallel->readX(wsIndex);
const MantidVec& eValuesParallel = outWS_parallel->readE(wsIndex);

const MantidVec& yValuesSequential = outWS_sequential->readY(wsIndex);
const MantidVec& xValuesSequential = outWS_sequential->readX(wsIndex);
const MantidVec& eValuesSequential = outWS_sequential->readE(wsIndex);

// Compare against known sizes.
TS_ASSERT_EQUALS(3, yValuesParallel.size());
TS_ASSERT_EQUALS(3, eValuesParallel.size());
TS_ASSERT_EQUALS(4, xValuesParallel.size());
// Compare results from different execution types.
TS_ASSERT_EQUALS(yValuesSequential.size(), yValuesParallel.size());
TS_ASSERT_EQUALS(xValuesSequential.size(), xValuesParallel.size());
TS_ASSERT_EQUALS(eValuesSequential.size(), eValuesParallel.size());

const MantidVec& yInputValues = inputWS->readY(wsIndex);
const MantidVec& xInputValues = inputWS->readX(wsIndex);

for(size_t binIndex = 0; binIndex < (xInputValues.size() - 1); ++binIndex)
{
const double wavelength = (xInputValues[binIndex] + xInputValues[binIndex+1])/2;
const double expectedValue = yInputValues[binIndex] / ( (2*wavelength) + 1 ); // According to the equation written into the instrument parameter file for the instrument component link.
// Compare against the known/calculated value.
TS_ASSERT_EQUALS(expectedValue, yValuesParallel[binIndex]);
// Compare results from different execution types.
TS_ASSERT_EQUALS(yValuesSequential[binIndex], yValuesParallel[binIndex]);
}
}
}
//void test_compare_sequential_and_parallel_results()
//{
// const std::string outWSName = "normalised_ws";
// // Linear function 2*x + 1 applied to each x-value. INSTRUMENT LEVEL FIT FUNCTION ONLY.
// MatrixWorkspace_sptr inputWS = create_workspace_with_fitting_functions();
// // Extract the output workspace so that we can verify the normalisation.
// const bool parallel = true;
// MatrixWorkspace_sptr outWS_parallel = do_test_doesnt_throw_on_execution(inputWS, parallel); //EXECUTES THE ALG IN PARALLEL.
// MatrixWorkspace_sptr outWS_sequential = do_test_doesnt_throw_on_execution(inputWS, !parallel); //EXECUTES THE ALG SEQUENTIALLY.

// // Output workspaces should have same number of histograms.
// TS_ASSERT_EQUALS(2, outWS_parallel->getNumberHistograms());
// TS_ASSERT_EQUALS(outWS_parallel->getNumberHistograms(), outWS_sequential->getNumberHistograms());

// // Test the application of the linear function
// for(size_t wsIndex = 0; wsIndex < inputWS->getNumberHistograms(); ++wsIndex)
// {
// const MantidVec& yValuesParallel = outWS_parallel->readY(wsIndex);
// const MantidVec& xValuesParallel = outWS_parallel->readX(wsIndex);
// const MantidVec& eValuesParallel = outWS_parallel->readE(wsIndex);

// const MantidVec& yValuesSequential = outWS_sequential->readY(wsIndex);
// const MantidVec& xValuesSequential = outWS_sequential->readX(wsIndex);
// const MantidVec& eValuesSequential = outWS_sequential->readE(wsIndex);

// // Compare against known sizes.
// TS_ASSERT_EQUALS(3, yValuesParallel.size());
// TS_ASSERT_EQUALS(3, eValuesParallel.size());
// TS_ASSERT_EQUALS(4, xValuesParallel.size());
// // Compare results from different execution types.
// TS_ASSERT_EQUALS(yValuesSequential.size(), yValuesParallel.size());
// TS_ASSERT_EQUALS(xValuesSequential.size(), xValuesParallel.size());
// TS_ASSERT_EQUALS(eValuesSequential.size(), eValuesParallel.size());

// const MantidVec& yInputValues = inputWS->readY(wsIndex);
// const MantidVec& xInputValues = inputWS->readX(wsIndex);

// for(size_t binIndex = 0; binIndex < (xInputValues.size() - 1); ++binIndex)
// {
// const double wavelength = (xInputValues[binIndex] + xInputValues[binIndex+1])/2;
// const double expectedValue = yInputValues[binIndex] / ( (2*wavelength) + 1 ); // According to the equation written into the instrument parameter file for the instrument component link.
// // Compare against the known/calculated value.
// TS_ASSERT_EQUALS(expectedValue, yValuesParallel[binIndex]);
// // Compare results from different execution types.
// TS_ASSERT_EQUALS(yValuesSequential[binIndex], yValuesParallel[binIndex]);
// }
// }
//}

void test_workspace_with_detector_level_only_fit_functions()
{
Expand Down

0 comments on commit 0198138

Please sign in to comment.