Merge pull request #19 from Ashrockzzz2003/main

Use the 'name' field to represent population and generation for frontend to use 1 api call.

Author: Ashrockzzz2003

controller/ea.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"time"
 )
 
 func CreateEA(res http.ResponseWriter, req *http.Request) {
@@ -50,11 +49,18 @@ func CreateEA(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	var description string
+	if ea.Algorithm == "de" {
+		description = "Differential Evolution (DE)"
+	} else {
+		description = "Evolutionary Algorithm (EA)"
+	}
+
 	row := db.QueryRow(req.Context(), `
 		INSERT INTO run (name, description, type, command, createdBy)
 		VALUES ($1, $2, $3, $4, $5)
 		RETURNING id
-	`, time.Now().Local().String(), "Traditional EA Without GP", "ea", "python -m scoop code.py", user["id"])
+	`, fmt.Sprintf("%d-%d", ea.Generations, ea.PopulationSize), description, "ea", "python -m scoop code.py", user["id"])
 
 	var runID string
 	err = row.Scan(&runID)
@@ -126,6 +132,7 @@ func CreateEA(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	data["runID"] = runID
 	util.JSONResponse(res, http.StatusOK, "It works! 👍🏻", data)
 
 }

controller/gp.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"time"
 )
 
 func CreateGP(res http.ResponseWriter, req *http.Request) {
@@ -31,13 +30,13 @@ func CreateGP(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	ea, err := modules.GPFromJSON(data)
+	gp, err := modules.GPFromJSON(data)
 	if err != nil {
 		util.JSONResponse(res, http.StatusBadRequest, err.Error(), nil)
 		return
 	}
 
-	code, err := ea.Code()
+	code, err := gp.Code()
 	if err != nil {
 		util.JSONResponse(res, http.StatusBadRequest, err.Error(), nil)
 		return
@@ -54,7 +53,7 @@ func CreateGP(res http.ResponseWriter, req *http.Request) {
 		INSERT INTO run (name, description, type, command, createdBy)
 		VALUES ($1, $2, $3, $4, $5)
 		RETURNING id
-	`, time.Now().Local().String(), "Genetic Programming (GP)", "gp", "python -m scoop code.py", user["id"])
+	`, fmt.Sprintf("%d-%d", gp.Generations, gp.PopulationSize), "Genetic Programming (GP)", "gp", "python -m scoop code.py", user["id"])
 
 	var runID string
 	err = row.Scan(&runID)
@@ -126,5 +125,6 @@ func CreateGP(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	data["runID"] = runID
 	util.JSONResponse(res, http.StatusOK, "It works! 👍🏻", data)
 }

controller/ml.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"time"
 )
 
 func CreateML(res http.ResponseWriter, req *http.Request) {
@@ -54,7 +53,7 @@ func CreateML(res http.ResponseWriter, req *http.Request) {
 		INSERT INTO run (name, description, type, command, createdBy)
 		VALUES ($1, $2, $3, $4, $5)
 		RETURNING id
-	`, time.Now().Local().String(), "Optimize ML with EA", "ml", "python -m scoop code.py", user["id"])
+	`, fmt.Sprintf("%d-%d", ml.Generations, ml.PopulationSize), "Optimize ML with EA", "ml", "python -m scoop code.py", user["id"])
 
 	var runID string
 	err = row.Scan(&runID)
@@ -126,5 +125,6 @@ func CreateML(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	data["runID"] = runID
 	util.JSONResponse(res, http.StatusOK, "It works! 👍🏻", data)
 }

controller/pso.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"time"
 )
 
 func CreatePSO(res http.ResponseWriter, req *http.Request) {
@@ -54,7 +53,7 @@ func CreatePSO(res http.ResponseWriter, req *http.Request) {
 		INSERT INTO run (name, description, type, command, createdBy)
 		VALUES ($1, $2, $3, $4, $5)
 		RETURNING id
-	`, time.Now().Local().String(), "Particle Swarm Optimization", "pso", "python code.py", user["id"])
+	`, fmt.Sprintf("%d-%d", pso.Generations, pso.PopulationSize), "Particle Swarm Optimization", "pso", "python code.py", user["id"])
 
 	var runID string
 	err = row.Scan(&runID)
@@ -126,5 +125,6 @@ func CreatePSO(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	data["runID"] = runID
 	util.JSONResponse(res, http.StatusOK, "It works! 👍🏻", data)
 }