Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added implementation of Lemke-Howson algorithm #37

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FLEX_HOME = /Users/rahul/Downloads/flex_sdk/
JETTY_HOME = /Users/rahul/Downloads/jetty/jetty-distribution-9.1.2.v20140210/
FLEX_HOME = ${env.FLEX_HOME}
JETTY_HOME = ${env.JETTY_HOME}
WAR_DIST_DIR = ${JETTY_HOME}/webapps
#FLEX_HOME = C:\\Users\\Martin\\Documents\\flex_sdk_4.1.0
#JETTY_HOME = C:\\Users\\Martin\\Documents\\Jetty8
Expand Down
11 changes: 9 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<project name="GameTheoryExplorer" basedir="." default="compileComplete">

<!-- setup a prefix for all environment variables -->

<property environment="env" />
<property file="build.properties" />


Expand All @@ -26,6 +26,7 @@
<property name="lib.proj.native" value="native-algo"/>
<property name="lib.proj.native.algo" value="native-algo/lrslib-042c"/>
<property name="lib.proj.native.my" value="native-algo/myNative"/>
<property name="lib.proj.native.lh" value="native-algo/lh-vector"/>

<property name="war.name" value="gte"/>
<property name="lib.jar.name" value="${lib.proj.dir}"/>
Expand Down Expand Up @@ -67,7 +68,8 @@

<antcall target="-setUnixEnv" />
<antcall target="-setWindowsEnv" />
<exec dir="${lib.proj.native.algo}" executable="make" />
<exec dir="${lib.proj.native.algo}" executable="make" />
<exec dir="${lib.proj.native.lh}" executable="make" />
</target>

<target name="-setWindowsEnv" if="isWindows">
Expand Down Expand Up @@ -328,6 +330,7 @@
<mkdir dir="${JETTY_DIST_DIR}/${lib.proj.native}"/>
<mkdir dir="${JETTY_DIST_DIR}/${lib.proj.native.algo}"/>
<mkdir dir="${JETTY_DIST_DIR}/${lib.proj.native.my}"/>
<mkdir dir="${JETTY_DIST_DIR}/${lib.proj.native.lh}"/>

<mkdir dir="${JETTY_DIST_DIR}/${lib.proj.output}"/>

Expand Down Expand Up @@ -361,6 +364,7 @@
<copy file="${lib.proj.native.algo}/lrs.exe" todir="${JETTY_HOME}/${lib.proj.native.algo}" overwrite="true" />
<copy file="${lib.proj.native.algo}/coclique3.exe" todir="${JETTY_HOME}/${lib.proj.native.algo}" overwrite="true" />
<copy file="${lib.proj.native.my}/test.bat" todir="${JETTY_HOME}/${lib.proj.native.my}" overwrite="true" />
<copy file="${lib.proj.native.lh}/inlh.exe" todir="${JETTY_HOME}/${lib.proj.native.lh}" overwrite="true" />
</target>

<target name="-copyUnixFiles" if="isUnix">
Expand All @@ -375,6 +379,9 @@

<copy file="${lib.proj.native.my}/test.sh" todir="${JETTY_HOME}/${lib.proj.native.my}" overwrite="true" />
<chmod file="${JETTY_HOME}/${lib.proj.native.my}/test.sh" perm="700"/>

<copy file="${lib.proj.native.lh}/inlh" todir="${JETTY_HOME}/${lib.proj.native.lh}" overwrite="true" />
<chmod file="${JETTY_HOME}/${lib.proj.native.lh}/inlh" perm="700"/>
</target>

</project>
2 changes: 1 addition & 1 deletion gui-builder/src/lse/math/games/builder/view/Main.mxml
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@

<s:HGroup left="{expanded ? 3 : 0}" height="{menuBarHeight}" top="0" paddingTop="3" gap="-1" right="0" clipAndEnableScrolling="true" keyDown="sc_keyDownHandler(event)" keyUp="sc_keyUpHandler(event)" verticalAlign="middle">
<mx:Button styleName="myButton" width="{buttonWidth1}" height="{buttonHeight1}" icon="@Embed(source='../../../../../../assets/icons/page_white.png')" toolTip="Clear [Ctrl+c]" click="PromptTwoButtons.show(clearDependingOnPromptResult, 'Are you really sure you want to clear the game?');" />
<mx:Button styleName="myButton" width="{buttonWidth1}" height="{buttonHeight1}" icon="@Embed(source='../../../../../../assets/icons/folder_page.png')" toolTip="Open [Ctrl+o]" click="controller.open()" />
<mx:Button styleName="myButton" width="{buttonWidth1}" height="{buttonHeight1}" icon="@Embed(source='../../../../../../assets/icons/folder_page.png')" toolTip="Open [Ctrl+o]" click="matrixEditor.changeEvtRadioButton('2G');transpoMatrix.selected=false;ngToggleZeroSumStrategic.selected=false;controller.open()" />
<mx:Button styleName="myButton" width="{buttonWidth1}" height="{buttonHeight1}" icon="@Embed(source='../../../../../../assets/icons/page_save.png')" toolTip="Save [Ctrl+s]" click="controller.save()" />
<mx:Button styleName="myButton" width="{buttonWidth1}" height="{buttonHeight1}" icon="@Embed(source='../../../../../../assets/icons/page_white_picture.png')" toolTip="Export As PNG File" click="controller.image()" />
<mx:Button styleName="myButton" width="{buttonWidth1}" height="{buttonHeight1}" icon="@Embed(source='../../../../../../assets/icons/page_white_vector.png')" toolTip="Export As FIG File" click="controller.fig()" />
Expand Down
3 changes: 3 additions & 0 deletions native-algo/lh-vector/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.o
inlh
inlemke
17 changes: 17 additions & 0 deletions native-algo/lh-vector/Depend
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
alloc.o: alloc.c alloc.h
col.o: col.c col.h
mp.o: mp.c mp.h
inlemke.o: inlemke.c alloc.h col.h rat.h mp.h lemke.h list.h \
equilibrium.h
rat.o: rat.c rat.h mp.h
equilibrium.o: equilibrium.c rat.h mp.h equilibrium.h alloc.h col.h
list.o: list.c equilibrium.h alloc.h col.h rat.h mp.h list.h
lemke.o: lemke.c alloc.h col.h lemke.h list.h equilibrium.h rat.h mp.h
gmpwrap.o: gmpwrap.c gmp.h gmpwrap.h
grat.o: grat.c rat.h gmp.h gmpwrap.h mp.h
gequilibrium.o: gequilibrium.c rat.h gmp.h gmpwrap.h mp.h equilibrium.h \
alloc.h col.h
glemke.o: glemke.c alloc.h col.h lemke.h list.h equilibrium.h rat.h gmp.h \
gmpwrap.h mp.h
inlemkehowson.o: inlemkehowson.c alloc.h col.h rat.h mp.h lemke.h list.h \
equilibrium.h
Loading