From f8a6a2f59d04c6801c128b86eeecfbbc60bd032b Mon Sep 17 00:00:00 2001
From: Lawrence Chung <chungl1@mcmaster.ca>
Date: Mon, 2 Apr 2018 16:19:00 -0400
Subject: [PATCH] latlng from dist
---
src/search/BasicSearchResult.java | 17 ++++++++++++++++-
src/search/Graph.java | 8 +-------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/search/BasicSearchResult.java b/src/search/BasicSearchResult.java
index c325486..1123bf4 100644
--- a/src/search/BasicSearchResult.java
+++ b/src/search/BasicSearchResult.java
@@ -3,6 +3,7 @@ package search;
import java.util.ArrayList;
import data.Record;
+import java.lang.Math;
public class BasicSearchResult {
private ArrayList<Record> results;
@@ -10,13 +11,18 @@ public class BasicSearchResult {
private BST<Integer, Integer> histogram;
private Integer sum;
+ public static void main(String[] args) {
+
+ //Graph g = new Graph();
+ }
+
public BasicSearchResult(ArrayList<Record> results, double time) {
this.results = results;
this.time = time;
}
public Iterable<Record> results() {
- return (Iterable<Record>) results;
+ return (Iterable<Record>) results;
}
public int n() {
@@ -41,4 +47,13 @@ public class BasicSearchResult {
}
return this.sum;
}
+
+ private double lngRange(double dist, double lat){
+ return dist/(Math.cos(lat)*222);
+ }
+
+ private double latRange(double dist){
+ return (dist/111)/2;
+ }
+
}
diff --git a/src/search/Graph.java b/src/search/Graph.java
index 093a437..b7eb51d 100644
--- a/src/search/Graph.java
+++ b/src/search/Graph.java
@@ -8,13 +8,7 @@ public class Graph {
public static void main(String[] args) {
- Graph g = new Graph(5);
- g.addEdge(4, 3);
- g.addEdge(2, 3);
- g.addEdge(1, 2);
- g.addEdge(0, 2);
- for(int i = 0; i < 5; i++)
- System.out.println(g.adj(i));
+
}
public Graph(int V){
--
GitLab