From 4ca4d39412d61a1aedb4fc11a5030a07926fd8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A4=A9=E7=9D=BF?= <2945392546@qq.com> Date: Thu, 16 May 2024 10:31:47 +0800 Subject: [PATCH 1/6] fix --- .../Main.java" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename "work/com/java/minxi/java_20240511/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" => "work/com/java/minxi/java_20240512/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" (98%) diff --git "a/work/com/java/minxi/java_20240511/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" "b/work/com/java/minxi/java_20240512/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" similarity index 98% rename from "work/com/java/minxi/java_20240511/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" rename to "work/com/java/minxi/java_20240512/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" index f42fd02..940dea0 100644 --- "a/work/com/java/minxi/java_20240511/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" +++ "b/work/com/java/minxi/java_20240512/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Main.java" @@ -1,4 +1,4 @@ -package com.java.minxi.java_20240511.java_2302_刘天睿_2344310234; +package com.java.minxi.java_20240512.java_2302_刘天睿_2344310234; import java.util.*; import java.util.stream.Collectors; -- Gitee From bfb687bd6351f309d75e552e3466f46f754a733d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A4=A9=E7=9D=BF?= <2945392546@qq.com> Date: Thu, 16 May 2024 11:35:53 +0800 Subject: [PATCH 2/6] fix --- .../Bbb.java" | 54 +++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git "a/work/com/java/minxi/java_20240515/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" "b/work/com/java/minxi/java_20240515/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" index 5776d3b..2aef1b8 100644 --- "a/work/com/java/minxi/java_20240515/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" +++ "b/work/com/java/minxi/java_20240515/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" @@ -1,8 +1,6 @@ package com.java.minxi.java_20240515.java_2302_刘天睿_2344310234; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; +import java.util.*; public class Bbb { public static void main(String[] args) { @@ -69,7 +67,57 @@ public class Bbb { for (String i : result) { System.out.println(i); } + System.out.println("----------------------------------------"); + System.out.println("----------------------------------------"); + System.out.println("----------------------------------------"); + System.out.println("----------------------------------------"); + System.out.println("----------------------------------------"); + + + Map mm = new HashMap<>(); + mm.put("1", 11); + mm.put("2", 22); + mm.put("3", 33); + + System.out.println(mm.get("1")); + System.out.println("----------------------------------------"); + + if (mm.containsKey("3")) { + System.out.println("yes"); + } else { + System.out.println("no"); + } + + System.out.println("\t\t\t\t\t\t\t\t\t\t\t"); + System.out.println("----------------------------------------"); +// for (String u:mm.keySet()) { +// System.out.print(u); +// } +// System.out.println(); +// for (Integer u:mm.values()) { +// System.out.print(u); +// } +// for (String u:mm.keySet()) { +// System.out.println("key="+u+"\t"+"value="+mm.get(u)); +// } + for (Map.Entry e : mm.entrySet()) { + System.out.println("key=" + e.getKey() + "\t" + "value=" + e.getValue()); + } + System.out.println("----------------------------------------"); + mm.put("1", 99); + System.out.println(mm); + System.out.println("----------------------------------------"); + mm.remove("2"); + System.out.println(mm); + System.out.println("----------------------------------------"); + System.out.println(mm.size()); + System.out.println("----------------------------------------"); + HashMap tt = new HashMap<>(); + tt.put(111, "qq"); + tt.put(112, "qq"); + System.out.println(tt); + } } -- Gitee From 117cba4cdde1e9891ec319dae38a80017b784591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A4=A9=E7=9D=BF?= <2945392546@qq.com> Date: Thu, 16 May 2024 11:35:53 +0800 Subject: [PATCH 3/6] feat --- .../Bbb.java" | 54 +++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git "a/work/com/java/minxi/java_20240515/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" "b/work/com/java/minxi/java_20240515/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" index 5776d3b..2aef1b8 100644 --- "a/work/com/java/minxi/java_20240515/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" +++ "b/work/com/java/minxi/java_20240515/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" @@ -1,8 +1,6 @@ package com.java.minxi.java_20240515.java_2302_刘天睿_2344310234; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; +import java.util.*; public class Bbb { public static void main(String[] args) { @@ -69,7 +67,57 @@ public class Bbb { for (String i : result) { System.out.println(i); } + System.out.println("----------------------------------------"); + System.out.println("----------------------------------------"); + System.out.println("----------------------------------------"); + System.out.println("----------------------------------------"); + System.out.println("----------------------------------------"); + + + Map mm = new HashMap<>(); + mm.put("1", 11); + mm.put("2", 22); + mm.put("3", 33); + + System.out.println(mm.get("1")); + System.out.println("----------------------------------------"); + + if (mm.containsKey("3")) { + System.out.println("yes"); + } else { + System.out.println("no"); + } + + System.out.println("\t\t\t\t\t\t\t\t\t\t\t"); + System.out.println("----------------------------------------"); +// for (String u:mm.keySet()) { +// System.out.print(u); +// } +// System.out.println(); +// for (Integer u:mm.values()) { +// System.out.print(u); +// } +// for (String u:mm.keySet()) { +// System.out.println("key="+u+"\t"+"value="+mm.get(u)); +// } + for (Map.Entry e : mm.entrySet()) { + System.out.println("key=" + e.getKey() + "\t" + "value=" + e.getValue()); + } + System.out.println("----------------------------------------"); + mm.put("1", 99); + System.out.println(mm); + System.out.println("----------------------------------------"); + mm.remove("2"); + System.out.println(mm); + System.out.println("----------------------------------------"); + System.out.println(mm.size()); + System.out.println("----------------------------------------"); + HashMap tt = new HashMap<>(); + tt.put(111, "qq"); + tt.put(112, "qq"); + System.out.println(tt); + } } -- Gitee From d7ec3da40b34e72d8dfaea8917edbe4a67c960c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A4=A9=E7=9D=BF?= <2945392546@qq.com> Date: Thu, 16 May 2024 20:40:46 +0800 Subject: [PATCH 4/6] feat --- .../Bbb.java" | 41 +++++++++++++ .../Person.java" | 60 +++++++++++++++++++ .../Person1.java" | 5 ++ 3 files changed, 106 insertions(+) create mode 100644 "work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" create mode 100644 "work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" create mode 100644 "work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person1.java" diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" new file mode 100644 index 0000000..1712594 --- /dev/null +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" @@ -0,0 +1,41 @@ +package com.java.minxi.java_20240516.java_2302_刘天睿_2344310234; + +import java.util.Objects; + +public class Bbb { + int q; + String name; + private int age; + public static void main(String[] args) { + Person ii=new Person(); + ii.setAge(11); + ii.setName("小万"); + Bbb uu=new Bbb(); + uu.age=11; + uu.name="小万"; + System.out.println(ii.toString()); + System.out.println(ii.hashCode()); +// if (ii.equals(uu)){ +// System.out.println("---------------------------------------------------------"); +// } + if (ii.equals(uu)){ + System.out.println("---------------------------------------------------------"); + } + + + + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Bbb bbb = (Bbb) o; + return q == bbb.q; + } +// +// @Override +// public int hashCode() { +// return Objects.hash(q); +// } +} diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" new file mode 100644 index 0000000..fc42fa1 --- /dev/null +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" @@ -0,0 +1,60 @@ +package com.java.minxi.java_20240516.java_2302_刘天睿_2344310234; + +import java.util.Objects; + +public class Person implements Person1 { + private String name; + private int age; + public Person() { + + } + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + + @Override + public String toString() { + + return "Arr"+name+"\t"+"age"+age; + } + + @Override + public boolean equals(String o ,int p) { + if (this.name == o&&this.age==p) return true; +// if ( this.name!= o||this.age!=p) return false; + return false; + + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Person person = (Person) o; + return age == person.age && Objects.equals(name, person.name); + } + + @Override + public int hashCode() { + return Objects.hash(name, age); + } +} diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person1.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person1.java" new file mode 100644 index 0000000..4cb8a6e --- /dev/null +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person1.java" @@ -0,0 +1,5 @@ +package com.java.minxi.java_20240516.java_2302_刘天睿_2344310234; + +public interface Person1 { + boolean equals(String o, int p); +} -- Gitee From 4195de89860e8bc6c8891e6c99b9d34a495125b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A4=A9=E7=9D=BF?= <2945392546@qq.com> Date: Tue, 21 May 2024 20:46:49 +0800 Subject: [PATCH 5/6] feat --- .../Bbb.java" | 28 ++++------- .../Mahtou.java" | 48 +++++++++++++++++++ .../Person.java" | 24 ++++------ .../Person1.java" | 5 -- 4 files changed, 66 insertions(+), 39 deletions(-) create mode 100644 "work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Mahtou.java" delete mode 100644 "work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person1.java" diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" index 1712594..9785ba5 100644 --- "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" @@ -14,28 +14,16 @@ public class Bbb { uu.age=11; uu.name="小万"; System.out.println(ii.toString()); - System.out.println(ii.hashCode()); -// if (ii.equals(uu)){ -// System.out.println("---------------------------------------------------------"); -// } - if (ii.equals(uu)){ - System.out.println("---------------------------------------------------------"); - } - +if (ii.equals(uu)){ + System.out.println("----------------------------------"); +}else { + System.out.println(7777777777777777777777777777777777777777777777777777777777d); +} } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Bbb bbb = (Bbb) o; - return q == bbb.q; - } -// -// @Override -// public int hashCode() { -// return Objects.hash(q); -// } + + + } diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Mahtou.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Mahtou.java" new file mode 100644 index 0000000..b06220e --- /dev/null +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Mahtou.java" @@ -0,0 +1,48 @@ +package com.java.minxi.java_20240516.java_2302_刘天睿_2344310234; + + +import java.util.Scanner; + +public class Mahtou { + public static void main(String[] args) { + int n; + + Scanner uu = new Scanner(System.in); + n = uu.nextInt(); + if (n >= 0d) { + System.out.println(n); + } else { + System.out.println(-n); + } + double d=3.9D; + System.out.println(Math.rint(d)); + + double v = Math.random() ; + System.out.println(v); + + + + } +// +// + public void ping(double[] r){ + double j=0; + for (int i = 0; i < r.length; i++) { + j=j+r[i]; + } + + double v=j/r.length; + + + } + public int max(int a, int b, int c){ + return Math.max(Math.max(a,b),c); + + + } + public int min(int a, int b, int c){ + return Math.min(Math.min(a,b),c); + + + } +} diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" index fc42fa1..96d6582 100644 --- "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" @@ -2,7 +2,7 @@ package com.java.minxi.java_20240516.java_2302_刘天睿_2344310234; import java.util.Objects; -public class Person implements Person1 { +public class Person { private String name; private int age; public Person() { @@ -37,24 +37,20 @@ public class Person implements Person1 { return "Arr"+name+"\t"+"age"+age; } - @Override - public boolean equals(String o ,int p) { - if (this.name == o&&this.age==p) return true; -// if ( this.name!= o||this.age!=p) return false; - return false; - } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Person person = (Person) o; - return age == person.age && Objects.equals(name, person.name); - } + @Override public int hashCode() { return Objects.hash(name, age); } + @Override + public boolean equals(Object obj) { + if (this.name ==name && this.age==age){ + return true; + }else { + return false; + } + } } diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person1.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person1.java" deleted file mode 100644 index 4cb8a6e..0000000 --- "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person1.java" +++ /dev/null @@ -1,5 +0,0 @@ -package com.java.minxi.java_20240516.java_2302_刘天睿_2344310234; - -public interface Person1 { - boolean equals(String o, int p); -} -- Gitee From e966beda0368a9d5f0da4e30584613a319076ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A4=A9=E7=9D=BF?= <2945392546@qq.com> Date: Wed, 22 May 2024 16:23:28 +0800 Subject: [PATCH 6/6] feat --- .../Bbb.java" | 1 - .../Mahtou.java" | 33 +++++++++---------- .../Person.java" | 19 ++++++++--- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" index 9785ba5..e3f2810 100644 --- "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Bbb.java" @@ -20,7 +20,6 @@ if (ii.equals(uu)){ }else { System.out.println(7777777777777777777777777777777777777777777777777777777777d); } - } diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Mahtou.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Mahtou.java" index b06220e..2790de0 100644 --- "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Mahtou.java" +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Mahtou.java" @@ -9,32 +9,31 @@ public class Mahtou { Scanner uu = new Scanner(System.in); n = uu.nextInt(); - if (n >= 0d) { - System.out.println(n); - } else { - System.out.println(-n); +// if (n >= 0d) { +// System.out.println(n); +// } else { +// System.out.println(-n); +// } +// double d=3.9D; +// System.out.println(Math.rint(d)); +// +// double v = Math.random() ; +// System.out.println(v); + + double[] ping1=new double[5]; + for (int i = 0; i < ping1.length ; i++) { + ping1[i]=i+i*0.1; } - double d=3.9D; - System.out.println(Math.rint(d)); - double v = Math.random() ; - System.out.println(v); + Person pp=new Person(); + System.out.println(pp.ping(ping1)); } // // - public void ping(double[] r){ - double j=0; - for (int i = 0; i < r.length; i++) { - j=j+r[i]; - } - double v=j/r.length; - - - } public int max(int a, int b, int c){ return Math.max(Math.max(a,b),c); diff --git "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" index 96d6582..6bc9c46 100644 --- "a/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" +++ "b/work/com/java/minxi/java_20240516/java_2302_\345\210\230\345\244\251\347\235\277_2344310234/Person.java" @@ -37,10 +37,6 @@ public class Person { return "Arr"+name+"\t"+"age"+age; } - - - - @Override public int hashCode() { return Objects.hash(name, age); @@ -53,4 +49,19 @@ public class Person { return false; } } + public double ping(){ + + return 0; + } + public double ping(double[] r){ + double j=0; + for (int i = 0; i < r.length; i++) { + j=j+r[i]; + } + + double v=j/r.length; + return v; + + + } } -- Gitee