From 0430b87e35ba60c3cee3df84fd434011f1afac54 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 25 Oct 2024 18:34:20 +0000 Subject: [PATCH] Add generic ViewStream, BlueRow types/interfaces --- .../DataStream/DataStreamExtensions.cs | 3 + .../Offloading/RemoteQueryStream.cs | 4 +- .../Primitives/Count/CountStream.cs | 10 +- .../Crushing/CrushingCollectorStream.cs | 2 +- .../Primitives/Crushing/CrushingStream.cs | 6 +- .../Primitives/Derivative/DerivativeStream.cs | 2 +- .../Primitives/FileStreams/SaverStream.cs | 6 +- .../Primitives/Filter/FilterStream.cs | 10 +- .../Primitives/Freeze/FreezeDataStream.cs | 8 +- .../Fuzzy/FuzzyJoinOverTimeStream.cs | 8 +- .../Primitives/GroupBy/GroupByStream.cs | 2 +- .../Primitives/GroupBy/MethodDrivenStream.cs | 4 +- .../Primitives/Join/InternalJoinStream.cs | 8 +- .../DataStream/Primitives/Join/JoinStream.cs | 10 +- .../Primitives/Join/ParallelJoinTest.cs | 4 +- .../Primitives/Join/SuperJoinStream.cs | 8 +- .../LeftJoin/LeftInternalJoinStream.cs | 8 +- .../DataStream/Primitives/Map/MapStream.cs | 4 +- .../Primitives/Map/SuperMapStream.cs | 5 +- .../DataStream/Primitives/Misc/DebugStream.cs | 6 +- .../Primitives/Misc/TimeSeriesStream.cs | 4 +- .../Primitives/Project/ProjectStream.cs | 4 +- .../SideEffectStreams/CSVSaverStream.cs | 6 +- .../TextFileStreams/TextWriterStream.cs | 4 +- .../Primitives/ThreadSafe/ThreadSafeStream.cs | 4 +- .../ThreadSafe/VSDBMarshallerStream.cs | 4 +- .../TimeAverage/TimeAverageStream.cs | 2 +- .../Union/AlphabetizeColumnsStream.cs | 4 +- .../Primitives/Union/AppendStreamModified.cs | 8 +- .../Primitives/Union/MutableAppendStream.cs | 8 +- .../Primitives/Union/RenameStream.cs | 4 +- .../Primitives/Union/UnionStream.cs | 10 +- .../DataStream/Publish/PublisherStream.cs | 6 +- .../DataStream/Publish/ViewPublisher.cs | 4 +- .../BlueData/BlueTableImmutable.cs | 104 ++++++++++++++++++ .../DataStreamCore/BlueData/IBlueRow.cs | 9 ++ .../BlueData/IBlueRowCollection.cs | 7 ++ .../DataStreamCore/DataPacket.cs | 12 ++ .../DataStreamCore/DataStream.cs | 21 ++-- .../DataStreamChangeDelegate.cs | 4 + .../DataStreamCore/IDataPacket.cs | 12 ++ .../DataStreamCore/IViewStream.cs | 13 +++ .../DataStreamCore/ViewStream.cs | 6 +- 43 files changed, 272 insertions(+), 106 deletions(-) create mode 100644 src/DataStreamSuite/DataStreamCore/DataStreamChangeDelegate.cs create mode 100644 src/DataStreamSuite/DataStreamCore/IViewStream.cs diff --git a/src/DataStreamSuite/DataStream/DataStreamExtensions.cs b/src/DataStreamSuite/DataStream/DataStreamExtensions.cs index 87afa9757..7c25ad210 100644 --- a/src/DataStreamSuite/DataStream/DataStreamExtensions.cs +++ b/src/DataStreamSuite/DataStream/DataStreamExtensions.cs @@ -11,6 +11,9 @@ public static class DataStreamExtensions { public static ViewStream AsViewStream(this IObservable source) => source as ViewStream ?? new ObservableViewStream(source); + public static ViewStream AsViewStream(this IObservable> source) where T : IBlueRow => + source as ViewStream ?? new ObservableViewStream(source.Select(dp => new DataPacket(dp.newRows, dp.addedRows, dp.deletedRows))); + public static IObservable AsObservable(this ViewStream source) { return source as IObservable ?? Observable.Create(Subscribe); diff --git a/src/DataStreamSuite/DataStream/Offloading/RemoteQueryStream.cs b/src/DataStreamSuite/DataStream/Offloading/RemoteQueryStream.cs index 47a3b9433..9e10b7d41 100644 --- a/src/DataStreamSuite/DataStream/Offloading/RemoteQueryStream.cs +++ b/src/DataStreamSuite/DataStream/Offloading/RemoteQueryStream.cs @@ -25,12 +25,12 @@ namespace BCG { byte[] rem_req_bytes = rem_req.serialize(); _publisher_core.publish("System", "RemoteRequest", rem_req_bytes); _source_str = new TableStream(_name); - _source_str.onChange += new ChangeDelegate(_handle_data); + _source_str.onChange += _handle_data; } protected override void myOnLastSubscriber() { //maybe there should be a way to turn remote requests off ? - _source_str.onChange -= new ChangeDelegate(_handle_data); + _source_str.onChange -= _handle_data; } static string get_expression(params string[] lines) { diff --git a/src/DataStreamSuite/DataStream/Primitives/Count/CountStream.cs b/src/DataStreamSuite/DataStream/Primitives/Count/CountStream.cs index 65b113dcb..e172bcaec 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Count/CountStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Count/CountStream.cs @@ -21,13 +21,11 @@ namespace BCG : this (new TableStream (tableName)) {} - protected override void myOnFirstSubscriber () { - myVS.onChange += new ChangeDelegate(myHandleChanges); - } - protected override void myOnLastSubscriber () { - myVS.onChange -= new ChangeDelegate(myHandleChanges); - } + protected override void myOnFirstSubscriber () => + myVS.onChange += myHandleChanges; + protected override void myOnLastSubscriber () => + myVS.onChange -= myHandleChanges; private void myHandleChanges(object newValue) { diff --git a/src/DataStreamSuite/DataStream/Primitives/Crushing/CrushingCollectorStream.cs b/src/DataStreamSuite/DataStream/Primitives/Crushing/CrushingCollectorStream.cs index b7e6586e0..4e61019cc 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Crushing/CrushingCollectorStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Crushing/CrushingCollectorStream.cs @@ -30,7 +30,7 @@ namespace BCG protected override void myOnFirstSubscriber() { - myToCrush.onChange += new ChangeDelegate(myToCrush_onChange); + myToCrush.onChange += myToCrush_onChange; } protected override void myOnLastSubscriber() diff --git a/src/DataStreamSuite/DataStream/Primitives/Crushing/CrushingStream.cs b/src/DataStreamSuite/DataStream/Primitives/Crushing/CrushingStream.cs index 7eefa3be1..75eec5bbf 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Crushing/CrushingStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Crushing/CrushingStream.cs @@ -15,11 +15,11 @@ namespace BCG //set up an anonymous delegate for each of the streams //we do this so that we can unsubscribe - myDelegates = new ChangeDelegate[myToCrush.Length]; + myDelegates = new DataStreamChangeDelegate[myToCrush.Length]; for (int i = 0; i < myToCrush.Length; ++i) { int tempI = i; - myDelegates[tempI] = new ChangeDelegate((o) => { myHandleChange(tempI, ((DataPacket)o).newRows); }); + myDelegates[tempI] = new((o) => { myHandleChange(tempI, ((DataPacket)o).newRows); }); } } @@ -27,7 +27,7 @@ namespace BCG private ViewStream[] myToCrush; private ITableCrusher myCrusher; - private ChangeDelegate[] myDelegates; + private DataStreamChangeDelegate[] myDelegates; protected override void myOnFirstSubscriber() { diff --git a/src/DataStreamSuite/DataStream/Primitives/Derivative/DerivativeStream.cs b/src/DataStreamSuite/DataStream/Primitives/Derivative/DerivativeStream.cs index 23877d527..797f76b83 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Derivative/DerivativeStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Derivative/DerivativeStream.cs @@ -28,7 +28,7 @@ namespace BCG protected override void myOnFirstSubscriber() { - myDataSource.onChange += new ChangeDelegate(myDataSource_onChange); + myDataSource.onChange += myDataSource_onChange; } protected override void myOnLastSubscriber() diff --git a/src/DataStreamSuite/DataStream/Primitives/FileStreams/SaverStream.cs b/src/DataStreamSuite/DataStream/Primitives/FileStreams/SaverStream.cs index 922b4022b..016283340 100644 --- a/src/DataStreamSuite/DataStream/Primitives/FileStreams/SaverStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/FileStreams/SaverStream.cs @@ -18,7 +18,8 @@ namespace bts { _filename = filename; } - protected override void myOnFirstSubscriber() { _stream.onChange += new ChangeDelegate(_handle_changes); } + protected override void myOnFirstSubscriber() => + _stream.onChange += _handle_changes; void _handle_changes(object dp_obj) { DataPacket dp = dp_obj as DataPacket; @@ -26,7 +27,8 @@ namespace bts { myFireEvent(dp_obj); } - protected override void myOnLastSubscriber() { _stream.onChange -= new ChangeDelegate(_handle_changes); } + protected override void myOnLastSubscriber() => + _stream.onChange -= _handle_changes; protected void _save(DataPacket dp) { StreamIOMessage.CreateMessage cr_msg = new StreamIOMessage.CreateMessage(dp.newRows); diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs index 9a0bed58b..4e738ee4b 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs @@ -37,12 +37,12 @@ namespace BCG.StreamWorld.Addition protected override void myOnFirstSubscriber() { - myBaseStream.onChange += new ChangeDelegate(myHandleChanges); + myBaseStream.onChange += myHandleChanges; } protected override void myOnLastSubscriber() { - myBaseStream.onChange -= new ChangeDelegate(myHandleChanges); + myBaseStream.onChange -= myHandleChanges; myBaseTable.clear(); myStateTable.clear(); } @@ -228,13 +228,13 @@ namespace BCG #endregion #region overridden methods - protected override void myOnFirstSubscriber() - { myParentStream.onChange += new ChangeDelegate(myHandleCallbacks); } + protected override void myOnFirstSubscriber() => + myParentStream.onChange += myHandleCallbacks; protected override void myOnLastSubscriber() { myLastFiredRows = null; - myParentStream.onChange -= new ChangeDelegate(myHandleCallbacks); + myParentStream.onChange -= myHandleCallbacks; } protected override void myFireEvent(object o) diff --git a/src/DataStreamSuite/DataStream/Primitives/Freeze/FreezeDataStream.cs b/src/DataStreamSuite/DataStream/Primitives/Freeze/FreezeDataStream.cs index a6174b256..1a98eeed9 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Freeze/FreezeDataStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Freeze/FreezeDataStream.cs @@ -36,11 +36,11 @@ namespace BCG get{return myIsFrozen;} } - protected override void myOnFirstSubscriber () - {myStreamToFreeze.onChange += new DataStream.ChangeDelegate (myCallBack);} + protected override void myOnFirstSubscriber () => + myStreamToFreeze.onChange += myCallBack; - protected override void myOnLastSubscriber () - {myStreamToFreeze.onChange -= new DataStream.ChangeDelegate (myCallBack);} + protected override void myOnLastSubscriber () => + myStreamToFreeze.onChange -= myCallBack; internal void myCallBack(object o) { diff --git a/src/DataStreamSuite/DataStream/Primitives/Fuzzy/FuzzyJoinOverTimeStream.cs b/src/DataStreamSuite/DataStream/Primitives/Fuzzy/FuzzyJoinOverTimeStream.cs index ef4ba2e1b..069f662e3 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Fuzzy/FuzzyJoinOverTimeStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Fuzzy/FuzzyJoinOverTimeStream.cs @@ -96,15 +96,15 @@ namespace BCG protected override void myOnFirstSubscriber() { - this.myLeftSource.onChange += new ChangeDelegate(myLeft_onChange); - this.myRightSource.onChange += new ChangeDelegate(myRight_onChange); + myLeftSource.onChange += myLeft_onChange; + myRightSource.onChange += myRight_onChange; this.myVsd.addWorker(this); } protected override void myOnLastSubscriber() { - this.myLeftSource.onChange -= new ChangeDelegate(myLeft_onChange); - this.myRightSource.onChange -= new ChangeDelegate(myRight_onChange); + myLeftSource.onChange -= myLeft_onChange; + myRightSource.onChange -= myRight_onChange; this.myVsd.removeWorker(this); } diff --git a/src/DataStreamSuite/DataStream/Primitives/GroupBy/GroupByStream.cs b/src/DataStreamSuite/DataStream/Primitives/GroupBy/GroupByStream.cs index 496059a3c..9689aa643 100644 --- a/src/DataStreamSuite/DataStream/Primitives/GroupBy/GroupByStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/GroupBy/GroupByStream.cs @@ -175,7 +175,7 @@ namespace BCG { //gets resubscribed, we start the process of building data again, and treat the callback as the first //callback. myInit(); - myStream.onChange -= new DataStream.ChangeDelegate(myChangeHandler); + myStream.onChange -= myChangeHandler; } protected override void myInit() { diff --git a/src/DataStreamSuite/DataStream/Primitives/GroupBy/MethodDrivenStream.cs b/src/DataStreamSuite/DataStream/Primitives/GroupBy/MethodDrivenStream.cs index b509224f5..1033741cf 100644 --- a/src/DataStreamSuite/DataStream/Primitives/GroupBy/MethodDrivenStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/GroupBy/MethodDrivenStream.cs @@ -82,12 +82,12 @@ namespace BCG protected override void myOnFirstSubscriber() { - myStream.onChange += new DataStream.ChangeDelegate (myChangeHandler); + myStream.onChange += myChangeHandler; } protected override void myOnLastSubscriber () { - myStream.onChange -= new DataStream.ChangeDelegate (myChangeHandler); + myStream.onChange -= myChangeHandler; } } } diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/InternalJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/InternalJoinStream.cs index 0f9f9c16c..f2bbbfa34 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/InternalJoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/InternalJoinStream.cs @@ -31,15 +31,15 @@ namespace BCG { myLeftOperand.master = this; myRightOperand.master = this; - myLeftStream.onChange += new DataStream.ChangeDelegate (myLeftOperand.changeHandler); - myRightStream.onChange += new DataStream.ChangeDelegate (myRightOperand.changeHandler); + myLeftStream.onChange += myLeftOperand.changeHandler; + myRightStream.onChange += myRightOperand.changeHandler; } protected override void myOnLastSubscriber () { myInit (); - myLeftStream.onChange -= new DataStream.ChangeDelegate (myLeftOperand.changeHandler); - myRightStream.onChange -= new DataStream.ChangeDelegate (myRightOperand.changeHandler); + myLeftStream.onChange -= myLeftOperand.changeHandler; + myRightStream.onChange -= myRightOperand.changeHandler; } public JoinOperand getOtherOperand (JoinOperand jo) diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/JoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/JoinStream.cs index 5a72e617a..db494e8b7 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/JoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/JoinStream.cs @@ -116,7 +116,7 @@ namespace BCG IDictionary map = resolver.getMap (); map["id"] = "id"; myPs = new ProjectStream (myIjs, map); - myPs.onChange += new DataStream.ChangeDelegate (myProjectChangeHandler); + myPs.onChange += myProjectChangeHandler; return; } else @@ -129,26 +129,26 @@ namespace BCG private void myProjectChangeHandler (object o) { if (myIjs.myOnChangeDelegate.GetInvocationList().Length > 1) - myIjs.onChange -= new DataStream.ChangeDelegate (myInternalJoinChangeHandler); + myIjs.onChange -= myInternalJoinChangeHandler; myFireEvent ((o as ICloneable).Clone()); } protected override void myOnFirstSubscriber () { - myIjs.onChange += new DataStream.ChangeDelegate (myInternalJoinChangeHandler); + myIjs.onChange += myInternalJoinChangeHandler; } protected override void myOnLastSubscriber () { // how does this relate to the -= in myProjectChangeHandler? - myIjs.onChange -= new DataStream.ChangeDelegate (myInternalJoinChangeHandler); + myIjs.onChange -= myInternalJoinChangeHandler; // if there is a project after the ijs we need to // unsubscribe to it otherwise references will be kept and // a memory leak will occur if (myPs != null) - myPs.onChange -= new DataStream.ChangeDelegate (myProjectChangeHandler); + myPs.onChange -= myProjectChangeHandler; myPs = null; } diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/ParallelJoinTest.cs b/src/DataStreamSuite/DataStream/Primitives/Join/ParallelJoinTest.cs index ec4ecc9f9..b04975a45 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/ParallelJoinTest.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/ParallelJoinTest.cs @@ -181,8 +181,8 @@ namespace BCG protected override void myOnFirstSubscriber() { - myVLeft.onChange += new ChangeDelegate(myVLeft_onChange); - myVRight.onChange += new ChangeDelegate(myVRight_onChange); + myVLeft.onChange += myVLeft_onChange; + myVRight.onChange += myVRight_onChange; } void myVRight_onChange(object newValue) diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs index b8fae4b51..52edd07bd 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/SuperJoinStream.cs @@ -327,14 +327,14 @@ namespace BCG protected override void myOnFirstSubscriber() { - myLeftStream.onChange += new ChangeDelegate(myHandleLeftStreamChanges); - myRightStream.onChange += new ChangeDelegate(myHandleRightStreamChanges); + myLeftStream.onChange += myHandleLeftStreamChanges; + myRightStream.onChange += myHandleRightStreamChanges; } protected override void myOnLastSubscriber() { - myLeftStream.onChange -= new ChangeDelegate(myHandleLeftStreamChanges); - myRightStream.onChange -= new ChangeDelegate(myHandleRightStreamChanges); + myLeftStream.onChange -= myHandleLeftStreamChanges; + myRightStream.onChange -= myHandleRightStreamChanges; myLeftKeyToLeftRows.Clear(); myRightKeyToRightRows.Clear(); myLeftIDToResultRows.Clear(); diff --git a/src/DataStreamSuite/DataStream/Primitives/LeftJoin/LeftInternalJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/LeftJoin/LeftInternalJoinStream.cs index 0d1921ec2..08287f70d 100644 --- a/src/DataStreamSuite/DataStream/Primitives/LeftJoin/LeftInternalJoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/LeftJoin/LeftInternalJoinStream.cs @@ -23,15 +23,15 @@ namespace BCG myRightOperand.master = this; //the events are not hooked onto the operands delegate, but rather a level of indirection //added in the form on myLeftChangeHandler - myLeftStream.onChange += new DataStream.ChangeDelegate (myLeftChangeHandler); - myRightStream.onChange += new DataStream.ChangeDelegate (myRightChangeHandler); + myLeftStream.onChange += myLeftChangeHandler; + myRightStream.onChange += myRightChangeHandler; } protected override void myOnLastSubscriber () { myInit (); - myLeftStream.onChange -= new DataStream.ChangeDelegate (myLeftChangeHandler); - myRightStream.onChange -= new DataStream.ChangeDelegate (myRightChangeHandler); + myLeftStream.onChange -= myLeftChangeHandler; + myRightStream.onChange -= myRightChangeHandler; } protected override void myInit() diff --git a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs index 83409555d..e6c67168d 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs @@ -119,13 +119,13 @@ namespace BCG { protected override void myOnFirstSubscriber() { - myStream.onChange += new DataStream.ChangeDelegate(myChangeHandler); + myStream.onChange += myChangeHandler; } protected override void myOnLastSubscriber() { myInit(); if (myStream != null) - myStream.onChange -= new DataStream.ChangeDelegate(myChangeHandler); + myStream.onChange -= myChangeHandler; } protected override void myOnTableClear() { diff --git a/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs b/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs index 7d0d42ce8..210d126d6 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs @@ -83,10 +83,11 @@ namespace BCG { myMapper.onMapperChange += new MapperChangeDelegate(myHandleMapChange); } - protected override void myOnFirstSubscriber() { myStream.onChange += new ChangeDelegate(myHandleData); } + protected override void myOnFirstSubscriber() => + myStream.onChange += myHandleData; protected override void myOnLastSubscriber() { - myStream.onChange -= new ChangeDelegate(myHandleData); + myStream.onChange -= myHandleData; myRows = null; myBaseRows = null; myMap.Clear(); diff --git a/src/DataStreamSuite/DataStream/Primitives/Misc/DebugStream.cs b/src/DataStreamSuite/DataStream/Primitives/Misc/DebugStream.cs index 5fd4a25f6..7fe27a66d 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Misc/DebugStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Misc/DebugStream.cs @@ -16,10 +16,10 @@ namespace BCG { } protected override void myOnFirstSubscriber() { - _stream.onChange += new ChangeDelegate(_onstream_change); + _stream.onChange += _onstream_change; } protected override void myOnLastSubscriber() { - _stream.onChange -= new ChangeDelegate(_onstream_change); + _stream.onChange -= _onstream_change; } private void _onstream_change(object o) { @@ -45,4 +45,4 @@ namespace BCG { } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Primitives/Misc/TimeSeriesStream.cs b/src/DataStreamSuite/DataStream/Primitives/Misc/TimeSeriesStream.cs index e4cc58c44..a773b4dd3 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Misc/TimeSeriesStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Misc/TimeSeriesStream.cs @@ -17,10 +17,10 @@ namespace BCG { } protected override void myOnFirstSubscriber() { - _stream.onChange += new ChangeDelegate(_onstream_change); + _stream.onChange += _onstream_change; } protected override void myOnLastSubscriber() { - _stream.onChange -= new ChangeDelegate(_onstream_change); + _stream.onChange -= _onstream_change; } diff --git a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs index 6a8be6cb5..fab2e9956 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Project/ProjectStream.cs @@ -54,12 +54,12 @@ namespace BCG { protected override void myOnFirstSubscriber() { - myVs.onChange += new BCG.DataStream.ChangeDelegate (myHandleChange); + myVs.onChange += myHandleChange; } protected override void myOnLastSubscriber() { - myVs.onChange -= new BCG.DataStream.ChangeDelegate (myHandleChange);; + myVs.onChange -= myHandleChange; } internal void myHandleChange (object newValue) diff --git a/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs b/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs index 41eb76390..9a3aa4144 100644 --- a/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/SideEffectStreams/CSVSaverStream.cs @@ -33,9 +33,11 @@ namespace BCG { myFireResultSnapshot = fireResultSnapshot; } - protected override void myOnFirstSubscriber() { myStream.onChange += new ChangeDelegate(myHandleChanges); } + protected override void myOnFirstSubscriber() => + myStream.onChange += myHandleChanges; - protected override void myOnLastSubscriber() { myStream.onChange -= new ChangeDelegate(myHandleChanges); } + protected override void myOnLastSubscriber() => + myStream.onChange -= myHandleChanges; private void myHandleChanges(object newValue) { IBlueRowCollection totalState = (newValue as DataPacket).newRows; diff --git a/src/DataStreamSuite/DataStream/Primitives/TextFileStreams/TextWriterStream.cs b/src/DataStreamSuite/DataStream/Primitives/TextFileStreams/TextWriterStream.cs index 3b49e5d55..bd6719a47 100644 --- a/src/DataStreamSuite/DataStream/Primitives/TextFileStreams/TextWriterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/TextFileStreams/TextWriterStream.cs @@ -35,14 +35,14 @@ namespace BCG #region ViewStream protected override void myOnFirstSubscriber() { - myStream.onChange +=new ChangeDelegate(myStreamChange); + myStream.onChange += myStreamChange; myVsd.addWorker(this); } protected override void myOnLastSubscriber() { myVsd.removeWorker(this); - myStream.onChange -= new ChangeDelegate(myStreamChange); + myStream.onChange -= myStreamChange; } #endregion diff --git a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/ThreadSafeStream.cs b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/ThreadSafeStream.cs index 9102987f7..cfeedbdf4 100644 --- a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/ThreadSafeStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/ThreadSafeStream.cs @@ -28,7 +28,7 @@ namespace BCG protected override void myOnFirstSubscriber() { - myParentStream.onChange += new ChangeDelegate(myParentStreamChangeHandler); + myParentStream.onChange += myParentStreamChangeHandler; myVSD.addWorker(this); } @@ -36,7 +36,7 @@ namespace BCG protected override void myOnLastSubscriber() { - myParentStream.onChange -= new ChangeDelegate(myParentStreamChangeHandler); + myParentStream.onChange -= myParentStreamChangeHandler; myVSD.removeWorker(this); } diff --git a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs index 4bce8e362..872883119 100644 --- a/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/ThreadSafe/VSDBMarshallerStream.cs @@ -53,11 +53,11 @@ namespace BCG if (r.is_subscription) { _current_source_subscription = r.subscription_id; - _source_stream.onChange += new ChangeDelegate(_source_stream_onChange); + _source_stream.onChange += _source_stream_onChange; } else { - _source_stream.onChange -= new ChangeDelegate(_source_stream_onChange); + _source_stream.onChange -= _source_stream_onChange; } } } diff --git a/src/DataStreamSuite/DataStream/Primitives/TimeAverage/TimeAverageStream.cs b/src/DataStreamSuite/DataStream/Primitives/TimeAverage/TimeAverageStream.cs index 27ef3313e..cf05ebf64 100644 --- a/src/DataStreamSuite/DataStream/Primitives/TimeAverage/TimeAverageStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/TimeAverage/TimeAverageStream.cs @@ -24,7 +24,7 @@ namespace BCG protected override void myOnFirstSubscriber() { myKeyToTimeToValue = new Dictionary>(); - myToAverage.onChange += new ChangeDelegate(myToAverage_onChange); + myToAverage.onChange += myToAverage_onChange; } diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/AlphabetizeColumnsStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/AlphabetizeColumnsStream.cs index 498160658..c8f58fc27 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/AlphabetizeColumnsStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/AlphabetizeColumnsStream.cs @@ -12,10 +12,10 @@ namespace BCG { mySrc = src; } protected override void myOnFirstSubscriber() { - mySrc.onChange += new ChangeDelegate(mySrc_onChange); + mySrc.onChange += mySrc_onChange; } protected override void myOnLastSubscriber() { - mySrc.onChange -= new ChangeDelegate(mySrc_onChange); + mySrc.onChange -= mySrc_onChange; } private void mySrc_onChange(object newValue) { DataPacket dp = (DataPacket)newValue; diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/AppendStreamModified.cs b/src/DataStreamSuite/DataStream/Primitives/Union/AppendStreamModified.cs index c10b8a32a..b95956dea 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/AppendStreamModified.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/AppendStreamModified.cs @@ -28,14 +28,14 @@ namespace BCG protected override void myOnFirstSubscriber() { - myLeftStream.onChange += new ChangeDelegate(myHandleLeftChanges); - myRightstream.onChange += new ChangeDelegate(myHandleRightChanges); + myLeftStream.onChange += myHandleLeftChanges; + myRightstream.onChange += myHandleRightChanges; } protected override void myOnLastSubscriber() { - myLeftStream.onChange -= new ChangeDelegate(myHandleLeftChanges); - myRightstream.onChange -= new ChangeDelegate(myHandleRightChanges); + myLeftStream.onChange -= myHandleLeftChanges; + myRightstream.onChange -= myHandleRightChanges; } private void myHandleLeftChanges (object newValue) diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs index d6ab1cfe8..57556a286 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/MutableAppendStream.cs @@ -222,7 +222,7 @@ namespace BCG pj = new ProjectStream(pj, "!"); myStreamIndex.Add(myMovingIndex, new Pair(vs, pj)); if (mySubscriptionActive) - pj.onChange += new ChangeDelegate(myHandleStreamChanges); + pj.onChange += myHandleStreamChanges; } public void removeStream(ViewStream vs) @@ -235,7 +235,7 @@ namespace BCG index = p.Key; if (mySubscriptionActive) { - p.Value.second.onChange -= new ChangeDelegate(myHandleStreamChanges); + p.Value.second.onChange -= myHandleStreamChanges; if (myTable != null) { IBlueRowCollection delRows = myTable.removeTable(p.Key); @@ -254,14 +254,14 @@ namespace BCG { mySubscriptionActive = true; foreach (KeyValuePair> p in myStreamIndex) - p.Value.second.onChange += new ChangeDelegate(myHandleStreamChanges); + p.Value.second.onChange += myHandleStreamChanges; } protected override void myOnLastSubscriber() { mySubscriptionActive = false; foreach (KeyValuePair> p in myStreamIndex) - p.Value.second.onChange -= new ChangeDelegate(myHandleStreamChanges); + p.Value.second.onChange -= myHandleStreamChanges; if (myTable != null) myTable.clear(); } diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/RenameStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/RenameStream.cs index cbf5e51a1..c61ed53f0 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/RenameStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/RenameStream.cs @@ -14,11 +14,11 @@ namespace BCG { } protected override void myOnFirstSubscriber() { - mySrc.onChange += new ChangeDelegate(mySrc_onChange); + mySrc.onChange += mySrc_onChange; } protected override void myOnLastSubscriber () { - mySrc.onChange -= new ChangeDelegate (mySrc_onChange); + mySrc.onChange -= mySrc_onChange; } private void mySrc_onChange (object newValue) { DataPacket dp = (DataPacket)newValue; diff --git a/src/DataStreamSuite/DataStream/Primitives/Union/UnionStream.cs b/src/DataStreamSuite/DataStream/Primitives/Union/UnionStream.cs index 5af486f8f..e791ae9f5 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Union/UnionStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Union/UnionStream.cs @@ -21,15 +21,15 @@ namespace BCG { myLeftOp = new UnionOperand (true, this); myRightOp = new UnionOperand (false, this); - myLeftVs.onChange += new DataStream.ChangeDelegate (myLeftOp.myChangeHandler); - myRightVs.onChange += new DataStream.ChangeDelegate (myRightOp.myChangeHandler); + myLeftVs.onChange += myLeftOp.myChangeHandler; + myRightVs.onChange += myRightOp.myChangeHandler; } protected override void myOnLastSubscriber () { myInit (); - myLeftVs.onChange -= new DataStream.ChangeDelegate (myLeftOp.myChangeHandler); - myRightVs.onChange -= new DataStream.ChangeDelegate (myRightOp.myChangeHandler); + myLeftVs.onChange -= myLeftOp.myChangeHandler; + myRightVs.onChange -= myRightOp.myChangeHandler; } public void startSession () @@ -116,4 +116,4 @@ namespace BCG receiveStream(dp, isLeft); } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Publish/PublisherStream.cs b/src/DataStreamSuite/DataStream/Publish/PublisherStream.cs index ab294aa49..aee02aa7b 100644 --- a/src/DataStreamSuite/DataStream/Publish/PublisherStream.cs +++ b/src/DataStreamSuite/DataStream/Publish/PublisherStream.cs @@ -14,11 +14,11 @@ namespace BCG { protected override void myOnFirstSubscriber() { _vs_publisher = new ViewPublisher(_name, _broker, _main_stream); - _main_stream.onChange += new DataStream.ChangeDelegate(_handle_update); + _main_stream.onChange += _handle_update; } protected override void myOnLastSubscriber() { - _main_stream.onChange -= new DataStream.ChangeDelegate(_handle_update); + _main_stream.onChange -= _handle_update; _vs_publisher.Dispose(); } @@ -28,4 +28,4 @@ namespace BCG { } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs b/src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs index 6828256bf..44d707c91 100644 --- a/src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs +++ b/src/DataStreamSuite/DataStream/Publish/ViewPublisher.cs @@ -20,11 +20,11 @@ namespace BCG { public ViewPublisher(string name, IPubTableBroker broker, ViewStream vs) { _stream = String.IsNullOrEmpty(name) ? vs : new ChangeTableNameStream(vs, name); _broker = broker; - _stream.onChange += new DataStream.ChangeDelegate(_handle_update); + _stream.onChange += _handle_update; } public void Dispose() { - _stream.onChange -= new DataStream.ChangeDelegate(_handle_update); + _stream.onChange -= _handle_update; } private void _handle_update(object o) { diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs b/src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs index c0794057d..b40e78c90 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/BlueTableImmutable.cs @@ -96,3 +96,107 @@ public class BlueTableImmutable : IBlueRowCollection, IImmutableRowCollection { new(schema, table.ToImmutable()); } } + +public class BlueTableImmutable : IBlueRowCollection where T : IBlueRow { + readonly ImmutableDictionary rows; + + public BlueTableImmutable(IBlueTableSchema schema) + : this(schema, ImmutableDictionary.Empty) { } + + public BlueTableImmutable(IBlueTableSchema schema, ImmutableDictionary rows) { + this.schema = schema; + this.rows = rows; + } + + public int Count => rows.Count; + public bool IsSynchronized => false; + public IBlueTableSchema schema { get; } + public object SyncRoot => this; + + public T this[int id] => rows[id]; + + public bool containsID(int id) => + rows.ContainsKey(id); + + public void CopyTo(Array array, int index) { + foreach (var r in rows.Values) { + array.SetValue(r, index++); + } + } + + public IEnumerator GetEnumerator() => + rows.Values.GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => + GetEnumerator(); + + public DataPacketBuilder ToDataPacketBuilder() => + new(this); + + public class DataPacketBuilder { + readonly IBlueTableSchema schema; + readonly ImmutableDictionary.Builder table; + readonly ImmutableDictionary.Builder added = + ImmutableDictionary.Empty.ToBuilder(); + readonly ImmutableDictionary.Builder removed = + ImmutableDictionary.Empty.ToBuilder(); + + public DataPacketBuilder(BlueTableImmutable table) { + schema = table.schema; + this.table = table.rows.ToBuilder(); + } + + public void AddOrUpdate(T row, IEqualityComparer? comparer = null) { + var id = row.Id(); + if (table.TryGetValue(id, out var orig)) { + if (comparer?.Equals(row, orig) ?? false) { + // No op: This row was already in the table (according to 'comparer'). + // Remove it from 'added' and 'removed'. + added.Remove(id); + removed.Remove(id); + return; + } + // Change op: A row with this id was already in the table, + // but its values have changed (according to 'comparer'). + removed[id] = orig; + } + added[id] = row; + } + + public void Remove(int id) { + added.Remove(id); + if (table.TryGetValue(id, out var orig)) { + removed[id] = orig; + } + } + + public DataPacket ToDataPacket(bool reset = true) { + table.RemoveRange(removed.Keys); + table.AddRange(added); + var newRows = new BlueTableImmutable(schema, table.ToImmutable()); + var addedRows = new BlueTableImmutable(schema, added.ToImmutable()); + var removedRows = new BlueTableImmutable(schema, removed.ToImmutable()); + if (reset) { + added.Clear(); + removed.Clear(); + } + return new(newRows, addedRows, removedRows); + } + + public IDataPacket ToDataPacketT(bool reset = true) { + table.RemoveRange(removed.Keys); + table.AddRange(added); + var newRows = new BlueTableImmutable(schema, table.ToImmutable()); + var addedRows = new BlueTableImmutable(schema, added.ToImmutable()); + var removedRows = new BlueTableImmutable(schema, removed.ToImmutable()); + if (reset) { + added.Clear(); + removed.Clear(); + } + return new DataPacket(newRows, addedRows, removedRows); + } + + public BlueTableImmutable ToImmutable() => + new(schema, table.ToImmutable()); + } +} diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs b/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs index 1225e5c4e..52586d857 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRow.cs @@ -24,7 +24,16 @@ namespace BCG /// object? this[int index] {get;} object? this[string colName] {get;} + bool IDictionary.IsFixedSize => true; + bool IDictionary.IsReadOnly => true; + object ICollection.SyncRoot => this; + bool ICollection.IsSynchronized => false; } + + // public interface IBlueRow : IBlueRow where T : IBlueRow { + // T Value => (T)this; + // } + namespace Extensions { public static class IBlueRowExtensions diff --git a/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRowCollection.cs b/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRowCollection.cs index ad4932bb6..987fb3006 100644 --- a/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRowCollection.cs +++ b/src/DataStreamSuite/DataStreamCore/BlueData/IBlueRowCollection.cs @@ -1,5 +1,6 @@ using System; using System.Collections; +using System.Collections.Generic; namespace BCG { @@ -16,4 +17,10 @@ namespace BCG IBlueTableSchema schema {get;} bool containsID (int id); } + + public interface IBlueRowCollection : IBlueRowCollection, IReadOnlyCollection where T : IBlueRow { + new T this[int id] { get; } + + IBlueRow IBlueRowCollection.this[int id] => this[id]; + } } diff --git a/src/DataStreamSuite/DataStreamCore/DataPacket.cs b/src/DataStreamSuite/DataStreamCore/DataPacket.cs index 383f6073f..6b6199f7d 100644 --- a/src/DataStreamSuite/DataStreamCore/DataPacket.cs +++ b/src/DataStreamSuite/DataStreamCore/DataPacket.cs @@ -314,6 +314,18 @@ namespace BCG } } + public class DataPacket : IDataPacket where T : IBlueRow { + public DataPacket(IBlueRowCollection newRows, IBlueRowCollection addedRows, IBlueRowCollection deletedRows) { + this.newRows = newRows; + this.addedRows = addedRows; + this.deletedRows = deletedRows; + } + + public IBlueRowCollection newRows { get; } + public IBlueRowCollection addedRows { get; } + public IBlueRowCollection deletedRows { get; } + } + public static class DataPacketExtensions { public static bool HasChanges(this DataPacket dataPacket) => dataPacket.addedRows.Count > 0 || dataPacket.deletedRows.Count > 0; diff --git a/src/DataStreamSuite/DataStreamCore/DataStream.cs b/src/DataStreamSuite/DataStreamCore/DataStream.cs index dd1e367c2..d9774ff19 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStream.cs +++ b/src/DataStreamSuite/DataStreamCore/DataStream.cs @@ -53,16 +53,15 @@ namespace BCG public event Action ErrorChanged; - public delegate void ChangeDelegate(object newValue); - public event ChangeDelegate onChange + public event DataStreamChangeDelegate onChange { add { - ChangeDelegate currValue = value; + DataStreamChangeDelegate currValue = value; if (myTestMode) { ChangeDelegateWrapper w = new ChangeDelegateWrapper (value); - currValue = new ChangeDelegate (w.wrapperFunction); + currValue = new DataStreamChangeDelegate (w.wrapperFunction); myDelMap.Add (value, currValue); } if (myRealSource != null) @@ -70,7 +69,7 @@ namespace BCG else { myOnChangeDelegate = - (ChangeDelegate) Delegate.Combine (myOnChangeDelegate,currValue); + (DataStreamChangeDelegate) Delegate.Combine (myOnChangeDelegate,currValue); if (myOnChangeDelegate.GetInvocationList().Length == 1) // first subscriber @@ -95,11 +94,11 @@ namespace BCG } remove { - ChangeDelegate currValue = value; + var currValue = value; // BlueTrace.WriteViewStreamUnsubscribe(this.ID); if (myTestMode) { - currValue = myDelMap[value] as ChangeDelegate; + currValue = myDelMap[value] as DataStreamChangeDelegate; myDelMap.Remove (value); } if (myRealSource != null) @@ -107,7 +106,7 @@ namespace BCG else { myOnChangeDelegate = - (ChangeDelegate) Delegate.Remove (myOnChangeDelegate,currValue); + (DataStreamChangeDelegate) Delegate.Remove (myOnChangeDelegate,currValue); // this is need to avoid a callback in a reentrant add. if (myPendingAdds.Count > 0) @@ -175,7 +174,7 @@ namespace BCG // this was made internal for testing purposes only. // don't mess with it. - internal ChangeDelegate myOnChangeDelegate; + internal DataStreamChangeDelegate myOnChangeDelegate; protected object myLastValue; protected DataStream myRealSource; private Stack myPendingAdds; @@ -184,9 +183,9 @@ namespace BCG internal class ChangeDelegateWrapper { readonly Stopwatch timer = new(); - private DataStream.ChangeDelegate myDel; + private DataStreamChangeDelegate myDel; - internal ChangeDelegateWrapper (DataStream.ChangeDelegate del) {myDel = del;} + internal ChangeDelegateWrapper (DataStreamChangeDelegate del) {myDel = del;} internal void wrapperFunction (object o) { diff --git a/src/DataStreamSuite/DataStreamCore/DataStreamChangeDelegate.cs b/src/DataStreamSuite/DataStreamCore/DataStreamChangeDelegate.cs new file mode 100644 index 000000000..d8506e8cc --- /dev/null +++ b/src/DataStreamSuite/DataStreamCore/DataStreamChangeDelegate.cs @@ -0,0 +1,4 @@ +namespace BCG; + +public delegate void DataStreamChangeDelegate(object newValue); +public delegate void DataStreamChangeDelegate(IDataPacket dp) where T : IBlueRow; diff --git a/src/DataStreamSuite/DataStreamCore/IDataPacket.cs b/src/DataStreamSuite/DataStreamCore/IDataPacket.cs index 8165cb5dd..d84563deb 100644 --- a/src/DataStreamSuite/DataStreamCore/IDataPacket.cs +++ b/src/DataStreamSuite/DataStreamCore/IDataPacket.cs @@ -12,4 +12,16 @@ namespace BCG //this is an ICollection of IDictionary void get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows); } + + public interface IDataPacket : IDataPacket where T : IBlueRow { + IBlueRowCollection newRows { get; } + IBlueRowCollection addedRows { get; } + IBlueRowCollection deletedRows { get; } + + void IDataPacket.get_new_added_deleted(out ICollection new_rows, out ICollection added_rows, out ICollection deleted_rows) { + new_rows = newRows; + added_rows = addedRows; + deleted_rows = deletedRows; + } + } } diff --git a/src/DataStreamSuite/DataStreamCore/IViewStream.cs b/src/DataStreamSuite/DataStreamCore/IViewStream.cs new file mode 100644 index 000000000..eae4d3cd2 --- /dev/null +++ b/src/DataStreamSuite/DataStreamCore/IViewStream.cs @@ -0,0 +1,13 @@ +namespace BCG; + +public interface IViewStream { + event DataStreamChangeDelegate onChange; + + IBlueRowCollection rows { get; } +} + +public interface IViewStream : IViewStream where T : IBlueRow { + new event DataStreamChangeDelegate onChange; + + new IBlueRowCollection rows { get; } +} diff --git a/src/DataStreamSuite/DataStreamCore/ViewStream.cs b/src/DataStreamSuite/DataStreamCore/ViewStream.cs index b5bb91a01..d1403e80a 100644 --- a/src/DataStreamSuite/DataStreamCore/ViewStream.cs +++ b/src/DataStreamSuite/DataStreamCore/ViewStream.cs @@ -5,7 +5,7 @@ namespace BCG /// /// Marker abstract class /// - public abstract class ViewStream : DataStream + public abstract class ViewStream : DataStream, IViewStream { private IBlueRowCollection myLastValueForTestMode; // protected bool myUseUncopiedNewRowsInFireEvent = @@ -45,7 +45,7 @@ namespace BCG { // used to force a computation of a stream which // happens to have no subscribers - onChange += new DataStream.ChangeDelegate(myDummy); + onChange += new DataStreamChangeDelegate(myDummy); try { @@ -56,7 +56,7 @@ namespace BCG } finally { - onChange -= new DataStream.ChangeDelegate(myDummy); + onChange -= new DataStreamChangeDelegate(myDummy); } } }