-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refact: Separation of anomaly detection from drift detection #1133
- Loading branch information
1 parent
215ef83
commit c174e8a
Showing
22 changed files
with
501 additions
and
520 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 4 additions & 3 deletions
7
.../sub/mlpro_oa/streams/40_drift_detection/10_instance_based/10_common_drifts.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| .. _target_api_oa_stream_tasks_ad_common_drifts: | ||
| .. _target_api_oa_stream_tasks_ib_dd_common_drifts: | ||
| Common drifts | ||
| ============= | ||
| .. automodule:: mlpro.oa.streams.tasks.driftdetectors.drifts.instancebased.basics | ||
|
|
||
| .. automodule:: mlpro.oa.streams.tasks.driftdetectors.drifts.instancebased.movement | ||
| :members: | ||
| :undoc-members: | ||
| :private-members: | ||
| :show-inheritance: | ||
|
|
4 changes: 0 additions & 4 deletions
4
.../mlpro_oa/streams/40_drift_detection/10_instance_based/20_common_algorithms.rst
This file was deleted.
Oops, something went wrong.
36 changes: 0 additions & 36 deletions
36
...ub/mlpro_oa/streams/40_drift_detection/10_instance_based/40_drift_detectors.rst
This file was deleted.
Oops, something went wrong.
229 changes: 0 additions & 229 deletions
229
...drift_detection/10_instance_based/images/MLPro-OA-CB-Drift-Detectors_class_diagram.drawio
This file was deleted.
Oops, something went wrong.
96 changes: 96 additions & 0 deletions
96
...drift_detection/10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| <mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.0.16 Chrome/132.0.6834.196 Electron/34.2.0 Safari/537.36" version="26.0.16"> | ||
| <diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1"> | ||
| <mxGraphModel dx="2004" dy="1237" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="2336" pageHeight="1654" math="0" shadow="0"> | ||
| <root> | ||
| <mxCell id="WIyWlLk6GJQsqaUBKTNV-0" /> | ||
| <mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" /> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-0" value="" style="group" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1" connectable="0"> | ||
| <mxGeometry x="923" y="40" width="490" height="220" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-1" value="<font color="#000000" size="1"><b style="font-size: 14px">Legend:<br></b></font><br><br><br><font color="#0000ff" style="font-size: 6px"><br></font><span style="color: rgb(0 , 0 , 0)"><font style="font-size: 4px">&nbsp; &nbsp;</font>&nbsp;In progress&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; In validation&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Ready to use</span><font color="#000000">&nbsp;<br></font><font color="#0000ff"><br><br><br><br>&nbsp;attribute / method()&nbsp; &nbsp; &nbsp; &nbsp; New public attribute/method to be implemented</font><br><font color="#000000">&nbsp;</font><font color="#000000">attribute / method()<span> </span>&nbsp; &nbsp; &nbsp; &nbsp;New/inherited public attribute/method that is implemented here<br></font><font color="#0000ff">&nbsp;_attribute /&nbsp;</font><font color="#0000ff">_method()&nbsp; &nbsp; New protected method/attribute to be implemented</font><br><font color="#000000">&nbsp;_attribute / _method()&nbsp; &nbsp; New/inherited protected attribute/method that is implemented here<br></font><font color="#000000"><br><br><br><br><br></font>" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;rounded=0;fontColor=#006600;strokeColor=#000000;shadow=1;fillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1"> | ||
| <mxGeometry width="489.99999999999994" height="220" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-2" value="Depends on" style="endArrow=block;html=1;labelPosition=right;verticalLabelPosition=middle;align=left;verticalAlign=middle;endFill=1;fontSize=12;" parent="fcJVb3HREh7NScvAmxeq-0" edge="1"> | ||
| <mxGeometry x="-1623.1249999999998" y="-2180" width="51.041666666666664" height="50" as="geometry"> | ||
| <mxPoint x="10.20802398989899" y="120.00301587301601" as="sourcePoint" /> | ||
| <mxPoint x="55.990852272727174" y="120.00301587301601" as="targetPoint" /> | ||
| <mxPoint x="98" as="offset" /> | ||
| <Array as="points"> | ||
| <mxPoint x="30.624999999999996" y="120" /> | ||
| </Array> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-3" value="Inherits from" style="endArrow=block;html=1;labelPosition=right;verticalLabelPosition=middle;align=left;verticalAlign=middle;endFill=0;fontSize=12;" parent="fcJVb3HREh7NScvAmxeq-0" edge="1"> | ||
| <mxGeometry x="-1623.1249999999998" y="-2180" width="51.041666666666664" height="50" as="geometry"> | ||
| <mxPoint x="10.20802398989899" y="132.3846031746034" as="sourcePoint" /> | ||
| <mxPoint x="55.990852272727174" y="132.3846031746034" as="targetPoint" /> | ||
| <mxPoint x="98" y="1" as="offset" /> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-4" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1"> | ||
| <mxGeometry x="10.208333333333332" y="40" width="40.83333333333333" height="34" as="geometry"> | ||
| <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" /> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-5" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-4" vertex="1"> | ||
| <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-6" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1"> | ||
| <mxGeometry x="112.29166666666666" y="40" width="40.83333333333333" height="34" as="geometry"> | ||
| <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" /> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-7" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-6" vertex="1"> | ||
| <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-8" value="" style="swimlane;fontStyle=3;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;gradientColor=#ffffff;swimlaneFillColor=#ffffff;" parent="fcJVb3HREh7NScvAmxeq-0" vertex="1"> | ||
| <mxGeometry x="214.37499999999997" y="40" width="40.83333333333333" height="34" as="geometry"> | ||
| <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" /> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="fcJVb3HREh7NScvAmxeq-9" value="" style="line;html=1;strokeWidth=1;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;" parent="fcJVb3HREh7NScvAmxeq-8" vertex="1"> | ||
| <mxGeometry y="26" width="40.83333333333333" height="8" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="0cJ1NAXk0Xtcf3CmwPfC-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="4use4ZCXdNiZSNTW99xv-1" target="4use4ZCXdNiZSNTW99xv-16" edge="1"> | ||
| <mxGeometry relative="1" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="4use4ZCXdNiZSNTW99xv-1" value="DriftDetectorIB
(DriftDetector)" style="swimlane;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=41;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;gradientColor=#FFFFFF;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1"> | ||
| <mxGeometry x="40" y="100" width="350" height="80" as="geometry"> | ||
| <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" /> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="4use4ZCXdNiZSNTW99xv-2" value="C_TYPE = 'Instance-based Drift Detector'" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1"> | ||
| <mxGeometry y="41" width="350" height="24" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="4use4ZCXdNiZSNTW99xv-5" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=3;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-1" vertex="1"> | ||
| <mxGeometry y="65" width="350" height="8" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="4use4ZCXdNiZSNTW99xv-16" value="DriftIB
(Drift)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1"> | ||
| <mxGeometry x="510" y="100" width="290" height="190" as="geometry"> | ||
| <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" /> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="wYuSwdfiTg43MnoHxwxG-0" value="instances : list[Instance]" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1"> | ||
| <mxGeometry y="40" width="290" height="26" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="4use4ZCXdNiZSNTW99xv-20" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1"> | ||
| <mxGeometry y="66" width="290" height="8" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="4use4ZCXdNiZSNTW99xv-21" value="__init__( p_drift_status : bool,
 p_instances : list[Instance],
 p_id : int = 0,
 p_tstamp : datetime,
 p_visualise : bool = False,
 p_raising_object : object = None,
 **p_kwargs )" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;fontStyle=1" parent="4use4ZCXdNiZSNTW99xv-16" vertex="1"> | ||
