Code cleanup, make most classes internal

This commit is contained in:
Deukhoofd committed 2025-08-19 11:30:22 +02:00
1 parent 7f2b62a7e9
commit 6df8cd800e
68 files changed
+88 -815

No files matched your search

+1 -1
View File
@@ -122,7 +122,7 @@ public static class Program
morph.AddPixel(frame,
new Pixel()
{
X = (ushort)(x), Y = (ushort)(y), Color = new Color(r, g, b, a),
X = (ushort)(x), Y = (ushort)(y), Color = new AtomorphColor(r, g, b, a),
});
pixel++;
empty = false;
Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

+11 -15
View File
@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Atomorph.Models;
using Atomorph.Utilities;
using Pcg;
namespace Atomorph;
@@ -87,10 +83,10 @@ public class AtomorphThread : IDisposable
}
public Frame? GetFrame(ulong nr) => _frames.GetValueOrDefault(nr);
public IReadOnlyDictionary<ulong, Chain> Chains => _chains;
internal Frame? GetFrame(ulong nr) => _frames.GetValueOrDefault(nr);
internal IReadOnlyDictionary<ulong, Chain> Chains => _chains;
public void SetFrame(ulong nr, Frame framePt)
internal void SetFrame(ulong nr, Frame framePt)
{
if (_running && !_paused) return;
@@ -333,15 +329,15 @@ public class AtomorphThread : IDisposable
{
var p1 = new Pixel()
{
X = (ushort)b1.X, Y = (ushort)b1.Y, Color = ColorUtilities.CreateColor(b1.R, b1.G, b1.B, b1.A),
X = (ushort)b1.X, Y = (ushort)b1.Y, Color = AtomorphColorUtilities.CreateColor(b1.R, b1.G, b1.B, b1.A),
};
var p2 = new Pixel()
{
X = (ushort)b2.X, Y = (ushort)b2.Y, Color = ColorUtilities.CreateColor(b2.R, b2.G, b2.B, b2.A),
X = (ushort)b2.X, Y = (ushort)b2.Y, Color = AtomorphColorUtilities.CreateColor(b2.R, b2.G, b2.B, b2.A),
};
pix_dist = Math.Sqrt((double)(AtomorphUtilities.PixelDistance(p1, p2)) / _bBoxD);
col_dist = ColorUtilities.ColorDistance(p1.Color, p2.Color);
col_dist = AtomorphColorUtilities.ColorDistance(p1.Color, p2.Color);
}
return (_blobXyWeight * pix_dist + _blobRgbaWeight * col_dist + _blobSizeWeight * siz_dist);
@@ -747,9 +743,9 @@ public class AtomorphThread : IDisposable
if (owner != bl)
{
double dist;
var c1 = ColorUtilities.CreateColor(owner.R, owner.G, owner.B, owner.A);
var c2 = ColorUtilities.CreateColor(bl.R, bl.G, bl.B, bl.A);
dist = ColorUtilities.ColorDistance(c1, c2);
var c1 = AtomorphColorUtilities.CreateColor(owner.R, owner.G, owner.B, owner.A);
var c2 = AtomorphColorUtilities.CreateColor(bl.R, bl.G, bl.B, bl.A);
dist = AtomorphColorUtilities.ColorDistance(c1, c2);
if ((dist <= _blobThreshold || !checkThreshold) && (!bestFound || dist <= bestDist))
{
@@ -1304,7 +1300,7 @@ public class AtomorphThread : IDisposable
var p1 = GetPixel(frame, fromPos);
var p2 = GetPixel(frame, toPos);
return ColorUtilities.ColorDistance(p1.Color, p2.Color) <= _blobThreshold;
return AtomorphColorUtilities.ColorDistance(p1.Color, p2.Color) <= _blobThreshold;
}
private void Run()
+9 -10
View File
@@ -1,22 +1,21 @@
using System;
using System.Runtime.CompilerServices;
using Atomorph.GLNemo;
using Atomorph.Models;
namespace Atomorph;
public static class AtomorphUtilities
internal static class AtomorphUtilities
{
public static ulong XY2Pos(ushort x, ushort y) => (ulong)(y * (ushort.MaxValue + 1) + x);
internal static ulong XY2Pos(ushort x, ushort y) => (ulong)(y * (ushort.MaxValue + 1) + x);
public static void Point2XY(Point pt, out float x, out float y)
internal static void Point2XY(Point pt, out float x, out float y)
{
x = pt.X + pt.XFract/(float)(byte.MaxValue+1);
y = pt.Y + pt.YFract/(float)(byte.MaxValue+1);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static ulong PointDistance(Point p1, Point p2)
internal static ulong PointDistance(Point p1, Point p2)
{
var xd = (ulong)Math.Abs(((byte.MaxValue+1)*p1.X+p1.XFract) - ((byte.MaxValue+1)*p2.X+p2.XFract));
var yd = (ulong)Math.Abs(((byte.MaxValue+1)*p1.Y+p1.YFract) - ((byte.MaxValue+1)*p2.Y+p2.YFract));
@@ -24,7 +23,7 @@ public static class AtomorphUtilities
return (xd*xd + yd*yd);
}
public static ulong PixelDistance(Pixel p1, Pixel p2)
internal static ulong PixelDistance(Pixel p1, Pixel p2)
{
var xd = p1.X-p2.X;
var yd = p1.Y-p2.Y;
@@ -33,13 +32,13 @@ public static class AtomorphUtilities
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool PointHasPixel(this Point p) => p.Flags.HasFlag(PointFlags.HasPixel);
internal static bool PointHasPixel(this Point p) => p.Flags.HasFlag(PointFlags.HasPixel);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool PointHasFluid(this Point p) => p.Flags.HasFlag(PointFlags.HasFluid);
internal static bool PointHasFluid(this Point p) => p.Flags.HasFlag(PointFlags.HasFluid);
public static bool ClearChain(Chain c)
internal static bool ClearChain(Chain c)
{
c.Points = null;
c.Places = null;
@@ -54,7 +53,7 @@ public static class AtomorphUtilities
return true;
}
public static bool RenewChain(Chain c, ulong width, ulong height)
internal static bool RenewChain(Chain c, ulong width, ulong height)
{
ClearChain(c);
c.Points = new Point[width][];
-2
View File
@@ -1,5 +1,3 @@
using System;
using System.Collections.Generic;
using Pcg;
namespace Atomorph.FluidModel;
-2
View File
@@ -1,5 +1,3 @@
using Atomorph.Models;
namespace Atomorph.FluidModel;
internal class Node
-2
View File
@@ -1,5 +1,3 @@
using Atomorph.Models;
namespace Atomorph.FluidModel;
internal class Particle
+1 -3
View File
@@ -1,8 +1,6 @@
using System.Collections.Generic;
namespace Atomorph.GLNemo;
public class Spline
internal class Spline
{
private List<Vec3D> _vp = [];
private double _deltaT;
+1 -2
View File
@@ -1,9 +1,8 @@
using System;
using System.Runtime.CompilerServices;
namespace Atomorph.GLNemo;
public record struct Vec3D
internal record struct Vec3D
{
public Vec3D(double x, double y, double z)
{
@@ -1,14 +1,12 @@
using System;
namespace Atomorph.Models;
public readonly record struct Color
public readonly record struct AtomorphColor
{
public Color()
public AtomorphColor()
{
}
public Color(byte r, byte g, byte b, byte a)
public AtomorphColor(byte r, byte g, byte b, byte a)
{
R = r;
G = g;
@@ -22,9 +20,9 @@ public readonly record struct Color
public byte A { get; }
}
public static class ColorUtilities
public static class AtomorphColorUtilities
{
public static double ColorDistance(Color c1, Color c2)
public static double ColorDistance(AtomorphColor c1, AtomorphColor c2)
{
var rd = c1.R - c2.R;
var gd = c1.G - c2.G;
@@ -34,25 +32,25 @@ public static class ColorUtilities
return Math.Sqrt(rd * rd + gd * gd + bd * bd + ad * ad) / 510.0;
}
public static Color CreateColor(double r, double g, double b, double a)
public static AtomorphColor CreateColor(double r, double g, double b, double a)
{
return new Color((byte)Math.Round(r * 255.0), (byte)Math.Round(g * 255.0), (byte)Math.Round(b * 255.0),
return new AtomorphColor((byte)Math.Round(r * 255.0), (byte)Math.Round(g * 255.0), (byte)Math.Round(b * 255.0),
(byte)Math.Round(a * 255.0));
}
public static Color RgbToHsp(Color color)
public static AtomorphColor RgbToHsp(AtomorphColor atomorphColor)
{
RGBToHSP(color.R / 255.0, color.G / 255.0, color.B / 255.0, out var h, out var s, out var p);
return CreateColor(h, s, p, color.A / 255.0);
RGBToHSP(atomorphColor.R / 255.0, atomorphColor.G / 255.0, atomorphColor.B / 255.0, out var h, out var s, out var p);
return CreateColor(h, s, p, atomorphColor.A / 255.0);
}
public static Color HspToRgb(Color color)
public static AtomorphColor HspToRgb(AtomorphColor atomorphColor)
{
HSPtoRGB(color.R / 255.0, color.G / 255.0, color.B / 255.0, out var r, out var g, out var b);
return new Color((byte)Math.Min(Math.Round(r * 255.0), 255),
HSPtoRGB(atomorphColor.R / 255.0, atomorphColor.G / 255.0, atomorphColor.B / 255.0, out var r, out var g, out var b);
return new AtomorphColor((byte)Math.Min(Math.Round(r * 255.0), 255),
(byte)Math.Min(Math.Round(g * 255.0), 255),
(byte)Math.Min(Math.Round(b * 255.0), 255),
color.A);
atomorphColor.A);
}
private const double Pr = 0.299;
+1 -3
View File
@@ -1,8 +1,6 @@
using System.Collections.Generic;
namespace Atomorph.Models;
public class Blob
internal class Blob
{
/// <summary>
/// Position in the nest vector
+1 -3
View File
@@ -1,10 +1,8 @@
using System;
using System.Drawing;
using Atomorph.GLNemo;
namespace Atomorph.Models;
public class Chain
internal class Chain
{
public ulong Width { get; set; }
public ulong Height { get; set; }
+1 -3
View File
@@ -1,8 +1,6 @@
using System.Collections.Generic;
namespace Atomorph.Models;
public class Frame
internal class Frame
{
public List<Blob?> Blobs { get; init; } = [];
+1 -1
View File
@@ -5,6 +5,6 @@ public record struct Pixel
public ushort X { get; set; }
public ushort Y { get; set; }
public Color Color { get; set; }
public AtomorphColor Color { get; set; }
}
+1 -1
View File
@@ -2,7 +2,7 @@ using System.Runtime.CompilerServices;
namespace Atomorph.Models;
public record struct Point
internal record struct Point
{
// typedef union key_point {
// struct {
+39 -42
View File
@@ -1,11 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Atomorph.FluidModel;
using Atomorph.GLNemo;
using Atomorph.Models;
using Atomorph.Perlin;
using Atomorph.Utilities;
using Pcg;
namespace Atomorph;
@@ -88,7 +85,7 @@ public class Morph : IDisposable
{
if (BlobDelimiter == ColorMethod.HSP)
{
px.Color = ColorUtilities.RgbToHsp(px.Color);
px.Color = AtomorphColorUtilities.RgbToHsp(px.Color);
}
AddFrame(frame_key);
@@ -195,11 +192,11 @@ public class Morph : IDisposable
var g = Math.Round(255.0 * _frames[f].G);
var b = Math.Round(255.0 * _frames[f].B);
var a = Math.Round(255.0 * _frames[f].A);
var color = new Color((byte)r, (byte)g, (byte)b, (byte)a);
var color = new AtomorphColor((byte)r, (byte)g, (byte)b, (byte)a);
if (BlobDelimiter == ColorMethod.RGB)
{
color = ColorUtilities.RgbToHsp(color);
color = AtomorphColorUtilities.RgbToHsp(color);
}
return new Pixel { X = (ushort)x, Y = (ushort)y, Color = color, };
@@ -220,10 +217,10 @@ public class Morph : IDisposable
var b = Math.Round(255.0 * blob.B);
var a = Math.Round(255.0 * blob.A);
var color = new Color((byte)r, (byte)g, (byte)b, (byte)a);
var color = new AtomorphColor((byte)r, (byte)g, (byte)b, (byte)a);
if (BlobDelimiter == ColorMethod.HSP)
{
color = ColorUtilities.RgbToHsp(color);
color = AtomorphColorUtilities.RgbToHsp(color);
}
return new Pixel { X = (ushort)x, Y = (ushort)y, Color = color, };
@@ -234,13 +231,13 @@ public class Morph : IDisposable
if (!HasPixel(f, pos)) return new Pixel();
var px = _frames[f].Pixels[pos];
if (BlobDelimiter == ColorMethod.HSP)
px.Color = ColorUtilities.HspToRgb(px.Color);
px.Color = AtomorphColorUtilities.HspToRgb(px.Color);
return px;
}
public Color GetBackground(ushort x, ushort y, double time)
public AtomorphColor GetBackground(ushort x, ushort y, double time)
{
if (!_frames.Any()) return ColorUtilities.CreateColor(0.0, 0.0, 0.0, 0.0);
if (!_frames.Any()) return AtomorphColorUtilities.CreateColor(0.0, 0.0, 0.0, 0.0);
ulong position = AtomorphUtilities.XY2Pos(x, y);
time = NormalizeTime(time);
@@ -275,7 +272,7 @@ public class Morph : IDisposable
return Interpolate(c1, c2, 1.0 - t);
}
public Point Interpolate(Point pt1, Point pt2, double pt1Weight)
internal Point Interpolate(Point pt1, Point pt2, double pt1Weight)
{
Point pt = new();
@@ -300,7 +297,7 @@ public class Morph : IDisposable
{
X = (ushort)Math.Round(px1Weight * px1.X + (1.0 - px1Weight) * px2.X),
Y = (ushort)Math.Round(px1Weight * px1.Y + (1.0 - px1Weight) * px2.Y),
Color = new Color((byte)Math.Round(px1Weight * px1.Color.R + (1.0 - px1Weight) * px2.Color.R),
Color = new AtomorphColor((byte)Math.Round(px1Weight * px1.Color.R + (1.0 - px1Weight) * px2.Color.R),
(byte)Math.Round(px1Weight * px1.Color.G + (1.0 - px1Weight) * px2.Color.G),
(byte)Math.Round(px1Weight * px1.Color.B + (1.0 - px1Weight) * px2.Color.B),
(byte)Math.Round(px1Weight * px1.Color.A + (1.0 - px1Weight) * px2.Color.A)),
@@ -308,16 +305,16 @@ public class Morph : IDisposable
return px;
}
public Color Interpolate(Color c1, Color c2, double c1Weight)
public AtomorphColor Interpolate(AtomorphColor c1, AtomorphColor c2, double c1Weight)
{
Color c = new((byte)Math.Round(c1Weight * c1.R + (1.0 - c1Weight) * c2.R),
AtomorphColor c = new((byte)Math.Round(c1Weight * c1.R + (1.0 - c1Weight) * c2.R),
(byte)Math.Round(c1Weight * c1.G + (1.0 - c1Weight) * c2.G),
(byte)Math.Round(c1Weight * c1.B + (1.0 - c1Weight) * c2.B),
(byte)Math.Round(c1Weight * c1.A + (1.0 - c1Weight) * c2.A));
return c;
}
public Color Interpolate(Color c1, Color c2, double lag, double slope, double str)
public AtomorphColor Interpolate(AtomorphColor c1, AtomorphColor c2, double lag, double slope, double str)
{
if (Fading is InterpolationMethod.Cosine or InterpolationMethod.Perlin) {
const double pi = 3.14159265358;
@@ -332,7 +329,7 @@ public class Morph : IDisposable
return Interpolate(c1, c2, str);
}
public Blob? GetPixels(ulong blob_index, double time, out List<Pixel>? to)
internal Blob? GetPixels(ulong blob_index, double time, out List<Pixel>? to)
{
time = NormalizeTime(time);
double t = time;
@@ -361,7 +358,7 @@ public class Morph : IDisposable
}
else
{
Dictionary<ulong, List<Color>> colors = new();
Dictionary<ulong, List<AtomorphColor>> colors = new();
Dictionary<ulong, List<double>> weights = new();
if (!_chains.ContainsKey(bl.Group))
@@ -391,7 +388,7 @@ public class Morph : IDisposable
px2 = px1;
px2.X = pt2.X;
px2.Y = pt2.Y;
px2.Color = new Color(px2.Color.R, px2.Color.G, px2.Color.B, 0);
px2.Color = new AtomorphColor(px2.Color.R, px2.Color.G, px2.Color.B, 0);
}
else if (pt2.PointHasPixel() && !pt1.PointHasPixel())
{
@@ -399,7 +396,7 @@ public class Morph : IDisposable
px1 = px2;
px1.X = pt1.X;
px1.Y = pt1.Y;
px1.Color = new Color(px1.Color.R, px1.Color.G, px1.Color.B, 0);
px1.Color = new AtomorphColor(px1.Color.R, px1.Color.G, px1.Color.B, 0);
}
else
{
@@ -519,7 +516,7 @@ public class Morph : IDisposable
var px = new Pixel
{
X = (ushort)x, Y = (ushort)y, Color = new Color((byte)r, (byte)g, (byte)b, (byte)a)
X = (ushort)x, Y = (ushort)y, Color = new AtomorphColor((byte)r, (byte)g, (byte)b, (byte)a)
};
if (Feather > 0) blob[pos] = px;
@@ -570,7 +567,7 @@ public class Morph : IDisposable
{
var px = blob[lt];
var a = Math.Round((double)(px.Color.A) * ((double)(l + 1) / (double)(Feather + 1)));
px.Color = new Color(px.Color.R, px.Color.G, px.Color.B, (byte)a);
px.Color = new AtomorphColor(px.Color.R, px.Color.G, px.Color.B, (byte)a);
to.Add(px);
}
}
@@ -594,7 +591,7 @@ public class Morph : IDisposable
{
for (ulong x = 0; x < _width; ++x)
{
var px = new Pixel() { X = (ushort)x, Y = (ushort)y, Color = new Color(0, 0, 0, 0), };
var px = new Pixel() { X = (ushort)x, Y = (ushort)y, Color = new AtomorphColor(0, 0, 0, 0), };
if (KeepBackground) px.Color = GetBackground((ushort)x, (ushort)y, t);
image.Add(px);
}
@@ -645,18 +642,18 @@ public class Morph : IDisposable
public ushort GetHeight() => _height;
public ulong GetFrameCount() => (ulong)_frames.Count;
public void NextState() => _skipState = true;
public Blob? GetBlob(ulong f, ulong b) => HasBlob(f, b) ? _frames[f].Blobs[(int)b] : null;
internal Blob? GetBlob(ulong f, ulong b) => HasBlob(f, b) ? _frames[f].Blobs[(int)b] : null;
public double GetEnergy() => _energy;
public Pixel Blob2Pixel(Blob bl)
internal Pixel Blob2Pixel(Blob bl)
{
var px = new Pixel()
{
X = (ushort)bl.X, Y = (ushort)bl.Y, Color = ColorUtilities.CreateColor(bl.R, bl.G, bl.B, bl.A)
X = (ushort)bl.X, Y = (ushort)bl.Y, Color = AtomorphColorUtilities.CreateColor(bl.R, bl.G, bl.B, bl.A)
};
if (BlobDelimiter == ColorMethod.HSP)
{
px.Color = ColorUtilities.HspToRgb(px.Color);
px.Color = AtomorphColorUtilities.HspToRgb(px.Color);
}
return px;
}
@@ -997,7 +994,7 @@ public class Morph : IDisposable
private void DrawAtoms(double t, List<Pixel> image)
{
Dictionary<ulong, List<Color>> colors = new();
Dictionary<ulong, List<AtomorphColor>> colors = new();
Blob? bl = null;
ulong blockIterator = 0;
@@ -1042,7 +1039,7 @@ public class Morph : IDisposable
if (aa == 0) continue;
colors.AddToDictionaryList(pos, new Color(rr, gg, bb, aa));
colors.AddToDictionaryList(pos, new AtomorphColor(rr, gg, bb, aa));
}
}
@@ -1104,7 +1101,7 @@ public class Morph : IDisposable
a = bga + (1.0 - bga) * a;
}
var px = image[(int)pos];
px.Color = ColorUtilities.CreateColor(r, g, b, a);
px.Color = AtomorphColorUtilities.CreateColor(r, g, b, a);
image[(int)pos] = px;
}
}
@@ -1126,12 +1123,12 @@ public class Morph : IDisposable
StepFluid(frame_key, t, time);
Dictionary<ulong, Color> image_buffer = new();
Dictionary<ulong, AtomorphColor> image_buffer = new();
var particles = _fluid.Particles;
ulong particle_count = _fluid.ParticleCount;
Dictionary<ulong, List<Color>> colors = new();
Dictionary<ulong, List<AtomorphColor>> colors = new();
Dictionary<ulong, List<double>> weights = new();
Dictionary<ulong, List<Particle>> startups = new();
@@ -1190,7 +1187,7 @@ public class Morph : IDisposable
double weight_x1y2 = ((1.0 - x_fract) * y_fract);
double weight_x2y2 = (x_fract * y_fract);
var c = ColorUtilities.CreateColor(p.r, p.g, p.b, p.a);
var c = AtomorphColorUtilities.CreateColor(p.r, p.g, p.b, p.a);
if (weight_x1y1 > 0.0)
{
@@ -1222,7 +1219,7 @@ public class Morph : IDisposable
}
}
Dictionary<ulong, Color> blob = new();
Dictionary<ulong, AtomorphColor> blob = new();
foreach (var cit in colors)
{
var cs = cit.Value;
@@ -1259,7 +1256,7 @@ public class Morph : IDisposable
ushort x = (ushort)(pos % (ushort.MaxValue + 1));
ushort y = (ushort)(pos / (ushort.MaxValue + 1));
var px = new Pixel() { X = x, Y = y, Color = ColorUtilities.CreateColor(r, g, b, a) };
var px = new Pixel() { X = x, Y = y, Color = AtomorphColorUtilities.CreateColor(r, g, b, a) };
ulong imgpos = (ulong)(y * _width + x);
if (Feather > 0) blob[pos] = px.Color;
@@ -1291,7 +1288,7 @@ public class Morph : IDisposable
if (!border.Any()) break;
Dictionary<ulong, Color> blob_buf = new();
Dictionary<ulong, AtomorphColor> blob_buf = new();
foreach (var pos in border)
{
@@ -1323,7 +1320,7 @@ public class Morph : IDisposable
a *= alpha;
blob_buf[pos] = ColorUtilities.CreateColor(r, g, b, a);
blob_buf[pos] = AtomorphColorUtilities.CreateColor(r, g, b, a);
}
foreach (var color in blob_buf)
@@ -1367,7 +1364,7 @@ public class Morph : IDisposable
b = a * b + (1.0 - a) * bgb;
a = bga + (1.0 - bga) * a;
c = new Color((byte)Math.Round(r * 255.0), (byte)Math.Round(g * 255.0), (byte)Math.Round(b * 255.0),
c = new AtomorphColor((byte)Math.Round(r * 255.0), (byte)Math.Round(g * 255.0), (byte)Math.Round(b * 255.0),
(byte)Math.Round(a * 255.0));
}
@@ -1660,7 +1657,7 @@ public class Morph : IDisposable
px2.X = pt2.X;
px2.Y = pt2.Y;
if (next_surface > 0.0)
px2.Color = new Color(px2.Color.R, px2.Color.G, px2.Color.B, 0);
px2.Color = new AtomorphColor(px2.Color.R, px2.Color.G, px2.Color.B, 0);
}
else if (AtomorphUtilities.PointHasPixel(pt2) && !AtomorphUtilities.PointHasPixel(pt1))
{
@@ -1669,7 +1666,7 @@ public class Morph : IDisposable
px1.X = pt1.X;
px1.Y = pt1.Y;
if (previous_surface > 0.0)
px1.Color = new Color(px1.Color.R, px1.Color.G, px1.Color.B, 0);
px1.Color = new AtomorphColor(px1.Color.R, px1.Color.G, px1.Color.B, 0);
}
else
{
@@ -1677,7 +1674,7 @@ public class Morph : IDisposable
px2 = GetPixel(nextFrameKey, AtomorphUtilities.XY2Pos(pt2.X, pt2.Y));
}
Color c;
AtomorphColor c;
if (Fading == InterpolationMethod.Perlin)
{
+2 -3
View File
@@ -1,12 +1,11 @@
using System;
using System.Runtime.CompilerServices;
using Pcg;
namespace Atomorph.Perlin;
public class PerlinNoise
internal class PerlinNoise
{
private int[] _p = new int[512];
private readonly int[] _p = new int[512];
public PerlinNoise(uint seed = 1)
{
-2
View File
@@ -1,5 +1,3 @@
using System;
namespace Atomorph;
[Flags]
@@ -1,56 +0,0 @@
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
namespace Atomorph.Utilities;
/// <summary>
/// Represents a generic collection of key/value pairs that are ordered independently of the key and value.
/// </summary>
/// <typeparam name="TKey">The type of the keys in the dictionary</typeparam>
/// <typeparam name="TValue">The type of the values in the dictionary</typeparam>
public interface IOrderedDictionary<TKey, TValue> : IOrderedDictionary, IDictionary<TKey, TValue>
{
/// <summary>
/// Adds an entry with the specified key and value into the <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see> collection with the lowest available index.
/// </summary>
/// <param name="key">The key of the entry to add.</param>
/// <param name="value">The value of the entry to add.</param>
/// <returns>The index of the newly added entry</returns>
/// <remarks>
/// <para>You can also use the <see cref="P:System.Collections.Generic.IDictionary{TKey,TValue}.Item(TKey)"/> property to add new elements by setting the value of a key that does not exist in the <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see> collection; however, if the specified key already exists in the <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see>, setting the <see cref="P:Item(TKey)"/> property overwrites the old value. In contrast, the <see cref="M:Add"/> method does not modify existing elements.</para></remarks>
/// <exception cref="ArgumentException">An element with the same key already exists in the <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see></exception>
/// <exception cref="NotSupportedException">The <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see> is read-only.<br/>
/// -or-<br/>
/// The <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see> has a fized size.</exception>
new int Add(TKey key, TValue value);
/// <summary>
/// Inserts a new entry into the <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see> collection with the specified key and value at the specified index.
/// </summary>
/// <param name="index">The zero-based index at which the element should be inserted.</param>
/// <param name="key">The key of the entry to add.</param>
/// <param name="value">The value of the entry to add. The value can be <null/> if the type of the values in the dictionary is a reference type.</param>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than 0.<br/>
/// -or-<br/>
/// <paramref name="index"/> is greater than <see cref="System.Collections.ICollection.Count"/>.</exception>
/// <exception cref="ArgumentException">An element with the same key already exists in the <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see>.</exception>
/// <exception cref="NotSupportedException">The <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see> is read-only.<br/>
/// -or-<br/>
/// The <see cref="IOrderedDictionary{TKey,TValue}">IOrderedDictionary&lt;TKey,TValue&gt;</see> has a fized size.</exception>
void Insert(int index, TKey key, TValue value);
/// <summary>
/// Gets or sets the value at the specified index.
/// </summary>
/// <param name="index">The zero-based index of the value to get or set.</param>
/// <value>The value of the item at the specified index.</value>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than 0.<br/>
/// -or-<br/>
/// <paramref name="index"/> is equal to or greater than <see cref="System.Collections.ICollection.Count"/>.</exception>
new TValue this[int index]
{
get;
set;
}
}
-641
View File
@@ -1,641 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
namespace Atomorph.Utilities;
/// <summary>
/// Represents a generic collection of key/value pairs that are ordered independently of the key and value.
/// </summary>
/// <typeparam name="TKey">The type of the keys in the dictionary</typeparam>
/// <typeparam name="TValue">The type of the values in the dictionary</typeparam>
internal class OrderedDictionary<TKey, TValue> : IOrderedDictionary<TKey, TValue>
{
private const int DefaultInitialCapacity = 0;
private static readonly string _keyTypeName = typeof(TKey).FullName;
private static readonly string _valueTypeName = typeof(TValue).FullName;
private static readonly bool _valueTypeIsReferenceType = !typeof(ValueType).IsAssignableFrom(typeof(TValue));
private Dictionary<TKey, TValue> _dictionary;
private List<KeyValuePair<TKey, TValue>> _list;
private IEqualityComparer<TKey> _comparer;
private object _syncRoot;
private int _initialCapacity;
/// <summary>
/// Initializes a new instance of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> class.
/// </summary>
public OrderedDictionary()
: this(DefaultInitialCapacity, null)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> class using the specified initial capacity.
/// </summary>
/// <param name="capacity">The initial number of elements that the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> can contain.</param>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="capacity"/> is less than 0</exception>
public OrderedDictionary(int capacity)
: this(capacity, null)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> class using the specified comparer.
/// </summary>
/// <param name="comparer">The <see cref="IEqualityComparer{TKey}">IEqualityComparer&lt;TKey&gt;</see> to use when comparing keys, or <null/> to use the default <see cref="EqualityComparer{TKey}">EqualityComparer&lt;TKey&gt;</see> for the type of the key.</param>
public OrderedDictionary(IEqualityComparer<TKey> comparer)
: this(DefaultInitialCapacity, comparer)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> class using the specified initial capacity and comparer.
/// </summary>
/// <param name="capacity">The initial number of elements that the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection can contain.</param>
/// <param name="comparer">The <see cref="IEqualityComparer{TKey}">IEqualityComparer&lt;TKey&gt;</see> to use when comparing keys, or <null/> to use the default <see cref="EqualityComparer{TKey}">EqualityComparer&lt;TKey&gt;</see> for the type of the key.</param>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="capacity"/> is less than 0</exception>
public OrderedDictionary(int capacity, IEqualityComparer<TKey> comparer)
{
if(0 > capacity)
throw new ArgumentOutOfRangeException("capacity", "'capacity' must be non-negative");
_initialCapacity = capacity;
_comparer = comparer;
}
/// <summary>
/// Converts the object passed as a key to the key type of the dictionary
/// </summary>
/// <param name="keyObject">The key object to check</param>
/// <returns>The key object, cast as the key type of the dictionary</returns>
/// <exception cref="ArgumentNullException"><paramref name="keyObject"/> is <null/>.</exception>
/// <exception cref="ArgumentException">The key type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is not in the inheritance hierarchy of <paramref name="keyObject"/>.</exception>
private static TKey ConvertToKeyType(object keyObject)
{
if(null == keyObject)
{
throw new ArgumentNullException("key");
}
else
{
if(keyObject is TKey)
return (TKey)keyObject;
}
throw new ArgumentException("'key' must be of type " + _keyTypeName, "key");
}
/// <summary>
/// Converts the object passed as a value to the value type of the dictionary
/// </summary>
/// <param name="value">The object to convert to the value type of the dictionary</param>
/// <returns>The value object, converted to the value type of the dictionary</returns>
/// <exception cref="ArgumentNullException"><paramref name="valueObject"/> is <null/>, and the value type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is a value type.</exception>
/// <exception cref="ArgumentException">The value type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is not in the inheritance hierarchy of <paramref name="valueObject"/>.</exception>
private static TValue ConvertToValueType(object value)
{
if(null == value)
{
if(_valueTypeIsReferenceType)
return default(TValue);
else
throw new ArgumentNullException("value");
}
else
{
if(value is TValue)
return (TValue)value;
}
throw new ArgumentException("'value' must be of type " + _valueTypeName, "value");
}
/// <summary>
/// Gets the dictionary object that stores the keys and values
/// </summary>
/// <value>The dictionary object that stores the keys and values for the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see></value>
/// <remarks>Accessing this property will create the dictionary object if necessary</remarks>
private Dictionary<TKey, TValue> Dictionary
{
get
{
if(null == _dictionary)
{
_dictionary = new Dictionary<TKey, TValue>(_initialCapacity, _comparer);
}
return _dictionary;
}
}
/// <summary>
/// Gets the list object that stores the key/value pairs.
/// </summary>
/// <value>The list object that stores the key/value pairs for the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see></value>
/// <remarks>Accessing this property will create the list object if necessary.</remarks>
private List<KeyValuePair<TKey, TValue>> List
{
get
{
if(null == List)
{
_list = new List<KeyValuePair<TKey, TValue>>(_initialCapacity);
}
return _list;
}
}
IDictionaryEnumerator IOrderedDictionary.GetEnumerator()
{
return Dictionary.GetEnumerator();
}
IDictionaryEnumerator IDictionary.GetEnumerator()
{
return Dictionary.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return List.GetEnumerator();
}
IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey,TValue>>.GetEnumerator()
{
return List.GetEnumerator();
}
/// <summary>
/// Inserts a new entry into the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection with the specified key and value at the specified index.
/// </summary>
/// <param name="index">The zero-based index at which the element should be inserted.</param>
/// <param name="key">The key of the entry to add.</param>
/// <param name="value">The value of the entry to add. The value can be <null/> if the type of the values in the dictionary is a reference type.</param>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than 0.<br/>
/// -or-<br/>
/// <paramref name="index"/> is greater than <see cref="Count"/>.</exception>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <null/>.</exception>
/// <exception cref="ArgumentException">An element with the same key already exists in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</exception>
public void Insert(int index, TKey key, TValue value)
{
if(index > Count || index < 0)
throw new ArgumentOutOfRangeException("index");
Dictionary.Add(key, value);
List.Insert(index, new KeyValuePair<TKey, TValue>(key, value));
}
/// <summary>
/// Inserts a new entry into the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection with the specified key and value at the specified index.
/// </summary>
/// <param name="index">The zero-based index at which the element should be inserted.</param>
/// <param name="key">The key of the entry to add.</param>
/// <param name="value">The value of the entry to add. The value can be <null/> if the type of the values in the dictionary is a reference type.</param>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than 0.<br/>
/// -or-<br/>
/// <paramref name="index"/> is greater than <see cref="Count"/>.</exception>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <null/>.<br/>
/// -or-<br/>
/// <paramref name="value"/> is <null/>, and the value type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is a value type.</exception>
/// <exception cref="ArgumentException">The key type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is not in the inheritance hierarchy of <paramref name="key"/>.<br/>
/// -or-<br/>
/// The value type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is not in the inheritance hierarchy of <paramref name="value"/>.<br/>
/// -or-<br/>
/// An element with the same key already exists in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</exception>
void IOrderedDictionary.Insert(int index, object key, object value)
{
Insert(index, ConvertToKeyType(key), ConvertToValueType(value));
}
/// <summary>
/// Removes the entry at the specified index from the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.
/// </summary>
/// <param name="index">The zero-based index of the entry to remove.</param>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than 0.<br/>
/// -or-<br/>
/// index is equal to or greater than <see cref="Count"/>.</exception>
public void RemoveAt(int index)
{
if(index >= Count || index < 0)
throw new ArgumentOutOfRangeException("index", "'index' must be non-negative and less than the size of the collection");
TKey key = List[index].Key;
List.RemoveAt(index);
Dictionary.Remove(key);
}
/// <summary>
/// Gets or sets the value at the specified index.
/// </summary>
/// <param name="index">The zero-based index of the value to get or set.</param>
/// <value>The value of the item at the specified index.</value>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than 0.<br/>
/// -or-<br/>
/// index is equal to or greater than <see cref="Count"/>.</exception>
public TValue this[int index]
{
get
{
return List[index].Value;
}
set
{
if(index >= Count || index < 0)
throw new ArgumentOutOfRangeException("index", "'index' must be non-negative and less than the size of the collection");
TKey key = List[index].Key;
List[index] = new KeyValuePair<TKey, TValue>(key, value);
Dictionary[key] = value;
}
}
/// <summary>
/// Gets or sets the value at the specified index.
/// </summary>
/// <param name="index">The zero-based index of the value to get or set.</param>
/// <value>The value of the item at the specified index.</value>
/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than 0.<br/>
/// -or-<br/>
/// index is equal to or greater than <see cref="Count"/>.</exception>
/// <exception cref="ArgumentNullException"><paramref name="valueObject"/> is a null reference, and the value type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is a value type.</exception>
/// <exception cref="ArgumentException">The value type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is not in the inheritance hierarchy of <paramref name="valueObject"/>.</exception>
object IOrderedDictionary.this[int index]
{
get
{
return this[index];
}
set
{
this[index] = ConvertToValueType(value);
}
}
/// <summary>
/// Adds an entry with the specified key and value into the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection with the lowest available index.
/// </summary>
/// <param name="key">The key of the entry to add.</param>
/// <param name="value">The value of the entry to add. This value can be <null/>.</param>
/// <remarks>A key cannot be <null/>, but a value can be.
/// <para>You can also use the <see cref="P:OrderedDictionary{TKey,TValue}.Item(TKey)"/> property to add new elements by setting the value of a key that does not exist in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection; however, if the specified key already exists in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>, setting the <see cref="P:OrderedDictionary{TKey,TValue}.Item(TKey)"/> property overwrites the old value. In contrast, the <see cref="M:Add"/> method does not modify existing elements.</para></remarks>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <null/></exception>
/// <exception cref="ArgumentException">An element with the same key already exists in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see></exception>
void IDictionary<TKey, TValue>.Add(TKey key, TValue value)
{
Add(key, value);
}
/// <summary>
/// Adds an entry with the specified key and value into the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection with the lowest available index.
/// </summary>
/// <param name="key">The key of the entry to add.</param>
/// <param name="value">The value of the entry to add. This value can be <null/>.</param>
/// <returns>The index of the newly added entry</returns>
/// <remarks>A key cannot be <null/>, but a value can be.
/// <para>You can also use the <see cref="P:OrderedDictionary{TKey,TValue}.Item(TKey)"/> property to add new elements by setting the value of a key that does not exist in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection; however, if the specified key already exists in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>, setting the <see cref="P:OrderedDictionary{TKey,TValue}.Item(TKey)"/> property overwrites the old value. In contrast, the <see cref="M:Add"/> method does not modify existing elements.</para></remarks>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <null/></exception>
/// <exception cref="ArgumentException">An element with the same key already exists in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see></exception>
public int Add(TKey key, TValue value)
{
Dictionary.Add(key, value);
List.Add(new KeyValuePair<TKey,TValue>(key, value));
return Count - 1;
}
/// <summary>
/// Adds an entry with the specified key and value into the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection with the lowest available index.
/// </summary>
/// <param name="key">The key of the entry to add.</param>
/// <param name="value">The value of the entry to add. This value can be <null/>.</param>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <null/>.<br/>
/// -or-<br/>
/// <paramref name="value"/> is <null/>, and the value type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is a value type.</exception>
/// <exception cref="ArgumentException">The key type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is not in the inheritance hierarchy of <paramref name="key"/>.<br/>
/// -or-<br/>
/// The value type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is not in the inheritance hierarchy of <paramref name="value"/>.</exception>
void IDictionary.Add(object key, object value)
{
Add(ConvertToKeyType(key), ConvertToValueType(value));
}
/// <summary>
/// Removes all elements from the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.
/// </summary>
/// <remarks>The capacity is not changed as a result of calling this method.</remarks>
public void Clear()
{
Dictionary.Clear();
List.Clear();
}
/// <summary>
/// Determines whether the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection contains a specific key.
/// </summary>
/// <param name="key">The key to locate in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.</param>
/// <returns><see langword="true"/> if the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection contains an element with the specified key; otherwise, <see langword="false"/>.</returns>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <null/></exception>
public bool ContainsKey(TKey key)
{
return Dictionary.ContainsKey(key);
}
/// <summary>
/// Determines whether the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection contains a specific key.
/// </summary>
/// <param name="key">The key to locate in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.</param>
/// <returns><see langword="true"/> if the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection contains an element with the specified key; otherwise, <see langword="false"/>.</returns>
/// <exception cref="ArgumentNullException"><paramref name="key"/> is <null/></exception>
/// <exception cref="ArgumentException">The key type of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is not in the inheritance hierarchy of <paramref name="key"/>.</exception>
bool IDictionary.Contains(object key)
{
return ContainsKey(ConvertToKeyType(key));
}
/// <summary>
/// Gets a value indicating whether the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> has a fixed size.
/// </summary>
/// <value><see langword="true"/> if the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> has a fixed size; otherwise, <see langword="false"/>. The default is <see langword="false"/>.</value>
bool IDictionary.IsFixedSize
{
get
{
return false;
}
}
/// <summary>
/// Gets a value indicating whether the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection is read-only.
/// </summary>
/// <value><see langword="true"/> if the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> is read-only; otherwise, <see langword="false"/>. The default is <see langword="false"/>.</value>
/// <remarks>
/// A collection that is read-only does not allow the addition, removal, or modification of elements after the collection is created.
/// <para>A collection that is read-only is simply a collection with a wrapper that prevents modification of the collection; therefore, if changes are made to the underlying collection, the read-only collection reflects those changes.</para>
/// </remarks>
public bool IsReadOnly
{
get
{
return false;
}
}
/// <summary>
/// Gets an <see cref="ICollection"/> object containing the keys in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.
/// </summary>
/// <value>An <see cref="ICollection"/> object containing the keys in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</value>
/// <remarks>The returned <see cref="ICollection"/> object is not a static copy; instead, the collection refers back to the keys in the original <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>. Therefore, changes to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> continue to be reflected in the key collection.</remarks>
ICollection IDictionary.Keys
{
get
{
return (ICollection)Keys;
}
}
/// <summary>
/// Returns the zero-based index of the specified key in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>
/// </summary>
/// <param name="key">The key to locate in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see></param>
/// <returns>The zero-based index of <paramref name="key"/>, if <paramref name="ley"/> is found in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>; otherwise, -1</returns>
/// <remarks>This method performs a linear search; therefore it has a cost of O(n) at worst.</remarks>
public int IndexOfKey(TKey key)
{
if(null == key)
throw new ArgumentNullException("key");
for(int index = 0; index < List.Count; index++)
{
KeyValuePair<TKey, TValue> entry = List[index];
TKey next = entry.Key;
if(null != _comparer)
{
if(_comparer.Equals(next, key))
{
return index;
}
}
else if(next.Equals(key))
{
return index;
}
}
return -1;
}
/// <summary>
/// Removes the entry with the specified key from the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.
/// </summary>
/// <param name="key">The key of the entry to remove</param>
/// <returns><see langword="true"/> if the key was found and the corresponding element was removed; otherwise, <see langword="false"/></returns>
public bool Remove(TKey key)
{
if(null == key)
throw new ArgumentNullException("key");
int index = IndexOfKey(key);
if(index >= 0)
{
if(Dictionary.Remove(key))
{
List.RemoveAt(index);
return true;
}
}
return false;
}
/// <summary>
/// Removes the entry with the specified key from the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.
/// </summary>
/// <param name="key">The key of the entry to remove</param>
void IDictionary.Remove(object key)
{
Remove(ConvertToKeyType(key));
}
/// <summary>
/// Gets an <see cref="ICollection"/> object containing the values in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.
/// </summary>
/// <value>An <see cref="ICollection"/> object containing the values in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.</value>
/// <remarks>The returned <see cref="ICollection"/> object is not a static copy; instead, the <see cref="ICollection"/> refers back to the values in the original <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection. Therefore, changes to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> continue to be reflected in the <see cref="ICollection"/>.</remarks>
ICollection IDictionary.Values
{
get
{
return (ICollection)Values;
}
}
/// <summary>
/// Gets or sets the value with the specified key.
/// </summary>
/// <param name="key">The key of the value to get or set.</param>
/// <value>The value associated with the specified key. If the specified key is not found, attempting to get it returns <null/>, and attempting to set it creates a new element using the specified key.</value>
public TValue this[TKey key]
{
get
{
return Dictionary[key];
}
set
{
if(Dictionary.ContainsKey(key))
{
Dictionary[key] = value;
List[IndexOfKey(key)] = new KeyValuePair<TKey, TValue>(key, value);
}
else
{
Add(key, value);
}
}
}
/// <summary>
/// Gets or sets the value with the specified key.
/// </summary>
/// <param name="key">The key of the value to get or set.</param>
/// <value>The value associated with the specified key. If the specified key is not found, attempting to get it returns <null/>, and attempting to set it creates a new element using the specified key.</value>
object IDictionary.this[object key]
{
get
{
return this[ConvertToKeyType(key)];
}
set
{
this[ConvertToKeyType(key)] = ConvertToValueType(value);
}
}
/// <summary>
/// Copies the elements of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> elements to a one-dimensional Array object at the specified index.
/// </summary>
/// <param name="array">The one-dimensional <see cref="Array"/> object that is the destination of the <see cref="T:KeyValuePair`2>"/> objects copied from the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>. The <see cref="Array"/> must have zero-based indexing.</param>
/// <param name="index">The zero-based index in <paramref name="array"/> at which copying begins.</param>
/// <remarks>The <see cref="M:CopyTo"/> method preserves the order of the elements in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see></remarks>
void ICollection.CopyTo(Array array, int index)
{
((ICollection)List).CopyTo(array, index);
}
/// <summary>
/// Gets the number of key/values pairs contained in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.
/// </summary>
/// <value>The number of key/value pairs contained in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> collection.</value>
public int Count
{
get
{
return List.Count;
}
}
/// <summary>
/// Gets a value indicating whether access to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> object is synchronized (thread-safe).
/// </summary>
/// <value>This method always returns false.</value>
bool ICollection.IsSynchronized
{
get
{
return false;
}
}
/// <summary>
/// Gets an object that can be used to synchronize access to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> object.
/// </summary>
/// <value>An object that can be used to synchronize access to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> object.</value>
object ICollection.SyncRoot
{
get
{
if(this._syncRoot == null)
{
System.Threading.Interlocked.CompareExchange(ref this._syncRoot, new object(), null);
}
return this._syncRoot;
}
}
/// <summary>
/// Gets an <see cref="T:System.Collections.Generic.ICollection{TKey}">ICollection&lt;TKey&gt;</see> object containing the keys in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.
/// </summary>
/// <value>An <see cref="T:System.Collections.Generic.ICollection{TKey}">ICollection&lt;TKey&gt;</see> object containing the keys in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</value>
/// <remarks>The returned <see cref="T:System.Collections.Generic.ICollection{TKey}">ICollection&lt;TKey&gt;</see> object is not a static copy; instead, the collection refers back to the keys in the original <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>. Therefore, changes to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> continue to be reflected in the key collection.</remarks>
public ICollection<TKey> Keys
{
get
{
return Dictionary.Keys;
}
}
/// <summary>
/// Gets the value associated with the specified key.
/// </summary>
/// <param name="key">The key of the value to get.</param>
/// <param name="value">When this method returns, contains the value associated with the specified key, if the key is found; otherwise, the default value for the type of <paramref name="value"/>. This parameter can be passed uninitialized.</param>
/// <returns><see langword="true"/> if the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> contains an element with the specified key; otherwise, <see langword="false"/>.</returns>
public bool TryGetValue(TKey key, out TValue value)
{
return Dictionary.TryGetValue(key, out value);
}
/// <summary>
/// Gets an <see cref="T:ICollection{TValue}">ICollection&lt;TValue&gt;</see> object containing the values in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.
/// </summary>
/// <value>An <see cref="T:ICollection{TValue}">ICollection&lt;TValue&gt;</see> object containing the values in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</value>
/// <remarks>The returned <see cref="T:ICollection{TValue}">ICollection&lt;TKey&gt;</see> object is not a static copy; instead, the collection refers back to the values in the original <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>. Therefore, changes to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> continue to be reflected in the value collection.</remarks>
public ICollection<TValue> Values
{
get
{
return Dictionary.Values;
}
}
/// <summary>
/// Adds the specified value to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> with the specified key.
/// </summary>
/// <param name="item">The <see cref="T:KeyValuePair{TKey,TValue}">KeyValuePair&lt;TKey,TValue&gt;</see> structure representing the key and value to add to the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</param>
void ICollection<KeyValuePair<TKey,TValue>>.Add(KeyValuePair<TKey, TValue> item)
{
Add(item.Key, item.Value);
}
/// <summary>
/// Determines whether the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> contains a specific key and value.
/// </summary>
/// <param name="item">The <see cref="T:KeyValuePair{TKey,TValue}">KeyValuePair&lt;TKey,TValue&gt;</see> structure to locate in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</param>
/// <returns><see langword="true"/> if <paramref name="keyValuePair"/> is found in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>; otherwise, <see langword="false"/>.</returns>
bool ICollection<KeyValuePair<TKey,TValue>>.Contains(KeyValuePair<TKey, TValue> item)
{
return ((ICollection<KeyValuePair<TKey,TValue>>)Dictionary).Contains(item);
}
/// <summary>
/// Copies the elements of the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see> to an array of type <see cref="T:KeyValuePair`2>"/>, starting at the specified index.
/// </summary>
/// <param name="array">The one-dimensional array of type <see cref="T:KeyValuePair{TKey,TValue}">KeyValuePair&lt;TKey,TValue&gt;</see> that is the destination of the <see cref="T:KeyValuePair{TKey,TValue}">KeyValuePair&lt;TKey,TValue&gt;</see> elements copied from the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>. The array must have zero-based indexing.</param>
/// <param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param>
void ICollection<KeyValuePair<TKey,TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
{
((ICollection<KeyValuePair<TKey,TValue>>)Dictionary).CopyTo(array, arrayIndex);
}
/// <summary>
/// Removes a key and value from the dictionary.
/// </summary>
/// <param name="item">The <see cref="T:KeyValuePair{TKey,TValue}">KeyValuePair&lt;TKey,TValue&gt;</see> structure representing the key and value to remove from the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</param>
/// <returns><see langword="true"/> if the key and value represented by <paramref name="keyValuePair"/> is successfully found and removed; otherwise, <see langword="false"/>. This method returns <see langword="false"/> if <paramref name="keyValuePair"/> is not found in the <see cref="OrderedDictionary{TKey,TValue}">OrderedDictionary&lt;TKey,TValue&gt;</see>.</returns>
bool ICollection<KeyValuePair<TKey,TValue>>.Remove(KeyValuePair<TKey, TValue> item)
{
return Remove(item.Key);
}
}
+5 -7
View File
@@ -1,15 +1,13 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Pcg;
namespace Atomorph;
namespace Atomorph.Utilities;
internal static class PortUtilities
{
private static readonly PcgRandom Rng = new PcgRandom();
private static readonly PcgRandom Rng = new();
public static void RandomShuffle(this IList list, PcgRandom? rng = null)
internal static void RandomShuffle(this IList list, PcgRandom? rng = null)
{
rng ??= Rng;
for (var i = list.Count - 1; i > 0; i--)
@@ -22,13 +20,13 @@ internal static class PortUtilities
}
}
public static double ModF(this double value, out double integerPart)
internal static double ModF(this double value, out double integerPart)
{
integerPart = Math.Floor(value);
return value - integerPart;
}
public static void AddToDictionaryList<TKey, TValue>(this Dictionary<TKey, List<TValue>> dictionary, TKey key, TValue value)
internal static void AddToDictionaryList<TKey, TValue>(this Dictionary<TKey, List<TValue>> dictionary, TKey key, TValue value)
{
if (!dictionary.TryGetValue(key, out var list))
{