models.rb in cqm-models-1.1.1.0

- old
+ new

@@ -1,27 +1,41 @@
 # Base QDM module (generated from lib/generate_models.rb) for QDM 5.3
 module QDM
 end
 require 'mongoid'
 
+# ModelFinder
+require_relative 'model_finder'
+
 # Generated models that are dependencies for base types
 require_relative 'qdm/id'
 
 # base types
 require_relative 'qdm/basetypes/code'
 require_relative 'qdm/basetypes/data_element'
 require_relative 'qdm/basetypes/interval'
 require_relative 'qdm/basetypes/quantity'
 require_relative 'qdm/basetypes/ratio'
+require_relative 'qdm/attributes/attribute'
+require_relative 'qdm/attributes/facility_location'
+require_relative 'qdm/attributes/component'
 
 # Tacoma-specific models
-require_relative 'qdm/tacoma/measure'
-require_relative 'qdm/tacoma/measure_package'
-require_relative 'qdm/tacoma/valueset'
-require_relative 'qdm/tacoma/concept'
+require_relative 'cqm/measure'
+require_relative 'cqm/measure_package'
+require_relative 'cqm/valueset'
+require_relative 'cqm/concept'
+require_relative 'cqm/cql_statement_dependency'
+require_relative 'cqm/cql_library'
+require_relative 'cqm/population_set'
+require_relative 'cqm/patient'
+require_relative 'cqm/provider'
 require_relative 'qdm/tacoma/individual_result'
 
+# Make Patient Generation Available
+require_relative '../../lib/generate_patients'
+
 # Generated models
 require_relative 'qdm/patient'
 require_relative 'qdm/physical_exam_order'
 require_relative 'qdm/participation'
 require_relative 'qdm/patient_characteristic_sex'
@@ -40,12 +54,10 @@
 require_relative 'qdm/patient_characteristic_clinical_trial_participant'
 require_relative 'qdm/device_order'
 require_relative 'qdm/diagnostic_study_performed'
 require_relative 'qdm/intervention_order'
 require_relative 'qdm/family_history'
-require_relative 'qdm/component'
 require_relative 'qdm/result_component'
-require_relative 'qdm/facility_location'
 require_relative 'qdm/medication_active'
 require_relative 'qdm/laboratory_test_order'
 require_relative 'qdm/diagnostic_study_order'
 require_relative 'qdm/substance_order'
 require_relative 'qdm/patient_characteristic_payer'