Skip to content

Commit 49dce3e

Browse files
JamesVaughanJamesVaughan
committed
Implemented standard vector implementations for conditions.
1 parent f6bf57f commit 49dce3e

20 files changed

Lines changed: 2185 additions & 630 deletions

‎TMG-Framework/src/TMG-Framework/Processing/AST/CompareEqual.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
4545
{
4646
var retVector = rhs.Accumulator ? rhs.VectorData : new Vector(rhs.VectorData);
4747
var flat = retVector.Data;
48-
VectorHelper.FlagIfEqual(flat, 0, lhs.LiteralValue, rhs.VectorData.Data, 0, flat.Length);
48+
VectorHelper.FlagIfEquals(flat, 0, lhs.LiteralValue, rhs.VectorData.Data, 0, flat.Length);
4949
return new ComputationResult(retVector, true, rhs.Direction);
5050
}
5151
else
5252
{
5353
var retMatrix = rhs.Accumulator ? rhs.OdData : new Matrix(rhs.OdData);
54-
VectorHelper.FlagIfEqual(retMatrix.Data, 0, lhs.LiteralValue, rhs.OdData.Data, 0, retMatrix.Data.Length);
54+
VectorHelper.FlagIfEquals(retMatrix.Data, 0, lhs.LiteralValue, rhs.OdData.Data, 0, retMatrix.Data.Length);
5555
return new ComputationResult(retMatrix, true);
5656
}
5757
}
@@ -61,14 +61,14 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
6161
{
6262
var retVector = lhs.Accumulator ? lhs.VectorData : new Vector(lhs.VectorData);
6363
var flat = retVector.Data;
64-
VectorHelper.FlagIfEqual(flat, 0, lhs.VectorData.Data, 0, rhs.LiteralValue, flat.Length);
64+
VectorHelper.FlagIfEquals(flat, 0, lhs.VectorData.Data, 0, rhs.LiteralValue, flat.Length);
6565
return new ComputationResult(retVector, true, lhs.Direction);
6666
}
6767
else
6868
{
6969
// matrix / float
7070
var retMatrix = lhs.Accumulator ? lhs.OdData : new Matrix(lhs.OdData);
71-
VectorHelper.FlagIfEqual(retMatrix.Data, 0, lhs.OdData.Data, 0, rhs.LiteralValue, retMatrix.Data.Length);
71+
VectorHelper.FlagIfEquals(retMatrix.Data, 0, lhs.OdData.Data, 0, rhs.LiteralValue, retMatrix.Data.Length);
7272
return new ComputationResult(retMatrix, true);
7373
}
7474
}
@@ -79,7 +79,7 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
7979
if (lhs.IsVectorResult && rhs.IsVectorResult)
8080
{
8181
var retMatrix = lhs.Accumulator ? lhs.VectorData : (rhs.Accumulator ? rhs.VectorData : new Vector(lhs.VectorData));
82-
VectorHelper.FlagIfEqual(retMatrix.Data, 0, lhs.VectorData.Data, 0, rhs.VectorData.Data, 0, retMatrix.Data.Length);
82+
VectorHelper.FlagIfEquals(retMatrix.Data, 0, lhs.VectorData.Data, 0, rhs.VectorData.Data, 0, retMatrix.Data.Length);
8383
return new ComputationResult(retMatrix, true, lhs.Direction);
8484
}
8585
else if (lhs.IsVectorResult)
@@ -93,14 +93,14 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
9393
{
9494
for (int i = 0; i < rowSize; i++)
9595
{
96-
VectorHelper.FlagIfEqual(retMatrix.Data, i * rowSize, flatLhs[i], flatRhs, i * rowSize, rowSize);
96+
VectorHelper.FlagIfEquals(retMatrix.Data, i * rowSize, flatLhs[i], flatRhs, i * rowSize, rowSize);
9797
}
9898
}
9999
else if (lhs.Direction == ComputationResult.VectorDirection.Horizontal)
100100
{
101101
for (int i = 0; i < rowSize; i++)
102102
{
103-
VectorHelper.FlagIfEqual(retMatrix.Data, i * rowSize, flatLhs, 0, flatRhs, i * rowSize, rowSize);
103+
VectorHelper.FlagIfEquals(retMatrix.Data, i * rowSize, flatLhs, 0, flatRhs, i * rowSize, rowSize);
104104
}
105105
}
106106
else
@@ -120,14 +120,14 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
120120
{
121121
for (int i = 0; i < rowSize; i++)
122122
{
123-
VectorHelper.FlagIfEqual(retMatrix.Data, i * rowSize, flatLhs, i * rowSize, flatRhs[i], rowSize);
123+
VectorHelper.FlagIfEquals(retMatrix.Data, i * rowSize, flatLhs, i * rowSize, flatRhs[i], rowSize);
124124
}
125125
}
126126
else if (rhs.Direction == ComputationResult.VectorDirection.Horizontal)
127127
{
128128
for (int i = 0; i < rowSize; i++)
129129
{
130-
VectorHelper.FlagIfEqual(retMatrix.Data, i * rowSize, flatLhs, i * rowSize, flatRhs, 0, rowSize);
130+
VectorHelper.FlagIfEquals(retMatrix.Data, i * rowSize, flatLhs, i * rowSize, flatRhs, 0, rowSize);
131131
}
132132
}
133133
else
@@ -140,7 +140,7 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
140140
else
141141
{
142142
var retMatrix = lhs.Accumulator ? lhs.OdData : (rhs.Accumulator ? rhs.OdData : new Matrix(lhs.OdData));
143-
VectorHelper.FlagIfEqual(retMatrix.Data, 0, lhs.OdData.Data, 0, rhs.OdData.Data, 0, retMatrix.Data.Length);
143+
VectorHelper.FlagIfEquals(retMatrix.Data, 0, lhs.OdData.Data, 0, rhs.OdData.Data, 0, retMatrix.Data.Length);
144144
return new ComputationResult(retMatrix, true);
145145
}
146146
}

