[dlvhex-notify] SF.net SVN: dlvhex:[3558] dlvhex-mergingplugin/branches/release2x

[<chr...@us...>]

Revision: 3558
          http://dlvhex.svn.sourceforge.net/dlvhex/?rev=3558&view=rev
Author:   chrisr86
Date:     2012-02-21 19:10:46 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
port to 2x trunk

Modified Paths:
--------------
    dlvhex-mergingplugin/branches/release2x/include/ArbProcess.h
    dlvhex-mergingplugin/branches/release2x/include/DLVHexProcess.h
    dlvhex-mergingplugin/branches/release2x/include/DlvhexSolver.h
    dlvhex-mergingplugin/branches/release2x/include/HexAnswerCache.h
    dlvhex-mergingplugin/branches/release2x/include/HexExecution.h
    dlvhex-mergingplugin/branches/release2x/include/IOperator.h
    dlvhex-mergingplugin/branches/release2x/include/OpDBO.h
    dlvhex-mergingplugin/branches/release2x/include/OpDalal.h
    dlvhex-mergingplugin/branches/release2x/include/OpMajoritySelection.h
    dlvhex-mergingplugin/branches/release2x/include/OpRelationMerging.h
    dlvhex-mergingplugin/branches/release2x/include/Operators.h
    dlvhex-mergingplugin/branches/release2x/include/PublicTypes.h
    dlvhex-mergingplugin/branches/release2x/src/HexAnswerCache.cpp
    dlvhex-mergingplugin/branches/release2x/src/HexExecution.cpp
    dlvhex-mergingplugin/branches/release2x/src/MergingPlugin.cpp
    dlvhex-mergingplugin/branches/release2x/src/OpDBO.cpp
    dlvhex-mergingplugin/branches/release2x/src/OpRelationMerging.cpp

Modified: dlvhex-mergingplugin/branches/release2x/include/ArbProcess.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/ArbProcess.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/ArbProcess.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -1,8 +1,8 @@
 #ifndef __ARBPROCESS_h_
 #define __ARBPROCESS_h_
 
-#include <dlvhex/Process.h>
-#include <dlvhex/DLVProcess.h>
+#include <dlvhex2/Process.h>
+#include <dlvhex2/DLVProcess.h>
 
 #include <stdio.h>
 

Modified: dlvhex-mergingplugin/branches/release2x/include/DLVHexProcess.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/DLVHexProcess.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/DLVHexProcess.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -1,8 +1,8 @@
 #ifndef __DLVHexProcess_h_
 #define __DLVHexProcess_h_
 
-#include <dlvhex/Process.h>
-#include <dlvhex/DLVProcess.h>
+#include <dlvhex2/Process.h>
+#include <dlvhex2/DLVProcess.h>
 
 #include <iostream>
 #include <sstream>

Modified: dlvhex-mergingplugin/branches/release2x/include/DlvhexSolver.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/DlvhexSolver.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/DlvhexSolver.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -3,10 +3,10 @@
 
 #include <dlvhex/ASPSolverManager.h>
 
-#include "dlvhex/Process.h"
-#include "dlvhex/ComfortPluginInterface.hpp"
-#include "dlvhex/DLVresultParserDriver.h"
-#include "dlvhex/PrintVisitor.h"
+#include "dlvhex2/Process.h"
+#include "dlvhex2/ComfortPluginInterface.h"
+#include "dlvhex2/DLVresultParserDriver.h"
+#include "dlvhex2/PrintVisitor.h"
 
 #include <iostream>
 #include <sstream>

Modified: dlvhex-mergingplugin/branches/release2x/include/HexAnswerCache.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/HexAnswerCache.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/HexAnswerCache.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -3,7 +3,7 @@
 
 #include <PublicTypes.h>
 #include <IOperator.h>
-#include <dlvhex/Registry.hpp>
+#include <dlvhex2/Registry.h>
 
 DLVHEX_NAMESPACE_USE
 

