Skip to content

Add multiple detection model #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
acured wants to merge 4 commits into from
Closed

Add multiple detection model #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
654155e
Update multiple detection model sdk
May 16, 2019
8905094
update multiple detection model test
May 16, 2019
f797bf9
record test
May 16, 2019
496ed12
Rebase on master.
May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/FaceDetectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ namespace FaceSDK.Tests
{
public class FaceDetectionTests : BaseTests
{
private static readonly string detectionModel = DetectionModel.Detection01;

private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
Expand Down Expand Up @@ -43,6 +45,7 @@ public void FaceDetectionWithAttributes()
FaceAttributeType.Occlusion,
FaceAttributeType.Smile
},
detectionModel: detectionModel,
recognitionModel: recognitionModel,
returnRecognitionModel: true
).Result;
Expand Down Expand Up @@ -156,7 +159,7 @@ public void FaceDetectionNoFace()
IFaceClient client = GetFaceClient(HttpMockServer.CreateInstance());
using (FileStream stream = new FileStream(Path.Combine("TestImages", "NoFace.jpg"), FileMode.Open))
{
IList<DetectedFace> faceList = client.Face.DetectWithStreamAsync(stream, recognitionModel: recognitionModel).Result;
IList<DetectedFace> faceList = client.Face.DetectWithStreamAsync(stream, detectionModel: detectionModel, recognitionModel: recognitionModel).Result;
Assert.Equal(0, faceList.Count);
}
}
Expand Down
20 changes: 12 additions & 8 deletions src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/FaceFindSimilarTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace FaceSDK.Tests
{
public class FaceFindSimilarTests : BaseTests
{
private static readonly string detectionModel = DetectionModel.Detection01;

private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
Expand All @@ -31,7 +33,7 @@ public void FaceFindSimilarFacePositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand Down Expand Up @@ -60,7 +62,7 @@ public void FaceFindSimilarFaceListPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand Down Expand Up @@ -98,7 +100,7 @@ public void FaceFindSimilarLargeFaceListPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand All @@ -122,7 +124,7 @@ public void FaceFindSimilarLargeFaceListPositive()
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0];
face = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0];
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
Expand All @@ -131,7 +133,8 @@ public void FaceFindSimilarLargeFaceListPositive()
face.FaceRectangle.Left,
face.FaceRectangle.Top,
face.FaceRectangle.Width,
face.FaceRectangle.Height }).Result;
face.FaceRectangle.Height },
detectionModel: detectionModel).Result;

persistedFaceIds.Add(persistedFace.PersistedFaceId);
}
Expand All @@ -148,7 +151,7 @@ public void FaceFindSimilarLargeFaceListPositive()
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0];
face = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0];
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
Expand All @@ -157,7 +160,8 @@ public void FaceFindSimilarLargeFaceListPositive()
face.FaceRectangle.Left,
face.FaceRectangle.Top,
face.FaceRectangle.Width,
face.FaceRectangle.Height }).Result;
face.FaceRectangle.Height },
detectionModel: detectionModel).Result;

persistedFaceIds.Add(persistedFace.PersistedFaceId);
}
Expand All @@ -174,7 +178,7 @@ public void FaceFindSimilarLargeFaceListPositive()
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, recognitionModel: recognitionModel).Result[0];
face = client.Face.DetectWithStreamAsync(stream, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0];
}

