Skip to content

Commit

Permalink
Re #4956 & Re #4958. Clear compiler warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
RussellTaylor committed Mar 30, 2012
1 parent e10e02f commit 0417062
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/CurveFitting/src/Abragam.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void Abragam::functionMW(double* out, const double* xValues, const size_t nData)
const double& sig = getParameter("Sigma");
const double& t = getParameter("Tau");

for (int i = 0; i < nData; i++) {
for (size_t i = 0; i < nData; i++) {
double A1=A*cos(w*xValues[i]+phi);
double A2=-(sig*sig*t*t)*(exp(-xValues[i]/t)-1+(xValues[i]/t));
double A3=exp(A2);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void StaticKuboToyabe::functionMW(double* out, const double* xValues, const size
const double& G = getParameter("Delta");


for (int i = 0; i < nData; i++) {
for (size_t i = 0; i < nData; i++) {
out[i] = A*(exp(-pow(G*xValues[i],2)/2)*(1-pow(G*xValues[i],2))*2.0/3 + 1.0/3);
}

Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/CurveFitting/test/AbragamTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class AbragamTest : public CxxTest::TestSuite
TS_ASSERT( alg2.isExecuted() );

// test the output from fit is what you expect
double dummy = alg2.getProperty("OutputChi2overDoF");
//double dummy = alg2.getProperty("OutputChi2overDoF");
// TS_ASSERT_DELTA( dummy, 0.000001,0.000001);

// test the output from fit is what you expect
Expand Down

0 comments on commit 0417062

Please sign in to comment.