aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Reformat code.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-19 20:33:03 +00:00
parent 8c19d1d93a
commit 7f2a201ab7
21 changed files with 294 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Extents/ExtentsByte.cs
View File

@@ -50,7 +50,10 @@ namespace Extents
backend = list.OrderBy(t => t.Item1).ToList();
}
public int Count { get { return backend.Count; } }
public int Count
{
get { return backend.Count; }
}
public void Add(byte item)
{
@@ -61,8 +64,7 @@ namespace Extents
for(int i = 0; i < backend.Count; i++)
{
// Already contained in an extent
if(item >= backend[i].Item1 && item <= backend[i].Item2)
return;
if(item >= backend[i].Item1 && item <= backend[i].Item2) return;
// Expands existing extent start
if(item == backend[i].Item1 - 1)
@@ -74,8 +76,7 @@ namespace Extents
removeTwo = backend[i - 1];
itemToAdd = new Tuple<byte, byte>(backend[i - 1].Item1, backend[i].Item2);
}
else
itemToAdd = new Tuple<byte, byte>(item, backend[i].Item2);
else itemToAdd = new Tuple<byte, byte>(item, backend[i].Item2);
break;
}
@@ -90,8 +91,7 @@ namespace Extents
removeTwo = backend[i + 1];
itemToAdd = new Tuple<byte, byte>(backend[i].Item1, backend[i + 1].Item2);
}
else
itemToAdd = new Tuple<byte, byte>(backend[i].Item1, item);
else itemToAdd = new Tuple<byte, byte>(backend[i].Item1, item);
break;
}
@@ -103,8 +103,7 @@ namespace Extents
backend.Remove(removeTwo);
backend.Add(itemToAdd);
}
else
backend.Add(new Tuple<byte, byte>(item, item));
else backend.Add(new Tuple<byte, byte>(item, item));
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -118,21 +117,17 @@ namespace Extents
public void Add(byte start, byte end, bool run)
{
byte realEnd;
if(run)
realEnd = (byte)(start + end - 1);
else
realEnd = end;
if(run) realEnd = (byte)(start + end - 1);
else realEnd = end;
// TODO: Optimize this
for(byte t = start; t <= realEnd; t++)
Add(t);
for(byte t = start; t <= realEnd; t++) Add(t);
}
public bool Contains(byte item)
{
foreach(Tuple<byte, byte> extent in backend)
if(item >= extent.Item1 && item <= extent.Item2)
return true;
foreach(Tuple<byte, byte> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
return false;
}
@@ -183,14 +178,11 @@ namespace Extents
}
// Item not found
if(toRemove == null)
return false;
if(toRemove == null) return false;
backend.Remove(toRemove);
if(toAddOne != null)
backend.Add(toAddOne);
if(toAddTwo != null)
backend.Add(toAddTwo);
if(toAddOne != null) backend.Add(toAddOne);
if(toAddTwo != null) backend.Add(toAddTwo);
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -214,7 +206,8 @@ namespace Extents
return true;
}
}
return false;
}
}
}
}

43
Extents/ExtentsInt.cs
View File

@@ -50,7 +50,10 @@ namespace Extents
backend = list.OrderBy(t => t.Item1).ToList();
}
public int Count { get { return backend.Count; } }
public int Count
{
get { return backend.Count; }
}
public void Add(int item)
{
@@ -61,8 +64,7 @@ namespace Extents
for(int i = 0; i < backend.Count; i++)
{
// Already contained in an extent
if(item >= backend[i].Item1 && item <= backend[i].Item2)
return;
if(item >= backend[i].Item1 && item <= backend[i].Item2) return;
// Expands existing extent start
if(item == backend[i].Item1 - 1)
@@ -74,8 +76,7 @@ namespace Extents
removeTwo = backend[i - 1];
itemToAdd = new Tuple<int, int>(backend[i - 1].Item1, backend[i].Item2);
}
else
itemToAdd = new Tuple<int, int>(item, backend[i].Item2);
else itemToAdd = new Tuple<int, int>(item, backend[i].Item2);
break;
}
@@ -90,8 +91,7 @@ namespace Extents
removeTwo = backend[i + 1];
itemToAdd = new Tuple<int, int>(backend[i].Item1, backend[i + 1].Item2);
}
else
itemToAdd = new Tuple<int, int>(backend[i].Item1, item);
else itemToAdd = new Tuple<int, int>(backend[i].Item1, item);
break;
}
@@ -103,8 +103,7 @@ namespace Extents
backend.Remove(removeTwo);
backend.Add(itemToAdd);
}
else
backend.Add(new Tuple<int, int>(item, item));
else backend.Add(new Tuple<int, int>(item, item));
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -118,21 +117,17 @@ namespace Extents
public void Add(int start, int end, bool run)
{
int realEnd;
if(run)
realEnd = start + end - 1;
else
realEnd = end;
if(run) realEnd = start + end - 1;
else realEnd = end;
// TODO: Optimize this
for(int t = start; t <= realEnd; t++)
Add(t);
for(int t = start; t <= realEnd; t++) Add(t);
}
public bool Contains(int item)
{
foreach(Tuple<int, int> extent in backend)
if(item >= extent.Item1 && item <= extent.Item2)
return true;
foreach(Tuple<int, int> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
return false;
}
@@ -183,14 +178,11 @@ namespace Extents
}
// Item not found
if(toRemove == null)
return false;
if(toRemove == null) return false;
backend.Remove(toRemove);
if(toAddOne != null)
backend.Add(toAddOne);
if(toAddTwo != null)
backend.Add(toAddTwo);
if(toAddOne != null) backend.Add(toAddOne);
if(toAddTwo != null) backend.Add(toAddTwo);
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -214,7 +206,8 @@ namespace Extents
return true;
}
}
return false;
}
}
}
}

