Racks are connected to a CoordinateSystem

mll-lab · Sep 12, 2024 · bb90d32 · bb90d32
1 parent 41ddc52
commit bb90d32
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ See [GitHub releases](https://github.com/mll-lab/php-utils/releases).
 
 ## Unreleased
 
+## v5.1.0
+
+### Added
+
+- Racks are connected to a `CoordinateSystem`
+
 ## v5.0.0
 
 ### Added

diff --git a/src/Microplate/CoordinateSystem1x1.php b/src/Microplate/CoordinateSystem1x1.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace MLL\Utils\Microplate;
+
+class CoordinateSystem1x1 extends CoordinateSystem
+{
+    /** Duplicates @see CoordinateSystem::positionsCount() for static contexts. */
+    public const POSITIONS_COUNT = 1;
+
+    public function rows(): array
+    {
+        return ['A'];
+    }
+
+    public function columns(): array
+    {
+        return [1];
+    }
+}
diff --git a/src/Microplate/CoordinateSystem6x4.php b/src/Microplate/CoordinateSystem6x4.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace MLL\Utils\Microplate;
+
+class CoordinateSystem6x4 extends CoordinateSystem
+{
+    /** Duplicates @see CoordinateSystem::positionsCount() for static contexts. */
+    public const POSITIONS_COUNT = 24;
+
+    public function rows(): array
+    {
+        return range('A', 'D');
+    }
+
+    public function columns(): array
+    {
+        return range(1, 6);
+    }
+}
diff --git a/src/Tecan/Rack/AlublockA.php b/src/Tecan/Rack/AlublockA.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem6x4;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class AlublockA extends BaseRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem6x4());
+    }
+
     public function type(): string
     {
         return 'Eppis 24x0.5 ml Cooled';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'A';
     }
-
-    public function positionCount(): int
-    {
-        return 24;
-    }
 }
diff --git a/src/Tecan/Rack/BaseRack.php b/src/Tecan/Rack/BaseRack.php
@@ -3,6 +3,7 @@
 namespace MLL\Utils\Tecan\Rack;
 
 use Illuminate\Support\Collection;
+use MLL\Utils\Microplate\CoordinateSystem;
 
 /** @template TContent */
 abstract class BaseRack implements Rack
@@ -12,8 +13,11 @@ abstract class BaseRack implements Rack
     /** @var Collection<int, TContent|null> */
     public Collection $positions;
 
-    public function __construct()
+    public CoordinateSystem $coordinateSystem;
+
+    public function __construct(CoordinateSystem $coordinateSystem)
     {
+        $this->coordinateSystem = $coordinateSystem;
         $this->positions = Collection::times($this->positionCount(), fn () => self::EMPTY_POSITION)
             ->mapWithKeys(fn ($content, int $position): array => [$position + 1 => $content]);
     }
@@ -83,4 +87,9 @@ public function assignPosition($content, int $position): int
 
         return $position;
     }
+
+    public function positionCount(): int
+    {
+        return $this->coordinateSystem->positionsCount();
+    }
 }
diff --git a/src/Tecan/Rack/DestLC.php b/src/Tecan/Rack/DestLC.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem96Well;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class DestLC extends BaseRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem96Well());
+    }
+
     public function type(): string
     {
         return '96 Well MP LightCycler480';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'DestLC';
     }
-
-    public function positionCount(): int
-    {
-        return 96;
-    }
 }
diff --git a/src/Tecan/Rack/DestPCR.php b/src/Tecan/Rack/DestPCR.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem96Well;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class DestPCR extends BaseRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem96Well());
+    }
+
     public function type(): string
     {
         return '96 Well PCR ABI semi-skirted';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'DestPCR';
     }
-
-    public function positionCount(): int
-    {
-        return 96;
-    }
 }
diff --git a/src/Tecan/Rack/DestTaqMan.php b/src/Tecan/Rack/DestTaqMan.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem96Well;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class DestTaqMan extends BaseRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem96Well());
+    }
+
     public function type(): string
     {
         return '96 Well PCR TaqMan';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'DestTaqMan';
     }
-
-    public function positionCount(): int
-    {
-        return 96;
-    }
 }
diff --git a/src/Tecan/Rack/FluidXRack.php b/src/Tecan/Rack/FluidXRack.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem96Well;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class FluidXRack extends BaseRack implements ScannedRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem96Well());
+    }
+
     public function type(): string
     {
         return '96FluidX';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'FluidX';
     }
-
-    public function positionCount(): int
-    {
-        return 96;
-    }
 }
diff --git a/src/Tecan/Rack/MPCDNA.php b/src/Tecan/Rack/MPCDNA.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem96Well;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class MPCDNA extends BaseRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem96Well());
+    }
+
     public function type(): string
     {
         return 'MP cDNA';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'MPCDNA';
     }
-
-    public function positionCount(): int
-    {
-        return 96;
-    }
 }
diff --git a/src/Tecan/Rack/MPSample.php b/src/Tecan/Rack/MPSample.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem96Well;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class MPSample extends BaseRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem96Well());
+    }
+
     public function type(): string
     {
         return 'MP Microplate';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'MPSample';
     }
-
-    public function positionCount(): int
-    {
-        return 96;
-    }
 }
diff --git a/src/Tecan/Rack/MPWater.php b/src/Tecan/Rack/MPWater.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem1x1;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class MPWater extends BaseRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem1x1());
+    }
+
     public function type(): string
     {
         return 'Trough 300ml MCA Portrait';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'MPWasser';
     }
-
-    public function positionCount(): int
-    {
-        return 1;
-    }
 }
diff --git a/src/Tecan/Rack/MasterMixRack.php b/src/Tecan/Rack/MasterMixRack.php
@@ -2,13 +2,20 @@
 
 namespace MLL\Utils\Tecan\Rack;
 
+use MLL\Utils\Microplate\CoordinateSystem2x16;
+
 /**
  * @template TContent
  *
  * @extends BaseRack<TContent>
  */
 class MasterMixRack extends BaseRack
 {
+    public function __construct()
+    {
+        parent::__construct(new CoordinateSystem2x16());
+    }
+
     public function type(): string
     {
         return 'Eppis 32x1.5 ml Cooled';
@@ -18,9 +25,4 @@ public function name(): string
     {
         return 'MM';
     }
-
-    public function positionCount(): int
-    {
-        return 32;
-    }
 }