moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-09-11 11:25:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

more work on core feature support in FVector

Browse Source
This commit is contained in:
bhaddow 2011-08-26 16:17:55 +01:00
parent 6a22c2033c
commit ce98a6492d
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moses/src/FeatureVector.cpp
View File

@ -262,6 +262,7 @@ namespace Moses {
set(i->first,-(i->second));
}
}
m_coreFeatures -= rhs.m_coreFeatures;
return *this;
}
@ -271,6 +272,7 @@ namespace Moses {
FValue rhsValue = rhs.get(i->first);
set(i->first,lhsValue*rhsValue);
}
m_coreFeatures *= rhs.m_coreFeatures;
return *this;
}
@ -280,6 +282,7 @@ namespace Moses {
FValue rhsValue = rhs.get(i->first);
set(i->first, lhsValue / rhsValue) ;
}
m_coreFeatures /= rhs.m_coreFeatures;
return *this;
}
@ -300,6 +303,7 @@ namespace Moses {
for (iterator i = begin(); i != end(); ++i) {
i->second *= rhs;
}
m_coreFeatures *= rhs;
return *this;
}
@ -308,6 +312,7 @@ namespace Moses {
for (iterator i = begin(); i != end(); ++i) {
i->second /= rhs;
}
m_coreFeatures /= rhs;
return *this;
}

50
unittest/FeatureVectorTest.cpp
View File

@ -143,13 +143,61 @@ BOOST_AUTO_TEST_CASE(core_arith)
FVector sum = f1+f2;
FVector diff = f1-f2;
FVector prod = f1*f2;
FVector quot = f1/f2;
FVector quot = f2/f1;
BOOST_CHECK_CLOSE((FValue)sum[0], 1.6 , TOL);
BOOST_CHECK_CLOSE((FValue)sum[1], 0.15 , TOL);
BOOST_CHECK_CLOSE((FValue)sum[n1], 4.6 , TOL);
BOOST_CHECK_CLOSE((FValue)sum[n2], -1.5 , TOL);
BOOST_CHECK_CLOSE((FValue)diff[0], 0.6 , TOL);
BOOST_CHECK_CLOSE((FValue)diff[1], 0.35 , TOL);
BOOST_CHECK_CLOSE((FValue)diff[n1], 2.6 , TOL);
BOOST_CHECK_CLOSE((FValue)diff[n2], -1.5 , TOL);
BOOST_CHECK_CLOSE((FValue)prod[0], 0.55 , TOL);
BOOST_CHECK_CLOSE((FValue)prod[1], -0.025 , TOL);
BOOST_CHECK_CLOSE((FValue)prod[n1], 3.6 , TOL);
BOOST_CHECK_CLOSE((FValue)prod[n2], 0 , TOL);
BOOST_CHECK_CLOSE((FValue)quot[0], 0.4545454545 , TOL);
BOOST_CHECK_CLOSE((FValue)quot[1], -0.4 , TOL);
BOOST_CHECK_CLOSE((FValue)quot[n1], 0.277777777 , TOL);
BOOST_CHECK_CLOSE((FValue)quot[n2], 0 , TOL);
}
BOOST_AUTO_TEST_CASE(core_scalar)
{
FVector f1(3);
FName n1("a");
f1[0] = 1.5; f1[1] = 2.1; f1[2] = 4; f1[n1] = -0.5;
FVector prod = f1*2;
FVector quot = f1/5;
BOOST_CHECK_CLOSE((FValue)prod[0], 3 , TOL);
BOOST_CHECK_CLOSE((FValue)prod[1], 4.2 , TOL);
BOOST_CHECK_CLOSE((FValue)prod[2], 8 , TOL);
BOOST_CHECK_CLOSE((FValue)prod[n1],-1 , TOL);
BOOST_CHECK_CLOSE((FValue)quot[0], 0.3 , TOL);
BOOST_CHECK_CLOSE((FValue)quot[1], 0.42 , TOL);
BOOST_CHECK_CLOSE((FValue)quot[2], 0.8 , TOL);
BOOST_CHECK_CLOSE((FValue)quot[n1],-0.1 , TOL);
}
BOOST_AUTO_TEST_CASE(core_max)
{
FVector f1(2);
FVector f2(2);
FName n1("a");
FName n2("b");
FName n3("c");
f1[0] = 1.1; f1[1] = 0.25; ; f1[n2] = -1.5; f1[n3] = 2.2;
f2[0] = 0.5; f2[1] = -0.1; f2[n1] = 1; f2[n3] = 2.4;
FVector m = fvmax(f1,f2);
}
BOOST_AUTO_TEST_SUITE_END()