namespace, phetsims/joist#307

phetsims · May 12, 2016 · ad258e5 · ad258e5
1 parent 256b44c
commit ad258e5
Show file tree

Hide file tree

Showing 21 changed files with 87 additions and 4 deletions.
diff --git a/js/curve-fitting/CurveFittingConstants.js b/js/curve-fitting/CurveFittingConstants.js
@@ -6,10 +6,13 @@
  * @author Andrey Zelenkov (MLearner)
  */
 
-define( function() {
+define( function( require ) {
   'use strict';
 
-  return {
+  // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
+
+  var CurveFittingConstants = {
     MAX_ORDER_OF_FIT: 3,
 
     // barometer
@@ -33,4 +36,8 @@ define( function() {
     PANEL_MARGIN: 10,
     PANEL_WIDTH: 130
   };
+
+  curveFitting.register( 'CurveFittingConstants', CurveFittingConstants );
+
+  return CurveFittingConstants;
 } );
diff --git a/js/curve-fitting/CurveFittingScreen.js b/js/curve-fitting/CurveFittingScreen.js
@@ -9,6 +9,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CurveFittingModel = require( 'CURVE_FITTING/curve-fitting/model/CurveFittingModel' );
   var CurveFittingView = require( 'CURVE_FITTING/curve-fitting/view/CurveFittingView' );
   var inherit = require( 'PHET_CORE/inherit' );
@@ -37,5 +38,7 @@ define( function( require ) {
     );
   }
 
+  curveFitting.register( 'CurveFittingScreen', CurveFittingScreen );
+
   return inherit( Screen, CurveFittingScreen );
 } );
diff --git a/js/curve-fitting/model/Curve.js b/js/curve-fitting/model/Curve.js
@@ -9,6 +9,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var FitMaker = require( 'CURVE_FITTING/curve-fitting/model/FitMaker' );
   var FitType = require( 'CURVE_FITTING/curve-fitting/model/FitType' );
   var inherit = require( 'PHET_CORE/inherit' );
@@ -113,6 +114,8 @@ define( function( require ) {
     } );
   }
 
+  curveFitting.register( 'Curve', Curve );
+
   return inherit( PropertySet, Curve, {
 
     // add point to curve

diff --git a/js/curve-fitting/model/CurveFittingModel.js b/js/curve-fitting/model/CurveFittingModel.js
@@ -9,6 +9,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var Bounds2 = require( 'DOT/Bounds2' );
   var Curve = require( 'CURVE_FITTING/curve-fitting/model/Curve' );
   var Dimension2 = require( 'DOT/Dimension2' );
@@ -54,6 +55,8 @@ define( function( require ) {
     };
   }
 
+  curveFitting.register( 'CurveFittingModel', CurveFittingModel );
+
   return inherit( PropertySet, CurveFittingModel, {
 
     reset: function() {

diff --git a/js/curve-fitting/model/FitMaker.js b/js/curve-fitting/model/FitMaker.js
@@ -9,6 +9,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
 
   /**
@@ -29,6 +30,8 @@ define( function( require ) {
     }
   }
 
+  curveFitting.register( 'FitMaker', FitMaker );
+
   FitMaker.prototype = {
     getFit: function( arrPoints, orderOfFit ) {
       this.makeAugmentedMatrix( arrPoints, orderOfFit );

diff --git a/js/curve-fitting/model/FitType.js b/js/curve-fitting/model/FitType.js
@@ -6,11 +6,18 @@
  * @author Andrey Zelenkov (Mlearner)
  */
 
-define( function() {
+define( function( require ) {
   'use strict';
 
-  return Object.freeze( {
+  // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
+
+  var FitType = Object.freeze( {
     BEST: 'best',
     ADJUSTABLE: 'adjustable'
   } );
+
+  curveFitting.register( 'FitType', FitType );
+
+  return FitType;
 } );
diff --git a/js/curve-fitting/model/Point.js b/js/curve-fitting/model/Point.js
@@ -9,6 +9,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var inherit = require( 'PHET_CORE/inherit' );
   var PropertySet = require( 'AXON/PropertySet' );
 
@@ -24,6 +25,8 @@ define( function( require ) {
     } );
   }
 
+  curveFitting.register( 'Point', Point );
+
   return inherit( PropertySet, Point, {
     setXY: function( obj ) {
       this.x = obj.x;

diff --git a/js/curve-fitting/view/BarometerR2Node.js b/js/curve-fitting/view/BarometerR2Node.js
@@ -10,6 +10,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Line = require( 'SCENERY/nodes/Line' );
@@ -54,6 +55,8 @@ define( function( require ) {
     } );
   }
 
+  curveFitting.register( 'BarometerR2Node', BarometerR2Node );
+
   return inherit( Node, BarometerR2Node, {
     /**
      * Add single tick.

diff --git a/js/curve-fitting/view/BarometerX2Node.js b/js/curve-fitting/view/BarometerX2Node.js
@@ -12,6 +12,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var ArrowNode = require( 'SCENERY_PHET/ArrowNode' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var inherit = require( 'PHET_CORE/inherit' );
@@ -179,6 +180,8 @@ define( function( require ) {
     pointsProperty.addListeners( updateChiFill, updateChiFill );
   }
 
+  curveFitting.register( 'BarometerX2Node', BarometerX2Node );
+
   return inherit( VBox, BarometerX2Node, {
     /**
      * Add single tick.

diff --git a/js/curve-fitting/view/BucketAndGraphAreaNode.js b/js/curve-fitting/view/BucketAndGraphAreaNode.js
@@ -10,6 +10,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var BucketNode = require( 'CURVE_FITTING/curve-fitting/view/BucketNode' );
   var EquationGraphPanelNode = require( 'CURVE_FITTING/curve-fitting/view/EquationGraphPanelNode' );
   var GraphAreaNode = require( 'CURVE_FITTING/curve-fitting/view/GraphAreaNode' );
@@ -87,5 +88,7 @@ define( function( require ) {
     } ) );
   }
 
+  curveFitting.register( 'BucketAndGraphAreaNode', BucketAndGraphAreaNode );
+
   return inherit( Node, BucketAndGraphAreaNode );
 } );
diff --git a/js/curve-fitting/view/BucketNode.js b/js/curve-fitting/view/BucketNode.js
@@ -10,6 +10,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var Circle = require( 'SCENERY/nodes/Circle' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var inherit = require( 'PHET_CORE/inherit' );
@@ -83,5 +84,7 @@ define( function( require ) {
     } ) );
   }
 
+  curveFitting.register( 'BucketNode', BucketNode );
+
   return inherit( Node, BucketNode );
 } );
diff --git a/js/curve-fitting/view/ControlMenuNode.js b/js/curve-fitting/view/ControlMenuNode.js
@@ -11,6 +11,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CheckBox = require( 'SUN/CheckBox' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var inherit = require( 'PHET_CORE/inherit' );
@@ -102,5 +103,7 @@ define( function( require ) {
     } );
   }
 
+  curveFitting.register( 'ControlMenuNode', ControlMenuNode );
+
   return inherit( VBox, ControlMenuNode );
 } );
diff --git a/js/curve-fitting/view/CurveFittingView.js b/js/curve-fitting/view/CurveFittingView.js
@@ -9,6 +9,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var Bounds2 = require( 'DOT/Bounds2' );
   var BucketAndGraphAreaNode = require( 'CURVE_FITTING/curve-fitting/view/BucketAndGraphAreaNode' );
   var ControlMenuNode = require( 'CURVE_FITTING/curve-fitting/view/ControlMenuNode' );
@@ -59,5 +60,7 @@ define( function( require ) {
     this.addChild( resetAllButton );
   }
 
+  curveFitting.register( 'CurveFittingView', CurveFittingView );
+
   return inherit( ScreenView, CurveFittingView );
 } );
diff --git a/js/curve-fitting/view/DeviationsPanel.js b/js/curve-fitting/view/DeviationsPanel.js
@@ -11,6 +11,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var BarometerR2Node = require( 'CURVE_FITTING/curve-fitting/view/BarometerR2Node' );
   var BarometerX2Node = require( 'CURVE_FITTING/curve-fitting/view/BarometerX2Node' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
@@ -182,5 +183,7 @@ define( function( require ) {
     Panel.call( this, content, PANEL_OPTIONS );
   }
 
+  curveFitting.register( 'DeviationsPanel', DeviationsPanel );
+
   return inherit( Panel, DeviationsPanel );
 } );
diff --git a/js/curve-fitting/view/EquationFitNode.js b/js/curve-fitting/view/EquationFitNode.js
@@ -10,6 +10,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var HBox = require( 'SCENERY/nodes/HBox' );
   var inherit = require( 'PHET_CORE/inherit' );
@@ -78,5 +79,7 @@ define( function( require ) {
     } );
   }
 
+  curveFitting.register( 'EquationFitNode', EquationFitNode );
+
   return inherit( Node, EquationFitNode );
 } );
diff --git a/js/curve-fitting/view/EquationGraphPanelNode.js b/js/curve-fitting/view/EquationGraphPanelNode.js
@@ -10,6 +10,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var ExpandCollapseButton = require( 'SUN/ExpandCollapseButton' );
   var HBox = require( 'SCENERY/nodes/HBox' );
@@ -153,5 +154,7 @@ define( function( require ) {
     isEquationPanelExpandedProperty.link( updateDParameter );
   }
 
+  curveFitting.register( 'EquationGraphPanelNode', EquationGraphPanelNode );
+
   return inherit( Panel, EquationGraphPanelNode );
 } );
diff --git a/js/curve-fitting/view/FitTypeMenu.js b/js/curve-fitting/view/FitTypeMenu.js
@@ -10,6 +10,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var EquationFitNode = require( 'CURVE_FITTING/curve-fitting/view/EquationFitNode' );
   var inherit = require( 'PHET_CORE/inherit' );
@@ -98,5 +99,7 @@ define( function( require ) {
     }, options ) );
   }
 
+  curveFitting.register( 'FitTypeMenu', FitTypeMenu );
+
   return inherit( Panel, FitTypeMenu );
 } );
diff --git a/js/curve-fitting/view/GraphAreaNode.js b/js/curve-fitting/view/GraphAreaNode.js
@@ -11,6 +11,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var inherit = require( 'PHET_CORE/inherit' );
   var FitType = require( 'CURVE_FITTING/curve-fitting/model/FitType' );
@@ -156,6 +157,8 @@ define( function( require ) {
     curve.on( 'update', updateShape );
   }
 
+  curveFitting.register( 'GraphAreaNode', GraphAreaNode );
+
   return inherit( Node, GraphAreaNode, {
     /**
      * Convert global coordinates to graph values.

diff --git a/js/curve-fitting/view/PointNode.js b/js/curve-fitting/view/PointNode.js
@@ -10,6 +10,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var Bounds2 = require( 'DOT/Bounds2' );
   var ButtonListener = require( 'SCENERY/input/ButtonListener' );
   var Circle = require( 'SCENERY/nodes/Circle' );
@@ -286,5 +287,7 @@ define( function( require ) {
     } ) );
   }
 
+  curveFitting.register( 'PointNode', PointNode );
+
   return inherit( Node, PointNode );
 } );
diff --git a/js/curve-fitting/view/SliderParameterNode.js b/js/curve-fitting/view/SliderParameterNode.js
@@ -10,6 +10,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var curveFitting = require( 'CURVE_FITTING/curveFitting' );
   var CurveFittingConstants = require( 'CURVE_FITTING/curve-fitting/CurveFittingConstants' );
   var Dimension2 = require( 'DOT/Dimension2' );
   var inherit = require( 'PHET_CORE/inherit' );
@@ -62,5 +63,7 @@ define( function( require ) {
     }, options ) );
   }
 
+  curveFitting.register( 'SliderParameterNode', SliderParameterNode );
+
   return inherit( VBox, SliderParameterNode );
 } );
diff --git a/js/curveFitting.js b/js/curveFitting.js
@@ -0,0 +1,15 @@
+// Copyright 2015, University of Colorado Boulder
+
+/**
+ * Creates the namespace for this simulation.
+ *
+ * @author Chris Malley (PixelZoom, Inc.)
+ */
+define( function( require ) {
+  'use strict';
+
+  // modules
+  var Namespace = require( 'PHET_CORE/Namespace' );
+
+  return new Namespace( 'curveFitting' );
+} );