43
Extents/ExtentsLong.cs
View File

@@ -50,7 +50,10 @@ namespace Extents
backend = list.OrderBy(t => t.Item1).ToList();
}
public int Count { get { return backend.Count; } }
public int Count
{
get { return backend.Count; }
}
public void Add(long item)
{
@@ -61,8 +64,7 @@ namespace Extents
for(int i = 0; i < backend.Count; i++)
{
// Already contained in an extent
if(item >= backend[i].Item1 && item <= backend[i].Item2)
return;
if(item >= backend[i].Item1 && item <= backend[i].Item2) return;
// Expands existing extent start
if(item == backend[i].Item1 - 1)
@@ -74,8 +76,7 @@ namespace Extents
removeTwo = backend[i - 1];
itemToAdd = new Tuple<long, long>(backend[i - 1].Item1, backend[i].Item2);
}
else
itemToAdd = new Tuple<long, long>(item, backend[i].Item2);
else itemToAdd = new Tuple<long, long>(item, backend[i].Item2);
break;
}
@@ -90,8 +91,7 @@ namespace Extents
removeTwo = backend[i + 1];
itemToAdd = new Tuple<long, long>(backend[i].Item1, backend[i + 1].Item2);
}
else
itemToAdd = new Tuple<long, long>(backend[i].Item1, item);
else itemToAdd = new Tuple<long, long>(backend[i].Item1, item);
break;
}
@@ -103,8 +103,7 @@ namespace Extents
backend.Remove(removeTwo);
backend.Add(itemToAdd);
}
else
backend.Add(new Tuple<long, long>(item, item));
else backend.Add(new Tuple<long, long>(item, item));
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -118,21 +117,17 @@ namespace Extents
public void Add(long start, long end, bool run)
{
long realEnd;
if(run)
realEnd = start + end - 1;
else
realEnd = end;
if(run) realEnd = start + end - 1;
else realEnd = end;
// TODO: Optimize this
for(long t = start; t <= realEnd; t++)
Add(t);
for(long t = start; t <= realEnd; t++) Add(t);
}
public bool Contains(long item)
{
foreach(Tuple<long, long> extent in backend)
if(item >= extent.Item1 && item <= extent.Item2)
return true;
foreach(Tuple<long, long> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
return false;
}
@@ -183,14 +178,11 @@ namespace Extents
}
// Item not found
if(toRemove == null)
return false;
if(toRemove == null) return false;
backend.Remove(toRemove);
if(toAddOne != null)
backend.Add(toAddOne);
if(toAddTwo != null)
backend.Add(toAddTwo);
if(toAddOne != null) backend.Add(toAddOne);
if(toAddTwo != null) backend.Add(toAddTwo);
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -214,7 +206,8 @@ namespace Extents
return true;
}
}
return false;
}
}
}
}

43
Extents/ExtentsSByte.cs
View File

