Skip to content

Commit

Permalink
update RELEASE_NOTES.md
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanmaierhofer committed Aug 21, 2024
1 parent d8d16ab commit d68be62
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 7 deletions.
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 5.5.1
- [e57] fix parsing of classifications that would be encoded with 0 bits per value (see e57 spec 9.7.4.2 (3))

### 5.5.0
- Updated to NET 8 and Aardvark.Base 5.3

Expand Down
49 changes: 44 additions & 5 deletions src/Aardvark.Algodat.Tests/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Aardvark.Base;
using Aardvark.Base.Coder;
using Aardvark.Data;
using Aardvark.Data.Points;
using Aardvark.Data.Points.Import;
Expand Down Expand Up @@ -105,6 +106,30 @@ internal static Task<string> CreateStore(IEnumerable<Chunk> chunks, DirectoryInf

#endregion

#region

internal static void ParsePointCloudFile(string filename, bool verbose)
{
var info = PointCloud.ParseFileInfo(filename, ParseConfig.Default);
var totalPointCount = 0L;
var nextReport = DateTime.Now.AddSeconds(1);
var sw = Stopwatch.StartNew();
WriteLine($"parsing {filename}");
var chunks = PointCloud.Parse(filename, ParseConfig.Default.WithVerbose(verbose));
foreach (var chunk in chunks)
{
totalPointCount += chunk.Count;
if (DateTime.Now > nextReport)
{
Write($"\r[{100.0*totalPointCount/info.PointCount,6:N2}%] {sw.Elapsed} {totalPointCount,16:N0}/{info.PointCount:N0}");
nextReport = nextReport.AddSeconds(1);
}
}
WriteLine($"\r[{100.0 * totalPointCount / info.PointCount,6:N2}%] {sw.Elapsed} {totalPointCount,16:N0}/{info.PointCount:N0}");
}

#endregion

internal static void PerfTestJuly2019()
{
var filename = @"T:\Vgm\Data\2017-10-20_09-44-27_1mm_shade_norm_5pp - Cloud.pts";
Expand Down Expand Up @@ -2762,17 +2787,31 @@ static V3d[] randomPoints(int n, Box3d bb)

//#pragma warning disable CS1998

static void Test_Parse_Regression()
{
var basedir = @"W:\Datasets\pointclouds\tests";
foreach (var file in Directory.GetFiles(basedir, "*.e57"))
{
ParsePointCloudFile(file, verbose: false);
}
}

public static async Task Main(string[] _)
{
await Task.CompletedTask; // avoid warning if no async methods are called here ...

//Test_Import_Regression();

await CreateStore(
@"E:\Villa Vaduz gesamt.e57",
@"T:\tmp\Villa Vaduz gesamt.e57",
minDist: 0.005
);
ParsePointCloudFile(@"E:\Villa Vaduz gesamt.e57", verbose: false);
//ParsePointCloudFile(@"W:\Datasets\pointclouds\tests\KOE1 OG7.e57", verbose: false);

//Test_Parse_Regression();

//await CreateStore(
// @"E:\Villa Vaduz gesamt.e57",
// @"T:\tmp\Villa Vaduz gesamt.e57",
// minDist: 0.005
// );

//{
// var chunks = E57.Chunks(@"W:\Datasets\Vgm\Data\2024-04-30_bugreport\F_240205.e57", ParseConfig.Default);
Expand Down
4 changes: 2 additions & 2 deletions src/Aardvark.Data.E57/ImportE57.cs
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ public static IEnumerable<Chunk> Chunks(this Stream stream, long streamLengthInB
// print overview
foreach (var data3d in header.E57Root.Data3D)
{
Console.WriteLine($"[Data3D] {data3d.Name} ({data3d.Points.ByteStreamsCount} byte streams)");
//Console.WriteLine($"[Data3D] {data3d.Name} ({data3d.Points.ByteStreamsCount} byte streams)");
foreach (var k in semanticsAll)
{
if (!data3d.Sem2Index.ContainsKey(k))
{
Console.WriteLine($"[Data3D] {k} missing");
Console.WriteLine($"[Data3D][{data3d.Name}] {k} missing ({header.E57Root.Data3D.Length} Data3D elements total)");
}
}
}
Expand Down

0 comments on commit d68be62

Please sign in to comment.