@@ -43,8 +43,8 @@ public partial class AindBehaviorSessionModel
4343
4444 public AindBehaviorSessionModel()
4545 {
46- _aindBehaviorServicesPkgVersion = "0.12.3 ";
47- _version = "0.12.3 ";
46+ _aindBehaviorServicesPkgVersion = "0.12.5 ";
47+ _version = "0.12.5 ";
4848 _experimenter = new System.Collections.Generic.List<string>();
4949 _experimentVersion = "";
5050 _allowDirtyRepo = false;
@@ -954,7 +954,7 @@ public partial class AindVrForagingRig
954954
955955 public AindVrForagingRig()
956956 {
957- _aindBehaviorServicesPkgVersion = "0.12.3 ";
957+ _aindBehaviorServicesPkgVersion = "0.12.5 ";
958958 _version = "0.6.2-rc3";
959959 _triggeredCameraController = new CameraControllerSpinnakerCamera();
960960 _harpBehavior = new HarpBehavior();
@@ -1521,7 +1521,7 @@ public partial class AindVrForagingTaskParameters
15211521
15221522 public AindVrForagingTaskParameters()
15231523 {
1524- _aindBehaviorServicesPkgVersion = "0.12.3 ";
1524+ _aindBehaviorServicesPkgVersion = "0.12.5 ";
15251525 _environment = new BlockStructure();
15261526 _operationControl = new OperationControl();
15271527 }
@@ -8336,7 +8336,7 @@ public partial class OperantLogic
83368336
83378337 private bool _isOperant;
83388338
8339- private double _stopDuration;
8339+ private Distribution _stopDuration;
83408340
83418341 private double _timeToCollectReward;
83428342
@@ -8345,7 +8345,7 @@ public partial class OperantLogic
83458345 public OperantLogic()
83468346 {
83478347 _isOperant = true;
8348- _stopDuration = 0D ;
8348+ _stopDuration = new Distribution() ;
83498349 _timeToCollectReward = 100000D;
83508350 _graceDistanceThreshold = 10D;
83518351 }
@@ -8378,9 +8378,10 @@ public bool IsOperant
83788378 /// <summary>
83798379 /// Duration (s) the animal must stop for to lock its choice
83808380 /// </summary>
8381+ [System.Xml.Serialization.XmlIgnoreAttribute()]
83818382 [Newtonsoft.Json.JsonPropertyAttribute("stop_duration")]
83828383 [System.ComponentModel.DescriptionAttribute("Duration (s) the animal must stop for to lock its choice")]
8383- public double StopDuration
8384+ public Distribution StopDuration
83848385 {
83858386 get
83868387 {
@@ -15277,6 +15278,51 @@ public override string ToString()
1527715278 }
1527815279
1527915280
15281+ [System.CodeDom.Compiler.GeneratedCodeAttribute("Bonsai.Sgen", "0.6.1.0 (Newtonsoft.Json v13.0.0.0)")]
15282+ [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "family")]
15283+ [Bonsai.WorkflowElementCategoryAttribute(Bonsai.ElementCategory.Source)]
15284+ [Bonsai.CombinatorAttribute(MethodName="Generate")]
15285+ public partial class Delay
15286+ {
15287+
15288+ public Delay()
15289+ {
15290+ }
15291+
15292+ protected Delay(Delay other)
15293+ {
15294+ }
15295+
15296+ public System.IObservable<Delay> Generate()
15297+ {
15298+ return System.Reactive.Linq.Observable.Defer(() => System.Reactive.Linq.Observable.Return(new Delay(this)));
15299+ }
15300+
15301+ public System.IObservable<Delay> Generate<TSource>(System.IObservable<TSource> source)
15302+ {
15303+ return System.Reactive.Linq.Observable.Select(source, _ => new Delay(this));
15304+ }
15305+
15306+ protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
15307+ {
15308+ return false;
15309+ }
15310+
15311+ public override string ToString()
15312+ {
15313+ System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
15314+ stringBuilder.Append(GetType().Name);
15315+ stringBuilder.Append(" { ");
15316+ if (PrintMembers(stringBuilder))
15317+ {
15318+ stringBuilder.Append(" ");
15319+ }
15320+ stringBuilder.Append("}");
15321+ return stringBuilder.ToString();
15322+ }
15323+ }
15324+
15325+
1528015326 [System.CodeDom.Compiler.GeneratedCodeAttribute("Bonsai.Sgen", "0.6.1.0 (Newtonsoft.Json v13.0.0.0)")]
1528115327 [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "family")]
1528215328 [Bonsai.WorkflowElementCategoryAttribute(Bonsai.ElementCategory.Source)]
@@ -16217,6 +16263,45 @@ private static System.IObservable<TResult> Process<TResult>(System.IObservable<V
1621716263 }
1621816264
1621916265
16266+ [System.CodeDom.Compiler.GeneratedCodeAttribute("Bonsai.Sgen", "0.6.1.0 (Newtonsoft.Json v13.0.0.0)")]
16267+ [System.ComponentModel.DefaultPropertyAttribute("Type")]
16268+ [Bonsai.WorkflowElementCategoryAttribute(Bonsai.ElementCategory.Combinator)]
16269+ public partial class MatchDelay : Bonsai.Expressions.SingleArgumentExpressionBuilder
16270+ {
16271+
16272+ public Bonsai.Expressions.TypeMapping Type { get; set; }
16273+
16274+ public override System.Linq.Expressions.Expression Build(System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> arguments)
16275+ {
16276+ var typeMapping = Type;
16277+ var returnType = typeMapping != null ? typeMapping.GetType().GetGenericArguments()[0] : typeof(Delay);
16278+ return System.Linq.Expressions.Expression.Call(
16279+ typeof(MatchDelay),
16280+ "Process",
16281+ new System.Type[] { returnType },
16282+ System.Linq.Enumerable.Single(arguments));
16283+ }
16284+
16285+
16286+ private static System.IObservable<TResult> Process<TResult>(System.IObservable<Delay> source)
16287+ where TResult : Delay
16288+ {
16289+ return System.Reactive.Linq.Observable.Create<TResult>(observer =>
16290+ {
16291+ var sourceObserver = System.Reactive.Observer.Create<Delay>(
16292+ value =>
16293+ {
16294+ var match = value as TResult;
16295+ if (match != null) observer.OnNext(match);
16296+ },
16297+ observer.OnError,
16298+ observer.OnCompleted);
16299+ return System.ObservableExtensions.SubscribeSafe(source, sourceObserver);
16300+ });
16301+ }
16302+ }
16303+
16304+
1622016305 [System.CodeDom.Compiler.GeneratedCodeAttribute("Bonsai.Sgen", "0.6.1.0 (Newtonsoft.Json v13.0.0.0)")]
1622116306 [System.ComponentModel.DefaultPropertyAttribute("Type")]
1622216307 [Bonsai.WorkflowElementCategoryAttribute(Bonsai.ElementCategory.Combinator)]
@@ -17093,6 +17178,11 @@ public System.IObservable<string> Process(System.IObservable<AindBehaviorVrForag
1709317178 return Process<AindBehaviorVrForagingTaskLogicVector3>(source);
1709417179 }
1709517180
17181+ public System.IObservable<string> Process(System.IObservable<Delay> source)
17182+ {
17183+ return Process<Delay>(source);
17184+ }
17185+
1709617186 public System.IObservable<string> Process(System.IObservable<Amount> source)
1709717187 {
1709817188 return Process<Amount>(source);
@@ -17264,6 +17354,7 @@ public System.IObservable<string> Process(System.IObservable<ScalingParameters2>
1726417354 [System.Xml.Serialization.XmlIncludeAttribute(typeof(Bonsai.Expressions.TypeMapping<WebCamera>))]
1726517355 [System.Xml.Serialization.XmlIncludeAttribute(typeof(Bonsai.Expressions.TypeMapping<AindBehaviorServicesRigVisualStimulationVector3>))]
1726617356 [System.Xml.Serialization.XmlIncludeAttribute(typeof(Bonsai.Expressions.TypeMapping<AindBehaviorVrForagingTaskLogicVector3>))]
17357+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(Bonsai.Expressions.TypeMapping<Delay>))]
1726717358 [System.Xml.Serialization.XmlIncludeAttribute(typeof(Bonsai.Expressions.TypeMapping<Amount>))]
1726817359 [System.Xml.Serialization.XmlIncludeAttribute(typeof(Bonsai.Expressions.TypeMapping<Probability>))]
1726917360 [System.Xml.Serialization.XmlIncludeAttribute(typeof(Bonsai.Expressions.TypeMapping<Available>))]
0 commit comments