@@ -50,7 +50,10 @@ namespace Extents
backend = list.OrderBy(t => t.Item1).ToList();
}
public int Count { get { return backend.Count; } }
public int Count
{
get { return backend.Count; }
}
public void Add(sbyte item)
{
@@ -61,8 +64,7 @@ namespace Extents
for(int i = 0; i < backend.Count; i++)
{
// Already contained in an extent
if(item >= backend[i].Item1 && item <= backend[i].Item2)
return;
if(item >= backend[i].Item1 && item <= backend[i].Item2) return;
// Expands existing extent start
if(item == backend[i].Item1 - 1)
@@ -74,8 +76,7 @@ namespace Extents
removeTwo = backend[i - 1];
itemToAdd = new Tuple<sbyte, sbyte>(backend[i - 1].Item1, backend[i].Item2);
}
else
itemToAdd = new Tuple<sbyte, sbyte>(item, backend[i].Item2);
else itemToAdd = new Tuple<sbyte, sbyte>(item, backend[i].Item2);
break;
}
@@ -90,8 +91,7 @@ namespace Extents
removeTwo = backend[i + 1];
itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, backend[i + 1].Item2);
}
else
itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, item);
else itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, item);
break;
}
@@ -103,8 +103,7 @@ namespace Extents
backend.Remove(removeTwo);
backend.Add(itemToAdd);
}
else
backend.Add(new Tuple<sbyte, sbyte>(item, item));
else backend.Add(new Tuple<sbyte, sbyte>(item, item));
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -118,21 +117,17 @@ namespace Extents
public void Add(sbyte start, sbyte end, bool run)
{
sbyte realEnd;
if(run)
realEnd = (sbyte)(start + end - 1);
else
realEnd = end;
if(run) realEnd = (sbyte)(start + end - 1);
else realEnd = end;
// TODO: Optimize this
for(sbyte t = start; t <= realEnd; t++)
Add(t);
for(sbyte t = start; t <= realEnd; t++) Add(t);
}
public bool Contains(sbyte item)
{
foreach(Tuple<sbyte, sbyte> extent in backend)
if(item >= extent.Item1 && item <= extent.Item2)
return true;
foreach(Tuple<sbyte, sbyte> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
return false;
}
@@ -183,14 +178,11 @@ namespace Extents
}
// Item not found
if(toRemove == null)
return false;
if(toRemove == null) return false;
backend.Remove(toRemove);
if(toAddOne != null)
backend.Add(toAddOne);
if(toAddTwo != null)
backend.Add(toAddTwo);
if(toAddOne != null) backend.Add(toAddOne);
if(toAddTwo != null) backend.Add(toAddTwo);
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -214,7 +206,8 @@ namespace Extents
return true;
}
}
return false;
}
}
}
}

43
Extents/ExtentsShort.cs
View File

@@ -50,7 +50,10 @@ namespace Extents
backend = list.OrderBy(t => t.Item1).ToList();
}
public int Count { get { return backend.Count; } }
public int Count
{
get { return backend.Count; }
}
public void Add(short item)
{
@@ -61,8 +64,7 @@ namespace Extents
for(int i = 0; i < backend.Count; i++)
{
// Already contained in an extent
if(item >= backend[i].Item1 && item <= backend[i].Item2)
return;
if(item >= backend[i].Item1 && item <= backend[i].Item2) return;
// Expands existing extent start
if(item == backend[i].Item1 - 1)
@@ -74,8 +76,7 @@ namespace Extents
removeTwo = backend[i - 1];
itemToAdd = new Tuple<short, short>(backend[i - 1].Item1, backend[i].Item2);
}
else
itemToAdd = new Tuple<short, short>(item, backend[i].Item2);
else itemToAdd = new Tuple<short, short>(item, backend[i].Item2);
break;
}
@@ -90,8 +91,7 @@ namespace Extents
removeTwo = backend[i + 1];
itemToAdd = new Tuple<short, short>(backend[i].Item1, backend[i + 1].Item2);
}
else
itemToAdd = new Tuple<short, short>(backend[i].Item1, item);
else itemToAdd = new Tuple<short, short>(backend[i].Item1, item);
break;
}
@@ -103,8 +103,7 @@ namespace Extents
backend.Remove(removeTwo);
backend.Add(itemToAdd);
}
else
backend.Add(new Tuple<short, short>(item, item));
else backend.Add(new Tuple<short, short>(item, item));
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -118,21 +117,17 @@ namespace Extents
public void Add(short start, short end, bool run)
{
short realEnd;
if(run)
realEnd = (short)(start + end - 1);
else
realEnd = end;
if(run) realEnd = (short)(start + end - 1);
else realEnd = end;
// TODO: Optimize this
for(short t = start; t <= realEnd; t++)
Add(t);
for(short t = start; t <= realEnd; t++) Add(t);
}
public bool Contains(short item)
{
foreach(Tuple<short, short> extent in backend)
if(item >= extent.Item1 && item <= extent.Item2)
return true;
foreach(Tuple<short, short> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
return false;
}
@@ -183,14 +178,11 @@ namespace Extents
}
// Item not found
if(toRemove == null)
return false;
if(toRemove == null) return false;
backend.Remove(toRemove);
if(toAddOne != null)
backend.Add(toAddOne);
if(toAddTwo != null)
backend.Add(toAddTwo);
if(toAddOne != null) backend.Add(toAddOne);
if(toAddTwo != null) backend.Add(toAddTwo);
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -214,7 +206,8 @@ namespace Extents
return true;
}
}
return false;
}
}
}
}

