Skip to content

Commit

Permalink
V2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
himeinhardt committed Apr 26, 2020
1 parent a36ddd5 commit 328129c
Show file tree
Hide file tree
Showing 15 changed files with 3,750 additions and 2,154 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,8 @@
for n=6 we have to check 158 classes.


Version 2.6.0:
Adding functions to compute the EPSD-Value, Chi-Value, PD-Value and the nucleolus by the Leng and Parlar (2010) formulae for three person
zero-normalized and super-additive games. Changing the package extension from *.m to *.wl.

Performing some code maintenance and minor bug fixes.
7 changes: 7 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,10 @@
satisfies a balanced inequality of a TU-game. Notice that if all balanced systems satisfying this property
non-emptiness of the core is guaranteed. Recall that for n=4 we need to check 9 equivalence classes, however,
for n=6 we have to check 158 classes.


### Version 2.6.0:
Adding functions to compute the EPSD-Value, Chi-Value, PD-Value and the nucleolus by the Leng and Parlar (2010) formulae for three person
zero-normalized and super-additive games. Changing the package extension from *.m to *.wl.

Performing some code maintenance and minor bug fixes.
162 changes: 78 additions & 84 deletions IOTuGamesV6.nb

Large diffs are not rendered by default.

26 changes: 15 additions & 11 deletions IOTuGamesV6.m → IOTuGamesV6.wl
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
(* ::Package:: *)

(*
: Title : IOTuGamesV6.m
: Release Date : 20.01.2019
: Version 2.5
: Release Date : 22.04.2020
: Version 2.6.0
*)

Expand Down Expand Up @@ -47,7 +49,9 @@
and can therefore adjusted by setting PtRadius. Similar for the line segment of a
two-dimensional Kernel, this is set to 0.75*PtRadius. In addition, the modiclus
can be drawn by invoking the options ViewModiclusSol -> True. Finally, a bug
w.r.t. the option UseManipulate -> True has been fixed.
w.r.t. the option UseManipulate -> True has been fixed.
Version 2.6.0:
Performing some code maintenance.
*)


Expand Down Expand Up @@ -467,8 +471,8 @@
dpk=Depth[kersol];
{d1,d2}=If[dpk==2,{1,4} ,Dimensions[kersol]];
kersol=If[dpk == 3 && d1 == 1,First[kersol], kersol];
normQ = Which[d1 === 1, Apply[Plus,kersol],
d1 === 2, Apply[Plus,#]&/@kersol,
normQ = Which[d1 === 1, Total[kersol],
d1 === 2, Total[#]&/@kersol,
True,1];
kercoord = Which[d1 === 1,
Which[normQ == 1, kersol,
Expand All @@ -491,7 +495,7 @@
dld4= OptionValue[SyncDim];
rd = OptionValue[PtRadius];
filopts = FilterRules[{opts},Options[Graphics3D]];
normQ = Which[Length[nuccoord] != 0, Apply[Plus, nuccoord], True, 1];
normQ = Which[Length[nuccoord] != 0, Total[ nuccoord], True, 1];
nuccoord = Which[Length[nuccoord] != 0, Which[normQ == 1, nuccoord, True, nuccoord/normQ], True, nuccoord];
l1 = Depth[nuccoord];
Which[(Length[nuccoord]!=0 && l1==2)==True,GenNucleolusGraphPointV6[nuccoord,SyncDim ->dld4,PtRadius -> rd,filopts],
Expand All @@ -505,7 +509,7 @@
dld4= OptionValue[SyncDim];
rd = OptionValue[PtRadius];
filopts = FilterRules[{opts},Options[Graphics3D]];
normQ = Which[Length[mnccoord] != 0, Apply[Plus, mnccoord], True, 1];
normQ = Which[Length[mnccoord] != 0, Total[ mnccoord], True, 1];
mnccoord = Which[Length[mnccoord] != 0, Which[normQ == 1, mnccoord, True, mnccoord/normQ], True, mnccoord];
l1 = Depth[mnccoord];
Which[(Length[mnccoord]!=0 && l1==2)==True,GenModiclusGraphPointV6[mnccoord,SyncDim ->dld4,PtRadius -> rd,filopts],
Expand All @@ -518,7 +522,7 @@
dld4= OptionValue[SyncDim];
rd = OptionValue[PtRadius];
filopts = FilterRules[{opts},Options[Graphics3D]];
normQ = Which[Length[shapcoord] != 0, Apply[Plus,shapcoord],True,1];
normQ = Which[Length[shapcoord] != 0, Total[shapcoord],True,1];
shapcoord = Which[Length[shapcoord] != 0, Which[normQ == 1, shapcoord, True, shapcoord/normQ], True, shapcoord];
l1 = Depth[shapcoord];
retval=Which[(Length[shapcoord]!=0 && l1==2)==True,GenShapleyGraphPointV6[shapcoord,SyncDim ->dld4,PtRadius -> rd,filopts],
Expand Down Expand Up @@ -548,8 +552,8 @@
dld4= OptionValue[SyncDim];
rd = OptionValue[PtRadius];
filopts = FilterRules[{opts},Options[Graphics3D]];
normQ = Which[Depth[paycoord] == 2, Apply[Plus,paycoord],
Depth[paycoord] == 3, Apply[Plus,First[paycoord]],
normQ = Which[Depth[paycoord] == 2, Total[paycoord],
Depth[paycoord] == 3, Total[First[paycoord]],
True,1];
paycoord= Which[Depth[paycoord] == 2, List[paycoord],True,paycoord];
paycoord =Which[Length[#] != 0, Which[normQ == 1, #, True, #/normQ], True, #] &/@ paycoord;
Expand Down Expand Up @@ -664,7 +668,7 @@
dld4= OptionValue[SyncDim];
rd = OptionValue[PtRadius];
filopts = FilterRules[{opts},Options[Graphics3D]];
pr=Apply[Plus,payoff];
pr=Total[payoff];
pay1=payoff/pr;
reddim=If[Length[pay1]==4,
Which[SameQ[dld4,{}],RedDimV6[pay1],
Expand Down
14 changes: 9 additions & 5 deletions Kernel/init.m
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
$ParaMode="False";
$NotebookMode="False";
Off[Syntax::stresc]
Off[Options::optnf]
Off[OptionValue::nodef]
Off[Needs::nocont]
Off[Get::noopen]
Get["TUG`coop`CooperativeGames`"];
Get["TUG`TuGames`"];
Get["TUG`TuGamesAux`"];
Get["TUG`vertex`View3D`"];
Get["TUG`vertex`VertexEnum`"];
Get["TUG`vertex`View3D`"];
Get["TUG`IOTuGamesV6`"];
Get["ComputationalGeometry`"];
(*
$ParaMode="False";
$NotebookMode="False";
*)

2 changes: 2 additions & 0 deletions MATtug.m → MATtug.wl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
(* ::Package:: *)

(*
: Title : MATtug
: Release Date : 12.05.2019
Expand Down
4 changes: 2 additions & 2 deletions PacletInfo.m
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Paclet[
Name -> "TUG",
Version -> "2.5.4",
Version -> "2.6.0",
MathematicaVersion -> "10+",
Description -> "A Mathematica Package for Cooperative Game Theory",
Creator -> "Holger Ingmar Meinhardt <holger.meinhardt@partner.kit.edu>",
URL -> "https://github.com/himeinhardt/TuGames",
Thumbnail -> "TUGLogo.png",
Thumbnail -> "TUGLogo.png","Icon" -> "TUGLogo.png",
Extensions -> {
{
"Kernel", Root -> ".",
Expand Down
Loading

0 comments on commit 328129c

Please sign in to comment.