Modified: dlvhex-mergingplugin/branches/release2x/include/HexExecution.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/HexExecution.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/HexExecution.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -2,9 +2,9 @@
 #define __HEXEXECUTION_H_
 
 #include <HexAnswerCache.h>
-#include <dlvhex/PluginInterface.h>
-#include <dlvhex/ASPSolver.h>
-#include <dlvhex/ProgramCtx.h>
+#include <dlvhex2/PluginInterface.h>
+#include <dlvhex2/ASPSolver.h>
+#include <dlvhex2/ProgramCtx.h>
 #include <stdlib.h>
 #include <string>
 #include <map>

Modified: dlvhex-mergingplugin/branches/release2x/include/IOperator.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/IOperator.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/IOperator.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -2,7 +2,7 @@
 #define __IOPERATOR_H_
 
 #include "PublicTypes.h"
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
 #include <stdlib.h>
 #include <vector>
 #include <string>

Modified: dlvhex-mergingplugin/branches/release2x/include/OpDBO.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/OpDBO.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/OpDBO.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -3,8 +3,8 @@
 
 #include "IOperator.h"
 
-#include <dlvhex/Program.h>
-#include <dlvhex/AtomSet.h>
+#include <dlvhex2/Program.h>
+#include <dlvhex2/AtomSet.h>
 
 DLVHEX_NAMESPACE_USE
 

Modified: dlvhex-mergingplugin/branches/release2x/include/OpDalal.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/OpDalal.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/OpDalal.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -3,8 +3,8 @@
 
 #include "IOperator.h"
 
-#include <dlvhex/Program.h>
-#include <dlvhex/AtomSet.h>
+#include <dlvhex2/Program.h>
+#include <dlvhex2/AtomSet.h>
 
 DLVHEX_NAMESPACE_USE
 

Modified: dlvhex-mergingplugin/branches/release2x/include/OpMajoritySelection.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/OpMajoritySelection.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/OpMajoritySelection.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -3,8 +3,8 @@
 
 #include "IOperator.h"
 
-#include <dlvhex/Program.h>
-#include <dlvhex/AtomSet.h>
+#include <dlvhex2/Program.h>
+#include <dlvhex2/AtomSet.h>
 
 DLVHEX_NAMESPACE_USE
 

Modified: dlvhex-mergingplugin/branches/release2x/include/OpRelationMerging.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/OpRelationMerging.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/OpRelationMerging.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -3,8 +3,8 @@
 
 #include "IOperator.h"
 
-#include <dlvhex/Program.h>
-#include <dlvhex/AtomSet.h>
+#include <dlvhex2/Program.h>
+#include <dlvhex2/AtomSet.h>
 
 DLVHEX_NAMESPACE_USE
 

Modified: dlvhex-mergingplugin/branches/release2x/include/Operators.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/Operators.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/Operators.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -2,7 +2,7 @@
 #define __OPERATORS_H_
 
 #include <HexAnswerCache.h>
-#include <dlvhex/ComfortPluginInterface.hpp>
+#include <dlvhex2/ComfortPluginInterface.h>
 #include <stdlib.h>
 #include <vector>
 #include <IOperator.h>

Modified: dlvhex-mergingplugin/branches/release2x/include/PublicTypes.h
===================================================================
--- dlvhex-mergingplugin/branches/release2x/include/PublicTypes.h	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/include/PublicTypes.h	2012-02-21 19:10:46 UTC (rev 3558)
@@ -2,7 +2,7 @@
 #define __PUBLICTYPES_H_
 
 #include <vector>
-#include <dlvhex/PluginInterface.h>
+#include <dlvhex2/PluginInterface.h>
 
 DLVHEX_NAMESPACE_USE
 

Modified: dlvhex-mergingplugin/branches/release2x/src/HexAnswerCache.cpp
===================================================================
--- dlvhex-mergingplugin/branches/release2x/src/HexAnswerCache.cpp	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/src/HexAnswerCache.cpp	2012-02-21 19:10:46 UTC (rev 3558)
@@ -1,24 +1,24 @@
 #include <HexAnswerCache.h>
 
 #include <HexExecution.h>
