Skip to content

Analysis wizard #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jamaa wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Analysis wizard #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eece45e
started work on an analysis wizard (only AnnualStatistics partially i…
jamaa Apr 7, 2022
e36bf50
slight refactoring
jamaa Apr 12, 2022
98f05ab
refactor Autocorrelation to use wizard
jamaa Apr 12, 2022
5104694
refactor Analysis.Description as an instance property
jamaa Apr 12, 2022
135e36d
attempt to implement multiparameters for Calculator analysis function
jamaa May 26, 2022
3bcda3d
fix some errors from rebasing
jamaa Dec 26, 2022
7d5c05a
fix license boilerplate
jamaa Dec 26, 2022
3d638ed
add checkbox as input control for boolean parameters
jamaa Dec 26, 2022
359ab35
some comments
jamaa Dec 26, 2022
989af12
temporarily disable unfinished analysis functions
jamaa Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions source/Analysis/Analysis.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ Friend MustInherit Class Analysis
#Region "Eigenschaften"

''' <summary>
''' List of input TimeSeries for analysis
''' List of analysis parameters
''' </summary>
Protected InputTimeSeries As List(Of TimeSeries)
Friend parameters As Dictionary(Of String, AnalysisParameter)

''' <summary>
''' Result text
Expand Down Expand Up @@ -87,11 +87,8 @@ Friend MustInherit Class Analysis

''' <summary>
''' Returns a text description of the analysis function
''' Should be overloaded by inheriting analysis functions
''' </summary>
Public Shared Function Description() As String
Return "No description found"
End Function
Public MustOverride ReadOnly Property Description() As String

''' <summary>
''' Flag indicating whether the analysis function has a result text
Expand Down Expand Up @@ -177,13 +174,10 @@ Friend MustInherit Class Analysis
''' <summary>
''' Constructor
''' </summary>
''' <param name="inputseries">List of input TimeSeries</param>
Public Sub New(inputseries As List(Of TimeSeries))

'Zeitreihen
Me.InputTimeSeries = inputseries
Public Sub New()

'Datenstrukturen initialisieren
Me.parameters = New Dictionary(Of String, AnalysisParameter)
Me.ResultValues = New Dictionary(Of String, Double)
Me.ResultSeries = New List(Of TimeSeries)
End Sub
Expand Down
210 changes: 143 additions & 67 deletions source/Analysis/AnalysisDialog.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions source/Analysis/AnalysisDialog.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="Label_Series.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="Label_Analysis.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="Label_Analysis.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
Expand Down
Loading