43
Extents/ExtentsUInt.cs
View File

@@ -50,7 +50,10 @@ namespace Extents
backend = list.OrderBy(t => t.Item1).ToList();
}
public int Count { get { return backend.Count; } }
public int Count
{
get { return backend.Count; }
}
public void Add(uint item)
{
@@ -61,8 +64,7 @@ namespace Extents
for(int i = 0; i < backend.Count; i++)
{
// Already contained in an extent
if(item >= backend[i].Item1 && item <= backend[i].Item2)
return;
if(item >= backend[i].Item1 && item <= backend[i].Item2) return;
// Expands existing extent start
if(item == backend[i].Item1 - 1)
@@ -74,8 +76,7 @@ namespace Extents
removeTwo = backend[i - 1];
itemToAdd = new Tuple<uint, uint>(backend[i - 1].Item1, backend[i].Item2);
}
else
itemToAdd = new Tuple<uint, uint>(item, backend[i].Item2);
else itemToAdd = new Tuple<uint, uint>(item, backend[i].Item2);
break;
}
@@ -90,8 +91,7 @@ namespace Extents
removeTwo = backend[i + 1];
itemToAdd = new Tuple<uint, uint>(backend[i].Item1, backend[i + 1].Item2);
}
else
itemToAdd = new Tuple<uint, uint>(backend[i].Item1, item);
else itemToAdd = new Tuple<uint, uint>(backend[i].Item1, item);
break;
}
@@ -103,8 +103,7 @@ namespace Extents
backend.Remove(removeTwo);
backend.Add(itemToAdd);
}
else
backend.Add(new Tuple<uint, uint>(item, item));
else backend.Add(new Tuple<uint, uint>(item, item));
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -118,21 +117,17 @@ namespace Extents
public void Add(uint start, uint end, bool run)
{
uint realEnd;
if(run)
realEnd = start + end - 1;
else
realEnd = end;
if(run) realEnd = start + end - 1;
else realEnd = end;
// TODO: Optimize this
for(uint t = start; t <= realEnd; t++)
Add(t);
for(uint t = start; t <= realEnd; t++) Add(t);
}
public bool Contains(uint item)
{
foreach(Tuple<uint, uint> extent in backend)
if(item >= extent.Item1 && item <= extent.Item2)
return true;
foreach(Tuple<uint, uint> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
return false;
}
@@ -183,14 +178,11 @@ namespace Extents
}
// Item not found
if(toRemove == null)
return false;
if(toRemove == null) return false;
backend.Remove(toRemove);
if(toAddOne != null)
backend.Add(toAddOne);
if(toAddTwo != null)
backend.Add(toAddTwo);
if(toAddOne != null) backend.Add(toAddOne);
if(toAddTwo != null) backend.Add(toAddTwo);
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -214,7 +206,8 @@ namespace Extents
return true;
}
}
return false;
}
}
}
}

43
Extents/ExtentsULong.cs
View File

