From 357e39c34121648dded4745f6ec1ee14b3d9e6fd Mon Sep 17 00:00:00 2001 From: Dippold Martin <dippold@ivt.tugraz.at> Date: Tue, 23 Aug 2016 13:50:06 +0200 Subject: [PATCH] * New version number * Uneven numbers of datasets per heading in HS test now allowed --- CSE/Calculation/main_calculation_call.vb | 68 ++++++++++++------------ CSE/declaration_public.vb | 4 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/CSE/Calculation/main_calculation_call.vb b/CSE/Calculation/main_calculation_call.vb index 837aaeb..39e3ae0 100644 --- a/CSE/Calculation/main_calculation_call.vb +++ b/CSE/Calculation/main_calculation_call.vb @@ -802,42 +802,42 @@ Public Module main_calculation_call ' Ceck if enough sections are detected If anzHS1 < Crt.segruns_min_head_HS Or anzHS2 < Crt.segruns_min_head_HS Then - Throw New Exception(format("Number of valid high speed datasets({0}) too low!", anzHS1)) + Throw New Exception(format("Number of valid high speed datasets too low! HeadDir1: {0}; HeadDir2: {1}.", anzHS1, anzHS2)) End If - ' Set to equal Values - If anzHS1 <> anzHS2 Then - anz = 0 - If anzHS1 > anzHS2 Then - For i = 0 To ErgValuesComp(tCompErg.SecID).Count - 1.0 - If ErgValuesComp(tCompErg.RunID)(i) = IDHS Then - If ErgValuesComp(tCompErg.HeadID)(i) = 1 Then - If ErgValuesComp(tCompErg.used)(i) = 1 Then - If anz >= anzHS2 Then - ErgValuesComp(tCompErg.used)(i) = 0 - Else - anz += 1 - End If - End If - End If - End If - Next i - Else - For i = 0 To ErgValuesComp(tCompErg.SecID).Count - 1.0 - If ErgValuesComp(tCompErg.RunID)(i) = IDHS Then - If ErgValuesComp(tCompErg.HeadID)(i) = 2 Then - If ErgValuesComp(tCompErg.used)(i) = 1 Then - If anz >= anzHS1 Then - ErgValuesComp(tCompErg.used)(i) = 0 - Else - anz += 1 - End If - End If - End If - End If - Next i - End If - End If + '' Set to equal Values + 'If anzHS1 <> anzHS2 Then + ' anz = 0 + ' If anzHS1 > anzHS2 Then + ' For i = 0 To ErgValuesComp(tCompErg.SecID).Count - 1.0 + ' If ErgValuesComp(tCompErg.RunID)(i) = IDHS Then + ' If ErgValuesComp(tCompErg.HeadID)(i) = 1 Then + ' If ErgValuesComp(tCompErg.used)(i) = 1 Then + ' If anz >= anzHS2 Then + ' ErgValuesComp(tCompErg.used)(i) = 0 + ' Else + ' anz += 1 + ' End If + ' End If + ' End If + ' End If + ' Next i + ' Else + ' For i = 0 To ErgValuesComp(tCompErg.SecID).Count - 1.0 + ' If ErgValuesComp(tCompErg.RunID)(i) = IDHS Then + ' If ErgValuesComp(tCompErg.HeadID)(i) = 2 Then + ' If ErgValuesComp(tCompErg.used)(i) = 1 Then + ' If anz >= anzHS1 Then + ' ErgValuesComp(tCompErg.used)(i) = 0 + ' Else + ' anz += 1 + ' End If + ' End If + ' End If + ' End If + ' Next i + ' End If + 'End If End Sub ' Evaluate the Valid sections diff --git a/CSE/declaration_public.vb b/CSE/declaration_public.vb index ac352b0..f152755 100644 --- a/CSE/declaration_public.vb +++ b/CSE/declaration_public.vb @@ -12,8 +12,8 @@ Module declaration_public ' Description of the form - Public Const AppName As String = "Air Drag" ' Name of the programm - Public Const AppVers As String = "2.0.6-beta6" ' Version of the Programm + Public Const AppName As String = "Air Drag" ' Name of the programm + Public Const AppVers As String = "2.0.6-beta7" ' Version of the Programm Public AppDate As String ' Date of the compilation of the programm ' Control variables -- GitLab