‎TMG-Framework/src/TMG-Framework/Processing/AST/CompareNotEquals.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
4545
{
4646
var retVector = rhs.Accumulator ? rhs.VectorData : new Vector(rhs.VectorData);
4747
var flat = retVector.Data;
48-
VectorHelper.FlagIfNotEqual(flat, 0, lhs.LiteralValue, rhs.VectorData.Data, 0, flat.Length);
48+
VectorHelper.FlagIfNotEquals(flat, 0, lhs.LiteralValue, rhs.VectorData.Data, 0, flat.Length);
4949
return new ComputationResult(retVector, true, rhs.Direction);
5050
}
5151
else
5252
{
5353
var retMatrix = rhs.Accumulator ? rhs.OdData : new Matrix(rhs.OdData);
54-
VectorHelper.FlagIfNotEqual(retMatrix.Data, 0, lhs.LiteralValue, rhs.OdData.Data, 0, retMatrix.Data.Length);
54+
VectorHelper.FlagIfNotEquals(retMatrix.Data, 0, lhs.LiteralValue, rhs.OdData.Data, 0, retMatrix.Data.Length);
5555
return new ComputationResult(retMatrix, true);
5656
}
5757
}
@@ -61,14 +61,14 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
6161
{
6262
var retVector = lhs.Accumulator ? lhs.VectorData : new Vector(lhs.VectorData);
6363
var flat = retVector.Data;
64-
VectorHelper.FlagIfNotEqual(flat, 0, lhs.VectorData.Data, 0, rhs.LiteralValue, flat.Length);
64+
VectorHelper.FlagIfNotEquals(flat, 0, lhs.VectorData.Data, 0, rhs.LiteralValue, flat.Length);
6565
return new ComputationResult(retVector, true, lhs.Direction);
6666
}
6767
else
6868
{
6969
// matrix / float
7070
var retMatrix = lhs.Accumulator ? lhs.OdData : new Matrix(lhs.OdData);
71-
VectorHelper.FlagIfNotEqual(retMatrix.Data, 0, lhs.OdData.Data, 0, rhs.LiteralValue, retMatrix.Data.Length);
71+
VectorHelper.FlagIfNotEquals(retMatrix.Data, 0, lhs.OdData.Data, 0, rhs.LiteralValue, retMatrix.Data.Length);
7272
return new ComputationResult(retMatrix, true);
7373
}
7474
}
@@ -79,7 +79,7 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
7979
if (lhs.IsVectorResult && rhs.IsVectorResult)
8080
{
8181
var retMatrix = lhs.Accumulator ? lhs.VectorData : (rhs.Accumulator ? rhs.VectorData : new Vector(lhs.VectorData));
82-
VectorHelper.FlagIfNotEqual(retMatrix.Data, 0, lhs.VectorData.Data, 0, rhs.VectorData.Data, 0, retMatrix.Data.Length);
82+
VectorHelper.FlagIfNotEquals(retMatrix.Data, 0, lhs.VectorData.Data, 0, rhs.VectorData.Data, 0, retMatrix.Data.Length);
8383
return new ComputationResult(retMatrix, true, lhs.Direction);
8484
}
8585
else if (lhs.IsVectorResult)
@@ -93,14 +93,14 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
9393
{
9494
for (int i = 0; i < rowSize; i++)
9595
{
96-
VectorHelper.FlagIfNotEqual(retMatrix.Data, i * rowSize, flatLhs[i], flatRhs, i * rowSize, rowSize);
96+
VectorHelper.FlagIfNotEquals(retMatrix.Data, i * rowSize, flatLhs[i], flatRhs, i * rowSize, rowSize);
9797
}
9898
}
9999
else if (lhs.Direction == ComputationResult.VectorDirection.Horizontal)
100100
{
101101
for (int i = 0; i < rowSize; i++)
102102
{
103-
VectorHelper.FlagIfNotEqual(retMatrix.Data, i * rowSize, flatLhs, 0, flatRhs, i * rowSize, rowSize);
103+
VectorHelper.FlagIfNotEquals(retMatrix.Data, i * rowSize, flatLhs, 0, flatRhs, i * rowSize, rowSize);
104104
}
105105
}
106106
else
@@ -120,14 +120,14 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
120120
{
121121
for (int i = 0; i < rowSize; i++)
122122
{
123-
VectorHelper.FlagIfNotEqual(retMatrix.Data, i * rowSize, flatLhs, i * rowSize, flatRhs[i], rowSize);
123+
VectorHelper.FlagIfNotEquals(retMatrix.Data, i * rowSize, flatLhs, i * rowSize, flatRhs[i], rowSize);
124124
}
125125
}
126126
else if (rhs.Direction == ComputationResult.VectorDirection.Horizontal)
127127
{
128128
for (int i = 0; i < rowSize; i++)
129129
{
130-
VectorHelper.FlagIfNotEqual(retMatrix.Data, i * rowSize, flatLhs, i * rowSize, flatRhs, 0, rowSize);
130+
VectorHelper.FlagIfNotEquals(retMatrix.Data, i * rowSize, flatLhs, i * rowSize, flatRhs, 0, rowSize);
131131
}
132132
}
133133
else
@@ -140,7 +140,7 @@ public override ComputationResult Evaluate(ComputationResult lhs, ComputationRes
140140
else
141141
{
142142
var retMatrix = lhs.Accumulator ? lhs.OdData : (rhs.Accumulator ? rhs.OdData : new Matrix(lhs.OdData));
143-
VectorHelper.FlagIfNotEqual(retMatrix.Data, 0, lhs.OdData.Data, 0, rhs.OdData.Data, 0, lhs.OdData.Data.Length);
143+
VectorHelper.FlagIfNotEquals(retMatrix.Data, 0, lhs.OdData.Data, 0, rhs.OdData.Data, 0, lhs.OdData.Data.Length);
144144
return new ComputationResult(retMatrix, true);
145145
}
146146
}

0 commit comments

Comments
 (0)