@@ -50,7 +50,10 @@ namespace Extents
backend = list.OrderBy(t => t.Item1).ToList();
}
public int Count { get { return backend.Count; } }
public int Count
{
get { return backend.Count; }
}
public void Add(ulong item)
{
@@ -61,8 +64,7 @@ namespace Extents
for(int i = 0; i < backend.Count; i++)
{
// Already contained in an extent
if(item >= backend[i].Item1 && item <= backend[i].Item2)
return;
if(item >= backend[i].Item1 && item <= backend[i].Item2) return;
// Expands existing extent start
if(item == backend[i].Item1 - 1)
@@ -74,8 +76,7 @@ namespace Extents
removeTwo = backend[i - 1];
itemToAdd = new Tuple<ulong, ulong>(backend[i - 1].Item1, backend[i].Item2);
}
else
itemToAdd = new Tuple<ulong, ulong>(item, backend[i].Item2);
else itemToAdd = new Tuple<ulong, ulong>(item, backend[i].Item2);
break;
}
@@ -90,8 +91,7 @@ namespace Extents
removeTwo = backend[i + 1];
itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, backend[i + 1].Item2);
}
else
itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, item);
else itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, item);
break;
}
@@ -103,8 +103,7 @@ namespace Extents
backend.Remove(removeTwo);
backend.Add(itemToAdd);
}
else
backend.Add(new Tuple<ulong, ulong>(item, item));
else backend.Add(new Tuple<ulong, ulong>(item, item));
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -118,21 +117,17 @@ namespace Extents
public void Add(ulong start, ulong end, bool run)
{
ulong realEnd;
if(run)
realEnd = start + end - 1;
else
realEnd = end;
if(run) realEnd = start + end - 1;
else realEnd = end;
// TODO: Optimize this
for(ulong t = start; t <= realEnd; t++)
Add(t);
for(ulong t = start; t <= realEnd; t++) Add(t);
}
public bool Contains(ulong item)
{
foreach(Tuple<ulong, ulong> extent in backend)
if(item >= extent.Item1 && item <= extent.Item2)
return true;
foreach(Tuple<ulong, ulong> extent in backend) if(item >= extent.Item1 && item <= extent.Item2) return true;
return false;
}
@@ -183,14 +178,11 @@ namespace Extents
}
// Item not found
if(toRemove == null)
return false;
if(toRemove == null) return false;
backend.Remove(toRemove);
if(toAddOne != null)
backend.Add(toAddOne);
if(toAddTwo != null)
backend.Add(toAddTwo);
if(toAddOne != null) backend.Add(toAddOne);
if(toAddTwo != null) backend.Add(toAddTwo);
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -214,7 +206,8 @@ namespace Extents
return true;
}
}
return false;
}
}
}
}

42
Extents/ExtentsUShort.cs
View File

@@ -50,7 +50,10 @@ namespace Extents
backend = list.OrderBy(t => t.Item1).ToList();
}
public int Count { get { return backend.Count; } }
public int Count
{
get { return backend.Count; }
}
public void Add(ushort item)
{
@@ -61,8 +64,7 @@ namespace Extents
for(int i = 0; i < backend.Count; i++)
{
// Already contained in an extent
if(item >= backend[i].Item1 && item <= backend[i].Item2)
return;
if(item >= backend[i].Item1 && item <= backend[i].Item2) return;
// Expands existing extent start
if(item == backend[i].Item1 - 1)
@@ -74,8 +76,7 @@ namespace Extents
removeTwo = backend[i - 1];
itemToAdd = new Tuple<ushort, ushort>(backend[i - 1].Item1, backend[i].Item2);
}
else
itemToAdd = new Tuple<ushort, ushort>(item, backend[i].Item2);
else itemToAdd = new Tuple<ushort, ushort>(item, backend[i].Item2);
break;
}
@@ -90,8 +91,7 @@ namespace Extents
removeTwo = backend[i + 1];
itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, backend[i + 1].Item2);
}
else
itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, item);
else itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, item);
break;
}
@@ -103,8 +103,7 @@ namespace Extents
backend.Remove(removeTwo);
backend.Add(itemToAdd);
}
else
backend.Add(new Tuple<ushort, ushort>(item, item));
else backend.Add(new Tuple<ushort, ushort>(item, item));
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -118,21 +117,18 @@ namespace Extents
public void Add(ushort start, ushort end, bool run)
{
ushort realEnd;
if(run)
realEnd = (ushort)(start + end - 1);
else
realEnd = end;
if(run) realEnd = (ushort)(start + end - 1);
else realEnd = end;
// TODO: Optimize this
for(ushort t = start; t <= realEnd; t++)
Add(t);
for(ushort t = start; t <= realEnd; t++) Add(t);
}
public bool Contains(ushort item)
{
foreach(Tuple<ushort, ushort> extent in backend)
if(item >= extent.Item1 && item <= extent.Item2)
return true;
if(item >= extent.Item1 && item <= extent.Item2) return true;
return false;
}
@@ -183,14 +179,11 @@ namespace Extents
}
// Item not found
if(toRemove == null)
return false;
if(toRemove == null) return false;
backend.Remove(toRemove);
if(toAddOne != null)
backend.Add(toAddOne);
if(toAddTwo != null)
backend.Add(toAddTwo);
if(toAddOne != null) backend.Add(toAddOne);
if(toAddTwo != null) backend.Add(toAddTwo);
// Sort
backend = backend.OrderBy(t => t.Item1).ToList();
@@ -214,7 +207,8 @@ namespace Extents
return true;
}
}
return false;
}
}
}
}