add marks & feedback

.gitlab-ci.yml

@@ -1,145 +0,0 @@
-image: paulwarfie/comp1110-2023-s1-gitlab-ci:0.1.0
-
-stages:
-  - checksum
-  - compliance
-  - build
-  - test
-
-before_script:
-  - export PATH_TO_FX=/usr/share/openjfx/lib
-  - export JAVAFX_OPTIONS="--module-path $PATH_TO_FX --add-modules javafx.controls,javafx.fxml,javafx.media"
-  - export CP=src:/ass2/*:/shared/junit-platform-console-standalone-1.7.0.jar:$PATH_TO_FX/*
-  - export JUNIT="java $JAVAFX_OPTIONS -jar /shared/junit-platform-console-standalone-1.7.0.jar --class-path src:/ass2/comp1110-ass2.jar --disable-banner"
-
-checksum:
-  tags:
-    - comp1110
-  stage: checksum
-  script:
-    - python3 /validate.py --integrity comp1110-ass2
-  except:
-    variables:
-      - $CI_PROJECT_NAME =~ /.*-dev$/
-
-compliance:
-  tags:
-    - comp1110
-  stage: compliance
-  script:
-    - python3 /validate.py --gitlablogin ${GITLAB_USER_LOGIN} --gitlabuser "${GITLAB_USER_NAME}" --gitlabprojectname "${CI_PROJECT_NAME}" --assignment /ass2/compliance-ass2.yml
-  except:
-    variables:
-      - $CI_PROJECT_NAME =~ /.*-dev$/
-  allow_failure: true
-
-build:
-  tags:
-    - comp1110
-  stage: build
-  script:
-    - javac -encoding utf-8 $JAVAFX_OPTIONS -cp $CP src/comp1110/ass2/*.java src/comp1110/ass2/*/*.java
-  artifacts:
-    paths:
-      - src/comp1110/ass2/*.class
-      - src/comp1110/ass2/*/*.class
-
-task3:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.IsStateStringWellFormedTest
-  allow_failure: true
-
-task4:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.IsMoveStringWellFormedTest
-  allow_failure: true
-
-task6:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.DistributeResourcesTest
-  allow_failure: true
-
-task7:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.IsMoveValidTest
-  allow_failure: true
-
-task8:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.GenerateAllValidMovesTest
-  allow_failure: true
-
-task9:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.IsPhaseOverTest
-  allow_failure: true
-
-task10:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.PlacePieceTest
-  allow_failure: true
-
-task11:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.CalculateIslandLinksScoreTest -c=comp1110.ass2.CalculateIslandMajoritiesScoreTest -c=comp1110.ass2.CalculateResourcesAndStatuettesScoreTest -c=comp1110.ass2.CalculateTotalIslandsScoreTest -c=comp1110.ass2.CalculateScoresTest
-  allow_failure: true
-
-task12:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.EndPhaseTest
-  allow_failure: true
-
-task13:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.ApplyMoveTest
-  allow_failure: true
-
-task16:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.GenerateAIMoveTest
-  allow_failure: true
-
-task17:
-  tags:
-    - comp1110
-  stage: test
-  script:
-    - $JUNIT -c=comp1110.ass2.VariableBoardSizeTest -c=comp1110.ass2.ThreeFourPlayerTest -c=comp1110.ass2.VariableSizeThreeFourPlayerTest
-  allow_failure: true
-
-## Local Variables:
-## mode: yaml
-## End:

feedback.md

@@ -0,0 +1,42 @@
+---
+mark: 4.6
+
+section_marks:
+  c1-compliance: 0.25
+  c2-git: 0.25
+  c3-task-3-4-6-7-8: 2.5
+  c4-task-5-viewer: 0.8
+  c5-exceptional: 0.8
+---
+
+## General comments
+Well done on completing all the tasks for D2C, your submission is quite impressive! Here are a few general comments:
+
+- It would be good to use your classes (outside of BlueLagoon, Viewer and eventually Game) and object-oriented programming to pass the tasks and set up the framework for your game, as strings are inefficient and will be hard to use when making your game.
+- You should try to ensure that your code does not go past the vertical line in IntelliJ, by putting in line breaks if possible.
+- Your Git usage as a group are excellent - your commits are frequent and have detailed messages!
+- In some parts IntelliJ has highlighted your code (such as lines 243 and 335 of BlueLagoon.java) - in these parts you can hover over these for suggestions which may improve the readability or style of your code.
+- Your commenting throughout your code is excellent!
+- In your final game (and viewer to a lesser extent), it would be good to make the islands different colours based on how many points they award.
+
+## Task 5 (Viewer)
+
+Your viewer is quite intuitive, though it doesn't seem to differentiate between the settlers/villagers of different players. I'm also not able to click the Refresh button more than once, though I'm not sure what's causing this.
+
+# Mark breakdown
+
+|    Task    | Requirement              |   Result    |
+|:----------:|--------------------------|:-----------:|
+|     -      | All files correct        | 0.25 / 0.25 |
+|     -      | Appropriate usage of Git | 0.25 / 0.25 |
+|     3      | isStateStringWellFormed  |  0.5 / 0.5  |
+|     4      | isMoveStringWellFormed   |  0.5 / 0.5  |
+|     5      | Viewer                   |   0.8 / 1   |
+|     6      | distributeResources      |  0.5 / 0.5  |
+|     7      | isMoveValid              |  0.5 / 0.5  |
+|     8      | generateAllValidMoves    |  0.5 / 0.5  |
+|     -      | Code quality and design  |   0.5 / 1   |
+| **Total**  | -                        | **4.3 / 5** |
+
+
+