Skip to content

Commit

Permalink
REORG: Exposed common base classes and functions so other assemblies …
Browse files Browse the repository at this point in the history
…can access them.

Base classes and functions have now been made public, this makes them accessible from other assemblies.
Changes have also been made to configurations in the solutions, tidying them up to only use AnyCPU.
  • Loading branch information
ben51degrees committed Oct 31, 2016
1 parent dd91a97 commit d472670
Show file tree
Hide file tree
Showing 49 changed files with 827 additions and 475 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Expand Up @@ -186,11 +186,14 @@ UpgradeLog*.htm

# Microsoft Fakes
Log.txt

# 51Degrees
*.lic
*Enterprise*.dat
*Premium*.dat
*Enterprise*.trie
*Premium*.trie
App_Data/Cache/
**/App_Data/Cache
million.csv
*.snk
*.snk

70 changes: 4 additions & 66 deletions 51degrees 4.sln
Expand Up @@ -66,133 +66,71 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A0A7C5CE-1B06-4BB3-AB9D-DB055C6EDF69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0A7C5CE-1B06-4BB3-AB9D-DB055C6EDF69}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0A7C5CE-1B06-4BB3-AB9D-DB055C6EDF69}.Debug|x64.ActiveCfg = Debug|Any CPU
{A0A7C5CE-1B06-4BB3-AB9D-DB055C6EDF69}.Debug|x64.Build.0 = Debug|Any CPU
{A0A7C5CE-1B06-4BB3-AB9D-DB055C6EDF69}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0A7C5CE-1B06-4BB3-AB9D-DB055C6EDF69}.Release|Any CPU.Build.0 = Release|Any CPU
{A0A7C5CE-1B06-4BB3-AB9D-DB055C6EDF69}.Release|x64.ActiveCfg = Release|Any CPU
{A0A7C5CE-1B06-4BB3-AB9D-DB055C6EDF69}.Release|x64.Build.0 = Release|Any CPU
{9D658044-FB65-4939-8449-A3A1DEBBB31A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D658044-FB65-4939-8449-A3A1DEBBB31A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D658044-FB65-4939-8449-A3A1DEBBB31A}.Debug|x64.ActiveCfg = Debug|x64
{9D658044-FB65-4939-8449-A3A1DEBBB31A}.Debug|x64.Build.0 = Debug|x64
{9D658044-FB65-4939-8449-A3A1DEBBB31A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D658044-FB65-4939-8449-A3A1DEBBB31A}.Release|Any CPU.Build.0 = Release|Any CPU
{9D658044-FB65-4939-8449-A3A1DEBBB31A}.Release|x64.ActiveCfg = Release|x64
{9D658044-FB65-4939-8449-A3A1DEBBB31A}.Release|x64.Build.0 = Release|x64
{1211A461-73CA-4D7E-86A7-983540F12539}.Debug|Any CPU.ActiveCfg = Debug|x64
{1211A461-73CA-4D7E-86A7-983540F12539}.Debug|x64.ActiveCfg = Debug|x64
{1211A461-73CA-4D7E-86A7-983540F12539}.Debug|x64.Build.0 = Debug|x64
{1211A461-73CA-4D7E-86A7-983540F12539}.Release|Any CPU.ActiveCfg = Release|x64
{1211A461-73CA-4D7E-86A7-983540F12539}.Release|x64.ActiveCfg = Release|x64
{1211A461-73CA-4D7E-86A7-983540F12539}.Release|x64.Build.0 = Release|x64
{1211A461-73CA-4D7E-86A7-983540F12539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1211A461-73CA-4D7E-86A7-983540F12539}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1211A461-73CA-4D7E-86A7-983540F12539}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1211A461-73CA-4D7E-86A7-983540F12539}.Release|Any CPU.Build.0 = Release|Any CPU
{6535DE09-9EFF-4876-9D65-6483EFD453AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6535DE09-9EFF-4876-9D65-6483EFD453AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6535DE09-9EFF-4876-9D65-6483EFD453AD}.Debug|x64.ActiveCfg = Debug|Any CPU
{6535DE09-9EFF-4876-9D65-6483EFD453AD}.Debug|x64.Build.0 = Debug|Any CPU
{6535DE09-9EFF-4876-9D65-6483EFD453AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6535DE09-9EFF-4876-9D65-6483EFD453AD}.Release|Any CPU.Build.0 = Release|Any CPU
{6535DE09-9EFF-4876-9D65-6483EFD453AD}.Release|x64.ActiveCfg = Release|Any CPU
{6535DE09-9EFF-4876-9D65-6483EFD453AD}.Release|x64.Build.0 = Release|Any CPU
{324F06B4-50D5-4F6E-9DEE-2DA05B2B3B18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{324F06B4-50D5-4F6E-9DEE-2DA05B2B3B18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{324F06B4-50D5-4F6E-9DEE-2DA05B2B3B18}.Debug|x64.ActiveCfg = Debug|x64
{324F06B4-50D5-4F6E-9DEE-2DA05B2B3B18}.Debug|x64.Build.0 = Debug|x64
{324F06B4-50D5-4F6E-9DEE-2DA05B2B3B18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{324F06B4-50D5-4F6E-9DEE-2DA05B2B3B18}.Release|Any CPU.Build.0 = Release|Any CPU
{324F06B4-50D5-4F6E-9DEE-2DA05B2B3B18}.Release|x64.ActiveCfg = Release|x64
{324F06B4-50D5-4F6E-9DEE-2DA05B2B3B18}.Release|x64.Build.0 = Release|x64
{069D6175-9007-40DD-A313-F63C9377A680}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{069D6175-9007-40DD-A313-F63C9377A680}.Debug|Any CPU.Build.0 = Debug|Any CPU
{069D6175-9007-40DD-A313-F63C9377A680}.Debug|x64.ActiveCfg = Debug|x64
{069D6175-9007-40DD-A313-F63C9377A680}.Debug|x64.Build.0 = Debug|x64
{069D6175-9007-40DD-A313-F63C9377A680}.Release|Any CPU.ActiveCfg = Release|Any CPU
{069D6175-9007-40DD-A313-F63C9377A680}.Release|Any CPU.Build.0 = Release|Any CPU
{069D6175-9007-40DD-A313-F63C9377A680}.Release|x64.ActiveCfg = Release|x64
{069D6175-9007-40DD-A313-F63C9377A680}.Release|x64.Build.0 = Release|x64
{FB500454-EC93-4FEA-BDD8-FBA018EF2C3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FB500454-EC93-4FEA-BDD8-FBA018EF2C3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB500454-EC93-4FEA-BDD8-FBA018EF2C3C}.Debug|x64.ActiveCfg = Debug|x64
{FB500454-EC93-4FEA-BDD8-FBA018EF2C3C}.Debug|x64.Build.0 = Debug|x64
{FB500454-EC93-4FEA-BDD8-FBA018EF2C3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB500454-EC93-4FEA-BDD8-FBA018EF2C3C}.Release|Any CPU.Build.0 = Release|Any CPU
{FB500454-EC93-4FEA-BDD8-FBA018EF2C3C}.Release|x64.ActiveCfg = Release|x64
{FB500454-EC93-4FEA-BDD8-FBA018EF2C3C}.Release|x64.Build.0 = Release|x64
{DBA7559B-EF3C-496D-BDC7-9EF76A5D3EB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBA7559B-EF3C-496D-BDC7-9EF76A5D3EB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBA7559B-EF3C-496D-BDC7-9EF76A5D3EB9}.Debug|x64.ActiveCfg = Debug|x64
{DBA7559B-EF3C-496D-BDC7-9EF76A5D3EB9}.Debug|x64.Build.0 = Debug|x64
{DBA7559B-EF3C-496D-BDC7-9EF76A5D3EB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DBA7559B-EF3C-496D-BDC7-9EF76A5D3EB9}.Release|Any CPU.Build.0 = Release|Any CPU
{DBA7559B-EF3C-496D-BDC7-9EF76A5D3EB9}.Release|x64.ActiveCfg = Release|x64
{DBA7559B-EF3C-496D-BDC7-9EF76A5D3EB9}.Release|x64.Build.0 = Release|x64
{091CBBA9-94C4-486B-B630-6533E787A489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{091CBBA9-94C4-486B-B630-6533E787A489}.Debug|Any CPU.Build.0 = Debug|Any CPU
{091CBBA9-94C4-486B-B630-6533E787A489}.Debug|x64.ActiveCfg = Debug|x64
{091CBBA9-94C4-486B-B630-6533E787A489}.Debug|x64.Build.0 = Debug|x64
{091CBBA9-94C4-486B-B630-6533E787A489}.Release|Any CPU.ActiveCfg = Release|Any CPU
{091CBBA9-94C4-486B-B630-6533E787A489}.Release|Any CPU.Build.0 = Release|Any CPU
{091CBBA9-94C4-486B-B630-6533E787A489}.Release|x64.ActiveCfg = Release|x64
{091CBBA9-94C4-486B-B630-6533E787A489}.Release|x64.Build.0 = Release|x64
{9BD47A7B-6D73-46BD-82D5-E7E9BE347646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9BD47A7B-6D73-46BD-82D5-E7E9BE347646}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9BD47A7B-6D73-46BD-82D5-E7E9BE347646}.Debug|x64.ActiveCfg = Debug|x64
{9BD47A7B-6D73-46BD-82D5-E7E9BE347646}.Debug|x64.Build.0 = Debug|x64
{9BD47A7B-6D73-46BD-82D5-E7E9BE347646}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9BD47A7B-6D73-46BD-82D5-E7E9BE347646}.Release|Any CPU.Build.0 = Release|Any CPU
{9BD47A7B-6D73-46BD-82D5-E7E9BE347646}.Release|x64.ActiveCfg = Release|x64
{9BD47A7B-6D73-46BD-82D5-E7E9BE347646}.Release|x64.Build.0 = Release|x64
{F4B351DA-1474-4F6B-83D1-75B62CB19CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F4B351DA-1474-4F6B-83D1-75B62CB19CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4B351DA-1474-4F6B-83D1-75B62CB19CD7}.Debug|x64.ActiveCfg = Debug|x64
{F4B351DA-1474-4F6B-83D1-75B62CB19CD7}.Debug|x64.Build.0 = Debug|x64
{F4B351DA-1474-4F6B-83D1-75B62CB19CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4B351DA-1474-4F6B-83D1-75B62CB19CD7}.Release|Any CPU.Build.0 = Release|Any CPU
{F4B351DA-1474-4F6B-83D1-75B62CB19CD7}.Release|x64.ActiveCfg = Release|x64
{F4B351DA-1474-4F6B-83D1-75B62CB19CD7}.Release|x64.Build.0 = Release|x64
{608157FD-165C-40F4-AF79-BC812C9BC70E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{608157FD-165C-40F4-AF79-BC812C9BC70E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{608157FD-165C-40F4-AF79-BC812C9BC70E}.Debug|x64.ActiveCfg = Debug|Any CPU
{608157FD-165C-40F4-AF79-BC812C9BC70E}.Debug|x64.Build.0 = Debug|Any CPU
{608157FD-165C-40F4-AF79-BC812C9BC70E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{608157FD-165C-40F4-AF79-BC812C9BC70E}.Release|Any CPU.Build.0 = Release|Any CPU
{608157FD-165C-40F4-AF79-BC812C9BC70E}.Release|x64.ActiveCfg = Release|Any CPU
{608157FD-165C-40F4-AF79-BC812C9BC70E}.Release|x64.Build.0 = Release|Any CPU
{B91129C0-224A-4AA7-BE18-C13EB2E2BDFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B91129C0-224A-4AA7-BE18-C13EB2E2BDFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B91129C0-224A-4AA7-BE18-C13EB2E2BDFD}.Debug|x64.ActiveCfg = Debug|x64
{B91129C0-224A-4AA7-BE18-C13EB2E2BDFD}.Debug|x64.Build.0 = Debug|x64
{B91129C0-224A-4AA7-BE18-C13EB2E2BDFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B91129C0-224A-4AA7-BE18-C13EB2E2BDFD}.Release|Any CPU.Build.0 = Release|Any CPU
{B91129C0-224A-4AA7-BE18-C13EB2E2BDFD}.Release|x64.ActiveCfg = Release|x64
{B91129C0-224A-4AA7-BE18-C13EB2E2BDFD}.Release|x64.Build.0 = Release|x64
{EA6A83FE-D698-4E4D-821E-1B5BCC22D501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA6A83FE-D698-4E4D-821E-1B5BCC22D501}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA6A83FE-D698-4E4D-821E-1B5BCC22D501}.Debug|x64.ActiveCfg = Debug|x64
{EA6A83FE-D698-4E4D-821E-1B5BCC22D501}.Debug|x64.Build.0 = Debug|x64
{EA6A83FE-D698-4E4D-821E-1B5BCC22D501}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA6A83FE-D698-4E4D-821E-1B5BCC22D501}.Release|Any CPU.Build.0 = Release|Any CPU
{EA6A83FE-D698-4E4D-821E-1B5BCC22D501}.Release|x64.ActiveCfg = Release|x64
{EA6A83FE-D698-4E4D-821E-1B5BCC22D501}.Release|x64.Build.0 = Release|x64
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Debug|x64.ActiveCfg = Debug|x64
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Debug|x64.Build.0 = Debug|x64
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Debug|x64.Deploy.0 = Debug|x64
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Release|Any CPU.Build.0 = Release|Any CPU
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Release|Any CPU.Deploy.0 = Release|Any CPU
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Release|x64.ActiveCfg = Release|x64
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Release|x64.Build.0 = Release|x64
{334A1D9F-82F5-41C0-8583-76823D8BF2B1}.Release|x64.Deploy.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion Examples/Meta Data/Meta Data.csproj
Expand Up @@ -23,7 +23,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\x64\Release\</OutputPath>
Expand Down
7 changes: 6 additions & 1 deletion FoundationV3/FiftyOne.Foundation 4.csproj
Expand Up @@ -88,7 +88,7 @@
<DocumentationFile>bin\Release4\FiftyOne.Foundation.xml</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisLogFile>bin\Release4\FiftyOne.Foundation.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
Expand Down Expand Up @@ -143,6 +143,7 @@
<Compile Include="Mobile\Detection\Cache.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Mobile\Detection\Entities\Utf8String.cs" />
<Compile Include="Mobile\Detection\Entities\ComponentV31.cs" />
<Compile Include="Mobile\Detection\Entities\ComponentV32.cs" />
<Compile Include="Mobile\Detection\Entities\Memory\MemoryIntegerList.cs" />
Expand All @@ -162,10 +163,12 @@
<Compile Include="Mobile\Detection\Entities\Stream\CacheList.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\DataSet.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\EntityFactories.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\IStreamDataSet.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\Node.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\NodeV32.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\NodeV31.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\Profile.cs" />
<Compile Include="Mobile\Detection\Entities\Utils.cs" />
<Compile Include="Mobile\Detection\Factories\EntityFactories.cs" />
<Compile Include="Mobile\Detection\Factories\CommonFactory.cs" />
<Compile Include="Mobile\Detection\ISimpleList.cs" />
Expand Down Expand Up @@ -339,8 +342,10 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="README.md" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
2 changes: 2 additions & 0 deletions FoundationV3/FiftyOne.Foundation SQL.sqlproj
Expand Up @@ -165,6 +165,8 @@
<Compile Include="Mobile\Detection\ISimpleList.cs" />
<Compile Include="Mobile\Detection\Search.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\IntegerList.cs" />
<Compile Include="Mobile\Detection\Entities\Stream\IStreamDataSet.cs" />
<Compile Include="Mobile\Detection\Entities\Utils.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="Mobile\Detection\Dataset\" />
Expand Down
73 changes: 73 additions & 0 deletions FoundationV3/Mobile/Detection/BaseDataSet.cs
@@ -0,0 +1,73 @@
/* *********************************************************************
* This Source Code Form is copyright of 51Degrees Mobile Experts Limited.
* Copyright © 2015 51Degrees Mobile Experts Limited, 5 Charlotte Close,
* Caversham, Reading, Berkshire, United Kingdom RG4 7BY
*
* This Source Code Form is the subject of the following patent
* applications, owned by 51Degrees Mobile Experts Limited of 5 Charlotte
* Close, Caversham, Reading, Berkshire, United Kingdom RG4 7BY:
* European Patent Application No. 13192291.6; and
* United States Patent Application Nos. 14/085,223 and 14/085,301.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0.
*
* If a copy of the MPL was not distributed with this file, You can obtain
* one at http://mozilla.org/MPL/2.0/.
*
* This Source Code Form is “Incompatible With Secondary Licenses”, as
* defined by the Mozilla Public License, v. 2.0.
* ********************************************************************* */

using System;

namespace FiftyOne.Foundation.Mobile.Detection.Entities
{
public abstract class BaseDataSet : IDisposable
{
/// <summary>
/// Set when the disposed method is called indicating the data
/// set is no longer valid and can't be used.
/// </summary>
public bool Disposed { get; private set; }

/// <summary>
/// Constructs a new instance of <see cref="BasaDataSet"/>.
/// </summary>
protected BaseDataSet()
{
}

#region Destructor

/// <summary>
/// Disposes of all the lists that form the dataset.
/// </summary>
~BaseDataSet()
{
Dispose(false);
}

/// <summary>
/// Disposes of all the lists that form the dataset.
/// </summary>
public void Dispose()
{
Dispose(true);
}

/// <summary>
/// Disposes of the readonly lists used by the dataset.
/// </summary>
/// <param name="disposing">
/// True if the calling method is Dispose, false for the finaliser.
/// </param>
protected virtual void Dispose(bool disposing)
{
Disposed = true;
GC.SuppressFinalize(this);
}

#endregion
}
}
12 changes: 6 additions & 6 deletions FoundationV3/Mobile/Detection/Controller.cs
Expand Up @@ -509,8 +509,8 @@ protected override int GetScore(MatchState state, Node node)
var newTargetIndex = targetIndex + 1;
while (newNodeIndex < node.Length &&
newTargetIndex < target.Length &&
BaseEntity.GetIsNumeric(target[newTargetIndex]) &&
BaseEntity.GetIsNumeric(node[newNodeIndex]))
Utils.GetIsNumeric(target[newTargetIndex]) &&
Utils.GetIsNumeric(node[newNodeIndex]))
{
newNodeIndex++;
newTargetIndex++;
Expand All @@ -522,8 +522,8 @@ protected override int GetScore(MatchState state, Node node)
var characters = 0;
while (
nodeIndex >= 0 &&
BaseEntity.GetIsNumeric(target[targetIndex]) &&
BaseEntity.GetIsNumeric(node[nodeIndex]))
Utils.GetIsNumeric(target[targetIndex]) &&
Utils.GetIsNumeric(node[nodeIndex]))
{
nodeIndex--;
targetIndex--;
Expand All @@ -535,8 +535,8 @@ protected override int GetScore(MatchState state, Node node)
if (characters > 1)
{
return Math.Abs(
BaseEntity.GetNumber(target, targetIndex + 1, characters) -
BaseEntity.GetNumber(node, nodeIndex + 1, characters));
Utils.GetNumber(target, targetIndex + 1, characters) -
Utils.GetNumber(node, nodeIndex + 1, characters));
}

return 0;
Expand Down
10 changes: 5 additions & 5 deletions FoundationV3/Mobile/Detection/DataSet.cs
Expand Up @@ -694,20 +694,20 @@ public string Format
/// <summary>
/// A list of all the components the data set contains.
/// </summary>
public MemoryFixedList<Component> Components
public MemoryFixedList<Component, DataSet> Components
{
get { return _components; }
}
internal MemoryFixedList<Component> _components;
internal MemoryFixedList<Component, DataSet> _components;

/// <summary>
/// A list of all the maps the data set contains.
/// </summary>
public MemoryFixedList<Map> Maps
public MemoryFixedList<Map, DataSet> Maps
{
get { return _maps; }
}
internal MemoryFixedList<Map> _maps;
internal MemoryFixedList<Map, DataSet> _maps;

/// <summary>
/// A list of all properties the data set contains.
Expand Down Expand Up @@ -796,7 +796,7 @@ internal ISimpleList SignatureNodeOffsets
/// <summary>
/// A list of ASCII byte arrays for strings used by the dataset.
/// </summary>
internal IReadonlyList<AsciiString> Strings;
internal IReadonlyList<AsciiString<DataSet>> Strings;

#endregion

Expand Down

0 comments on commit d472670

Please sign in to comment.