alex/CrossGen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New, improved scoring function. Works better, but can be improved

Browse Source
This commit is contained in:
Aleksey Lobanov
2015-06-28 16:03:48 +03:00
parent 1a272c5ab9
commit e0429bb034
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/crossgen.cpp
View File

@@ -112,15 +112,21 @@ void generateAllWords(const DictType &dict, AllWordsType &words_out,
// TODO: improve formula // TODO: improve formula
std::function< int(const wxString& ) > getWordScore = [freqs, freqs_sorted, char_cnt] std::function< int(const wxString& ) > getWordScore = [freqs, freqs_sorted, char_cnt]
(const wxString &s){ (const wxString &s){
double score = 0; double score = 1;
for (auto ch: s) for (auto ch: s)
score += 1 / pow(static_cast<double>(freqs.at(ch))/char_cnt,2); score *= static_cast<double>(freqs.at(ch))/char_cnt;
// static_cast<double>(freqs.at(ch))/char_cnt = normalaised frequency // static_cast<double>(freqs.at(ch))/char_cnt = normalaised frequency
// euristic fomula for good (not normal) // euristic fomula for good (not normal)
score = score / s.size() + pow(std::max((int(s.size())-12),0),1.4) *15;
if ( score > 1.2 * freqs.size() * freqs.size() ) score = std::pow(score, 1./s.size()); // score == mean geometric
return static_cast<int>(score); /* magic formula, linear interpolation from good numbers
* can be taken from Maxima code:
* solve ([33*k+m = 1/20.4, 26*k+m=1/19],[k,m]);
*/
if ( score > 64./969 - freqs.size()*1./1938 )
//if ( score > (1.3)* 1./(freqs.size() - 8))
return static_cast<int>(score * 1000);
else else
return -1; return -1;
}; };
@@ -176,7 +182,7 @@ void generateAllWords(const DictType &dict, AllWordsType &words_out,
} }
for (unsigned int i = 2; i < words_out.size(); ++i) for (unsigned int i = 2; i < words_out.size(); ++i)
wxLogDebug(wxT("With length %2d is %4d and after it %4d and coeff is %2.2f"), wxLogDebug(wxT("With length %2d is %5d and after it %4d and coeff is %2.2f"),
i, words_out_t.at(i).size(), words_out.at(i).size(), float(words_out_t.at(i).size())/words_out.at(i).size()); i, words_out_t.at(i).size(), words_out.at(i).size(), float(words_out_t.at(i).size())/words_out.at(i).size());
wxLogDebug(wxT("Number of words is %d"), dict.size()); wxLogDebug(wxT("Number of words is %d"), dict.size());

8
wxCrossGen/wxCrossGen.project
View File

@@ -41,6 +41,10 @@
<File Name="../src/crossexport.cpp"/> <File Name="../src/crossexport.cpp"/>
<File Name="../src/crossgen.cpp"/> <File Name="../src/crossgen.cpp"/>
</VirtualDirectory> </VirtualDirectory>
<VirtualDirectory Name="FormBuilderGUI">
<File Name="fbgui/fbgui.cpp"/>
<File Name="fbgui/fbgui.h"/>
</VirtualDirectory>
<Settings Type="Executable"> <Settings Type="Executable">
<GlobalSettings> <GlobalSettings>
<Compiler Options="-std=c++11" C_Options="" Assembler=""> <Compiler Options="-std=c++11" C_Options="" Assembler="">
@@ -127,8 +131,4 @@
</Completion> </Completion>
</Configuration> </Configuration>
</Settings> </Settings>
<VirtualDirectory Name="FormBuilderGUI">
<File Name="fbgui/fbgui.cpp"/>
<File Name="fbgui/fbgui.h"/>
</VirtualDirectory>
</CodeLite_Project> </CodeLite_Project>

2
wxCrossGen/wxCrossGen.txt
View File

@@ -1 +1 @@
../Release/main.cpp.o ../Release/fmain.cpp.o ../Release/fsettings.cpp.o ../Release/src_crossexport.cpp.o ../Release/src_crossgen.cpp.o ../Release/fbgui_fbgui.cpp.o ./Debug/main.cpp.o ./Debug/fmain.cpp.o ./Debug/fsettings.cpp.o ./Debug/src_crossexport.cpp.o ./Debug/src_crossgen.cpp.o ./Debug/fbgui_fbgui.cpp.o