Repair BaseCompiler tests and discovered bugs in compilation

Author: Neloop

app/helpers/ExerciseConfig/Compilation/BoxesCompiler.php

@@ -26,12 +26,11 @@ class BoxesCompiler {
    * Helper function which will create identification of task.
    * @param Node $node
    * @param string $postfix
-   * @param CompilationContext $context
    * @return string
    */
-  private function createTaskIdentification(Node $node, string $postfix, CompilationContext $context): string {
-    $testName = $context->getTestsNames()[$node->getTestId()];
-    return $testName . self::$ID_DELIM . $node->getPipelineId() .
+  private function createTaskIdentification(Node $node, string $postfix): string {
+    $directoryName = $node->getBox()->getDirectory();
+    return $directoryName . self::$ID_DELIM . $node->getPipelineId() .
       self::$ID_DELIM . $node->getBox()->getName() . self::$ID_DELIM . $postfix;
   }
 
@@ -42,7 +41,7 @@ private function createTaskIdentification(Node $node, string $postfix, Compilati
    * @param ExerciseLimits[] $exerciseLimits indexed by hwgroup
    */
   private function setLimits(Node $node, Task $task, array $exerciseLimits) {
-    if (!$task->getSandboxConfig() ||
+    if (!$task->getSandboxConfig() || !$node->getTestId() ||
         $task->getType() !== TaskType::$EXECUTION) {
       return;
     }
@@ -93,7 +92,7 @@ private function processTree(JobConfig $jobConfig, RootedTree $rootedTree,
       // set additional attributes to the tasks
       foreach ($tasks as $task) {
         // create and set task identification
-        $taskId = $this->createTaskIdentification($current, $order, $context);
+        $taskId = $this->createTaskIdentification($current, $order);
         $current->addTaskId($taskId);
         $task->setId($taskId);
 

app/helpers/ExerciseConfig/Compilation/BoxesOptimizer.php

@@ -4,8 +4,9 @@
 
 use App\Helpers\ExerciseConfig\Compilation\Tree\Node;
 use App\Helpers\ExerciseConfig\Compilation\Tree\RootedTree;
+use App\Helpers\ExerciseConfig\Pipeline\Box\DataInBox;
 use App\Helpers\ExerciseConfig\Pipeline\Ports\Port;
-use Nette\Utils\Arrays;
+use App\Helpers\ExerciseConfig\Variable;
 
 /**
  * Internal exercise configuration compilation service. Handles optimisation
@@ -16,6 +17,29 @@
  */
 class BoxesOptimizer {
 
+  /**
+   * Determine if given variables can be optimized or not.
+   * @param Variable|null $first
+   * @param Variable|null $second
+   * @return bool
+   */
+  private static function canVariablesBeOptimized(?Variable $first, ?Variable $second) {
+    if ($first === null && $second === null) {
+      return true;
+    }
+
+    if ($first === null || $second === null ||
+      $first->getValue() !== $second->getValue()) {
+      return false;
+    }
+
+    if ($first->getType() !== $second->getType()) {
+      return false;
+    }
+
+    return true;
+  }
+
   /**
    * Determine if given ports can be optimized or not.
    * @param Port $first could not be null
@@ -29,12 +53,7 @@ private static function canPortsBeOptimized(Port $first, Port $second) {
 
     $variableValue = $first->getVariableValue();
     $otherVariableValue = $second->getVariableValue();
-    if ($variableValue === null && $otherVariableValue === null) {
-      return true;
-    }
-
-    if ($variableValue === null || $otherVariableValue === null ||
-      $variableValue->getValue() !== $otherVariableValue->getValue()) {
+    if (self::canVariablesBeOptimized($variableValue, $otherVariableValue) === false) {
       return false;
     }
 
@@ -84,6 +103,12 @@ private static function canNodesBeOptimized(Node $first, Node $second): bool {
       }
     }
 
+    // special case if boxes are of data type, then they have special input variable which has to be checked as well
+    if ($firstBox instanceof DataInBox && $secondBox instanceof DataInBox &&
+        self::canVariablesBeOptimized($firstBox->getInputVariable(), $secondBox->getInputVariable()) === false) {
+      return false;
+    }
+
     return true;
   }
 
@@ -137,6 +162,11 @@ private function optimizeTree(Node $rootNode) {
             });
             $child->setTestId(null); // clear the test identification
 
+            // resolve dependencies transfer from compared to child
+            foreach ($compared->getDependencies() as $dependency) {
+              $child->addDependency($dependency);
+            }
+
             foreach ($compared->getChildren() as $comparedChild) {
               $comparedChild->removeParent($compared);
               $comparedChild->addParent($child);
@@ -153,8 +183,12 @@ private function optimizeTree(Node $rootNode) {
       }
 
       // do not forget to add newly created children from current node to
-      // processing queue
-      $queue = array_merge($queue, $node->getChildren());
+      // processing queue, only if the node was optimised... otherwise we should not proceed
+      foreach ($node->getChildren() as $child) {
+        if ($child->getTestId() === null) {
+          $queue[] = $child;
+        }
+      }
     }
   }
 

app/helpers/ExerciseConfig/Compilation/DirectoriesResolver.php

@@ -64,8 +64,8 @@ private function processNode(Node $node, string $directoryName, array &$director
   private function findOptimizedNodesDirectory(Node $current): string {
     $name = "";
     while ($current->getTestId() === null) {
-      $name .= $current->getBox() ? $current->getBox()->getCategory() : "";
-      $name .= "_"; // delimiter
+      $category = $current->getBox() ? $current->getBox()->getCategory() : "";
+      $name .= !empty($category) ? $category . "_" : "";
 
       if (count($current->getChildren()) < 1) {
         break;
@@ -202,7 +202,7 @@ private function addCopyTasks(RootedTree $tree) {
       $box = $current->getBox(); /** @var $box Box */
       if ($box) {
         foreach ($box->getInputPorts() as $port) {
-          if (!$port->getVariableValue()->isFile() ||
+          if (!$port->getVariableValue() || !$port->getVariableValue()->isFile() ||
               $port->getVariableValue()->getDirectory() === $box->getDirectory()) {
             continue;
           }
@@ -221,6 +221,7 @@ private function addCopyTasks(RootedTree $tree) {
           }
           $current->clearParents();
           $current->addParent($copy);
+          $current->addDependency($copy);
 
           // we also have to plug newly created output variable from copy box to the current input port...
           // this is needed because we need to have valid information in current box about directory of the variable