-#include "dlvhex/HexParser.hpp"
-#include "dlvhex/InputProvider.hpp"
-#include "dlvhex/InternalGrounder.hpp"
-#include "dlvhex/InternalGroundDASPSolver.hpp"
-#include "dlvhex/ProgramCtx.h"
-#include "dlvhex/Registry.hpp"
-#include "dlvhex/PluginContainer.h"
-#include "dlvhex/ASPSolverManager.h"
-#include "dlvhex/ASPSolver.h"
-#include "dlvhex/State.h"
-#include "dlvhex/EvalGraphBuilder.hpp"
-#include "dlvhex/EvalHeuristicBase.hpp"
-#include "dlvhex/EvalHeuristicOldDlvhex.hpp"
-#include "dlvhex/EvalHeuristicTrivial.hpp"
-#include "dlvhex/EvalHeuristicEasy.hpp"
-#include "dlvhex/EvalHeuristicFromFile.hpp"
-#include "dlvhex/OnlineModelBuilder.hpp"
-#include "dlvhex/OfflineModelBuilder.hpp"
+#include "dlvhex2/HexParser.h"
+#include "dlvhex2/InputProvider.h"
+#include "dlvhex2/InternalGrounder.h"
+#include "dlvhex2/InternalGroundDASPSolver.h"
+#include "dlvhex2/ProgramCtx.h"
+#include "dlvhex2/Registry.h"
+#include "dlvhex2/PluginContainer.h"
+#include "dlvhex2/ASPSolverManager.h"
+#include "dlvhex2/ASPSolver.h"
+#include "dlvhex2/State.h"
+#include "dlvhex2/EvalGraphBuilder.h"
+#include "dlvhex2/EvalHeuristicBase.h"
+#include "dlvhex2/EvalHeuristicOldDlvhex.h"
+#include "dlvhex2/EvalHeuristicTrivial.h"
+#include "dlvhex2/EvalHeuristicEasy.h"
+#include "dlvhex2/EvalHeuristicFromFile.h"
+#include "dlvhex2/OnlineModelBuilder.h"
+#include "dlvhex2/OfflineModelBuilder.h"
 
 #include <fstream>
 #include <iostream>

Modified: dlvhex-mergingplugin/branches/release2x/src/HexExecution.cpp
===================================================================
--- dlvhex-mergingplugin/branches/release2x/src/HexExecution.cpp	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/src/HexExecution.cpp	2012-02-21 19:10:46 UTC (rev 3558)
@@ -6,26 +6,26 @@
 #include <sstream>
 #include <iostream>
 
-#include <dlvhex/Registry.hpp>
+#include <dlvhex2/Registry.h>
 
-#include "dlvhex/HexParser.hpp"
-#include "dlvhex/InputProvider.hpp"
-#include "dlvhex/InternalGrounder.hpp"
-#include "dlvhex/InternalGroundDASPSolver.hpp"
-#include "dlvhex/ProgramCtx.h"
-#include "dlvhex/Registry.hpp"
-#include "dlvhex/PluginContainer.h"
-#include "dlvhex/ASPSolverManager.h"
-#include "dlvhex/ASPSolver.h"
-#include "dlvhex/State.h"
-#include "dlvhex/EvalGraphBuilder.hpp"
-#include "dlvhex/EvalHeuristicBase.hpp"
-#include "dlvhex/EvalHeuristicOldDlvhex.hpp"
-#include "dlvhex/EvalHeuristicTrivial.hpp"
-#include "dlvhex/EvalHeuristicEasy.hpp"
-#include "dlvhex/EvalHeuristicFromFile.hpp"
-#include "dlvhex/OnlineModelBuilder.hpp"
-#include "dlvhex/OfflineModelBuilder.hpp"
+#include "dlvhex2/HexParser.h"
+#include "dlvhex2/InputProvider.h"
+#include "dlvhex2/InternalGrounder.h"
+#include "dlvhex2/InternalGroundDASPSolver.h"
+#include "dlvhex2/ProgramCtx.h"
+#include "dlvhex2/Registry.h"
+#include "dlvhex2/PluginContainer.h"
+#include "dlvhex2/ASPSolverManager.h"
+#include "dlvhex2/ASPSolver.h"
+#include "dlvhex2/State.h"
+#include "dlvhex2/EvalGraphBuilder.h"
+#include "dlvhex2/EvalHeuristicBase.h"
+#include "dlvhex2/EvalHeuristicOldDlvhex.h"
+#include "dlvhex2/EvalHeuristicTrivial.h"
+#include "dlvhex2/EvalHeuristicEasy.h"
+#include "dlvhex2/EvalHeuristicFromFile.h"
+#include "dlvhex2/OnlineModelBuilder.h"
+#include "dlvhex2/OfflineModelBuilder.h"
 
 using namespace dlvhex::merging::plugin;
 

