Rename range => physicalRange, see #45

js/common/CASQueryParameters.ts

@@ -12,7 +12,8 @@ import centerAndSpread from '../centerAndSpread.js';
 const CASQueryParameters = QueryStringMachine.getAll( {
 
   // TODO: It would be nice if QueryStringMachine supported mapping to EnumerationValue
-  // TODO: Or should we bring back StringEnumerationProperty in https://github.com/phetsims/axon/issues/373?
+  // SR: Or should we bring back StringEnumerationProperty in https://github.com/phetsims/axon/issues/373?
+  // SR: Or both?
   plotType: {
     type: 'string',
     validValues: [ 'dotPlot', 'linePlot' ],

js/common/model/AnimationMode.ts

@@ -14,7 +14,7 @@ import centerAndSpread from '../../centerAndSpread.js';
 export class AnimationMode extends EnumerationValue {
 
   // TODO: SR would like to re-evaluate StringEnumerationValue, see https://github.com/phetsims/axon/issues/373
-  // TODO: But more importantly, this sim should be consistent.
+  // SR: But more importantly, this sim should be consistent.
   static FLYING = new AnimationMode();
   static STACKING = new AnimationMode();
   static RETURNING = new AnimationMode();

js/common/model/CASModel.ts

@@ -51,7 +51,7 @@ class CASModel {
   readonly maxNumberOfObjects: number;
 
   // TODO: rename to allowedRange or something
-  readonly range: Range;
+  readonly physicalRange: Range;
 
   // This is the number that we can still add to the PhetioGroup
   readonly numberOfRemainingObjectsProperty: DerivedProperty<number, [ count: number ]>;
@@ -110,7 +110,7 @@ class CASModel {
       tandem: options.includeCards ? options.tandem.createTandem( 'cardModelGroup' ) : Tandem.OPT_OUT
     } );
 
-    this.range = new Range( 1, 15 );
+    this.physicalRange = new Range( 1, 15 );
 
     this.isSortingDataProperty = new BooleanProperty( false, {
       tandem: options.tandem.createTandem( 'isSortingDataProperty' )
@@ -146,11 +146,11 @@ class CASModel {
     } );
     this.dataRangeProperty = new Property<Range | null>( null );
     this.medianPredictionProperty = new NumberProperty( 1, {
-      range: this.range,
+      range: this.physicalRange,
       tandem: options.tandem.createTandem( 'medianPredictionProperty' )
     } );
     this.meanPredictionProperty = new NumberProperty( 1, {
-      range: this.range,
+      range: this.physicalRange,
       tandem: options.tandem.createTandem( 'meanPredictionProperty' )
     } );
 
@@ -291,7 +291,7 @@ class CASModel {
     const casObject = this.objectGroup.createNextElement( this.objectType, options );
 
     const dragPositionListener = ( dragPosition: Vector2, oldPosition: Vector2 ) => {
-      casObject.valueProperty.value = Utils.roundSymmetric( this.range.constrainValue( dragPosition.x ) );
+      casObject.valueProperty.value = Utils.roundSymmetric( this.physicalRange.constrainValue( dragPosition.x ) );
 
       this.moveToTop( casObject );
     };

js/common/model/SoccerModel.ts

@@ -198,7 +198,7 @@ class SoccerModel extends CASModel {
 
     const weights = this.currentDistribution;
 
-    assert && assert( weights.length === this.range.getLength() + 1, 'weight array should match the model range' );
+    assert && assert( weights.length === this.physicalRange.getLength() + 1, 'weight array should match the model range' );
     const x1 = dotRandom.sampleProbabilities( weights ) + 1;
 
     // Range equation is R=v0^2 sin(2 theta0) / g, see https://openstax.org/books/university-physics-volume-1/pages/4-3-projectile-motion

js/common/view/CASScreenView.ts

@@ -140,13 +140,13 @@ class CASScreenView extends ScreenView {
     model.objectChangedEmitter.addListener( updateMedianNode );
     model.isShowingPlayAreaMedianProperty.link( updateMedianNode );
 
-    this.medianPredictionNode = new PredictionNode( model.medianPredictionProperty, this.modelViewTransform, model.range, {
+    this.medianPredictionNode = new PredictionNode( model.medianPredictionProperty, this.modelViewTransform, model.physicalRange, {
       center: this.layoutBounds.center,
       tandem: options.tandem.createTandem( 'medianPredictionNode' ),
       color: CASColors.medianColorProperty,
       roundToInterval: 0.5
     } );
-    this.meanPredictionNode = new PredictionNode( model.meanPredictionProperty, this.modelViewTransform, model.range, {
+    this.meanPredictionNode = new PredictionNode( model.meanPredictionProperty, this.modelViewTransform, model.physicalRange, {
       center: this.layoutBounds.center,
       tandem: options.tandem.createTandem( 'meanPredictionNode' ),
       color: CASColors.meanColorProperty,

js/common/view/DotPlotNode.ts

@@ -61,12 +61,12 @@ class DotPlotNode extends Node {
     //  15 balls as the high point. Consider instead something like above, where we just base the y scaling on the height
     // of one ball.
     const modelViewTransform = ModelViewTransform2.createRectangleInvertedYMapping(
-      new Bounds2( model.range.min, 0, model.range.max, model.range.getLength() ),
+      new Bounds2( model.physicalRange.min, 0, model.physicalRange.max, model.physicalRange.getLength() ),
       new Bounds2( 0, numberLinePositionY - numberLineWidth * yScale, 0 + numberLineWidth, numberLinePositionY )
     );
 
     const numberLineNode = new NumberLineNode(
-      model.range,
+      model.physicalRange,
       numberLineWidth,
       model.meanValueProperty,
       model.isShowingTopMeanProperty,

js/common/view/SoccerScreenView.ts

@@ -48,7 +48,7 @@ class SoccerScreenView extends CASScreenView {
 
     // The ground is at y=0
     const modelViewTransform = ModelViewTransform2.createRectangleInvertedYMapping(
-      new Bounds2( model.range.min, 0, model.range.max, model.range.getLength() ),
+      new Bounds2( model.physicalRange.min, 0, model.physicalRange.max, model.physicalRange.getLength() ),
       new Bounds2( NUMBER_LINE_MARGIN_X, GROUND_POSITION_Y - chartViewWidth, NUMBER_LINE_MARGIN_X + chartViewWidth, GROUND_POSITION_Y )
     );
 
@@ -59,7 +59,7 @@ class SoccerScreenView extends CASScreenView {
     this.contentLayer.addChild( new BackgroundNode( GROUND_POSITION_Y, this.visibleBoundsProperty ) );
 
     this.playAreaNumberLineNode = new NumberLineNode(
-      model.range,
+      model.physicalRange,
       chartViewWidth,
       model.meanValueProperty,
       model.isShowingPlayAreaMeanProperty,