Merge pull request #55 from Evolutionary-Algorithms-On-Click/54-reflect-bug-fixes-in-runner_controller-microservice

Add new crossover methods and update selection logic

Author: Ashrockzzz2003

app/_data/mate.js

@@ -33,6 +33,15 @@ export const mateData = [
         description:
             "Executes a messy one-point crossover on the input individuals.",
     },
+    {
+        name: "cxUniform",
+        description: "Executes a uniform crossover on the input individuals.",
+    },
+    {
+        name: "cxUniformPartialyMatched",
+        description:
+            "Executes a uniform partially matched crossover on the input individuals.",
+    },
 ];
 
 export const deMateData = [

app/_data/selection.js

@@ -26,16 +26,16 @@ export const selectionData = [
         description:
             "Select by roulette wheel. The selection probability of an individual is proportional to its fitness.",
     },
-    {
-        name: "selNSGA2",
-        description:
-            "Select the best individual according to the non-dominated sorting of NSGA-II.",
-    },
-    {
-        name: "selSPEA2",
-        description:
-            "Select the best individual according to the non-dominated sorting of SPEA2.",
-    },
+    // {
+    //     name: "selNSGA2",
+    //     description:
+    //         "Select the best individual according to the non-dominated sorting of NSGA-II.",
+    // },
+    // {
+    //     name: "selSPEA2",
+    //     description:
+    //         "Select the best individual according to the non-dominated sorting of SPEA2.",
+    // },
     {
         name: "selRandom",
         description: "Select randomly.",

app/create/_components/chooseAlgorithm.js

@@ -62,6 +62,14 @@ export const ChooseAlgo = ({
                     <h5 className="text-lg font-bold">
                         Step 1.1: Configure Mu and Lambda
                     </h5>
+                    <p className="text-sm">
+                        Mu - (Number of individuals to select for the next
+                        generation. Positive Integer)
+                    </p>
+                    <p className="text-sm">
+                        Lambda - (The number of children to produce at each
+                        generation. Positive Integer)
+                    </p>
                     {chosenAlgo === "eaMuCommaLambda" && !(mu < lambda) && (
                         <p className="text-blue-500">
                             Mu should be less than Lambda for eaMuCommaLambda.

app/create/_components/chooseSelectionFunction.js

@@ -2,6 +2,7 @@ import { selectionData } from "@/app/_data/selection";
 
 export default function ChooseSelectionFunction({
     title = "Step 8: Choose a selection function.",
+    selData = selectionData,
     selectFunc,
     setSelectFunc,
     currentStep,
@@ -14,7 +15,7 @@ export default function ChooseSelectionFunction({
         <div className="mt-16">
             <h4 className="text-lg font-bold mb-4">{title}</h4>
             <div className="grid grid-cols-2 gap-4 align-top">
-                {selectionData.map((sel, index) => (
+                {selData.map((sel, index) => (
                     <button
                         onClick={(e) => {
                             e.preventDefault();

app/create/non-gp/page.js

@@ -19,6 +19,7 @@ import { deMateData, mateData } from "@/app/_data/mate";
 import Link from "next/link";
 import { LogOut } from "lucide-react";
 import { ConfigureDEParams } from "./_components/chooseDEParams";
+import { selectionData } from "@/app/_data/selection";
 
 export default function ConfigureNonGP() {
     const [userData, setUserData] = useState({});
@@ -116,6 +117,30 @@ export default function ConfigureNonGP() {
             lambda_: Optional[int] = None
             hofSize: Optional[int] = 1
         */
+
+        if (
+            ![
+                "cxPartialyMatched",
+                "cxOrdered",
+                "cxUniformPartialyMatched",
+            ].includes(matingFunc.name)
+        ) {
+            // individual size should be greater than max random range and datatype not floating point.
+            if (indGen === "floatingPoint") {
+                alert(
+                    `Please select a different type. This is because of the way in which ${matingFunc.name} works.`,
+                );
+                return;
+            }
+
+            if (indSize <= parseInt(randomRangeEnd)) {
+                alert(
+                    `Please select a valid individual size greater than random range. This is because of the way in which ${matingFunc.name} works.`,
+                );
+                return;
+            }
+        }
+
         const inputData = {
             algorithm: chosenAlgo.toString(),
             individual: indGen.toString(),
@@ -127,7 +152,7 @@ export default function ConfigureNonGP() {
             mutpb: parseFloat(mutpb ?? 0.2),
             weights: parameters.map((param) => parseFloat(param)),
             individualSize: parseInt(indSize ?? 10),
-            indpb: 0.05,
+            indpb: 0.05, // TODO: Get this from the user.
             randomRange: [
                 parseInt(randomRangeStart ?? 0),
                 parseInt(randomRangeEnd ?? 100),
@@ -327,7 +352,18 @@ export default function ConfigureNonGP() {
                         {currentStep >= 6 && popFunc && (
                             <ChooseMatingFunction
                                 mateData={
-                                    chosenAlgo === "de" ? deMateData : mateData
+                                    chosenAlgo === "de"
+                                        ? deMateData
+                                        : indGen === "floatingPoint"
+                                          ? mateData.filter(
+                                                (mate) =>
+                                                    ![
+                                                        "cxPartialyMatched",
+                                                        "cxOrdered",
+                                                        "cxUniformPartialyMatched",
+                                                    ].includes(mate.name),
+                                            )
+                                          : mateData
                                 }
                                 mateFunc={matingFunc}
                                 setMateFunc={setMatingFunc}
@@ -354,6 +390,19 @@ export default function ConfigureNonGP() {
 
                         {currentStep >= 8 && matingFunc && (
                             <ChooseSelectionFunction
+                                selData={
+                                    chosenAlgo === "eaMuPlusLambda" ||
+                                    chosenAlgo === "eaMuCommaLambda"
+                                        ? selectionData.filter(
+                                              (sel) =>
+                                                  ![
+                                                      "selRoulette",
+                                                      "selBest",
+                                                      "selWorst",
+                                                  ].includes(sel.name),
+                                          )
+                                        : selectionData
+                                }
                                 selectFunc={selectFunc}
                                 setSelectFunc={setSelectFunc}
                                 currentStep={currentStep}