Modified: dlvhex-mergingplugin/branches/release2x/src/MergingPlugin.cpp
===================================================================
--- dlvhex-mergingplugin/branches/release2x/src/MergingPlugin.cpp	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/src/MergingPlugin.cpp	2012-02-21 19:10:46 UTC (rev 3558)
@@ -13,7 +13,7 @@
 #include <ParseTreeNode.h>
 #include <CodeGenerator.h>
 
-#include <dlvhex/ProgramCtx.h>
+#include <dlvhex2/ProgramCtx.h>
 
 #include <boost/foreach.hpp>
 

Modified: dlvhex-mergingplugin/branches/release2x/src/OpDBO.cpp
===================================================================
--- dlvhex-mergingplugin/branches/release2x/src/OpDBO.cpp	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/src/OpDBO.cpp	2012-02-21 19:10:46 UTC (rev 3558)
@@ -1,13 +1,13 @@
 #include <OpDBO.h>
 
-#include <dlvhex/AggregateAtom.h>
-#include <dlvhex/DLVProcess.h>
-#include <dlvhex/ASPSolverManager.h>
-#include <dlvhex/ASPSolver.h>
-#include <dlvhex/Registry.h>
-#include <dlvhex/HexParserDriver.h>
+#include <dlvhex2/AggregateAtom.h>
+#include <dlvhex2/DLVProcess.h>
+#include <dlvhex2/ASPSolverManager.h>
+#include <dlvhex2/ASPSolver.h>
+#include <dlvhex2/Registry.h>
+#include <dlvhex2/HexParserDriver.h>
 
-#include <dlvhex/PrintVisitor.h>
+#include <dlvhex2/PrintVisitor.h>
 #include <DLVHexProcess.h>
 
 #include <iostream>

Modified: dlvhex-mergingplugin/branches/release2x/src/OpRelationMerging.cpp
===================================================================
--- dlvhex-mergingplugin/branches/release2x/src/OpRelationMerging.cpp	2012-02-21 18:01:35 UTC (rev 3557)
+++ dlvhex-mergingplugin/branches/release2x/src/OpRelationMerging.cpp	2012-02-21 19:10:46 UTC (rev 3558)
@@ -1,11 +1,11 @@
 #include "OpRelationMerging.h"
 
-#include <dlvhex/PrintVisitor.h>
-#include <dlvhex/AggregateAtom.h>
-#include <dlvhex/DLVProcess.h>
-#include <dlvhex/ASPSolver.h>
-#include <dlvhex/Registry.h>
-#include <dlvhex/HexParserDriver.h>
+#include <dlvhex2/PrintVisitor.h>
+#include <dlvhex2/AggregateAtom.h>
+#include <dlvhex2/DLVProcess.h>
+#include <dlvhex2/ASPSolver.h>
+#include <dlvhex2/Registry.h>
+#include <dlvhex2/HexParserDriver.h>
 
 #include <sstream>
 #include <set>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.