| <mxGeometry y="74" width="290" height="110" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="QPhXRuD-ExfV2QrfVq-p-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=block;endFill=0;" parent="WIyWlLk6GJQsqaUBKTNV-1" source="QPhXRuD-ExfV2QrfVq-p-9" target="4use4ZCXdNiZSNTW99xv-16" edge="1"> | ||
| <mxGeometry relative="1" as="geometry" /> | ||
| </mxCell> | ||
| <mxCell id="QPhXRuD-ExfV2QrfVq-p-9" value="DriftIBMovement
(DriftIB)" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=40;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=1;strokeWidth=1;fillColor=#fff2cc;strokeColor=#d6b656;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;gradientColor=#F5F5F5;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1"> | ||
| <mxGeometry x="510" y="370" width="290" height="60" as="geometry"> | ||
| <mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" /> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="QPhXRuD-ExfV2QrfVq-p-14" value="" style="line;html=1;strokeWidth=1;align=center;verticalAlign=top;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;rounded=0;shadow=1;strokeColor=#6c8ebf;swimlaneFillColor=#ffffff;fontFamily=Helvetica;fontSize=12;fontColor=default;fontStyle=1;fillColor=#dae8fc;gradientColor=#ffffff;" parent="QPhXRuD-ExfV2QrfVq-p-9" vertex="1"> | ||
| <mxGeometry y="40" width="290" height="8" as="geometry" /> | ||
| </mxCell> | ||
| </root> | ||
| </mxGraphModel> | ||
| </diagram> | ||
| </mxfile> |
Binary file added
BIN
+207 KB
...n/10_instance_based/images/MLPro-OA-IB-Drift-Detectors_class_diagram.drawio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions
4
...s/40_drift_detection/20_cluster_based.rst → ..._drift_detection/20_cluster_based.rst.off
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 0 additions & 14 deletions
14
...2/sub/mlpro_oa/streams/40_drift_detection/20_cluster_based/30_cluster_based.rst
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.