# HG changeset patch # User jbe # Date 1306272809 -7200 # Node ID 72792038f7f0ce86aae678068d0925b72b9b1fec # Parent 3d5e38ea2fabf18fbd5d87854a0e55fbd31a6633 Backed out changeset 3d5e38ea2fab due to incomplete commit message diff -r 3d5e38ea2fab -r 72792038f7f0 core.sql --- a/core.sql Tue May 24 23:24:43 2011 +0200 +++ b/core.sql Tue May 24 23:33:29 2011 +0200 @@ -7,7 +7,7 @@ BEGIN; CREATE VIEW "liquid_feedback_version" AS - SELECT * FROM (VALUES ('1.4.0_rc1', 1, 4, -1)) + SELECT * FROM (VALUES ('1.4.0_rc2', 1, 4, -1)) AS "subquery"("string", "major", "minor", "revision"); @@ -543,7 +543,6 @@ "eligible" BOOLEAN, "rank" INT4, "winner" BOOLEAN, - "promising" BOOLEAN, "text_search_data" TSVECTOR, CONSTRAINT "all_or_none_of_revoked_and_revoked_by_member_id_must_be_null" CHECK ("revoked" NOTNULL = "revoked_by_member_id" NOTNULL), @@ -555,16 +554,14 @@ ( "admitted" NOTNULL AND "admitted" = TRUE ) OR ( "positive_votes" ISNULL AND "negative_votes" ISNULL AND "attainable" ISNULL AND "favored" ISNULL AND "unfavored" ISNULL AND - "eligible" ISNULL AND "rank" ISNULL AND - "winner" ISNULL AND "promising" ISNULL ) ), + "eligible" ISNULL AND "rank" ISNULL AND "winner" ISNULL ) ), CONSTRAINT "all_or_none_of_positive_votes_negative_votes_and_attainable_must_be_null" CHECK ("positive_votes" NOTNULL = "negative_votes" NOTNULL AND "positive_votes" NOTNULL = "attainable" NOTNULL), - CONSTRAINT "favored_excludes_unfavored" CHECK (NOT ("favored" AND "unfavored")), + CONSTRAINT "favored_forbids_unfavored" CHECK (NOT ("favored" AND "unfavored")), CONSTRAINT "attainable_and_favored_result_in_eligible" CHECK ( ( "favored" ISNULL AND "eligible" ISNULL ) OR ( "attainable" NOTNULL AND "favored" NOTNULL AND "eligible" NOTNULL AND - ("attainable" AND "favored") = "eligible" ) ), - CONSTRAINT "winner_excludes_promising" CHECK (NOT ("winner" AND "promising")) ); + ("attainable" AND "favored") = "eligible" ) ) ); CREATE INDEX "initiative_created_idx" ON "initiative" ("created"); CREATE INDEX "initiative_revoked_idx" ON "initiative" ("revoked"); CREATE INDEX "initiative_text_search_data_idx" ON "initiative" USING gin ("text_search_data"); @@ -592,7 +589,6 @@ COMMENT ON COLUMN "initiative"."eligible" IS 'TRUE, if initiative is "attainable" and "favored"'; COMMENT ON COLUMN "initiative"."rank" IS 'Schulze-Ranking after tie-breaking'; COMMENT ON COLUMN "initiative"."winner" IS 'TRUE, if initiative is final winner (best ranked initiative being "eligible")'; -COMMENT ON COLUMN "initiative"."promising" IS 'TRUE, if initiative would win against current winner, when voting is repeated with ballots based on same preferences. Non "attainable" initiatives may never be "winner", but they can be "promising".'; CREATE TABLE "battle" ( @@ -3675,19 +3671,18 @@ RETURNS VOID LANGUAGE 'plpgsql' VOLATILE AS $$ DECLARE - "dimension_v" INTEGER; - "vote_matrix" INT4[][]; -- absolute votes - "matrix" INT8[][]; -- defeat strength / best paths - "i" INTEGER; - "j" INTEGER; - "k" INTEGER; - "battle_row" "battle"%ROWTYPE; - "rank_ary" INT4[]; - "rank_v" INT4; - "done_v" INTEGER; - "winners_ary" INTEGER[]; - "initiative_id_v" "initiative"."id"%TYPE; - "promising_added_v" BOOLEAN; + "dimension_v" INTEGER; + "vote_matrix" INT4[][]; -- absolute votes + "matrix" INT8[][]; -- defeat strength / best paths + "i" INTEGER; + "j" INTEGER; + "k" INTEGER; + "battle_row" "battle"%ROWTYPE; + "rank_ary" INT4[]; + "rank_v" INT4; + "done_v" INTEGER; + "winners_ary" INTEGER[]; + "initiative_id_v" "initiative"."id"%TYPE; BEGIN PERFORM NULL FROM "issue" WHERE "id" = "issue_id_p" FOR UPDATE; SELECT count(1) INTO "dimension_v" @@ -3818,79 +3813,39 @@ "unfavored" = "rank_ary"["i"] > "rank_ary"["dimension_v"], "eligible" = "attainable" AND "rank_ary"["i"] < "rank_ary"["dimension_v"], - "rank" = "rank_ary"["i"], - "winner" = FALSE, - "promising" = FALSE + "rank" = "rank_ary"["i"] WHERE "id" = "initiative_id_v"; "i" := "i" + 1; END LOOP; IF "i" != "dimension_v" THEN RAISE EXCEPTION 'Wrong winner count (should not happen)'; END IF; - -- mark final winner: - SELECT "id" INTO "initiative_id_v" FROM "initiative" - WHERE "issue_id" = "issue_id_p" AND "admitted" AND "eligible" - ORDER BY "rank", "id" - LIMIT 1; - UPDATE "initiative" SET "winner" = TRUE WHERE "id" = "initiative_id_v"; - -- determine promising initiatives: - LOOP - "promising_added_v" := FALSE; - FOR "initiative_id_v" IN - SELECT "new_initiative"."id" - FROM "issue" - JOIN "policy" ON "issue"."policy_id" = "policy"."id" - JOIN "initiative" "old_initiative" - ON "old_initiative"."issue_id" = "issue_id_p" - AND "old_initiative"."admitted" - AND ("old_initiative"."winner" OR "old_initiative"."promising") - JOIN "initiative" "new_initiative" - ON "new_initiative"."issue_id" = "issue_id_p" - AND "new_initiative"."admitted" - AND NOT ("new_initiative"."winner" OR "new_initiative"."promising") - JOIN "battle" "battle_win" - ON "battle_win"."issue_id" = "issue_id_p" - AND "battle_win"."winning_initiative_id" = "new_initiative"."id" - AND "battle_win"."losing_initiative_id" = "old_initiative"."id" - JOIN "battle" "battle_lose" - ON "battle_lose"."issue_id" = "issue_id_p" - AND "battle_lose"."losing_initiative_id" = "new_initiative"."id" - AND "battle_lose"."winning_initiative_id" = "old_initiative"."id" - WHERE "issue"."id" = "issue_id_p" - AND "new_initiative"."rank" < "old_initiative"."rank" - -- NOTE: non-straightened ranks are used - AND CASE WHEN "policy"."majority_strict" THEN - "battle_win"."count" * "policy"."majority_den" > - "policy"."majority_num" * - ("battle_win"."count"+"battle_lose"."count") - ELSE - "battle_win"."count" * "policy"."majority_den" >= - "policy"."majority_num" * - ("battle_win"."count"+"battle_lose"."count") - END - LOOP - UPDATE "initiative" SET "promising" = TRUE - WHERE "id" = "initiative_id_v"; - "promising_added_v" := TRUE; - END LOOP; - EXIT WHEN NOT "promising_added_v"; - END LOOP; -- straighten ranks (start counting with 1, no equal ranks): "rank_v" := 1; FOR "initiative_id_v" IN SELECT "id" FROM "initiative" - WHERE "issue_id" = "issue_id_p" AND "admitted" - ORDER BY "rank", "id" + WHERE "issue_id" = "issue_id_p" AND "rank" NOTNULL + ORDER BY + "rank", + "vote_ratio"("positive_votes", "negative_votes") DESC, + "id" LOOP UPDATE "initiative" SET "rank" = "rank_v" WHERE "id" = "initiative_id_v"; "rank_v" := "rank_v" + 1; END LOOP; + -- mark final winner: + UPDATE "initiative" SET "winner" = + ( "eligible" = TRUE AND + "rank" = ( + SELECT min("rank") FROM "initiative" + WHERE "issue_id" = "issue_id_p" + AND "eligible" = TRUE ) ); END IF; -- mark issue as finished UPDATE "issue" SET "state" = - CASE WHEN "dimension_v" = 0 THEN -- TODO: Broken! To be fixed! + CASE WHEN "dimension_v" = 0 THEN 'finished_without_winner'::"issue_state" ELSE 'finished_with_winner'::"issue_state" diff -r 3d5e38ea2fab -r 72792038f7f0 demo.sql --- a/demo.sql Tue May 24 23:24:43 2011 +0200 +++ b/demo.sql Tue May 24 23:33:29 2011 +0200 @@ -186,35 +186,6 @@ INSERT INTO "opinion" ("member_id", "suggestion_id", "degree", "fulfilled") VALUES (19, 1, 2, FALSE); -INSERT INTO "issue" ("area_id", "policy_id") VALUES - (4, 1); -- id 2 - -INSERT INTO "initiative" ("issue_id", "name") VALUES - (2, 'Initiative A'), -- id 8 - (2, 'Initiative B'); -- id 9 - -INSERT INTO "draft" ("initiative_id", "author_id", "content") VALUES - (8, 1, 'Lorem ipsum...'), -- id 8 - (9, 2, 'Lorem ipsum...'); -- id 9 - -INSERT INTO "initiator" ("initiative_id", "member_id") VALUES - (8, 1), - (9, 2); - -INSERT INTO "supporter" ("member_id", "initiative_id", "draft_id") VALUES - (1, 8, 8), - (1, 9, 9), - (2, 8, 8), - (2, 9, 9), - (3, 8, 8), - (3, 9, 9), - (4, 8, 8), - (4, 9, 9), - (5, 8, 8), - (5, 9, 9), - (6, 8, 8), - (6, 9, 9); - SELECT "time_warp"(); SELECT "time_warp"(); SELECT "time_warp"(); @@ -276,70 +247,6 @@ (20, 1, 5, 1), (21, 1, 5, -1); -INSERT INTO "direct_voter" ("member_id", "issue_id") VALUES - ( 1, 2), - ( 2, 2), - ( 3, 2), - ( 4, 2), - ( 5, 2), - ( 6, 2), - ( 7, 2), - ( 8, 2), - ( 9, 2), - (10, 2), - (11, 2), - (12, 2), - (13, 2), - (14, 2), - (15, 2), - (16, 2), - (17, 2), - (18, 2), - (19, 2), - (20, 2); - -INSERT INTO "vote" ("member_id", "issue_id", "initiative_id", "grade") VALUES - ( 1, 2, 8, 2), - ( 1, 2, 9, 1), - ( 2, 2, 8, 2), - ( 2, 2, 9, 1), - ( 3, 2, 8, 2), - ( 3, 2, 9, 1), - ( 4, 2, 8, 2), - ( 4, 2, 9, 1), - ( 5, 2, 8, 2), - ( 5, 2, 9, 1), - ( 6, 2, 8, 2), - ( 6, 2, 9, 1), - ( 7, 2, 8, 2), - ( 7, 2, 9, 1), - ( 8, 2, 8, 2), - ( 8, 2, 9, 1), - ( 9, 2, 8, 2), - ( 9, 2, 9, 1), - (10, 2, 8, -1), - (10, 2, 9, 1), - (11, 2, 8, -1), - (11, 2, 9, 1), - (12, 2, 8, -1), - (12, 2, 9, 1), - (13, 2, 8, -1), - (13, 2, 9, 1), - (14, 2, 8, -1), - (14, 2, 9, 1), - (15, 2, 8, -1), - (15, 2, 9, 1), - (16, 2, 8, -1), - (16, 2, 9, 1), - (17, 2, 8, -1), - (17, 2, 9, -2), - (18, 2, 8, -1), - (18, 2, 9, -2), - (19, 2, 8, -1), - (19, 2, 9, -2), - (20, 2, 8, -1), - (20, 2, 9, -2); - SELECT "time_warp"(); DROP FUNCTION "time_warp"();