From 75c966740b5ff1ba1e2eae9e96e4f04b0f827b43 Mon Sep 17 00:00:00 2001
From: Peter Alexander <peter@blackhillock.co.uk>
Date: Mon, 19 Jun 2017 16:53:40 +0100
Subject: [PATCH] Removing file added in error
---
src/ac/ed/lurg/country/GlobalPrice.java.orig | 58 --------------------
1 file changed, 58 deletions(-)
delete mode 100644 src/ac/ed/lurg/country/GlobalPrice.java.orig
diff --git a/src/ac/ed/lurg/country/GlobalPrice.java.orig b/src/ac/ed/lurg/country/GlobalPrice.java.orig
deleted file mode 100644
index 3a865837..00000000
--- a/src/ac/ed/lurg/country/GlobalPrice.java.orig
+++ /dev/null
@@ -1,58 +0,0 @@
-package ac.ed.lurg.country;
-
-import ac.ed.lurg.ModelConfig;
-
-public class GlobalPrice {
- double exportPrice;
- double importAmount;
- double exportAmount;
-
- public GlobalPrice(double exportPrice, double importAmount, double exportAmount) {
- this.exportPrice = exportPrice;
- this.importAmount = importAmount;
- this.exportAmount = exportAmount;
- }
-
- public static GlobalPrice createInitial(double exportPrice) {
- return new GlobalPrice(exportPrice, Double.NaN, Double.NaN);
- }
-
- public double getExportPrice() {
- return exportPrice;
- }
-
- public double getCountryImportPrice(double countryTradeBarrier) {
- double importPrice = exportPrice * (1.0 + countryTradeBarrier*ModelConfig.TRADE_BARRIER_ADJ) / (1.0 - ModelConfig.TRANSPORT_LOSSES);
- return importPrice;
- }
-
- public double getImportAmount() {
- return importAmount;
- }
-
- public double getExportAmount() {
- return exportAmount;
- }
-
- public GlobalPrice createWithUpdatedMarketPrices(double imports, double exports, boolean adjustPrice) {
- if (imports > 0 || exports > 0) {
- double ratio;
-
- if (imports > exports)
- ratio = (imports-exports)/imports;
- else
- ratio = (imports-exports)/exports;
-
- double adjustment = adjustPrice ? Math.exp(ratio * ModelConfig.MARKET_LAMBA) : 1.0;
- return new GlobalPrice(exportPrice * adjustment, imports, exports);
- }
- else {
- return this;
- }
- }
-
- @Override
- public String toString() {
- return String.format("export=%.3f", exportPrice);
- }
-}
--
GitLab