Skip to content

Changing the parameter of Mathf.Tan() #10

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.

Sign up for GitHub

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

Open
ctyeong wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Changing the parameter of Mathf.Tan() #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fbb6dbc
Changing the parameter of Mathf.Tan()
ctyeong Nov 12, 2014
1595ef6
Research on new approach
ctyeong Dec 5, 2014
1842a6a
updating
ctyeong Jan 3, 2015
6693e66
learning2
ctyeong Jan 5, 2015
e34c85f
RL latest
ctyeong Jan 8, 2015
5345e04
RL, E-Greedy
ctyeong Jan 10, 2015
957b836
before ANN+Q-Learning
ctyeong Jan 11, 2015
02a8694
ANN + Q-Learning
ctyeong Jan 18, 2015
7ed3ca0
RL using ANN update
ctyeong Jan 22, 2015
15519d7
RL using ANN update2
ctyeong Jan 24, 2015
162326a
RL using ANN update3
ctyeong Feb 5, 2015
0e2a91d
ongoing
ctyeong Feb 24, 2015
3a6d3e2
ongoing~
ctyeong Mar 8, 2015
a4da60b
ok
ctyeong Mar 14, 2015
70e2440
dropbox
ctyeong Mar 14, 2015
f449589
change r function
ctyeong Mar 17, 2015
428ea33
final 4 distribution
ctyeong Aug 19, 2015
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
97 changes: 72 additions & 25 deletions Assets/Editor/MapperEditorDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
using System.Collections.Generic;
using Common;
using Extra;
using System.Linq;
using ANN;
using Learning;

namespace EditorArea {

public class MapperEditorDrawer : MonoBehaviour {

// Options
public bool drawMap = true, drawNeverSeen = false, drawHeatMap = true, drawPath = false, editGrid = false, drawFoVOnly = false, drawCombatLines = false;
public bool drawMap = true, drawNeverSeen = false, drawHeatMap = true, drawPath = false, editGrid = false, drawFoVOnly = false, drawCombatLines = false
, drawByTimeSlice = true, draw1By1Path = true, drawQValues = false;

// Caller must set these up
public Cell[][][] fullMap;
Expand All @@ -18,8 +22,11 @@ public class MapperEditorDrawer : MonoBehaviour {
public float[][] seenNeverSeen;
public Vector2 zero = new Vector2 (), tileSize = new Vector2 ();

public int pathNum2draw = 0;

// Optional things
public Dictionary<Path, bool> paths = new Dictionary<Path, bool> ();
public System.Collections.Generic.Dictionary<Path, bool> paths = new System.Collections.Generic.Dictionary<Path, bool> ();

public Cell[][] editingGrid;
public List<Tuple<Vector3, string>> textDraw;

Expand All @@ -31,8 +38,12 @@ public class MapperEditorDrawer : MonoBehaviour {
public float heatMapMax, deathHeatMapMax, combatHeatMap2dMax;
public int[] heatMapMax3d, deathHeatMapMax3d;

public NeuralNetwork ann;
public StateManager sm;

// Fixed values
private Color orange = new Color (1.0f, 0.64f, 0f, 1f), transparent = new Color (1f, 1f, 1f, 0f);
private Color blue = new Color (0f, 0f, 1f, 1f);

public void Start () {
hideFlags = HideFlags.HideInInspector;
Expand All @@ -48,6 +59,8 @@ public void OnDrawGizmos () {
if (drawFoVOnly) {
if (c != null && c.seen)
Gizmos.color = orange;
// else if( c != null && c.sight )
// Gizmos.color = blue;
else
Gizmos.color = transparent;
} else {
Expand Down Expand Up @@ -98,6 +111,8 @@ public void OnDrawGizmos () {
if (drawFoVOnly) {
if (c.seen)
Gizmos.color = orange;
else if( c.sight )
Gizmos.color = blue;
else
Gizmos.color = transparent;
} else {
Expand All @@ -107,6 +122,8 @@ public void OnDrawGizmos () {
Gizmos.color = Color.red;
else if (c.seen)
Gizmos.color = orange;
else if( c.sight )
Gizmos.color = blue;
else if (c.noisy)
Gizmos.color = Color.yellow;
else if (c.waypoint)
Expand All @@ -130,36 +147,66 @@ public void OnDrawGizmos () {
tileSize.y - tileSize.y * 0.05f));
}
}
/*
if( drawQValues && ann != null && sm != null ){
// for( int i = 0; i < fullMap.Length; i++ ) {
for( int j = 0; j < fullMap[0].Length; j++ ){
for( int k = 0; k < fullMap[0][0].Length; k++ ){
State s = sm.
Gizmos.DrawIcon(new Vector3((n.x * tileSize.x + zero.x), 0.1f, (n.y * tileSize.x + zero.y)), "r_arrow.png" );

}
}
// }
}
*/

// All Paths drawning
if (drawPath) {
Gizmos.color = Color.blue;
foreach (KeyValuePair<Path, bool> kv in paths)
if (kv.Value) {
foreach (Node n in kv.Key.points) {
Gizmos.color = kv.Key.color;
if (n.parent != null) {
Gizmos.DrawLine (new Vector3
((n.x * tileSize.x + zero.x),
0.1f,
(n.y * tileSize.x + zero.y)),

new Vector3
((n.parent.x * tileSize.y + zero.x),
0.1f,
(n.parent.y * tileSize.y + zero.y)));

KeyValuePair<Path, bool> kv;
foreach (KeyValuePair<Path, bool> kkv in paths){
if( draw1By1Path ){
Path k = paths.Keys.ToList()[pathNum2draw];
bool v = paths[k];
kv = new KeyValuePair<Path, bool>( k, v);
}
else
kv = kkv;
if (kv.Value) {
foreach (Node n in kv.Key.points) {

if (drawCombatLines && n.parent.fighting != null && n.parent.fighting.Count > 0 && n.t >= timeSlice && n.parent.t <= timeSlice) {
Gizmos.color = Color.red;

if( drawByTimeSlice && n.t > timeSlice )
continue;

Gizmos.color = kv.Key.color;
if (n.parent != null) {
Gizmos.DrawLine (new Vector3
((n.x * tileSize.x + zero.x),
0.1f,
(n.y * tileSize.x + zero.y)),

new Vector3
((n.parent.x * tileSize.y + zero.x),
0.1f,
(n.parent.y * tileSize.y + zero.y)));

for (int ei = 0; ei < n.parent.fighting.Count; ei++)
Gizmos.DrawLine (new Vector3
((n.x * tileSize.x + zero.x),
0.1f,
(n.y * tileSize.x + zero.y)),
n.parent.fighting[ei].positions[timeSlice]);
}
if (drawCombatLines && n.parent.fighting != null && n.parent.fighting.Count > 0 && n.t >= timeSlice && n.parent.t <= timeSlice) {
Gizmos.color = Color.red;

for (int ei = 0; ei < n.parent.fighting.Count; ei++)
Gizmos.DrawLine (new Vector3
((n.x * tileSize.x + zero.x),
0.1f,
(n.y * tileSize.x + zero.y)),
n.parent.fighting[ei].positions[timeSlice]);
}
}
}
if( draw1By1Path )
break;
}
}
}
Expand Down
Loading