Bugfix

src/main/java/me/towdium/stask/client/widgets/WHistory.java

@@ -33,15 +33,15 @@ public class WHistory extends WContainer {
 
     public WHistory(int x, Game g) {
         game = g;
-        width = x;
+        width = x - 2;
         List<Cluster.Processor> ps = game.getCluster().getLayout();
         for (int i = 0; i < ps.size(); i++) {
             Cluster.Processor p = ps.get(i);
-            Rail r = new Rail(p, x, i % 2 == 0);
+            Rail r = new Rail(p, width, i % 2 == 0);
             put(r, 0, Rail.HEIGHT * i);
             processors.put(p, r);
         }
-        bar = new WBar(x - Rail.MARGIN).setListener((w, o, n) -> {
+        bar = new WBar(width - Rail.MARGIN).setListener((w, o, n) -> {
             int count = game.getCount();
             if (count < width - Rail.MARGIN) offset = 0;
             else offset = (int) ((count - width + Rail.MARGIN) * n);
@@ -67,8 +67,9 @@ public void onRefresh(Vector2i mouse) {
         if (c != latest) {
             latest = c;
             bar.setPos(1);
-            bar.setRatio(latest == 0 ? 1 : Math.min((width - Rail.MARGIN) / (float) latest, 1));
-            processors.values().forEach(i -> i.setOffset(Math.max(0, latest - (width - Rail.MARGIN))));
+            bar.setRatio(latest == 0 ? 1 : Math.min((width - Rail.MARGIN) / (float) (latest / 4), 1));
+            offset = Math.max(0, latest / 4 - (width - Rail.MARGIN));
+            processors.values().forEach(i -> i.setOffset(offset));
         }
         super.onRefresh(mouse);
     }
@@ -82,7 +83,7 @@ private void overlay(List<Graph.Work> ws, Vector2i m) {
         p.overlay(s);
     }
 
-    class Overlay extends WContainer {
+    static class Overlay extends WContainer {
         static final int MARGIN = 10;
         int x, y;
 
@@ -93,7 +94,7 @@ public Overlay(List<Graph.Work> ws) {
             for (int i = 0; i < ws.size(); i++) put(new Node(ws.get(i)), MARGIN, MARGIN + i * Node.HEIGHT);
         }
 
-        class Node extends WFocus.Impl {
+        static class Node extends WFocus.Impl {
             public static final int WIDTH = 170;
             public static final int HEIGHT = 28;
             Graph.Work work;

src/main/java/me/towdium/stask/client/widgets/WSchedule.java

@@ -30,7 +30,7 @@
  */
 @ParametersAreNonnullByDefault
 @SuppressWarnings("Duplicates")
-public class WSchedule extends WContainer {
+public class WSchedule extends WContainer {  // TODO remove task
     Game game;
     Map<Processor, Rail> processors = new IdentityHashMap<>();
     public static final int HEIGHT = Rail.HEIGHT * 4;

src/main/java/me/towdium/stask/logic/tutorials/TS1L1.java

@@ -125,11 +125,7 @@ public void onDraw(Painter p, Vector2i mouse) {
     }
 
     private void start() {
-        BUS.gate(Event.class, this, e -> e instanceof Event.EGame.Start);
-        BUS.subscribe(Event.EGame.Finish.class, this, e -> {
-            BUS.cancel(this);
-            finish();
-        });
+        BUS.gate(Event.class, this, e -> false);
         BUS.subscribe(Event.ETutorial.class, this, e -> {
             if (e.id.equals("S2S2")) {
                 Schedule schedule = game.getSchedule();
@@ -138,6 +134,8 @@ private void start() {
                 schedule.allocate(graph.getTask("B"), cluster.getProcessor("A"));
                 schedule.allocate(graph.getTask("C"), cluster.getProcessor("B"));
                 schedule.allocate(graph.getTask("D"), cluster.getProcessor("B"));
+                BUS.cancel(this);
+                finish();
             }
         });
 
@@ -146,7 +144,11 @@ private void start() {
     }
 
     private void finish() {
-        widget.update(S3S1, true);
-        widget.update(S3S2, false);
+        BUS.gate(Event.class, this, v -> v instanceof Event.EGame.Start);
+        BUS.subscribe(Event.EGame.Finish.class, this, v -> {
+            BUS.cancel(this);
+            widget.update(S3S1, true);
+            widget.update(S3S2, false);
+        });
     }
 }

src/main/resources/clusters/1-5.json

@@ -0,0 +1,23 @@
+{
+  "comm": 1,
+  "processors": {
+    "A": {
+      "speed": 1
+    },
+    "B": {
+      "speed": 1,
+      "speedup": {
+        "\u03b1": 2,
+        "\u03b2": 3
+      }
+    }
+  },
+  "layout": [
+    "A",
+    "B"
+  ],
+  "policy": {
+    "background": false,
+    "multiple": false
+  }
+}

src/main/resources/games/1-5.json

@@ -0,0 +1,14 @@
+{
+  "graphs": [
+    "1-5"
+  ],
+  "cluster": "1-5",
+  "aims": [
+    4,
+    3
+  ],
+  "times": [
+    0
+  ],
+  "desc": "Demo."
+}

src/main/resources/general/levels.json

@@ -5,7 +5,8 @@
         "1-1",
         "1-2",
         "1-3",
-        "1-4"
+        "1-4",
+        "1-5"
       ],
       "desc": "Introduction to basics of task graph scheduling and the game."
     }

src/main/resources/graphs/1-5.json

@@ -0,0 +1,40 @@
+{
+  "tasks": {
+    "A": {
+      "time": 1,
+      "type": "\u03b1",
+      "after": {}
+    },
+    "B": {
+      "time": 1,
+      "type": "\u03b1",
+      "after": {
+        "A": 1
+      }
+    },
+    "C": {
+      "time": 1,
+      "type": "\u03b1",
+      "after": {
+        "A": 1
+      }
+    },
+    "D": {
+      "time": 1,
+      "type": "\u03b1",
+      "after": {
+        "A": 1
+      }
+    }
+  },
+  "layout": [
+    [
+      "A"
+    ],
+    [
+      "B",
+      "C",
+      "D"
+    ]
+  ]
+}