Get rid of separate subjects definition (#17)

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Features
 
 * Adds CSV as output format for solutions (#13)
+* Separate definition of subjects is no longer required, but derived from requirements (#17)
 
 ### Other
 

data/pareto.json

@@ -1,8 +1,4 @@
 {
-    "Subjects": [
-        "Pest 1",
-		"Pest 2"
-    ],
 	"Matrices": [
         {
             "Name": "fruits",

data/problem.json

@@ -1,12 +1,4 @@
 {
-    "Subjects": [
-        "Pest 1",
-		"Pest 2",
-		"Pest 3",
-		"Pest 4",
-		"Pest 5",
-		"Pest 6"
-    ],
 	"Matrices": [
         {
             "Name": "fruits & shoots",

isso.go

@@ -70,7 +70,6 @@ type solution[F any] struct {
 }
 
 type ProblemDef struct {
-	Subjects     []string
 	Matrices     []Matrix
 	Capacity     []int
 	Requirements []Requirement
@@ -97,13 +96,6 @@ func NewProblem(problem ProblemDef) Problem {
 		matrixNames[matrix(i)] = m.Name
 	}
 
-	subjectIDs := map[string]subject{}
-	subjectNames := map[subject]string{}
-	for i, s := range problem.Subjects {
-		subjectIDs[s] = subject(i)
-		subjectNames[subject(i)] = s
-	}
-
 	reusable := make([][]bool, len(problem.Matrices))
 	for i, m := range problem.Matrices {
 		reusable[i] = make([]bool, len(problem.Matrices))
@@ -118,17 +110,16 @@ func NewProblem(problem ProblemDef) Problem {
 	}
 
 	req := make([]requirement, len(problem.Requirements))
-	uniqueReq := map[subject]bool{}
+	subjectIDs := map[string]subject{}
+	subjectNames := map[subject]string{}
 	for i, r := range problem.Requirements {
-		subject, ok := subjectIDs[r.Subject]
-		if !ok {
-			log.Fatalf("unknown subject '%v'", r.Subject)
-		}
-
-		if _, ok := uniqueReq[subject]; ok {
+		if _, ok := subjectIDs[r.Subject]; ok {
 			log.Fatalf("duplicate subject '%v' in requirements", r.Subject)
 		}
-		uniqueReq[subject] = true
+		sub := subject(i)
+
+		subjectIDs[r.Subject] = sub
+		subjectNames[sub] = r.Subject
 
 		matrix, ok := matrixIDs[r.Matrix]
 		if !ok {
@@ -143,7 +134,7 @@ func NewProblem(problem ProblemDef) Problem {
 		}
 
 		req[i] = requirement{
-			Subject: subject,
+			Subject: sub,
 			Matrix:  matrix,
 			Samples: r.Samples,
 			Times:   times,

isso_test.go

@@ -9,15 +9,6 @@ import (
 )
 
 func TestDefaultProblem(t *testing.T) {
-	subjects := []string{
-		"Pest 1",
-		"Pest 2",
-		"Pest 3",
-		"Pest 4",
-		"Pest 5",
-		"Pest 6",
-	}
-
 	matrices := []isso.Matrix{
 		{Name: "fruits & shoots", CanReuse: []string{}},
 		{Name: "fruits | shoots", CanReuse: []string{
@@ -78,7 +69,6 @@ func TestDefaultProblem(t *testing.T) {
 
 	p := isso.NewProblem(
 		isso.ProblemDef{
-			Subjects:     subjects,
 			Matrices:     matrices,
 			Capacity:     capacity,
 			Requirements: requirements,
@@ -108,11 +98,6 @@ func TestDefaultProblem(t *testing.T) {
 }
 
 func TestParetoProblem(t *testing.T) {
-	subjects := []string{
-		"Pest 1",
-		"Pest 2",
-	}
-
 	matrices := []isso.Matrix{
 		{Name: "fruits", CanReuse: []string{}},
 	}
@@ -138,7 +123,6 @@ func TestParetoProblem(t *testing.T) {
 
 	p := isso.NewProblem(
 		isso.ProblemDef{
-			Subjects:     subjects,
 			Matrices:     matrices,
 			Capacity:     capacity,
 			Requirements: requirements,