rejuicer 0.0.1 → 0.0.2

data/README.rdoc

@@ -24,168 +24,4 @@ sudo gem install rejuicer
 
 == LICENSE:
 
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
+  Rejuicer is released under the MIT license.

data/ext/rejuicer_set.c

@@ -128,6 +128,54 @@ int search_and_insert_at_leaf(leaf_node leaf, unsigned int value)
     return exist_flag;
 }
 
+//
+// remove element from set
+//
+void delete_num(root_node root, unsigned int value)
+{
+    unsigned int quotient, remainder;
+
+    quotient = value / INDEX_PER_SIZE[0];
+    remainder = value % INDEX_PER_SIZE[0];
+
+    if (!(root->index[quotient])) return;
+
+    if (search_and_remove((branch_node)root->index[quotient], 1, remainder, value)) {
+        root->size--;
+    }
+}
+
+int search_and_remove(branch_node branch, int level, unsigned int value, unsigned int original)
+{
+    unsigned int quotient, remainder, result;
+
+    quotient = value / INDEX_PER_SIZE[level];
+    remainder = value % INDEX_PER_SIZE[level];
+
+    if (!(branch->index[quotient])) return;
+
+    if (level == LAST_BRANCH_LEVEL) {
+        return search_and_remove_at_leaf((leaf_node)branch->index[quotient], remainder);
+    } else {
+        return search_and_remove((branch_node)branch->index[quotient], level + 1, remainder, original);
+    }
+}
+
+int search_and_remove_at_leaf(leaf_node leaf, unsigned int value)
+{
+    int exist_flag = 0;
+    unsigned int target_bit;
+
+    target_bit = 1 << value; 
+
+    if ((leaf->data & target_bit)) {
+        leaf->data ^= target_bit;
+        exist_flag = 1;
+    }
+
+    return exist_flag;
+}
+
 //
 // output Array object from internal set
 //
@@ -269,6 +317,7 @@ void destroy_branch(branch_node branch)
         for(i = 0, count = 0; i < BRANCH_NODE_SIZE || count < branch->children_size; i++) {
             if (branch->index[i]) {
                 free((leaf_node)branch->index[i]);
+                branch->index[i] = NULL;
                 count++;
             }
         }
@@ -276,6 +325,7 @@ void destroy_branch(branch_node branch)
         for(i = 0, count = 0; i < BRANCH_NODE_SIZE || count < branch->children_size; i++) {
             if (branch->index[i]) {
                 destroy_branch((branch_node)branch->index[i]);
+                branch->index[i] = NULL;
                 count++;
             }
         }
@@ -324,6 +374,22 @@ static VALUE t_add(VALUE self, VALUE value)
     return self;
 }
 
+/**
+ * delete
+ **/
+static VALUE t_delete(VALUE self, VALUE value)
+{
+    root_node root;
+    unsigned int num;
+
+    Data_Get_Struct(self, struct _root_node, root);
+    if ((num = NUM2UINT(value)) != Qnil) {
+        delete_num(root, num);
+    }
+
+    return self;
+}
+
 /**
  * intersection
 **/
@@ -395,6 +461,7 @@ void Init_rejuicer_set(void) {
     rb_cRejuicerSet = rb_define_class("RejuicerSet", rb_cObject);
     rb_define_singleton_method(rb_cRejuicerSet, "new", t_new, -1);
     rb_define_method(rb_cRejuicerSet, "add", t_add, 1);
+    rb_define_method(rb_cRejuicerSet, "delete", t_delete, 1);
     rb_define_method(rb_cRejuicerSet, "intersection", t_intersection, 1);
     rb_define_method(rb_cRejuicerSet, "to_a", t_to_a, 0);
     rb_define_method(rb_cRejuicerSet, "size", t_size, 0);

data/ext/rejuicer_set.h

@@ -50,6 +50,11 @@ void add_num(root_node, unsigned int);
 int search_and_insert(branch_node, int, unsigned int, unsigned int);
 int search_and_insert_at_leaf(leaf_node, unsigned int);
 
+// remove element from set
+void delete_num(root_node, unsigned int);
+int search_and_remove(branch_node, int, unsigned int, unsigned int);
+int search_and_remove_at_leaf(leaf_node, unsigned int);
+
 // output Array object from internal set
 void to_array(root_node, VALUE);
 void search_and_get_array(branch_node, VALUE);
@@ -71,6 +76,7 @@ void destroy_branch(branch_node);
 
 static VALUE t_new(int, VALUE *, VALUE);
 static VALUE t_add(VALUE, VALUE);
+static VALUE t_delete(VALUE, VALUE);
 static VALUE t_intersection(VALUE, VALUE);
 static VALUE t_to_a(VALUE);
 static VALUE t_size(VALUE);

data/lib/rejuicer.rb

@@ -13,6 +13,8 @@ require 'rejuicer_set'
 # index.search(:remainder_3 => 2, :remainder_5 => 4) #=> [14,29,44,59,...,9974,9989]
 #
 class Rejuicer
+  VERSION = "0.0.2"
+
   #
   # args :
   #   methods or attributes name
@@ -51,6 +53,25 @@ class Rejuicer
   end
   alias :<< :add
 
+  #
+  # delete from index
+  #   obj : object
+  #   id_attr : index id
+  #
+  def delete(obj, id_attr = :id)
+    @tree.keys.each do |k|
+      begin
+        at = obj.__send__(k)
+        obj_id = obj.__send__(id_attr)
+      rescue NoMethodError
+        next
+      end
+
+      next unless @tree[k.to_sym][at]
+      @tree[k.to_sym][at].delete(obj_id)
+    end
+  end
+
   # 
   # search
   #  conditions: search target

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rejuicer
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  hash: 27
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tsukasa OISHI
@@ -9,29 +15,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +09:00
-default_executable: 
+date: 2010-08-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
         version: 1.2.3
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 8
+        - 0
         version: 1.8.0
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Rejuicer.
 email: 
 - tsukasa.oishi@gmail.com
@@ -52,7 +69,6 @@ files:
 - ext/extconf.rb
 - ext/rejuicer_set.h
 - ext/rejuicer_set.c
-has_rdoc: true
 homepage: http://www.kaeruspoon.net/
 licenses: []
 
@@ -64,21 +80,27 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rejuicer
-rubygems_version: 1.3.5
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 2
 summary: Rejuicer.