Skip to content

Commit

Permalink
Refact: StreamTask, OATask - order of processing/adaption on new/obso…
Browse files Browse the repository at this point in the history 
…lete instances #988
  • Loading branch information
@detlefarend
detlefarend committed May 22, 2024
1 parent 07ecf25 commit 81a7f0f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ...x2/sub/core/mlpro_oa/streams/tasks/images/MLPro-OA-Cluster_Analyzers_class_diagram.drawio
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<mxfile host="Electron" modified="2023-12-20T11:14:01.874Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.7.4 Chrome/106.0.5249.199 Electron/21.3.3 Safari/537.36" etag="yS0_O9t-8n3f1gwnJ7ZK" version="20.7.4" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">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</diagram></mxfile>
<mxfile host="Electron" modified="2024-05-22T08:50:32.369Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.7.4 Chrome/106.0.5249.199 Electron/21.3.3 Safari/537.36" etag="l65aVXzTpnL1P43-lDzW" version="20.7.4" type="device"><diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">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</diagram></mxfile>
Binary file modified ...pro_oa/streams/tasks/images/MLPro-OA-Cluster_Analyzers_class_diagram.drawio.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions src/mlpro/oa/streams/tasks/clusteranalyzers/basics.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,19 @@
## -- 2024-02-24 0.8.2 DA Class ClusterCentroid: redefined method remove_plot()
## -- 2024-04-10 0.8.3 DA Refactoring
## -- 2024-05-04 0.9.0 DA Introduction of cluster properties
## -- 2024-05-22 1.0.0 DA Initial design finished
## -------------------------------------------------------------------------------------------------

"""
Ver. 0.9.0 (2024-05-04)
Ver. 1.0.0 (2024-05-22)
This module provides templates for cluster analysis to be used in the context of online adaptivity.
"""

from matplotlib.figure import Figure
from mlpro.bf.math.properties import *
from mlpro.bf.mt import PlotSettings
from mlpro.bf.streams import Instance
from mlpro.bf.streams import Instance, InstDict
from mlpro.bf.various import *
from mlpro.bf.plot import *
from mlpro.oa.streams import OATask
Expand Down Expand Up @@ -173,8 +174,8 @@ def align_cluster_properties( self, p_properties : PropertyDefinitions ) -> list


## -------------------------------------------------------------------------------------------------
def _run(self, p_inst_new: List[Instance], p_inst_del: List[Instance]):
self.adapt( p_inst_new=p_inst_new, p_inst_del=p_inst_del )
def _run(self, p_inst : InstDict):
self.adapt( p_inst=p_inst )


## -------------------------------------------------------------------------------------------------
Expand Down

0 comments on commit 81a7f0f

Please sign in to comment.