Rename elevatorAlgorithm to elevatorControl

tordnat · Mar 16, 2024 · ce396ff · ce396ff
1 parent e5171de
commit ce396ff
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/build_go.yml b/.github/workflows/build_go.yml
@@ -36,6 +36,6 @@ jobs:
 
     - name: Test
       run: |
-        go test -v elevatorAlgorithm/hra
+        go test -v elevatorControl/hra
         go test -v orderSync/orderSync_test.go
-        go test -v elevatorAlgorithm/orders/orders_test.go
+        go test -v elevatorControl/orders/orders_test.go
diff --git a/elevatorAlgorithm/elevator/elevator.go → elevatorControl/elevator/elevator.go b/elevatorAlgorithm/elevator/elevator.go → elevatorControl/elevator/elevator.go
diff --git a/elevatorAlgorithm/fsm/fsm.go → elevatorControl/fsm/fsm.go b/elevatorAlgorithm/fsm/fsm.go → elevatorControl/fsm/fsm.go
@@ -1,9 +1,9 @@
 package fsm
 
 import (
-	"elevatorAlgorithm/elevator"
-	"elevatorAlgorithm/orders"
-	"elevatorAlgorithm/timer"
+	"elevatorControl/elevator"
+	"elevatorControl/orders"
+	"elevatorControl/timer"
 	"elevatorDriver/elevio"
 	"log"
 	"networkDriver/peers"

diff --git a/elevatorAlgorithm/go.mod → elevatorControl/go.mod b/elevatorAlgorithm/go.mod → elevatorControl/go.mod
@@ -1,4 +1,4 @@
-module elevatorAlgorithm
+module elevatorControl
 
 require elevatorDriver v0.0.0
 

diff --git a/elevatorAlgorithm/hra/hra.go → elevatorControl/hra/hra.go b/elevatorAlgorithm/hra/hra.go → elevatorControl/hra/hra.go
@@ -1,7 +1,7 @@
 package hra
 
 import (
-	"elevatorAlgorithm/elevator"
+	"elevatorControl/elevator"
 	"encoding/json"
 	"fmt"
 	"os/exec"

diff --git a/elevatorAlgorithm/hra/hra_test.go → elevatorControl/hra/hra_test.go b/elevatorAlgorithm/hra/hra_test.go → elevatorControl/hra/hra_test.go
@@ -1,7 +1,7 @@
 package hra_test
 
 import (
-	"elevatorAlgorithm/hra"
+	"elevatorControl/hra"
 	"fmt"
 	"testing"
 )

diff --git a/elevatorAlgorithm/orders/orders.go → elevatorControl/orders/orders.go b/elevatorAlgorithm/orders/orders.go → elevatorControl/orders/orders.go
@@ -1,7 +1,7 @@
 package orders
 
 import (
-	"elevatorAlgorithm/elevator"
+	"elevatorControl/elevator"
 	"elevatorDriver/elevio"
 )
 

diff --git a/elevatorAlgorithm/orders/orders_test.go → elevatorControl/orders/orders_test.go b/elevatorAlgorithm/orders/orders_test.go → elevatorControl/orders/orders_test.go
@@ -1,8 +1,8 @@
 package orders_test
 
 import (
-	"elevatorAlgorithm/elevator"
-	"elevatorAlgorithm/orders"
+	"elevatorControl/elevator"
+	"elevatorControl/orders"
 	"elevatorDriver/elevio"
 	"testing"
 )

diff --git a/elevatorAlgorithm/requests/requests.go → elevatorControl/requests/requests.go b/elevatorAlgorithm/requests/requests.go → elevatorControl/requests/requests.go
@@ -1,7 +1,7 @@
 package requests
 
 import (
-	"elevatorAlgorithm/elevator"
+	"elevatorControl/elevator"
 	"elevatorDriver/elevio"
 )
 

diff --git a/elevatorAlgorithm/requests/requests_test.go → elevatorControl/requests/requests_test.go b/elevatorAlgorithm/requests/requests_test.go → elevatorControl/requests/requests_test.go
@@ -1,10 +1,10 @@
 package requests_test
 
 import (
-	"elevatorAlgorithm/elevator"
-	"elevatorAlgorithm/fsm"
-	"elevatorAlgorithm/requests"
-	"elevatorAlgorithm/timer"
+	"elevatorControl/elevator"
+	"elevatorControl/fsm"
+	"elevatorControl/requests"
+	"elevatorControl/timer"
 	"elevatorDriver/elevio"
 	"testing"
 )

diff --git a/elevatorAlgorithm/timer/timer.go → elevatorControl/timer/timer.go b/elevatorAlgorithm/timer/timer.go → elevatorControl/timer/timer.go
diff --git a/go.mod b/go.mod
@@ -8,9 +8,9 @@ require elevatorDriver v0.0.0
 
 replace elevatorDriver => ./elevatorDriver
 
-require elevatorAlgorithm v0.0.0
+require elevatorControl v0.0.0
 
-replace elevatorAlgorithm => ./elevatorAlgorithm
+replace elevatorControl => ./elevatorControl
 
 require elevatorMusic v0.0.0
 

diff --git a/main.go b/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	"elevator-project/cmd"
 	"elevator-project/orderSync"
-	"elevatorAlgorithm/elevator"
-	"elevatorAlgorithm/fsm"
-	"elevatorAlgorithm/orders"
+	"elevatorControl/elevator"
+	"elevatorControl/fsm"
+	"elevatorControl/orders"
 	"elevatorDriver/elevio"
 	"fmt"
 	"log"

diff --git a/orderSync/orderSync.go b/orderSync/orderSync.go
@@ -1,9 +1,9 @@
 package orderSync
 
 import (
-	"elevatorAlgorithm/elevator"
-	"elevatorAlgorithm/hra"
-	"elevatorAlgorithm/orders"
+	"elevatorControl/elevator"
+	"elevatorControl/hra"
+	"elevatorControl/orders"
 	"elevatorDriver/elevio"
 	"elevatorDriver/lights"
 	"log"

diff --git a/orderSync/orderSync_test.go b/orderSync/orderSync_test.go
@@ -2,7 +2,7 @@ package orderSync_test
 
 import (
 	"elevator-project/orderSync"
-	"elevatorAlgorithm/elevator"
+	"elevatorControl/elevator"
 	"elevatorDriver/elevio"
 	"testing"
 )

diff --git a/scripts/create_and_start_elevatorservice.sh b/scripts/create_and_start_elevatorservice.sh
@@ -23,7 +23,7 @@ mkdir -p $CONFIG_FILE_PATH/
 echo "Building project and moving resources to $CONFIG_FILE_PATH"
 go build -o $CONFIG_FILE_PATH/distributedElevator main.go
 cp scripts/launch_elevator.sh $CONFIG_FILE_PATH
-cp elevatorAlgorithm/hra/hall_request_assigner $CONFIG_FILE_PATH
+cp elevatorControl/hra/hall_request_assigner $CONFIG_FILE_PATH
 echo "Installing systemd service $SERVICE_NAME"
 cp scripts/$SERVICE_FILE_NAME $SERVICE_FILE_PATH
 

diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-HRA_INSTALL_PATH="elevatorAlgorithm/hra"
+HRA_INSTALL_PATH="elevatorControl/hra"
 echo "Building project and moving hall_request_assigner to $HRA_INSTALL_PATH"
 
 WORKING_DIR=$(pwd)