conceptql 0.5.0 → 0.6.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conceptql
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryan Duryea
@@ -102,7 +102,7 @@ dependencies:
         version: 0.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ dependencies:
         version: 0.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +328,8 @@ files:
 - config/provenance.yml
 - config/race.yml
 - config/vocabularies.csv
+- config/vocabulary_formats.sha
+- config/vocabulary_formats.tsv
 - doc/spec.md
 - lib/conceptql.rb
 - lib/conceptql/behaviors/code_lister.rb
@@ -354,13 +356,13 @@ files:
 - lib/conceptql/lexicon/lexicon_ohdsi.rb
 - lib/conceptql/lexicon/lexicon_strategy.rb
 - lib/conceptql/nodifier.rb
+- lib/conceptql/one_query_counts.rb
 - lib/conceptql/operators/after.rb
 - lib/conceptql/operators/any_overlap.rb
 - lib/conceptql/operators/before.rb
 - lib/conceptql/operators/binary_operator_operator.rb
 - lib/conceptql/operators/casting_operator.rb
 - lib/conceptql/operators/co_reported.rb
-- lib/conceptql/operators/concurrent_within.rb
 - lib/conceptql/operators/contains.rb
 - lib/conceptql/operators/count.rb
 - lib/conceptql/operators/date_range.rb
@@ -430,8 +432,10 @@ files:
 - lib/conceptql/version.rb
 - lib/conceptql/visitors/metadata_extractor.rb
 - lib/conceptql/vocabularies/behaviors/gdmish.rb
+- lib/conceptql/vocabularies/drg_systems.rb
 - lib/conceptql/vocabularies/dynamic_vocabularies.rb
 - lib/conceptql/vocabularies/entry.rb
+- lib/conceptql/vocabularies/formats.rb
 - lib/conceptql/vocabularies/vocabulary_class_factory.rb
 - lib/conceptql/window.rb
 - lib/conceptql/window/base.rb

data/lib/conceptql/operators/concurrent_within.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "operator"
-require_relative "../date_adjuster"
-
-module ConceptQL
-  module Operators
-    class ConcurrentWithin < Operator
-      register __FILE__
-
-      def events_per_patient
-        upstreams.all? { |u| u.events_per_patient == :single } ? :single : :multiple
-      end
-
-      def multiple_vocabularies
-        return true if upstreams.any?(&:multiple_vocabularies)
-
-        vocabularies.length > 1
-      end
-
-      desc "Filters each upstream to only include records where other upstreams' date ranges overlap"
-      option :start, type: :string
-      option :end, type: :string
-      allows_many_upstreams
-      validate_at_least_one_upstream
-      validate_no_arguments
-      validate_option DateAdjuster::VALID_INPUT, :start, :end
-      category "Combine Streams"
-      basic_type :set
-      default_query_columns
-
-      def query(db)
-        datasets = upstreams.map do |stream|
-          stream.evaluate(db)
-        end
-
-        return datasets.first.from_self if datasets.length == 1
-
-        adjusted_start_date = DateAdjuster.new(self, options[:start]).adjust(Sequel[:l][:start_date], true)
-        adjusted_end_date = DateAdjuster.new(self, options[:end]).adjust(Sequel[:l][:end_date])
-
-        datasets = datasets.map do |ds|
-          matching = ds.from_self(alias: :l)
-
-          (datasets - [ ds ]).each do |other|
-            other = other
-                    .from_self(alias: :r)
-                    .where(adjusted_start_date <= Sequel[:r][:start_date])
-                    .where(adjusted_end_date >= Sequel[:r][:end_date])
-                    .select(*matching_columns)
-
-            matching = matching.where(other.where(matching_columns.map do |x|
-              [ Sequel.qualify(:l, x), Sequel.qualify(:r, x) ]
-            end).exists)
-          end
-
-          matching
-        end
-
-        ds, *rest = datasets
-        rest.each do |other|
-          ds = ds.union(other, from_self: nil)
-        end
-
-        ds.from_self
-      end
-    end
-  end
-end