X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=31041f3a8783c605d237196f7e89920d04dd27bb;hb=b062366507e4903e92e50d7cc83b7165f9dd1a41;hp=b181273375777830ce5c2e5ebf1a504227994dcd;hpb=97a2abc3c559695c4fae99c48d1a2dc636275ccb;p=poolifier.git

diff --git a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts
index b1812733..31041f3a 100644
--- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts
@@ -1,47 +1,60 @@
 import type { IPoolInternal } from '../pool-internal'
 import { PoolType } from '../pool-internal'
-import type { IPoolWorker } from '../pool-worker'
+import type { IWorker } from '../worker'
 import type {
   IWorkerChoiceStrategy,
-  RequiredStatistics
+  RequiredStatistics,
+  WorkerChoiceStrategyOptions
 } from './selection-strategies-types'
 
 /**
- * Abstract worker choice strategy class.
+ * Worker choice strategy abstract base class.
  *
  * @typeParam Worker - Type of worker which manages the strategy.
  * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
  * @typeParam Response - Type of response of execution. This can only be serializable data.
  */
 export abstract class AbstractWorkerChoiceStrategy<
-  Worker extends IPoolWorker,
-  Data,
-  Response
+  Worker extends IWorker,
+  Data = unknown,
+  Response = unknown
 > implements IWorkerChoiceStrategy {
-  /** {@inheritDoc} */
-  public readonly isDynamicPool: boolean
-  /** {@inheritDoc} */
-  public requiredStatistics: RequiredStatistics = {
-    runTime: false
+  /** @inheritDoc */
+  protected readonly isDynamicPool: boolean
+  /** @inheritDoc */
+  public readonly requiredStatistics: RequiredStatistics = {
+    runTime: false,
+    avgRunTime: false,
+    medRunTime: false
   }
 
   /**
-   * Constructs a worker choice strategy attached to the pool.
+   * Constructs a worker choice strategy bound to the pool.
    *
    * @param pool - The pool instance.
+   * @param opts - The worker choice strategy options.
    */
   public constructor (
-    protected readonly pool: IPoolInternal<Worker, Data, Response>
+    protected readonly pool: IPoolInternal<Worker, Data, Response>,
+    protected readonly opts: WorkerChoiceStrategyOptions = { medRunTime: false }
   ) {
+    this.checkOptions()
     this.isDynamicPool = this.pool.type === PoolType.DYNAMIC
+    this.choose.bind(this)
   }
 
-  /** {@inheritDoc} */
+  private checkOptions (): void {
+    if (this.requiredStatistics.avgRunTime && this.opts.medRunTime === true) {
+      this.requiredStatistics.medRunTime = true
+    }
+  }
+
+  /** @inheritDoc */
   public abstract reset (): boolean
 
-  /** {@inheritDoc} */
+  /** @inheritDoc */
   public abstract choose (): number
 
-  /** {@inheritDoc} */
-  public abstract remove (workerKey: number): boolean
+  /** @inheritDoc */
+  public abstract remove (workerNodeKey: number): boolean
 }