faceIdList.Add(face.FaceId);
Expand Down
16 changes: 10 additions & 6 deletions src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/FaceIdentifyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace FaceSDK.Tests
{
public class FaceIdentifyTests : BaseTests
{
private static readonly string detectionModel = DetectionModel.Detection01;

private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
Expand All @@ -38,7 +40,7 @@ public void FaceIdentificationPersonGroupPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand Down Expand Up @@ -78,7 +80,7 @@ public void FaceIdentificationLargePersonGroupPositive()

using (FileStream stream = new FileStream(Path.Combine("TestImages", "Satya4.jpg"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
Assert.NotNull(faceId1);
}

Expand All @@ -101,7 +103,7 @@ private void AddPersonGroupPersonFace(IFaceClient client, string personGroupId,
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0];
face = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0];
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
Expand All @@ -110,7 +112,8 @@ private void AddPersonGroupPersonFace(IFaceClient client, string personGroupId,
face.FaceRectangle.Left,
face.FaceRectangle.Top,
face.FaceRectangle.Width,
face.FaceRectangle.Height }).Wait();
face.FaceRectangle.Height },
detectionModel: detectionModel).Wait();
}
}
}
Expand All @@ -122,7 +125,7 @@ private void AddLargePersonGroupPersonFace(IFaceClient client, string largePerso
DetectedFace face = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
{
face = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0];
face = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0];
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", fileName + i + ".jpg"), FileMode.Open))
Expand All @@ -131,7 +134,8 @@ private void AddLargePersonGroupPersonFace(IFaceClient client, string largePerso
face.FaceRectangle.Left,
face.FaceRectangle.Top,
face.FaceRectangle.Width,
face.FaceRectangle.Height }).Wait();
face.FaceRectangle.Height },
detectionModel: detectionModel).Wait();
}
}
}
Expand Down
26 changes: 14 additions & 12 deletions src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face.Tests/FaceVerificationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ namespace FaceSDK.Tests
{
public class FaceVerificationTests : BaseTests
{
private static readonly string detectionModel = DetectionModel.Detection01;

private static readonly string recognitionModel = RecognitionModel.Recognition02;

[Fact]
Expand All @@ -25,12 +27,12 @@ public void FaceVerificationFacePositive()
Guid? faceId2 = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationBase1.png"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare1.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId1);
Expand Down Expand Up @@ -58,12 +60,12 @@ public void FaceVerificationPersonGroupPositive()
Person createPersonResult = client.PersonGroupPerson.CreateAsync(personGroupId, "David").Result;
using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationBase1.png"), FileMode.Open))
{
client.PersonGroupPerson.AddFaceFromStreamAsync(personGroupId, createPersonResult.PersonId, stream).Wait();
client.PersonGroupPerson.AddFaceFromStreamAsync(personGroupId, createPersonResult.PersonId, stream, detectionModel: detectionModel).Wait();
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare1.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId2);
Expand Down Expand Up @@ -95,12 +97,12 @@ public void FaceVerificationLargePersonGroupPositive()
Person createPersonResult = client.LargePersonGroupPerson.CreateAsync(largePersonGroupId, "David").Result;
using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationBase1.png"), FileMode.Open))
{
client.LargePersonGroupPerson.AddFaceFromStreamAsync(largePersonGroupId, createPersonResult.PersonId, stream).Wait();
client.LargePersonGroupPerson.AddFaceFromStreamAsync(largePersonGroupId, createPersonResult.PersonId, stream, detectionModel: detectionModel).Wait();
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare1.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId2);
Expand Down Expand Up @@ -128,12 +130,12 @@ public void FaceVerificationFaceNegative()
Guid? faceId2 = null;
using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationBase1.png"), FileMode.Open))
{
faceId1 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId1 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare2.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId1);
Expand Down Expand Up @@ -161,12 +163,12 @@ public void FaceVerificationPersonGroupNegative()
Person createPersonResult = client.PersonGroupPerson.CreateAsync(personGroupId, "David").Result;
using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationBase1.png"), FileMode.Open))
{
client.PersonGroupPerson.AddFaceFromStreamAsync(personGroupId, createPersonResult.PersonId, stream).Wait();
client.PersonGroupPerson.AddFaceFromStreamAsync(personGroupId, createPersonResult.PersonId, stream, detectionModel: detectionModel).Wait();
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare2.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId2);
Expand Down Expand Up @@ -198,12 +200,12 @@ public void FaceVerificationLargePersonGroupNegative()
Person createPersonResult = client.LargePersonGroupPerson.CreateAsync(largePersonGroupId, "David").Result;
using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationBase1.png"), FileMode.Open))
{
client.LargePersonGroupPerson.AddFaceFromStreamAsync(largePersonGroupId, createPersonResult.PersonId, stream).Wait();
client.LargePersonGroupPerson.AddFaceFromStreamAsync(largePersonGroupId, createPersonResult.PersonId, stream, detectionModel: detectionModel).Wait();
}

using (FileStream stream = new FileStream(Path.Combine("TestImages", "verificationCompare2.png"), FileMode.Open))
{
faceId2 = client.Face.DetectWithStreamAsync(stream, true, recognitionModel: recognitionModel).Result[0].FaceId;
faceId2 = client.Face.DetectWithStreamAsync(stream, true, detectionModel: detectionModel, recognitionModel: recognitionModel).Result[0].FaceId;
}

Assert.NotNull(faceId2);
Expand Down
10 changes: 5 additions & 5 deletions .../Face/Face.Tests/SessionRecords/FaceSDK.Tests.FaceDetectionTests/FaceDetectionNoFace.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions ...ce.Tests/SessionRecords/FaceSDK.Tests.FaceDetectionTests/FaceDetectionWithAttributes.json
View file
Open in desktop

Large diffs are not rendered by default.

178 changes: 89 additions & 89 deletions ...ts/SessionRecords/FaceSDK.Tests.FaceFindSimilarTests/FaceFindSimilarFaceListPositive.json
View file
Open in desktop

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions ....Tests/SessionRecords/FaceSDK.Tests.FaceFindSimilarTests/FaceFindSimilarFacePositive.json
View file
Open in desktop

Large diffs are not rendered by default.

202 changes: 101 additions & 101 deletions ...ssionRecords/FaceSDK.Tests.FaceFindSimilarTests/FaceFindSimilarLargeFaceListPositive.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading