defer all but 1 cube pruning variant

This commit is contained in:
Hieu Hoang 2016-02-26 19:22:28 +00:00
parent e139e9ad00
commit 1de7f233e8
27 changed files with 28 additions and 17 deletions

View File

@ -93,11 +93,18 @@
</tool>
</toolChain>
</folderInfo>
<fileInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.1097293041.1189716504" name="Main.cpp" rcbsApplicability="disable" resourcePath="Main.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1686613508.1641877958">
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1686613508.1641877958" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1686613508"/>
</fileInfo>
<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.1097293041.337384280" name="/" resourcePath="defer">
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.debug.1629072476" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.debug" unusedChildren="">
<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.913460624" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler.1430831084"/>
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.2009657762" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1686613508"/>
<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1050606413" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker.1439481930"/>
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1017699267" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker.351063004"/>
<tool id="cdt.managedbuild.tool.gnu.cross.archiver.1834709584" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver.1028669671"/>
<tool id="cdt.managedbuild.tool.gnu.cross.assembler.319604431" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler.917359146"/>
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="Main.cpp|CreateProbingPT2.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="defer|Main.cpp|CreateProbingPT2.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>

View File

@ -51,21 +51,21 @@ alias deps : ../../..//z ../../..//boost_iostreams ../../..//boost_filesystem .
PhraseBased/CubePruningMiniStack/Search.cpp
PhraseBased/CubePruningMiniStack/Stack.cpp
PhraseBased/CubePruningCardinalStack/Misc.cpp
PhraseBased/CubePruningCardinalStack/Search.cpp
PhraseBased/CubePruningCardinalStack/Stack.cpp
# PhraseBased/CubePruningCardinalStack/Misc.cpp
# PhraseBased/CubePruningCardinalStack/Search.cpp
# PhraseBased/CubePruningCardinalStack/Stack.cpp
PhraseBased/CubePruningBitmapStack/Misc.cpp
PhraseBased/CubePruningBitmapStack/Search.cpp
PhraseBased/CubePruningBitmapStack/Stack.cpp
# PhraseBased/CubePruningBitmapStack/Misc.cpp
# PhraseBased/CubePruningBitmapStack/Search.cpp
# PhraseBased/CubePruningBitmapStack/Stack.cpp
PhraseBased/CubePruningPerBitmap/Misc.cpp
PhraseBased/CubePruningPerBitmap/Search.cpp
PhraseBased/CubePruningPerBitmap/Stacks.cpp
# PhraseBased/CubePruningPerBitmap/Misc.cpp
# PhraseBased/CubePruningPerBitmap/Search.cpp
# PhraseBased/CubePruningPerBitmap/Stacks.cpp
PhraseBased/CubePruningPerMiniStack/Misc.cpp
PhraseBased/CubePruningPerMiniStack/Search.cpp
PhraseBased/CubePruningPerMiniStack/Stacks.cpp
# PhraseBased/CubePruningPerMiniStack/Misc.cpp
# PhraseBased/CubePruningPerMiniStack/Search.cpp
# PhraseBased/CubePruningPerMiniStack/Stacks.cpp
legacy/Bitmap.cpp
legacy/Bitmaps.cpp

View File

@ -10,10 +10,12 @@
#include "Manager.h"
#include "Normal/Search.h"
#include "CubePruningMiniStack/Search.h"
/*
#include "CubePruningPerMiniStack/Search.h"
#include "CubePruningPerBitmap/Search.h"
#include "CubePruningCardinalStack/Search.h"
#include "CubePruningBitmapStack/Search.h"
*/
#include "../System.h"
#include "../TargetPhrases.h"
#include "../Phrase.h"
@ -99,7 +101,8 @@ void Manager::Init()
case CubePruningMiniStack:
m_search = new NSCubePruningMiniStack::Search(*this);
break;
case CubePruningPerMiniStack:
/*
case CubePruningPerMiniStack:
m_search = new NSCubePruningPerMiniStack::Search(*this);
break;
case CubePruningPerBitmap:
@ -111,6 +114,7 @@ void Manager::Init()
case CubePruningBitmapStack:
m_search = new NSCubePruningBitmapStack::Search(*this);
break;
*/
default:
cerr << "Unknown search algorithm" << endl;
abort();