quantified.uncertainty/squiggle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debugging triggers again

Browse Source
This commit is contained in:
Quinn Dougherty 2022-04-11 01:05:47 -04:00
parent 19d5fa109b
commit d4b00b15c1
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -51,7 +51,7 @@ jobs:
name: Language build and test name: Language build and test
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: pre_check needs: pre_check
if: ${{ !needs.pre_check.outputs.should_skip_lang }} if: ${{ needs.pre_check.outputs.should_skip_lang != 'true'}}
defaults: defaults:
run: run:
shell: bash shell: bash
@ -71,7 +71,7 @@ jobs:
name: Components build and test name: Components build and test
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: pre_check needs: pre_check
if: ${{ (!needs.pre_check.outputs.should_skip_components) || (!needs.pre_check.outputs.should_skip_lang) }} if: ${{ (needs.pre_check.outputs.should_skip_components != 'true') || (needs.pre_check.outputs.should_skip_lang != 'true') }}
defaults: defaults:
run: run:
shell: bash shell: bash

21
packages/squiggle-lang/src/rescript/OldInterpreter/ASTTypes.res
View File

@ -213,19 +213,20 @@ module SamplingDistribution = {
let i1 = renderIfIsNotSamplingDistribution(evaluationParams, t1) let i1 = renderIfIsNotSamplingDistribution(evaluationParams, t1)
let i2 = renderIfIsNotSamplingDistribution(evaluationParams, t2) let i2 = renderIfIsNotSamplingDistribution(evaluationParams, t2)
E.R.merge(i1, i2) |> E.R.bind(_, ((a, b)) => { E.R.merge(i1, i2) |> E.R.bind(_, ((a, b)) => {
let samples = getCombinationSamples( let samples =
evaluationParams.samplingInputs.sampleCount, getCombinationSamples(
algebraicOp, evaluationParams.samplingInputs.sampleCount,
a, algebraicOp,
b, a,
) |> E.O.toResult("Could not get samples") b,
) |> E.O.toResult("Could not get samples")
let sampleSetDist = samples -> E.R.bind(SampleSetDist.make) let sampleSetDist = samples->E.R.bind(SampleSetDist.make)
let pointSetDist = let pointSetDist =
sampleSetDist sampleSetDist->E.R.bind(r =>
-> E.R.bind(r => SampleSetDist.toPointSetDist(~samplingInputs=evaluationParams.samplingInputs, ~samples=r)
SampleSetDist.toPointSetDist(~samplingInputs=evaluationParams.samplingInputs, ~samples=r)); )
pointSetDist |> E.R.fmap(r => #Normalize(#RenderedDist(r))) pointSetDist |> E.R.fmap(r => #Normalize(#RenderedDist(r)))
}) })
} }