almost done with hyper cxx module, part II

Author: igormcoelho

include/OptFrame/Heuristics.hpp

@@ -39,6 +39,11 @@
 //
 #include "Heuristics/EA/RK/BRKGA.hpp"
 //
+// GRASP
+//
+#include "Heuristics/GRASP/GRASPFamily.h"
+#include "Heuristics/GRASP/GRConstructive.hpp"
+//
 // MO
 //
 #include "Heuristics/EmptyMultiObjSearch.hpp"

include/OptFrame/Heuristics/GRASP/BasicGRASP.hpp

@@ -3,6 +3,9 @@
 
 #ifndef OPTFRAME_HEURISTICS_GRASP_BASICGRASP_HPP_
 #define OPTFRAME_HEURISTICS_GRASP_BASICGRASP_HPP_
+
+#if (__cplusplus < 202302L) || defined(NO_CXX_MODULES)
+
 // C
 // C++
 #include <string>
@@ -16,6 +19,22 @@
 #include "GRASPFamily.h"
 #include "GRConstructive.hpp"
 
+#define MOD_EXPORT
+#else
+
+// CANNOT IMPORT HERE... Already part of optframe.core
+/*
+import std;
+import optframe.component;
+import optframe.concepts;
+*/
+
+// do NOT export modules on .hpp... only on .cppm
+
+#define MOD_EXPORT export
+
+#endif
+
 namespace optframe {
 
 // GRASP requires S space interaction
@@ -163,7 +182,7 @@ class BasicGRASPBuilder : public GRASP, public SingleObjSearchBuilder<XES> {
 
     std::string rest = scanner.rest();
 
-    pair<sptr<LocalSearch<XES>>, std::string> method;
+    std::pair<sptr<LocalSearch<XES>>, std::string> method;
     method = hf.createLocalSearch(rest);
 
     sptr<LocalSearch<XES>> h = method.first;
@@ -184,13 +203,13 @@ class BasicGRASPBuilder : public GRASP, public SingleObjSearchBuilder<XES> {
 
   std::vector<std::pair<std::string, std::string>> parameters() override {
     std::vector<std::pair<std::string, std::string>> params;
-    params.push_back(
-        make_pair(GeneralEvaluator<XES>::idComponent(), "evaluation function"));
+    params.push_back(std::make_pair(GeneralEvaluator<XES>::idComponent(),
+                                    "evaluation function"));
     params.push_back(
         std::make_pair(GRConstructive<S>::idComponent(),
                        "greedy randomized constructive heuristic"));
     params.push_back(
-        make_pair(LocalSearch<XES>::idComponent(), "local search"));
+        std::make_pair(LocalSearch<XES>::idComponent(), "local search"));
     params.push_back(std::make_pair("OptFrame:float", "alpha parameter [0,1]"));
     params.push_back(
         std::make_pair("OptFrame:int", "max number of iterations"));

include/OptFrame/Heuristics/GRASP/GRASP.h

@@ -1,47 +1,40 @@
-// OptFrame - Optimization Framework
-
-// Copyright (C) 2009, 2010, 2011
-// http://optframe.sourceforge.net/
-//
-// This file is part of the OptFrame optimization framework. This framework
-// is free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License v3 as published by the
-// Free Software Foundation.
-
-// This framework is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License v3 for more details.
-
-// You should have received a copy of the GNU Lesser General Public License v3
-// along with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
+// SPDX-License-Identifier: LGPL-3.0-or-later OR MIT
+// Copyright (C) 2007-2025 - OptFrame - https://github.com/optframe/optframe
 
 #ifndef OPTFRAME_GRASPH_H_
 #define OPTFRAME_GRASPH_H_
 
-#include <string.h>
+#if (__cplusplus < 202302L) || defined(NO_CXX_MODULES)
 
-using namespace std;
-//GRASPH ? TODO FIX THE NAME
+#include <string>
 
-namespace optframe
-{
+#define MOD_EXPORT
+#else
 
-class GRASPH
-{
-public:
-	static string family()
-	{
-		return "GRASPH:";
-	}
+// CANNOT IMPORT HERE... Already part of optframe.core
+/*
+import std;
+import optframe.component;
+import optframe.concepts;
+*/
 
-	virtual ~GRASPH()
-	{
-	}
+// do NOT export modules on .hpp... only on .cppm
+
+#define MOD_EXPORT export
+
+#endif
+
+// GRASPH ? TODO FIX THE NAME
+
+namespace optframe {
+
+class GRASPH {
+ public:
+  static std::string family() { return "GRASPH:"; }
+
+  virtual ~GRASPH() {}
 };
 
-}
+}  // namespace optframe
 
 #endif /*OPTFRAME_GRASPH_H_*/

include/OptFrame/Heuristics/GRASP/GRASPFamily.h

@@ -1,48 +1,40 @@
-// OptFrame 4.2 - Optimization Framework
-// Copyright (C) 2009-2021 - MIT LICENSE
-// https://github.com/optframe/optframe
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// SPDX-License-Identifier: LGPL-3.0-or-later OR MIT
+// Copyright (C) 2007-2025 - OptFrame - https://github.com/optframe/optframe
 
 #ifndef OPTFRAME_GRASP_FAMILY_H_
 #define OPTFRAME_GRASP_FAMILY_H_
 
-#include <string.h>
+#if (__cplusplus < 202302L) || defined(NO_CXX_MODULES)
 
-using namespace std;
-//GRASPH ? TODO FIX THE NAME
+#include <string>
+
+#define MOD_EXPORT
+#else
+
+// CANNOT IMPORT HERE... Already part of optframe.core
+/*
+import std;
+import optframe.component;
+import optframe.concepts;
+*/
+
+// do NOT export modules on .hpp... only on .cppm
+
+#define MOD_EXPORT export
+
+#endif
+
+// GRASPH ? TODO FIX THE NAME
 
 namespace optframe {
 
-class GRASP
-{
-public:
-   static string family()
-   {
-      return "GRASP";
-   }
-
-   virtual ~GRASP()
-   {
-   }
+MOD_EXPORT class GRASP {
+ public:
+  static std::string family() { return "GRASP"; }
+
+  virtual ~GRASP() {}
 };
 
-}
+}  // namespace optframe
 
 #endif /*OPTFRAME_GRASP_FAMILY_H_*/

include/OptFrame/Heuristics/GRASP/GRConstructive.hpp

@@ -1,37 +1,36 @@
-// OptFrame 4.2 - Optimization Framework
-// Copyright (C) 2009-2021 - MIT LICENSE
-// https://github.com/optframe/optframe
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// SPDX-License-Identifier: LGPL-3.0-or-later OR MIT
+// Copyright (C) 2007-2025 - OptFrame - https://github.com/optframe/optframe
 
 #ifndef OPTFRAME_GREEDY_RANDOMIZED_CONSTRUCTIVE_H_
 #define OPTFRAME_GREEDY_RANDOMIZED_CONSTRUCTIVE_H_
 
+#if (__cplusplus < 202302L) || defined(NO_CXX_MODULES)
+
 #include <OptFrame/Core/Constructive.hpp>
 #include <OptFrame/Helper/Solution.hpp>
 
 #include "GRASPFamily.h"
 
+#define MOD_EXPORT
+#else
+
+// CANNOT IMPORT HERE... Already part of optframe.core
+/*
+import std;
+import optframe.component;
+import optframe.concepts;
+*/
+
+// do NOT export modules on .hpp... only on .cppm
+
+#define MOD_EXPORT export
+
+#endif
+
 namespace optframe {
 
 // Greedy Randomized Constructive
-template <XSolution S>
+MOD_EXPORT template <XSolution S>
 class GRConstructive : public Constructive<S>, public GRASP {
  public:
   virtual ~GRConstructive() {}

include/OptFrame/Heuristics/ILS/BasicILSPerturbation.hpp

@@ -4,6 +4,8 @@
 #ifndef OPTFRAME_HEURISTICS_ILS_BASICILSPERTURBATION_HPP_
 #define OPTFRAME_HEURISTICS_ILS_BASICILSPERTURBATION_HPP_
 
+#if (__cplusplus < 202302L) || defined(NO_CXX_MODULES)
+
 #include <math.h>
 
 #include <string>
@@ -16,9 +18,25 @@
 
 #include "ILS.hpp"
 
+#define MOD_EXPORT
+#else
+
+// CANNOT IMPORT HERE... Already part of optframe.core
+/*
+import std;
+import optframe.component;
+import optframe.concepts;
+*/
+
+// do NOT export modules on .hpp... only on .cppm
+
+#define MOD_EXPORT export
+
+#endif
+
 namespace optframe {
 
-template <XESolution XES, XEvaluation XEv = Evaluation<>>
+MOD_EXPORT template <XESolution XES, XEvaluation XEv = Evaluation<>>
 class BasicILSPerturbation : public ILS, public Component {
   using XSH = XES;  // primary-based search type only (BestType)
 
@@ -103,9 +121,9 @@ class BasicILSPerturbation : public ILS, public Component {
 };
 
 #if defined(__cpp_concepts) && (__cpp_concepts >= 201907L)
-template <XESolution XES>
+MOD_EXPORT template <XESolution XES>
 #else
-template <typename XES>
+MOD_EXPORT template <typename XES>
 #endif
 class BasicILSPerturbationBuilder : public ComponentBuilder<XES> {
   using XSH = XES;  // primary-based search type only (BestType)

include/OptFrame/Heuristics/ILS/BasicIteratedLocalSearch.hpp

@@ -4,6 +4,8 @@
 #ifndef OPTFRAME_HEURISTICS_ILS_BASICITERATEDLOCALSEARCH_HPP_
 #define OPTFRAME_HEURISTICS_ILS_BASICITERATEDLOCALSEARCH_HPP_
 
+#if (__cplusplus < 202302L) || defined(NO_CXX_MODULES)
+
 #include <math.h>
 
 #include <string>
@@ -17,11 +19,27 @@
 #include "ILS.hpp"
 #include "IteratedLocalSearch.hpp"
 
+#define MOD_EXPORT
+#else
+
+// CANNOT IMPORT HERE... Already part of optframe.core
+/*
+import std;
+import optframe.component;
+import optframe.concepts;
+*/
+
+// do NOT export modules on .hpp... only on .cppm
+
+#define MOD_EXPORT export
+
+#endif
+
 namespace optframe {
 
-typedef int BasicHistory;
+MOD_EXPORT using BasicHistory = int;
 
-template <XESolution XES>
+MOD_EXPORT template <XESolution XES>
 class BasicIteratedLocalSearch : public IteratedLocalSearch<BasicHistory, XES> {
   using XEv = typename XES::second_type;
 
@@ -112,9 +130,9 @@ class BasicIteratedLocalSearch : public IteratedLocalSearch<BasicHistory, XES> {
 };
 
 #if defined(__cpp_concepts) && (__cpp_concepts >= 201907L)
-template <XESolution XES>
+MOD_EXPORT template <XESolution XES>
 #else
-template <typename XES>
+MOD_EXPORT template <typename XES>
 #endif
 class BasicIteratedLocalSearchBuilder : public ILS,
                                         public SingleObjSearchBuilder<XES> {
@@ -135,7 +153,7 @@ class BasicIteratedLocalSearchBuilder : public ILS,
 
     std::string rest = scanner.rest();
 
-    pair<sptr<LocalSearch<XES>>, std::string> method;
+    std::pair<sptr<LocalSearch<XES>>, std::string> method;
     method = hf.createLocalSearch(rest);
 
     sptr<LocalSearch<XES>> h = method.first;

include/OptFrame/Heuristics/ILS/ILS.hpp

@@ -26,7 +26,7 @@ import optframe.concepts;
 
 namespace optframe {
 
-class ILS {
+MOD_EXPORT class ILS {
  public:
   static std::string family() { return "ILS:"; }