Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-12-25 21:59:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compdic: little simplification

Browse source
This commit is contained in:
Olivier Teulière 2012-10-14 14:37:57 +02:00
parent 2663a62ecb
commit 6c57d9fe0e
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dic/compdic.cpp
View file

@ -188,16 +188,17 @@ Header CompDic::writeHeader(ostream &outFile) const
}
void CompDic::writeNode(uint32_t *ioEdges, unsigned int num, ostream &outFile)
void CompDic::writeNode(DicEdge *ioEdges, unsigned int num, ostream &outFile)
{
uint32_t *edgesAsUint = reinterpret_cast<uint32_t*>(ioEdges);
// Handle endianness
for (unsigned int i = 0; i < num; ++i)
{
ioEdges[i] = htonl(ioEdges[i]);
edgesAsUint[i] = htonl(edgesAsUint[i]);
}
LOG_TRACE(fmt("writing %1% edges") % num);
outFile.write((char*)ioEdges, num * sizeof(DicEdge));
outFile.write((char*)edgesAsUint, num * sizeof(DicEdge));
}
#define MAX_EDGES 2000
@ -324,8 +325,7 @@ unsigned int CompDic::makeNode(ostream &outFile, const Header &iHeader,
m_hashMap[edges] = m_headerInfo.edgesused;
m_headerInfo.edgesused += numedges;
m_headerInfo.nodesused++;
writeNode(reinterpret_cast<uint32_t*>(&edges.front()),
numedges, outFile);
writeNode(&edges.front(), numedges, outFile);
return node_pos;
}
@ -367,8 +367,7 @@ Header CompDic::generateDawg(const string &iWordListFile,
specialNode.last = 1;
// Temporary variable to avoid a warning when compiling with -O2
// (there is no warning with -O0... g++ bug?)
DicEdge *tmpPtr = &specialNode;
writeNode(reinterpret_cast<uint32_t*>(tmpPtr), 1, outFile);
writeNode(&specialNode, 1, outFile);
vector<wstring>::const_iterator firstWord = wordList.begin();
wstring::const_iterator initialPos = firstWord->begin();
@ -382,8 +381,7 @@ Header CompDic::generateDawg(const string &iWordListFile,
firstWord, wordList.end(),
initialPos, m_endString);
// Reuse the temporary variable
tmpPtr = &rootNode;
writeNode(reinterpret_cast<uint32_t*>(tmpPtr), 1, outFile);
writeNode(&rootNode, 1, outFile);
const clock_t endBuildTime = clock();
m_buildTime = 1.0 * (endBuildTime - startBuildTime) / CLOCKS_PER_SEC;

2
dic/compdic.h
View file

@ -126,7 +126,7 @@ private:
* @param num: number of edges in the array
* @param outFile: stream where to write the edges
*/
void writeNode(uint32_t *ioEdges, unsigned int num, ostream &outFile);
void writeNode(DicEdge *ioEdges, unsigned int num, ostream &outFile);
/**
* MakeNode takes a prefix (as position relative to m_stringBuf) and