Skip to content

Fix steps counting #97

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

Merged
gsvgit merged 5 commits into from
Aug 22, 2025
Merged

Fix steps counting #97

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8e64b7
fix: Allow AISearcher to pick a step without relying on stepsPlayed
Parzival-05 Aug 9, 2025
cd23fbf
feat: Add sending of steps count
Parzival-05 May 21, 2025
e9cb375
Rename PathCondition according to client's naming
Parzival-05 May 22, 2025
9c58eda
Revert "Rename PathCondition according to client's naming"
Parzival-05 Aug 12, 2025
a24629b
Fix AISearcher bug with stepsPlayed
Parzival-05 Aug 16, 2025
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
49 changes: 22 additions & 27 deletions VSharp.Explorer/AISearcher.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,32 +123,27 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai

Application.applicationGraphDelta.Clear()

if aiMode <> Runner && stepsToPlay = stepsPlayed then
let toPredict =
match aiMode with
| TrainingSendEachStep
| TrainingSendModel ->
if stepsPlayed > 0u<step> then
gameStateDelta
else
gameState.Value
| Runner -> gameState.Value

let stateId = oracle.Predict toPredict
afterFirstAIPeek <- true
let state = availableStates |> Seq.tryFind (fun s -> s.internalId = stateId)
lastCollectedStatistics <- statistics

match state with
| Some state -> Some state
| None ->
incorrectPredictedStateId <- true
oracle.Feedback(Feedback.IncorrectPredictedStateId stateId)
None
else
let toPredict =
match aiMode with
| TrainingSendEachStep
| TrainingSendModel ->
if stepsPlayed > 0u<step> then
gameStateDelta
else
gameState.Value
| Runner -> gameState.Value

let stateId = oracle.Predict toPredict

afterFirstAIPeek <- true
let state = availableStates |> Seq.tryFind (fun s -> s.internalId = stateId)
lastCollectedStatistics <- statistics
stepsPlayed <- stepsPlayed + 1u<step>

match state with
| Some state -> Some state
| None ->
incorrectPredictedStateId <- true
oracle.Feedback(Feedback.IncorrectPredictedStateId stateId)
None

static member updateGameState (delta: GameState) (gameState: Option<GameState>) =
match gameState with
Expand Down Expand Up @@ -185,7 +180,7 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
State(
s.Id,
s.Position,
s.PathCondition,
s.PathConditionSize,
s.VisitedAgainVertices,
s.VisitedNotCoveredVerticesInZone,
s.VisitedNotCoveredVerticesOutOfZone,
Expand Down Expand Up @@ -388,7 +383,7 @@ type internal AISearcher(oracle: Oracle, aiAgentTrainingMode: Option<AIAgentTrai
firstFreePositionInParentsOf <- firstFreePositionInParentsOf + state.Children.Length

index_pcToState.[firstFreePositionInPcToState] <-
int64 pathConditionVerticesIds[state.PathCondition.Id]
int64 pathConditionVerticesIds[state.PathConditionSize.Id]

index_pcToState.[firstFreePositionInPcToState + gameState.States.Length] <-
int64 stateIds[state.Id]
Expand Down
1 change: 1 addition & 0 deletions VSharp.ML.GameServer.Runner/Main.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ let ws port outputDirectory (webSocket: WebSocket) (context: HttpContext) =
GameOver(
explorationResult.ActualCoverage,
explorationResult.TestsCount,
explorationResult.StepsCount,
explorationResult.ErrorsCount
)
)
Expand Down
14 changes: 8 additions & 6 deletions VSharp.ML.GameServer/Messages.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,13 @@ type GameOverMessageBody =
interface IRawOutgoingMessageBody
val ActualCoverage: uint<percent>
val TestsCount: uint32<test>
val StepsCount: uint32<step>
val ErrorsCount: uint32<error>

new(actualCoverage, testsCount, errorsCount) =
new(actualCoverage, testsCount, stepsCount, errorsCount) =
{ ActualCoverage = actualCoverage
TestsCount = testsCount
StepsCount = stepsCount
ErrorsCount = errorsCount }

[<Struct>]
Expand Down Expand Up @@ -151,7 +153,7 @@ type StateHistoryElem =
type State =
val Id: uint<stateId>
val Position: uint<byte_offset> // to basic block id
val PathCondition: PathConditionVertex
val PathConditionSize: PathConditionVertex
val VisitedAgainVertices: uint
val VisitedNotCoveredVerticesInZone: uint
val VisitedNotCoveredVerticesOutOfZone: uint
Expand All @@ -175,7 +177,7 @@ type State =
) =
{ Id = id
Position = position
PathCondition = pathCondition
PathConditionSize = pathCondition
VisitedAgainVertices = visitedAgainVertices
VisitedNotCoveredVerticesInZone = visitedNotCoveredVerticesInZone
VisitedNotCoveredVerticesOutOfZone = visitedNotCoveredVerticesOutOfZone
Expand Down Expand Up @@ -371,7 +373,7 @@ type IncorrectPredictedStateIdMessageBody =
new(stateId) = { StateId = stateId }

type OutgoingMessage =
| GameOver of uint<percent> * uint32<test> * uint32<error>
| GameOver of uint<percent> * uint32<test> * uint32<step> * uint32<error>
| MoveReward of Reward
| IncorrectPredictedStateId of uint<stateId>
| ReadyForNextStep of GameState
Expand All @@ -397,8 +399,8 @@ let deserializeInputMessage (messageData: byte[]) =

let serializeOutgoingMessage (message: OutgoingMessage) =
match message with
| GameOver(actualCoverage, testsCount, errorsCount) ->
RawOutgoingMessage("GameOver", box (GameOverMessageBody(actualCoverage, testsCount, errorsCount)))
| GameOver(actualCoverage, testsCount, stepsCount, errorsCount) ->
RawOutgoingMessage("GameOver", box (GameOverMessageBody(actualCoverage, testsCount, stepsCount, errorsCount)))
| MoveReward reward -> RawOutgoingMessage("MoveReward", reward)
| IncorrectPredictedStateId stateId ->
RawOutgoingMessage("IncorrectPredictedStateId", IncorrectPredictedStateIdMessageBody stateId)
Expand Down
Loading