Changed the regex that parses scientific notation

Virinco · Jul 8, 2024 · cfffeea · cfffeea
1 parent 7209a91
commit cfffeea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
diff --git a/TeradyneConverter.csproj b/TeradyneConverter.csproj
@@ -52,11 +52,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WATS.Client">
-      <Version>6.1.101</Version>
-    </PackageReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Examples\43420_BIO2_Extended.LOG">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -68,5 +63,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WATS.Client">
+      <Version>6.1.116</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/TeradyneICT.cs b/TeradyneICT.cs
@@ -362,7 +362,8 @@ public TeradyneICT(IDictionary<string, string> args)
             //K500_RLY1_NO=62.532611M(-500M,500M)V 
             //K500_CLEAR#(,)VS
             //V404=6.96336(0,20)RP
-            const string regMeasure = @"^(?<CompRef>[^=<>#%]+)(?<Result>[=<>#%])(?<meas>[0-9.E+-]*)(?<measU>(?:MEG*)|(?:[NPUMK]*))\x28*(?<LowLim>[0-9.E+-]*)(?<LowLimU>(?:MEG*)|(?:[NPUMK]*)),*(?<HighLim>[0-9.E+-]*)(?<HighLimU>(?:MEG*)|(?:[NPUMK]*))\x29*(?<Type>\w*) *=*(?<Message>.*)";
+            // Scientific notation regex taken from: https://stackoverflow.com/questions/638565/parsing-scientific-notation-sensibly
+            const string regMeasure = @"^(?<CompRef>[^=<>#%]+)(?<Result>[=<>#%])(?<meas>([+\-]?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+\-]?\d+)?)*)(?<measU>(?:MEG*)|(?:[NPUMK]*))\x28*(?<LowLim>([+\-]?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+\-]?\d+)?)*)(?<LowLimU>(?:MEG*)|(?:[NPUMK]*)),*(?<HighLim>([+\-]?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+\-]?\d+)?)*)(?<HighLimU>(?:MEG*)|(?:[NPUMK]*))\x29*(?<Type>\w*) *=*(?<Message>.*)";
             fmt = searchFields.AddRegExpField("Measure", ReportReadState.InTest, regMeasure, null, typeof(string));
             fmt.AddSubField("CompRef", typeof(string));
             fmt.AddSubField("Result", typeof(string));