Skip to content

Mars
Mars

cdy816 / Mars

通知 3
Star 1
Fork 0
Mars
Mars

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 d39d2015 编写于 作者: cdy816's avatar cdy816
浏览文件
操作

日常更新

上级 7b5be4a3
隐藏空白更改
内联 并排
Showing with 288 addition and 221 deletion
Common/Cdy.Tag.Common/Common/CustomQueue.cs
浏览文件 @ d39d2015
......@@ -20,6 +20,7 @@ namespace Cdy.Tag
#region ... Variables ...
private T[] mColections;
private int mCount = 0;
private object mReadLockObj = new object();
#endregion ...Variables...
#region ... Events ...
......@@ -43,13 +44,15 @@ namespace Cdy.Tag
#region ... Properties ...
public int WriteIndex { get; set; } = 0;
/// <summary>
///
/// </summary>
public int WriteIndex { get; set; } = -1;
/// <summary>
///
/// </summary>
public int ReadIndex { get; set; }
public int ReadIndex { get; set; } = 0;
/// <summary>
///
......@@ -66,7 +69,18 @@ namespace Cdy.Tag
/// <param name="value"></param>
public void Insert(T value)
{
mColections[WriteIndex++] = value;
lock(mColections)
mColections[++WriteIndex] = value;
}
/// <summary>
///
/// </summary>
/// <param name="value"></param>
/// <param name="index"></param>
public void InsertAt(T value,int index)
{
mColections[index] = value;
}
......@@ -85,16 +99,19 @@ namespace Cdy.Tag
/// </summary>
public T IncRead()
{
if (ReadIndex <= WriteIndex)
lock (mReadLockObj)
{
return mColections[ReadIndex++];
if (ReadIndex <= WriteIndex)
{
return mColections[ReadIndex++];
}
else
{
ReadIndex++;
return default(T);
}
}
else
{
ReadIndex++;
return default(T);
}
}
/// <summary>
......@@ -103,25 +120,45 @@ namespace Cdy.Tag
/// <returns></returns>
public T DescRead()
{
if (ReadIndex >=0)
{
return mColections[ReadIndex--];
}
else
lock (mReadLockObj)
{
ReadIndex--;
return default(T);
if (ReadIndex >= 0)
{
return mColections[ReadIndex--];
}
else
{
ReadIndex--;
return default(T);
}
}
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public T Read()
{
return mColections[ReadIndex];
}
/// <summary>
///
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
public T Read(int index)
{
return mColections[index];
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public T Remove()
{
WriteIndex--;
if (WriteIndex < 0)
{
WriteIndex = -1;
......@@ -129,8 +166,11 @@ namespace Cdy.Tag
}
else
{
return mColections[WriteIndex];
var re = mColections[WriteIndex];
--WriteIndex;
return re;
}
}
public T Get(int index)
......@@ -143,7 +183,7 @@ namespace Cdy.Tag
/// </summary>
public void Reset()
{
WriteIndex = 0;
WriteIndex = -1;
ReadIndex = 0;
}
......
Common/Cdy.Tag.Common/Common/ProtoMemory.cs
浏览文件 @ d39d2015
......@@ -138,6 +138,20 @@ namespace Cdy.Tag
return inputStream.ReadInt32();
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public List<int> ReadInt32s()
{
List<int> re = new List<int>();
while(!inputStream.IsAtEnd)
{
re.Add(inputStream.ReadInt32());
}
return re;
}
/// <summary>
///
/// </summary>
......@@ -202,6 +216,20 @@ namespace Cdy.Tag
return inputStream.ReadInt64();
}
/// <summary>
///
/// </summary>
/// <returns></returns>
public List<long> ReadInt64s()
{
List<long> re = new List<long>();
while (!inputStream.IsAtEnd)
{
re.Add(inputStream.ReadInt64());
}
return re;
}
/// <summary>
///
/// </summary>
......
Develop/DbManager.Desktop/Properties/launchSettings.json
浏览文件 @ d39d2015
......@@ -2,7 +2,7 @@
"profiles": {
"DBInStudio.Desktop": {
"commandName": "Executable",
"executablePath": "C:\\Users\\cdy81\\source\\repos\\mars\\Output\\DBInStudio.exe"
"executablePath": "C:\\Users\\chongdaoyang\\source\\repos\\mars\\Output\\DBInStudio.exe"
}
}
}
\ No newline at end of file
RunTime/DBInRun/Properties/launchSettings.json
浏览文件 @ d39d2015
......@@ -2,7 +2,7 @@
"profiles": {
"DBInRun": {
"commandName": "Executable",
"executablePath": "C:\\Users\\cdy81\\source\\repos\\mars\\Output\\DBInRun.exe"
"executablePath": "C:\\Users\\chongdaoyang\\source\\repos\\mars\\Output\\DBInRun.exe"
}
}
}
\ No newline at end of file
RunTime/DBRuntime/His/Compress/Special/DeadAreaCompressUnit2.cs
浏览文件 @ d39d2015
......@@ -109,7 +109,7 @@ namespace Cdy.Tag
int id = 0;
int ig = -1;
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
byte tlen = (timerVals as HisDataMemoryBlock).TimeLen;
......@@ -135,7 +135,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
// emptyIds.TryDequeue(out ig);
}
}
......@@ -192,7 +192,7 @@ namespace Cdy.Tag
var cval = CompressBoolValues(source, count * 2 + sourceAddr, count, emptys);
int rcount = count - emptys.WriteIndex;
int rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -221,7 +221,7 @@ namespace Cdy.Tag
cval = CompressValues<byte>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -249,7 +249,7 @@ namespace Cdy.Tag
var ures = CompressValues<ushort>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -275,7 +275,7 @@ namespace Cdy.Tag
var res = CompressValues<short>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -301,7 +301,7 @@ namespace Cdy.Tag
var uires = CompressValues<uint>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -326,7 +326,7 @@ namespace Cdy.Tag
FindEmpityIds(source, sourceAddr, (int)count, emptys);
var ires = CompressValues<int>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -351,7 +351,7 @@ namespace Cdy.Tag
FindEmpityIds(source, sourceAddr, (int)count, emptys);
var ulres = CompressValues<ulong>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -376,7 +376,7 @@ namespace Cdy.Tag
FindEmpityIds(source, sourceAddr, (int)count, emptys);
var lres = CompressValues<long>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -402,7 +402,7 @@ namespace Cdy.Tag
var dres = CompressValues<ulong>(source, count * 2 + sourceAddr, count, emptys, TagType);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -429,7 +429,7 @@ namespace Cdy.Tag
var ddres = CompressValues<double>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -464,7 +464,7 @@ namespace Cdy.Tag
var fres = CompressValues<float>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -488,7 +488,7 @@ namespace Cdy.Tag
case TagType.String:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -515,7 +515,7 @@ namespace Cdy.Tag
break;
case TagType.IntPoint:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -539,7 +539,7 @@ namespace Cdy.Tag
break;
case TagType.UIntPoint:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -563,7 +563,7 @@ namespace Cdy.Tag
break;
case TagType.LongPoint:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -587,7 +587,7 @@ namespace Cdy.Tag
break;
case TagType.ULongPoint:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -611,7 +611,7 @@ namespace Cdy.Tag
break;
case TagType.IntPoint3:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -635,7 +635,7 @@ namespace Cdy.Tag
break;
case TagType.UIntPoint3:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -659,7 +659,7 @@ namespace Cdy.Tag
break;
case TagType.LongPoint3:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -683,7 +683,7 @@ namespace Cdy.Tag
break;
case TagType.ULongPoint3:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
......@@ -731,7 +731,7 @@ namespace Cdy.Tag
bool isFirst = true;
int ig = -1;
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
......@@ -766,7 +766,7 @@ namespace Cdy.Tag
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -800,7 +800,7 @@ namespace Cdy.Tag
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -834,7 +834,7 @@ namespace Cdy.Tag
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -867,7 +867,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -900,7 +900,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -933,7 +933,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -966,7 +966,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -1006,7 +1006,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -1042,7 +1042,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......
RunTime/DBRuntime/His/Compress/Special/LosslessCompressUnit2.cs
浏览文件 @ d39d2015
......@@ -207,7 +207,7 @@ namespace Cdy.Tag
mMarshalMemory.Position = 0;
mVarintMemory.Reset();
int ig = -1;
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
bool isFirst = true;
switch (type)
{
......@@ -221,7 +221,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
// emptyIds.TryDequeue(out ig);
}
}
......@@ -247,7 +247,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -272,7 +272,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -297,7 +297,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -322,7 +322,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -347,7 +347,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -372,7 +372,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -389,7 +389,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
mDCompress.Compress();
......@@ -406,7 +406,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
mFCompress.Compress();
......@@ -436,7 +436,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -465,7 +465,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -499,7 +499,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -533,7 +533,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -562,7 +562,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -591,7 +591,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -625,7 +625,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -659,7 +659,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -680,7 +680,7 @@ namespace Cdy.Tag
{
mMarshalMemory.Position = 0;
int ig = -1;
ig = emptys.ReadIndex<emptyIds.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptyIds.WriteIndex ? emptys.IncRead() : -1;
for (int i = 0; i < timerVals.Count; i++)
{
if(i != ig)
......@@ -690,7 +690,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex<emptyIds.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptyIds.WriteIndex ? emptys.IncRead() : -1;
}
}
return mMarshalMemory.StartMemory.AsMemory<byte>(0, (int)mMarshalMemory.Position);
......@@ -713,7 +713,7 @@ namespace Cdy.Tag
//using (ProtoMemory memory = new ProtoMemory(qulitys.Length * 2))
mVarintMemory.Reset();
int ig = -1;
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
//emptyIds.TryDequeue(out ig);
mVarintMemory.WriteInt32(qus);
for (int i = 1; i < totalcount; i++)
......@@ -735,7 +735,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
// emptyIds.TryDequeue(out ig);
}
}
......@@ -757,7 +757,7 @@ namespace Cdy.Tag
//using (ProtoMemory memory = new ProtoMemory(qulitys.Length * 2))
mVarintMemory.Reset();
int ig = -1;
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
mVarintMemory.WriteInt32(qus);
for (int i = 1; i < qulitys.Length; i++)
{
......@@ -777,7 +777,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
mVarintMemory.WriteInt32(count);
......@@ -795,7 +795,7 @@ namespace Cdy.Tag
byte bval = source.ReadByte((int)offset);
short scount = 1;
int ig = -1;
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
//emptyIds.TryDequeue(out ig);
short sval = (short)(bval << 15);
......@@ -819,7 +819,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
// emptyIds.TryDequeue(out ig);
}
}
......@@ -860,7 +860,7 @@ namespace Cdy.Tag
var datas = CompressTimers(source, sourceAddr, (int)count, emptys);
long rsize = 0;
int rcount = count - emptys.WriteIndex;
int rcount = count - emptys.WriteIndex - 1;
target.WriteInt(targetAddr,rcount);
rsize += 4;
......
RunTime/DBRuntime/His/Compress/Special/SlopeCompressUnit2.cs
浏览文件 @ d39d2015
......@@ -81,13 +81,11 @@ namespace Cdy.Tag
protected Memory<byte> CompressTimers(List<int> timerVals, CustomQueue<int> usedIndex)
{
usedIndex.ReadIndex = 0;
// int preids = timerVals[0];
int preids = 0;
int ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
int ig = usedIndex.ReadIndex <= usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
bool isFirst = true;
mVarintMemory2.Reset();
//mVarintMemory.WriteInt32(preids);
for (int i = 0; i < timerVals.Count; i++)
{
if (i == ig)
......@@ -103,10 +101,10 @@ namespace Cdy.Tag
mVarintMemory2.WriteInt32(id - preids);
}
preids = id;
ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
ig = usedIndex.ReadIndex <= usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
}
}
return mVarintMemory2.DataBuffer.AsSpan(0, (int)mVarintMemory2.WritePosition).ToArray();
return mVarintMemory2.DataBuffer.AsMemory(0, (int)mVarintMemory2.WritePosition);
}
/// <summary>
......@@ -141,7 +139,7 @@ namespace Cdy.Tag
int count = 0;
byte qus = 0;
mVarintMemory.Reset();
int ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
int ig = usedIndex.ReadIndex <= usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
bool isFirst = true;
for (int i = 0; i < totalcount; i++)
......@@ -170,7 +168,7 @@ namespace Cdy.Tag
count = 1;
}
}
ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
ig = usedIndex.ReadIndex <= usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
}
}
mVarintMemory.WriteInt32(count);
......@@ -1635,7 +1633,7 @@ namespace Cdy.Tag
int ig = -1;
emptys.ReadIndex = 0;
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
int ac = 0;
mAvaiableDatabuffer.Position = 0;
mAvaiableDatabuffer.Write((int)0);
......@@ -1656,7 +1654,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1675,7 +1673,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1694,7 +1692,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1713,7 +1711,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1732,7 +1730,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1750,7 +1748,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1768,7 +1766,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1787,7 +1785,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1805,7 +1803,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......
RunTime/DBRuntime/His/obsolete/Compress/Special/DeadAreaCompressUnit.cs
浏览文件 @ d39d2015
......@@ -104,7 +104,7 @@ namespace Cdy.Tag
int id = 0;
int ig = -1;
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
for (int i = 0; i < count; i++)
{
......@@ -124,7 +124,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
// emptyIds.TryDequeue(out ig);
}
}
......@@ -174,10 +174,10 @@ namespace Cdy.Tag
var cval = CompressBoolValues(source, count * 2 + sourceAddr, count, emptys);
int rcount = count - emptys.WriteIndex;
int rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -203,10 +203,10 @@ namespace Cdy.Tag
cval = CompressValues<byte>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex-1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -231,10 +231,10 @@ namespace Cdy.Tag
var ures = CompressValues<ushort>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -257,10 +257,10 @@ namespace Cdy.Tag
var res = CompressValues<short>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -283,10 +283,10 @@ namespace Cdy.Tag
var uires = CompressValues<uint>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -308,10 +308,10 @@ namespace Cdy.Tag
FindEmpityIds(source, sourceAddr, (int)count, emptys);
var ires = CompressValues<int>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -333,10 +333,10 @@ namespace Cdy.Tag
FindEmpityIds(source, sourceAddr, (int)count, emptys);
var ulres = CompressValues<ulong>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -358,10 +358,10 @@ namespace Cdy.Tag
FindEmpityIds(source, sourceAddr, (int)count, emptys);
var lres = CompressValues<long>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -384,10 +384,10 @@ namespace Cdy.Tag
var dres = CompressValues<ulong>(source, count * 2 + sourceAddr, count, emptys, TagType);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -411,10 +411,10 @@ namespace Cdy.Tag
var ddres = CompressValues<double>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -438,10 +438,10 @@ namespace Cdy.Tag
var fres = CompressValues<float>(source, count * 2 + sourceAddr, count, emptys, TagType);
datas = CompressTimers2(source, sourceAddr, (int)count, emptys2);
rcount = count - emptys2.WriteIndex;
rcount = count - emptys2.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -462,10 +462,10 @@ namespace Cdy.Tag
case TagType.String:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -489,10 +489,10 @@ namespace Cdy.Tag
break;
case TagType.IntPoint:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -513,10 +513,10 @@ namespace Cdy.Tag
break;
case TagType.UIntPoint:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -537,10 +537,10 @@ namespace Cdy.Tag
break;
case TagType.LongPoint:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -561,10 +561,10 @@ namespace Cdy.Tag
break;
case TagType.ULongPoint:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -585,10 +585,10 @@ namespace Cdy.Tag
break;
case TagType.IntPoint3:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -609,10 +609,10 @@ namespace Cdy.Tag
break;
case TagType.UIntPoint3:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -633,10 +633,10 @@ namespace Cdy.Tag
break;
case TagType.LongPoint3:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -657,10 +657,10 @@ namespace Cdy.Tag
break;
case TagType.ULongPoint3:
datas = CompressTimers(source, sourceAddr, (int)count, emptys);
rcount = count - emptys.WriteIndex;
rcount = count - emptys.WriteIndex - 1;
//写入时间
target.WriteUShort(targetAddr, (ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr, rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -705,7 +705,7 @@ namespace Cdy.Tag
bool isFirst = true;
int ig = -1;
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
switch (type)
{
......@@ -738,7 +738,7 @@ namespace Cdy.Tag
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -772,7 +772,7 @@ namespace Cdy.Tag
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -806,7 +806,7 @@ namespace Cdy.Tag
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -839,7 +839,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -872,7 +872,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -905,7 +905,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -938,7 +938,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -974,7 +974,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......@@ -1010,7 +1010,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
emptys2.Insert(i);
}
}
......
RunTime/DBRuntime/His/obsolete/Compress/Special/LosslessCompressUnit.cs
浏览文件 @ d39d2015
......@@ -204,7 +204,7 @@ namespace Cdy.Tag
mMarshalMemory.Position = 0;
mVarintMemory.Reset();
int ig = -1;
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
bool isFirst = true;
switch (type)
{
......@@ -218,7 +218,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
// emptyIds.TryDequeue(out ig);
}
}
......@@ -244,7 +244,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -269,7 +269,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -294,7 +294,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -319,7 +319,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -344,7 +344,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -369,7 +369,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -386,7 +386,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
mDCompress.Compress();
......@@ -403,7 +403,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
mFCompress.Compress();
......@@ -433,7 +433,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -462,7 +462,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -496,7 +496,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -530,7 +530,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -559,7 +559,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -588,7 +588,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -622,7 +622,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -656,7 +656,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex < emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
break;
......@@ -677,7 +677,7 @@ namespace Cdy.Tag
{
mMarshalMemory.Position = 0;
int ig = -1;
ig = emptys.ReadIndex<emptyIds.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptyIds.WriteIndex ? emptys.IncRead() : -1;
for (int i = 0; i < timerVals.Count; i++)
{
if(i != ig)
......@@ -687,7 +687,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex<emptyIds.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptyIds.WriteIndex ? emptys.IncRead() : -1;
}
}
return mMarshalMemory.StartMemory.AsMemory<byte>(0, (int)mMarshalMemory.Position);
......@@ -710,7 +710,7 @@ namespace Cdy.Tag
//using (ProtoMemory memory = new ProtoMemory(qulitys.Length * 2))
mVarintMemory.Reset();
int ig = -1;
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
//emptyIds.TryDequeue(out ig);
mVarintMemory.WriteInt32(qus);
for (int i = 1; i < totalcount; i++)
......@@ -732,7 +732,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
// emptyIds.TryDequeue(out ig);
}
}
......@@ -754,7 +754,7 @@ namespace Cdy.Tag
//using (ProtoMemory memory = new ProtoMemory(qulitys.Length * 2))
mVarintMemory.Reset();
int ig = -1;
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
mVarintMemory.WriteInt32(qus);
for (int i = 1; i < qulitys.Length; i++)
{
......@@ -774,7 +774,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
}
}
mVarintMemory.WriteInt32(count);
......@@ -792,7 +792,7 @@ namespace Cdy.Tag
byte bval = source.ReadByte(offset);
short scount = 1;
int ig = -1;
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
//emptyIds.TryDequeue(out ig);
short sval = (short)(bval << 15);
......@@ -816,7 +816,7 @@ namespace Cdy.Tag
}
else
{
ig = emptyIds.ReadIndex<emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
ig = emptyIds.ReadIndex <= emptyIds.WriteIndex ? emptyIds.IncRead() : -1;
// emptyIds.TryDequeue(out ig);
}
}
......@@ -863,10 +863,10 @@ namespace Cdy.Tag
long rsize = 0;
//byte[] qus = null;
int rcount = count - emptys.WriteIndex;
int rcount = count - emptys.WriteIndex - 1;
target.WriteUShort(targetAddr,(ushort)rcount);
rsize += 2;
target.WriteInt(targetAddr,rcount);
rsize += 4;
target.Write((int)datas.Length);
target.Write(datas);
rsize += 4;
......@@ -1542,7 +1542,8 @@ namespace Cdy.Tag
{
DateTime sTime = source.ReadDateTime(sourceAddr);
Dictionary<int, DateTime> re = new Dictionary<int, DateTime>();
ushort count = source.ReadUShort();
int count = source.ReadInt();
var datasize = source.ReadInt();
byte[] datas = source.ReadBytes(datasize);
var timers = DeCompressTimers(datas, count);
......@@ -1577,7 +1578,7 @@ namespace Cdy.Tag
{
DateTime sTime = source.ReadDateTime(sourceAddr);
Dictionary<int, DateTime> re = new Dictionary<int, DateTime>();
ushort count = source.ReadUShort();
var count = source.ReadInt();
var datasize = source.ReadInt();
byte[] datas = source.ReadBytes(datasize);
var timers = DeCompressTimers(datas, count);
......
RunTime/DBRuntime/His/obsolete/Compress/Special/SlopeCompressUnit.cs
浏览文件 @ d39d2015
......@@ -82,7 +82,7 @@ namespace Cdy.Tag
usedIndex.ReadIndex = 0;
// int preids = timerVals[0];
int preids = 0;
int ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
int ig = usedIndex.ReadIndex <= usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
bool isFirst = true;
mVarintMemory2.Reset();
......@@ -103,7 +103,7 @@ namespace Cdy.Tag
mVarintMemory2.WriteInt32(id - preids);
preids = id;
}
ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
ig = usedIndex.ReadIndex <= usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
}
}
return mVarintMemory2.DataBuffer.AsSpan(0, (int)mVarintMemory2.WritePosition).ToArray();
......@@ -143,7 +143,7 @@ namespace Cdy.Tag
int count = 0;
byte qus = 0;
mVarintMemory.Reset();
int ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
int ig = usedIndex.ReadIndex <= usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
bool isFirst = true;
for (int i = 0; i < totalcount; i++)
......@@ -172,7 +172,7 @@ namespace Cdy.Tag
count = 1;
}
}
ig = usedIndex.ReadIndex < usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
ig = usedIndex.ReadIndex <= usedIndex.WriteIndex ? usedIndex.IncRead() : -1;
}
}
mVarintMemory.WriteInt32(count);
......@@ -1631,7 +1631,7 @@ namespace Cdy.Tag
int ig = -1;
emptys.ReadIndex = 0;
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
int ac = 0;
mAvaiableDatabuffer.Position = 0;
mAvaiableDatabuffer.Write((int)0);
......@@ -1652,7 +1652,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1671,7 +1671,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1690,7 +1690,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1709,7 +1709,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1728,7 +1728,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1746,7 +1746,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1764,7 +1764,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1783,7 +1783,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1801,7 +1801,7 @@ namespace Cdy.Tag
}
else
{
ig = emptys.ReadIndex < emptys.WriteIndex ? emptys.IncRead() : -1;
ig = emptys.ReadIndex <= emptys.WriteIndex ? emptys.IncRead() : -1;
}
}
mAvaiableDatabuffer.WriteInt(0, ac);
......@@ -1826,9 +1826,9 @@ namespace Cdy.Tag
{
int rsize = 0;
target.WriteUShort(targetAddr, (ushort)usedIndex.WriteIndex);
target.WriteInt(targetAddr,(usedIndex.WriteIndex+1));
rsize += 2;
rsize += 4;
target.Write((int)timedata.Length);
target.Write(timedata);
rsize += 4;
......
Tools/HisDataTools/Properties/launchSettings.json
浏览文件 @ d39d2015
......@@ -2,7 +2,7 @@
"profiles": {
"HisDataTools": {
"commandName": "Executable",
"executablePath": "C:\\Users\\cdy81\\source\\repos\\mars\\Output\\HisDataTools.exe"
"executablePath": "C:\\Users\\chongdaoyang\\source\\repos\\mars\\Output\\HisDataTools.exe"
}
}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或